Auto merge of rust-lang#126951 - matthiaskrgr:rollup-xg0o4mc, r=matth…

…iaskrgr

Rollup of 7 pull requests

Successful merges:

 - rust-lang#126618 (Mark assoc tys live only if the corresponding trait is live)
 - rust-lang#126746 (Deny `use<>` for RPITITs)
 - rust-lang#126868 (not use offset when there is not ends with brace)
 - rust-lang#126884 (Do not ICE when suggesting dereferencing closure arg)
 - rust-lang#126893 (Eliminate the distinction between PREC_POSTFIX and PREC_PAREN precedence level)
 - rust-lang#126915 (Don't suggest awaiting in closure patterns)
 - rust-lang#126943 (De-duplicate all consecutive native libs regardless of their options)

r? `@ghost`
`@rustbot` modify labels: rollup

compiler/rustc_ast/src/util/parser.rs

@@ -233,8 +233,7 @@ pub const PREC_JUMP: i8 = -30;
 pub const PREC_RANGE: i8 = -10;
 // The range 2..=14 is reserved for AssocOp binary operator precedences.
 pub const PREC_PREFIX: i8 = 50;
-pub const PREC_POSTFIX: i8 = 60;
-pub const PREC_PAREN: i8 = 99;
+pub const PREC_UNAMBIGUOUS: i8 = 60;
 pub const PREC_FORCE_PAREN: i8 = 100;
 
 #[derive(Debug, Clone, Copy)]
@@ -325,37 +324,35 @@ impl ExprPrecedence {
  | ExprPrecedence::Let
  | ExprPrecedence::Unary => PREC_PREFIX,
 
- // Unary, postfix
- ExprPrecedence::Await
+ // Never need parens
+ ExprPrecedence::Array
+ | ExprPrecedence::Await
+ | ExprPrecedence::Block
  | ExprPrecedence::Call
- | ExprPrecedence::MethodCall
+ | ExprPrecedence::ConstBlock
  | ExprPrecedence::Field
+ | ExprPrecedence::ForLoop
+ | ExprPrecedence::FormatArgs
+ | ExprPrecedence::Gen
+ | ExprPrecedence::If
  | ExprPrecedence::Index
- | ExprPrecedence::Try
  | ExprPrecedence::InlineAsm
+ | ExprPrecedence::Lit
+ | ExprPrecedence::Loop
  | ExprPrecedence::Mac
- | ExprPrecedence::FormatArgs
+ | ExprPrecedence::Match
+ | ExprPrecedence::MethodCall
  | ExprPrecedence::OffsetOf
- | ExprPrecedence::PostfixMatch => PREC_POSTFIX,
-
- // Never need parens
- ExprPrecedence::Array
+ | ExprPrecedence::Paren
+ | ExprPrecedence::Path
+ | ExprPrecedence::PostfixMatch
  | ExprPrecedence::Repeat
+ | ExprPrecedence::Struct
+ | ExprPrecedence::Try
+ | ExprPrecedence::TryBlock
  | ExprPrecedence::Tup
- | ExprPrecedence::Lit
- | ExprPrecedence::Path
- | ExprPrecedence::Paren
- | ExprPrecedence::If
  | ExprPrecedence::While
- | ExprPrecedence::ForLoop
- | ExprPrecedence::Loop
- | ExprPrecedence::Match
- | ExprPrecedence::ConstBlock
- | ExprPrecedence::Block
- | ExprPrecedence::TryBlock
- | ExprPrecedence::Gen
- | ExprPrecedence::Struct
- | ExprPrecedence::Err => PREC_PAREN,
+ | ExprPrecedence::Err => PREC_UNAMBIGUOUS,
  }
  }
 }

compiler/rustc_ast_lowering/messages.ftl

@@ -130,6 +130,9 @@ ast_lowering_never_pattern_with_guard =
 
 ast_lowering_no_precise_captures_on_apit = `use<...>` precise capturing syntax not allowed in argument-position `impl Trait`
 
+ast_lowering_no_precise_captures_on_rpitit = `use<...>` precise capturing syntax is currently not allowed in return-position `impl Trait` in traits
+ .note = currently, return-position `impl Trait` in traits and trait implementations capture all lifetimes in scope
+
 ast_lowering_previously_used_here = previously used here
 
 ast_lowering_register1 = register `{$reg1_name}`

compiler/rustc_ast_lowering/src/errors.rs

@@ -424,6 +424,14 @@ pub(crate) struct NoPreciseCapturesOnApit {
  pub span: Span,
 }
 
