Auto merge of #131196 - matthiaskrgr:rollup-3it3zqp, r=matthiaskrgr

Rollup of 3 pull requests
Successful merges:
- #130419 (Streamline `HirCollector`)
- #131163 (Add `get_line` confusable to `Stdin::read_line()`)
- #131173 (Fix `target_abi` in SOLID targets)
r? `@ghost`
`@rustbot` modify labels: rollup

Author: bors

compiler/rustc_ast_passes/src/ast_validation.rs

@@ -63,7 +63,7 @@ impl TraitOrTraitImpl {
 }
 
 structAstValidator<'a>{
-session:&'aSession,
+sess:&'aSession,
 features:&'aFeatures,
 
 /// The span of the `extern` in an `extern { ... }` block, if any.
@@ -267,7 +267,7 @@ impl<'a> AstValidator<'a> {
 }
 
 fndcx(&self) -> DiagCtxtHandle<'a>{
-self.session.dcx()
+self.sess.dcx()
 }
 
 fnvisibility_not_permitted(&self,vis:&Visibility,note: errors::VisibilityNotPermittedNote){
@@ -359,7 +359,7 @@ impl<'a> AstValidator<'a> {
 in_impl:matches!(parent,TraitOrTraitImpl::TraitImpl{ .. }),
 const_context_label: parent_constness,
 remove_const_sugg:(
-self.session.source_map().span_extend_while_whitespace(span),
+self.sess.source_map().span_extend_while_whitespace(span),
 match parent_constness {
 Some(_) => rustc_errors::Applicability::MachineApplicable,
 None => rustc_errors::Applicability::MaybeIncorrect,
@@ -472,15 +472,15 @@ impl<'a> AstValidator<'a> {
 
 fncheck_defaultness(&self,span:Span,defaultness:Defaultness){
 ifletDefaultness::Default(def_span) = defaultness {
-let span = self.session.source_map().guess_head_span(span);
+let span = self.sess.source_map().guess_head_span(span);
 self.dcx().emit_err(errors::ForbiddenDefault{ span, def_span });
 }
 }
 
 /// If `sp` ends with a semicolon, returns it as a `Span`
 /// Otherwise, returns `sp.shrink_to_hi()`
 fnending_semi_or_hi(&self,sp:Span) -> Span{
-let source_map = self.session.source_map();
+let source_map = self.sess.source_map();
 let end = source_map.end_point(sp);
 
 if source_map.span_to_snippet(end).is_ok_and(|s| s == ";"){
@@ -552,7 +552,7 @@ impl<'a> AstValidator<'a> {
 }
 
 fncurrent_extern_span(&self) -> Span{
-self.session.source_map().guess_head_span(self.extern_mod.unwrap())
+self.sess.source_map().guess_head_span(self.extern_mod.unwrap())
 }
 
 /// An `fn` in `extern { ... }` cannot have qualifiers, e.g. `async fn`.
@@ -648,7 +648,7 @@ impl<'a> AstValidator<'a> {
 if ident.name.as_str().is_ascii(){
 return;
 }
-let span = self.session.source_map().guess_head_span(item_span);
+let span = self.sess.source_map().guess_head_span(item_span);
 self.dcx().emit_err(errors::NoMangleAscii{ span });
 }
 
@@ -753,7 +753,7 @@ impl<'a> AstValidator<'a> {
 self.dcx().emit_err(errors::PatternFnPointer{ span });
 });
 ifletExtern::Implicit(_) = bfty.ext{
-let sig_span = self.session.source_map().next_point(ty.span.shrink_to_lo());
+let sig_span = self.sess.source_map().next_point(ty.span.shrink_to_lo());
 self.maybe_lint_missing_abi(sig_span, ty.id);
 }
 }
@@ -795,7 +795,7 @@ impl<'a> AstValidator<'a> {
 // FIXME(davidtwco): This is a hack to detect macros which produce spans of the
 // call site which do not have a macro backtrace. See #61963.
 ifself
-.session
+.sess
 .source_map()
 .span_to_snippet(span)
 .is_ok_and(|snippet| !snippet.starts_with("#["))
@@ -885,7 +885,7 @@ fn validate_generic_param_order(dcx: DiagCtxtHandle<'_>, generics: &[GenericPara
 
 impl<'a>Visitor<'a>forAstValidator<'a>{
 fnvisit_attribute(&mutself,attr:&Attribute){
- validate_attr::check_attr(&self.session.psess, attr);
+ validate_attr::check_attr(&self.sess.psess, attr);
 }
 
 fnvisit_ty(&mutself,ty:&'aTy){
@@ -1192,7 +1192,7 @@ impl<'a> Visitor<'a> for AstValidator<'a> {
 }elseif where_clauses.after.has_where_token{
 self.dcx().emit_err(errors::WhereClauseAfterTypeAlias{
 span: where_clauses.after.span,
-help:self.session.is_nightly_build(),
+help:self.sess.is_nightly_build(),
 });
 }
 }
@@ -1328,7 +1328,7 @@ impl<'a> Visitor<'a> for AstValidator<'a> {
 (BoundKind::SuperTraits,BoundConstness::Never,BoundPolarity::Maybe(_))
 if !self.features.more_maybe_bounds =>
 {
-self.session
+self.sess
 .create_feature_err(
  errors::OptionalTraitSupertrait{
 span: trait_ref.span,
@@ -1341,7 +1341,7 @@ impl<'a> Visitor<'a> for AstValidator<'a> {
 (BoundKind::TraitObject,BoundConstness::Never,BoundPolarity::Maybe(_))
 if !self.features.more_maybe_bounds =>
 {
-self.session
+self.sess
 .create_feature_err(
  errors::OptionalTraitObject{span: trait_ref.span},
  sym::more_maybe_bounds,
@@ -1752,13 +1752,13 @@ fn deny_equality_constraints(
 }
 
 pubfncheck_crate(
-session:&Session,
+sess:&Session,
 features:&Features,
 krate:&Crate,
 lints:&mutLintBuffer,
 ) -> bool{
 letmut validator = AstValidator{
-session,
+sess,
  features,
 extern_mod:None,
 outer_trait_or_trait_impl:None,

compiler/rustc_target/src/spec/targets/armv7a_kmc_solid_asp3_eabi.rs

@@ -14,6 +14,7 @@ pub(crate) fn target() -> Target {
 data_layout:"e-m:e-p:32:32-Fi8-i64:64-v128:64:128-a:0:32-n32-S64".into(),
 arch:"arm".into(),
 options:TargetOptions{
+abi:"eabi".into(),
 linker:Some("arm-kmc-eabi-gcc".into()),
 features:"+v7,+soft-float,+thumb2,-neon".into(),
 relocation_model:RelocModel::Static,

compiler/rustc_target/src/spec/targets/armv7a_kmc_solid_asp3_eabihf.rs

@@ -14,6 +14,7 @@ pub(crate) fn target() -> Target {
 data_layout:"e-m:e-p:32:32-Fi8-i64:64-v128:64:128-a:0:32-n32-S64".into(),
 arch:"arm".into(),
 options:TargetOptions{
+abi:"eabihf".into(),
 linker:Some("arm-kmc-eabi-gcc".into()),
 features:"+v7,+vfp3,-d32,+thumb2,-neon".into(),
 relocation_model:RelocModel::Static,

library/std/src/io/stdio.rs

@@ -394,6 +394,7 @@ impl Stdin {
 /// in which case it will wait for the Enter key to be pressed before
 /// continuing
 #[stable(feature = "rust1", since = "1.0.0")]
+#[rustc_confusables("get_line")]
 pubfnread_line(&self,buf:&mutString) -> io::Result<usize>{
 self.lock().read_line(buf)
 }

src/librustdoc/doctest.rs

@@ -186,8 +186,6 @@ pub(crate) fn run(
 
 letmut collector = CreateRunnableDocTests::new(options, opts);
 let hir_collector = HirCollector::new(
-&compiler.sess,
- tcx.hir(),
 ErrorCodes::from(compiler.sess.opts.unstable_features.is_nightly_build()),
  enable_per_target_ignores,
  tcx,

src/librustdoc/doctest/rust.rs

@@ -6,11 +6,9 @@ use rustc_data_structures::fx::FxHashSet;
 use rustc_data_structures::sync::Lrc;
 use rustc_hir::def_id::{CRATE_DEF_ID,LocalDefId};
 use rustc_hir::{selfas hir,CRATE_HIR_ID, intravisit};
-use rustc_middle::hir::map::Map;
 use rustc_middle::hir::nested_filter;
 use rustc_middle::ty::TyCtxt;
 use rustc_resolve::rustdoc::span_of_fragments;
-use rustc_session::Session;
 use rustc_span::source_map::SourceMap;
 use rustc_span::{BytePos,DUMMY_SP,FileName,Pos,Span};
 
@@ -63,30 +61,22 @@ impl DocTestVisitor for RustCollector {
 fnvisit_header(&mutself,_name:&str,_level:u32){}
 }
 
-pub(super)structHirCollector<'a,'tcx>{
-sess:&'aSession,
-map:Map<'tcx>,
+pub(super)structHirCollector<'tcx>{
 codes:ErrorCodes,
 tcx:TyCtxt<'tcx>,
 enable_per_target_ignores:bool,
 collector:RustCollector,
 }
 
-impl<'a,'tcx>HirCollector<'a,'tcx>{
-pubfnnew(
-sess:&'aSession,
-map:Map<'tcx>,
-codes:ErrorCodes,
-enable_per_target_ignores:bool,
-tcx:TyCtxt<'tcx>,
-) -> Self{
+impl<'tcx>HirCollector<'tcx>{
+pubfnnew(codes:ErrorCodes,enable_per_target_ignores:bool,tcx:TyCtxt<'tcx>) -> Self{
 let collector = RustCollector{
-source_map: sess.psess.clone_source_map(),
+source_map:tcx.sess.psess.clone_source_map(),
 cur_path:vec![],
 position:DUMMY_SP,
 tests:vec![],
 };
-Self{sess, map,codes, enable_per_target_ignores, tcx, collector }
+Self{ codes, enable_per_target_ignores, tcx, collector }
 }
 
 pubfncollect_crate(mutself) -> Vec<ScrapedDocTest>{
@@ -98,7 +88,7 @@ impl<'a, 'tcx> HirCollector<'a, 'tcx> {
 }
 }
 
-impl<'a,'tcx>HirCollector<'a,'tcx>{
+impl<'tcx>HirCollector<'tcx>{
 fnvisit_testable<F:FnOnce(&mutSelf)>(
 &mutself,
 name:String,
@@ -108,7 +98,7 @@ impl<'a, 'tcx> HirCollector<'a, 'tcx> {
 ){
 let ast_attrs = self.tcx.hir().attrs(self.tcx.local_def_id_to_hir_id(def_id));
 ifletSome(ref cfg) = ast_attrs.cfg(self.tcx,&FxHashSet::default()){
-if !cfg.matches(&self.sess.psess,Some(self.tcx.features())){
+if !cfg.matches(&self.tcx.sess.psess,Some(self.tcx.features())){
 return;
 }
 }
@@ -141,17 +131,17 @@ impl<'a, 'tcx> HirCollector<'a, 'tcx> {
 }
 }
 
-impl<'a,'tcx> intravisit::Visitor<'tcx>forHirCollector<'a,'tcx>{
+impl<'tcx> intravisit::Visitor<'tcx>forHirCollector<'tcx>{
 typeNestedFilter = nested_filter::All;
 
 fnnested_visit_map(&mutself) -> Self::Map{
-self.map
+self.tcx.hir()
 }
 
 fnvisit_item(&mutself,item:&'tcx hir::Item<'_>){
 let name = match&item.kind{
  hir::ItemKind::Impl(impl_) => {
- rustc_hir_pretty::id_to_string(&self.map, impl_.self_ty.hir_id)
+ rustc_hir_pretty::id_to_string(&self.tcx.hir(), impl_.self_ty.hir_id)
 }
  _ => item.ident.to_string(),
 };

tests/ui/attributes/rustc_confusables_std_cases.rs

@@ -23,4 +23,8 @@ fn main() {
 //~^ HELP you might have meant to use `push_str`
 String::new().append("");//~ ERROR E0599
 //~^ HELP you might have meant to use `push_str`
+letmut buffer = String::new();
+let stdin = std::io::stdin();
+ stdin.get_line(&mut buffer).unwrap();//~ ERROR E0599
+//~^ HELP you might have meant to use `read_line`
 }

tests/ui/attributes/rustc_confusables_std_cases.stderr

@@ -106,7 +106,18 @@ help: you might have meant to use `push_str`
 LL | String::new().push_str("");
  | ~~~~~~~~
 
-error: aborting due to 8 previous errors
+error[E0599]: no method named `get_line` found for struct `Stdin` in the current scope
+ --> $DIR/rustc_confusables_std_cases.rs:28:11
+ |
+LL | stdin.get_line(&mut buffer).unwrap();
+ | ^^^^^^^^ method not found in `Stdin`
+ |
+help: you might have meant to use `read_line`
+ |
+LL | stdin.read_line(&mut buffer).unwrap();
+ | ~~~~~~~~~
+
+error: aborting due to 9 previous errors
 
 Some errors have detailed explanations: E0308, E0599.
 For more information about an error, try `rustc --explain E0308`.