+#[derive(Diagnostic)]
+#[diag(ast_lowering_no_precise_captures_on_rpitit)]
+#[note]
+pub(crate) struct NoPreciseCapturesOnRpitit {
+ #[primary_span]
+ pub span: Span,
+}
+
 #[derive(Diagnostic)]
 #[diag(ast_lowering_yield_in_closure)]
 pub(crate) struct YieldInClosure {

compiler/rustc_ast_lowering/src/lib.rs

@@ -1594,6 +1594,26 @@ impl<'a, 'hir> LoweringContext<'a, 'hir> {
  };
  debug!(?captured_lifetimes_to_duplicate);
 
+ match fn_kind {
+ // Deny `use<>` on RPITIT in trait/trait-impl for now.
+ Some(FnDeclKind::Trait | FnDeclKind::Impl) => {
+ if let Some(span) = bounds.iter().find_map(|bound| match *bound {
+ ast::GenericBound::Use(_, span) => Some(span),
+ _ => None,
+ }) {
+ self.tcx.dcx().emit_err(errors::NoPreciseCapturesOnRpitit { span });
+ }
+ }
+ None
+ | Some(
+ FnDeclKind::Fn
+ | FnDeclKind::Inherent
+ | FnDeclKind::ExternFn
+ | FnDeclKind::Closure
+ | FnDeclKind::Pointer,
+ ) => {}
+ }
+
  self.lower_opaque_inner(
  opaque_ty_node_id,
  origin,

compiler/rustc_ast_pretty/src/pprust/state/expr.rs

@@ -217,7 +217,7 @@ impl<'a> State<'a> {
  fn print_expr_call(&mut self, func: &ast::Expr, args: &[P<ast::Expr>], fixup: FixupContext) {
  let prec = match func.kind {
  ast::ExprKind::Field(..) => parser::PREC_FORCE_PAREN,
- _ => parser::PREC_POSTFIX,
+ _ => parser::PREC_UNAMBIGUOUS,
  };
 
  // Independent of parenthesization related to precedence, we must
@@ -257,7 +257,7 @@ impl<'a> State<'a> {
  // boundaries, `$receiver.method()` can be parsed back as a statement
  // containing an expression if and only if `$receiver` can be parsed as
  // a statement containing an expression.
- self.print_expr_maybe_paren(receiver, parser::PREC_POSTFIX, fixup);
+ self.print_expr_maybe_paren(receiver, parser::PREC_UNAMBIGUOUS, fixup);
 
  self.word(".");
  self.print_ident(segment.ident);
@@ -489,7 +489,7 @@ impl<'a> State<'a> {
  self.space();
  }
  MatchKind::Postfix => {
- self.print_expr_maybe_paren(expr, parser::PREC_POSTFIX, fixup);
+ self.print_expr_maybe_paren(expr, parser::PREC_UNAMBIGUOUS, fixup);
  self.word_nbsp(".match");
  }
  }
@@ -549,7 +549,7 @@ impl<'a> State<'a> {
  self.print_block_with_attrs(blk, attrs);
  }
  ast::ExprKind::Await(expr, _) => {
- self.print_expr_maybe_paren(expr, parser::PREC_POSTFIX, fixup);
+ self.print_expr_maybe_paren(expr, parser::PREC_UNAMBIGUOUS, fixup);
  self.word(".await");
  }
  ast::ExprKind::Assign(lhs, rhs, _) => {
@@ -568,14 +568,14 @@ impl<'a> State<'a> {
  self.print_expr_maybe_paren(rhs, prec, fixup.subsequent_subexpression());
  }
  ast::ExprKind::Field(expr, ident) => {
- self.print_expr_maybe_paren(expr, parser::PREC_POSTFIX, fixup);
+ self.print_expr_maybe_paren(expr, parser::PREC_UNAMBIGUOUS, fixup);
  self.word(".");
  self.print_ident(*ident);
  }
  ast::ExprKind::Index(expr, index, _) => {
  self.print_expr_maybe_paren(
  expr,
- parser::PREC_POSTFIX,
+ parser::PREC_UNAMBIGUOUS,
  fixup.leftmost_subexpression(),
  );
  self.word("[");
@@ -713,7 +713,7 @@ impl<'a> State<'a> {
  }
  }
  ast::ExprKind::Try(e) => {
- self.print_expr_maybe_paren(e, parser::PREC_POSTFIX, fixup);
+ self.print_expr_maybe_paren(e, parser::PREC_UNAMBIGUOUS, fixup);
  self.word("?")
  }
  ast::ExprKind::TryBlock(blk) => {

compiler/rustc_borrowck/src/diagnostics/region_errors.rs

@@ -1151,7 +1151,9 @@ impl<'tcx> MirBorrowckCtxt<'_, '_, '_, 'tcx> {
  // Get the arguments for the found method, only specifying that `Self` is the receiver type.
  let Some(possible_rcvr_ty) = typeck_results.node_type_opt(rcvr.hir_id) else { return };
  let args = GenericArgs::for_item(tcx, method_def_id, |param, _| {
- if param.index == 0 {
+ if let ty::GenericParamDefKind::Lifetime = param.kind {
+ tcx.lifetimes.re_erased.into()
+ } else if param.index == 0 && param.name == kw::SelfUpper {
  possible_rcvr_ty.into()
  } else if param.index == closure_param.index {
  closure_ty.into()
@@ -1168,7 +1170,7 @@ impl<'tcx> MirBorrowckCtxt<'_, '_, '_, 'tcx> {
  Obligation::misc(tcx, span, self.mir_def_id(), self.param_env, pred)
  }));
 
- if ocx.select_all_or_error().is_empty() {
+ if ocx.select_all_or_error().is_empty() && count > 0 {
  diag.span_suggestion_verbose(
  tcx.hir().body(*body).value.peel_blocks().span.shrink_to_lo(),
  "dereference the return value",

compiler/rustc_codegen_ssa/src/back/link.rs

@@ -1490,11 +1490,6 @@ fn print_native_static_libs(
  let mut lib_args: Vec<_> = all_native_libs
  .iter()
  .filter(|l| relevant_lib(sess, l))
- // Deduplication of successive repeated libraries, see rust-lang/rust#113209
- //
- // note: we don't use PartialEq/Eq because NativeLib transitively depends on local
- // elements like spans, which we don't care about and would make the deduplication impossible
- .dedup_by(|l1, l2| l1.name == l2.name && l1.kind == l2.kind && l1.verbatim == l2.verbatim)
  .filter_map(|lib| {
  let name = lib.name;
  match lib.kind {
@@ -1521,6 +1516,8 @@ fn print_native_static_libs(
  | NativeLibKind::RawDylib => None,
  }
  })
+ // deduplication of consecutive repeated libraries, see rust-lang/rust#113209
+ .dedup()
  .collect();
  for path in all_rust_dylibs {
  // FIXME deduplicate with add_dynamic_crate

compiler/rustc_hir_analysis/src/check/mod.rs

@@ -211,11 +211,18 @@ fn missing_items_err(
  .collect::<Vec<_>>()
  .join("`, `");
 
- // `Span` before impl block closing brace.
- let hi = full_impl_span.hi() - BytePos(1);
- // Point at the place right before the closing brace of the relevant `impl` to suggest
- // adding the associated item at the end of its body.
- let sugg_sp = full_impl_span.with_lo(hi).with_hi(hi);
+ let sugg_sp = if let Ok(snippet) = tcx.sess.source_map().span_to_snippet(full_impl_span)
+ && snippet.ends_with("}")
+ {
+ // `Span` before impl block closing brace.
+ let hi = full_impl_span.hi() - BytePos(1);
+ // Point at the place right before the closing brace of the relevant `impl` to suggest
+ // adding the associated item at the end of its body.
+ full_impl_span.with_lo(hi).with_hi(hi)
+ } else {
+ full_impl_span.shrink_to_hi()
+ };
+
  // Obtain the level of indentation ending in `sugg_sp`.
  let padding =
  tcx.sess.source_map().indentation_before(sugg_sp).unwrap_or_else(|| String::new());

compiler/rustc_hir_pretty/src/lib.rs

@@ -1120,7 +1120,7 @@ impl<'a> State<'a> {
  fn print_expr_call(&mut self, func: &hir::Expr<'_>, args: &[hir::Expr<'_>]) {
  let prec = match func.kind {
  hir::ExprKind::Field(..) => parser::PREC_FORCE_PAREN,
- _ => parser::PREC_POSTFIX,
+ _ => parser::PREC_UNAMBIGUOUS,
  };
 
  self.print_expr_maybe_paren(func, prec);
@@ -1134,7 +1134,7 @@ impl<'a> State<'a> {
  args: &[hir::Expr<'_>],
  ) {
  let base_args = args;
- self.print_expr_maybe_paren(receiver, parser::PREC_POSTFIX);
+ self.print_expr_maybe_paren(receiver, parser::PREC_UNAMBIGUOUS);
  self.word(".");
  self.print_ident(segment.ident);
 
@@ -1478,12 +1478,12 @@ impl<'a> State<'a> {
  self.print_expr_maybe_paren(rhs, prec);
  }
  hir::ExprKind::Field(expr, ident) => {
- self.print_expr_maybe_paren(expr, parser::PREC_POSTFIX);
+ self.print_expr_maybe_paren(expr, parser::PREC_UNAMBIGUOUS);
  self.word(".");
  self.print_ident(ident);
  }
  hir::ExprKind::Index(expr, index, _) => {
- self.print_expr_maybe_paren(expr, parser::PREC_POSTFIX);
+ self.print_expr_maybe_paren(expr, parser::PREC_UNAMBIGUOUS);
  self.word("[");
  self.print_expr(index);
  self.word("]");

compiler/rustc_hir_typeck/src/callee.rs

@@ -3,7 +3,7 @@ use super::method::MethodCallee;
 use super::{Expectation, FnCtxt, TupleArgumentsFlag};
 
 use crate::errors;
-use rustc_ast::util::parser::PREC_POSTFIX;
+use rustc_ast::util::parser::PREC_UNAMBIGUOUS;
 use rustc_errors::{Applicability, Diag, ErrorGuaranteed, StashKey};
 use rustc_hir::def::{self, CtorKind, Namespace, Res};
 use rustc_hir::def_id::DefId;
@@ -656,7 +656,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
  };
 
  if let Ok(rest_snippet) = rest_snippet {
- let sugg = if callee_expr.precedence().order() >= PREC_POSTFIX {
+ let sugg = if callee_expr.precedence().order() >= PREC_UNAMBIGUOUS {
  vec![
  (up_to_rcvr_span, "".to_string()),
  (rest_span, format!(".{}({rest_snippet}", segment.ident)),

compiler/rustc_hir_typeck/src/cast.rs

@@ -946,7 +946,7 @@ impl<'a, 'tcx> CastCheck<'tcx> {
 
  fn lossy_provenance_ptr2int_lint(&self, fcx: &FnCtxt<'a, 'tcx>, t_c: ty::cast::IntTy) {
  let expr_prec = self.expr.precedence().order();
- let needs_parens = expr_prec < rustc_ast::util::parser::PREC_POSTFIX;
+ let needs_parens = expr_prec < rustc_ast::util::parser::PREC_UNAMBIGUOUS;
 
  let needs_cast = !matches!(t_c, ty::cast::IntTy::U(ty::UintTy::Usize));
  let cast_span = self.expr_span.shrink_to_hi().to(self.cast_span);

compiler/rustc_hir_typeck/src/fn_ctxt/suggestions.rs

@@ -9,7 +9,7 @@ use crate::method::probe::{IsSuggestion, Mode, ProbeScope};
 use core::cmp::min;
 use core::iter;
 use hir::def_id::LocalDefId;
-use rustc_ast::util::parser::{ExprPrecedence, PREC_POSTFIX};
+use rustc_ast::util::parser::{ExprPrecedence, PREC_UNAMBIGUOUS};
 use rustc_data_structures::packed::Pu128;
 use rustc_errors::{Applicability, Diag, MultiSpan};
 use rustc_hir as hir;
@@ -1329,7 +1329,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
  {
  let span = expr.span.find_oldest_ancestor_in_same_ctxt();
 
- let mut sugg = if expr.precedence().order() >= PREC_POSTFIX {
+ let mut sugg = if expr.precedence().order() >= PREC_UNAMBIGUOUS {
  vec![(span.shrink_to_hi(), ".into()".to_owned())]
  } else {
  vec![
@@ -2868,7 +2868,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
  "change the type of the numeric literal from `{checked_ty}` to `{expected_ty}`",
  );
 
- let close_paren = if expr.precedence().order() < PREC_POSTFIX {
+ let close_paren = if expr.precedence().order() < PREC_UNAMBIGUOUS {
  sugg.push((expr.span.shrink_to_lo(), "(".to_string()));
  ")"
  } else {
@@ -2893,7 +2893,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
  let len = src.trim_end_matches(&checked_ty.to_string()).len();
  expr.span.with_lo(expr.span.lo() + BytePos(len as u32))
  },
- if expr.precedence().order() < PREC_POSTFIX {
+ if expr.precedence().order() < PREC_UNAMBIGUOUS {
  // Readd `)`
  format!("{expected_ty})")
  } else {

compiler/rustc_infer/src/infer/error_reporting/suggest.rs

@@ -209,8 +209,10 @@ impl<'tcx> TypeErrCtxt<'_, 'tcx> {
  }
  (Some(ty), _) if self.same_type_modulo_infer(ty, exp_found.found) => match cause.code()
  {
- ObligationCauseCode::Pattern { span: Some(then_span), .. } => {
- Some(ConsiderAddingAwait::FutureSugg { span: then_span.shrink_to_hi() })
+ ObligationCauseCode::Pattern { span: Some(then_span), origin_expr, .. } => {
+ origin_expr.then_some(ConsiderAddingAwait::FutureSugg {
+ span: then_span.shrink_to_hi(),
+ })
  }
  ObligationCauseCode::IfExpression(box IfExpressionCause { then_id, .. }) => {
  let then_span = self.find_block_span_from_hir_id(*then_id);