Skip to content

Commit 31f8b70

Browse files
borsbors
committed
Auto merge of #126951 - matthiaskrgr:rollup-xg0o4mc, r=matthiaskrgr
Rollup of 7 pull requests Successful merges: - #126618 (Mark assoc tys live only if the corresponding trait is live) - #126746 (Deny `use<>` for RPITITs) - #126868 (not use offset when there is not ends with brace) - #126884 (Do not ICE when suggesting dereferencing closure arg) - #126893 (Eliminate the distinction between PREC_POSTFIX and PREC_PAREN precedence level) - #126915 (Don't suggest awaiting in closure patterns) - #126943 (De-duplicate all consecutive native libs regardless of their options) r? `@ghost` `@rustbot` modify labels: rollup
2 parents fda509e + 812b8b4 commit 31f8b70

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+495
-148
lines changed

‎compiler/rustc_ast/src/util/parser.rs

+21-24
Original file line numberDiff line numberDiff line change
@@ -233,8 +233,7 @@ pub const PREC_JUMP: i8 = -30;
233233
pub const PREC_RANGE: i8 = -10;
234234
// The range 2..=14 is reserved for AssocOp binary operator precedences.
235235
pub const PREC_PREFIX: i8 = 50;
236-
pub const PREC_POSTFIX: i8 = 60;
237-
pub const PREC_PAREN: i8 = 99;
236+
pub const PREC_UNAMBIGUOUS: i8 = 60;
238237
pub const PREC_FORCE_PAREN: i8 = 100;
239238

240239
#[derive(Debug, Clone, Copy)]
@@ -325,37 +324,35 @@ impl ExprPrecedence {
325324
| ExprPrecedence::Let
326325
| ExprPrecedence::Unary => PREC_PREFIX,
327326

328-
// Unary, postfix
329-
ExprPrecedence::Await
327+
// Never need parens
328+
ExprPrecedence::Array
329+
| ExprPrecedence::Await
330+
| ExprPrecedence::Block
330331
| ExprPrecedence::Call
331-
| ExprPrecedence::MethodCall
332+
| ExprPrecedence::ConstBlock
332333
| ExprPrecedence::Field
334+
| ExprPrecedence::ForLoop
335+
| ExprPrecedence::FormatArgs
336+
| ExprPrecedence::Gen
337+
| ExprPrecedence::If
333338
| ExprPrecedence::Index
334-
| ExprPrecedence::Try
335339
| ExprPrecedence::InlineAsm
340+
| ExprPrecedence::Lit
341+
| ExprPrecedence::Loop
336342
| ExprPrecedence::Mac
337-
| ExprPrecedence::FormatArgs
343+
| ExprPrecedence::Match
344+
| ExprPrecedence::MethodCall
338345
| ExprPrecedence::OffsetOf
339-
| ExprPrecedence::PostfixMatch => PREC_POSTFIX,
340-
341-
// Never need parens
342-
ExprPrecedence::Array
346+
| ExprPrecedence::Paren
347+
| ExprPrecedence::Path
348+
| ExprPrecedence::PostfixMatch
343349
| ExprPrecedence::Repeat
350+
| ExprPrecedence::Struct
351+
| ExprPrecedence::Try
352+
| ExprPrecedence::TryBlock
344353
| ExprPrecedence::Tup
345-
| ExprPrecedence::Lit
346-
| ExprPrecedence::Path
347-
| ExprPrecedence::Paren
348-
| ExprPrecedence::If
349354
| ExprPrecedence::While
350-
| ExprPrecedence::ForLoop
351-
| ExprPrecedence::Loop
352-
| ExprPrecedence::Match
353-
| ExprPrecedence::ConstBlock
354-
| ExprPrecedence::Block
355-
| ExprPrecedence::TryBlock
356-
| ExprPrecedence::Gen
357-
| ExprPrecedence::Struct
358-
| ExprPrecedence::Err => PREC_PAREN,
355+
| ExprPrecedence::Err => PREC_UNAMBIGUOUS,
359356
}
360357
}
361358
}

‎compiler/rustc_ast_lowering/messages.ftl

+3
Original file line numberDiff line numberDiff line change
@@ -130,6 +130,9 @@ ast_lowering_never_pattern_with_guard =
130130
131131
ast_lowering_no_precise_captures_on_apit = `use<...>` precise capturing syntax not allowed in argument-position `impl Trait`
132132
133+
ast_lowering_no_precise_captures_on_rpitit = `use<...>` precise capturing syntax is currently not allowed in return-position `impl Trait` in traits
134+
.note = currently, return-position `impl Trait` in traits and trait implementations capture all lifetimes in scope
135+
133136
ast_lowering_previously_used_here = previously used here
134137
135138
ast_lowering_register1 = register `{$reg1_name}`

‎compiler/rustc_ast_lowering/src/errors.rs

+8
Original file line numberDiff line numberDiff line change
@@ -424,6 +424,14 @@ pub(crate) struct NoPreciseCapturesOnApit {
424424
pub span: Span,
425425
}
426426

427+
#[derive(Diagnostic)]
428+
#[diag(ast_lowering_no_precise_captures_on_rpitit)]
429+
#[note]
430+
pub(crate) struct NoPreciseCapturesOnRpitit {
431+
#[primary_span]
432+
pub span: Span,
433+
}
434+
427435
#[derive(Diagnostic)]
428436
#[diag(ast_lowering_yield_in_closure)]
429437
pub(crate) struct YieldInClosure {

‎compiler/rustc_ast_lowering/src/lib.rs

+20
Original file line numberDiff line numberDiff line change
@@ -1594,6 +1594,26 @@ impl<'a, 'hir> LoweringContext<'a, 'hir> {
15941594
};
15951595
debug!(?captured_lifetimes_to_duplicate);
15961596

1597+
match fn_kind {
1598+
// Deny `use<>` on RPITIT in trait/trait-impl for now.
1599+
Some(FnDeclKind::Trait | FnDeclKind::Impl) => {
1600+
if let Some(span) = bounds.iter().find_map(|bound| match *bound {
1601+
ast::GenericBound::Use(_, span) => Some(span),
1602+
_ => None,
1603+
}) {
1604+
self.tcx.dcx().emit_err(errors::NoPreciseCapturesOnRpitit { span });
1605+
}
1606+
}
1607+
None
1608+
| Some(
1609+
FnDeclKind::Fn
1610+
| FnDeclKind::Inherent
1611+
| FnDeclKind::ExternFn
1612+
| FnDeclKind::Closure
1613+
| FnDeclKind::Pointer,
1614+
) => {}
1615+
}
1616+
15971617
self.lower_opaque_inner(
15981618
opaque_ty_node_id,
15991619
origin,

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

+7-7
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,7 @@ impl<'a> State<'a> {
217217
fn print_expr_call(&mut self, func: &ast::Expr, args: &[P<ast::Expr>], fixup: FixupContext) {
218218
let prec = match func.kind {
219219
ast::ExprKind::Field(..) => parser::PREC_FORCE_PAREN,
220-
_ => parser::PREC_POSTFIX,
220+
_ => parser::PREC_UNAMBIGUOUS,
221221
};
222222

223223
// Independent of parenthesization related to precedence, we must
@@ -257,7 +257,7 @@ impl<'a> State<'a> {
257257
// boundaries, `$receiver.method()` can be parsed back as a statement
258258
// containing an expression if and only if `$receiver` can be parsed as
259259
// a statement containing an expression.
260-
self.print_expr_maybe_paren(receiver, parser::PREC_POSTFIX, fixup);
260+
self.print_expr_maybe_paren(receiver, parser::PREC_UNAMBIGUOUS, fixup);
261261

262262
self.word(".");
263263
self.print_ident(segment.ident);
@@ -489,7 +489,7 @@ impl<'a> State<'a> {
489489
self.space();
490490
}
491491
MatchKind::Postfix => {
492-
self.print_expr_maybe_paren(expr, parser::PREC_POSTFIX, fixup);
492+
self.print_expr_maybe_paren(expr, parser::PREC_UNAMBIGUOUS, fixup);
493493
self.word_nbsp(".match");
494494
}
495495
}
@@ -549,7 +549,7 @@ impl<'a> State<'a> {
549549
self.print_block_with_attrs(blk, attrs);
550550
}
551551
ast::ExprKind::Await(expr, _) => {
552-
self.print_expr_maybe_paren(expr, parser::PREC_POSTFIX, fixup);
552+
self.print_expr_maybe_paren(expr, parser::PREC_UNAMBIGUOUS, fixup);
553553
self.word(".await");
554554
}
555555
ast::ExprKind::Assign(lhs, rhs, _) => {
@@ -568,14 +568,14 @@ impl<'a> State<'a> {
568568
self.print_expr_maybe_paren(rhs, prec, fixup.subsequent_subexpression());
569569
}
570570
ast::ExprKind::Field(expr, ident) => {
571-
self.print_expr_maybe_paren(expr, parser::PREC_POSTFIX, fixup);
571+
self.print_expr_maybe_paren(expr, parser::PREC_UNAMBIGUOUS, fixup);
572572
self.word(".");
573573
self.print_ident(*ident);
574574
}
575575
ast::ExprKind::Index(expr, index, _) => {
576576
self.print_expr_maybe_paren(
577577
expr,
578-
parser::PREC_POSTFIX,
578+
parser::PREC_UNAMBIGUOUS,
579579
fixup.leftmost_subexpression(),
580580
);
581581
self.word("[");
@@ -713,7 +713,7 @@ impl<'a> State<'a> {
713713
}
714714
}
715715
ast::ExprKind::Try(e) => {
716-
self.print_expr_maybe_paren(e, parser::PREC_POSTFIX, fixup);
716+
self.print_expr_maybe_paren(e, parser::PREC_UNAMBIGUOUS, fixup);
717717
self.word("?")
718718
}
719719
ast::ExprKind::TryBlock(blk) => {

‎compiler/rustc_borrowck/src/diagnostics/region_errors.rs

+4-2
Original file line numberDiff line numberDiff line change
@@ -1151,7 +1151,9 @@ impl<'tcx> MirBorrowckCtxt<'_, '_, '_, 'tcx> {
11511151
// Get the arguments for the found method, only specifying that `Self` is the receiver type.
11521152
let Some(possible_rcvr_ty) = typeck_results.node_type_opt(rcvr.hir_id) else { return };
11531153
let args = GenericArgs::for_item(tcx, method_def_id, |param, _| {
1154-
if param.index == 0 {
1154+
if let ty::GenericParamDefKind::Lifetime = param.kind {
1155+
tcx.lifetimes.re_erased.into()
1156+
} else if param.index == 0 && param.name == kw::SelfUpper {
11551157
possible_rcvr_ty.into()
11561158
} else if param.index == closure_param.index {
11571159
closure_ty.into()
@@ -1168,7 +1170,7 @@ impl<'tcx> MirBorrowckCtxt<'_, '_, '_, 'tcx> {
11681170
Obligation::misc(tcx, span, self.mir_def_id(), self.param_env, pred)
11691171
}));
11701172

1171-
if ocx.select_all_or_error().is_empty() {
1173+
if ocx.select_all_or_error().is_empty() && count > 0 {
11721174
diag.span_suggestion_verbose(
11731175
tcx.hir().body(*body).value.peel_blocks().span.shrink_to_lo(),
11741176
"dereference the return value",

‎compiler/rustc_codegen_ssa/src/back/link.rs

+2-5
Original file line numberDiff line numberDiff line change
@@ -1490,11 +1490,6 @@ fn print_native_static_libs(
14901490
let mut lib_args: Vec<_> = all_native_libs
14911491
.iter()
14921492
.filter(|l| relevant_lib(sess, l))
1493-
// Deduplication of successive repeated libraries, see rust-lang/rust#113209
1494-
//
1495-
// note: we don't use PartialEq/Eq because NativeLib transitively depends on local
1496-
// elements like spans, which we don't care about and would make the deduplication impossible
1497-
.dedup_by(|l1, l2| l1.name == l2.name && l1.kind == l2.kind && l1.verbatim == l2.verbatim)
14981493
.filter_map(|lib| {
14991494
let name = lib.name;
15001495
match lib.kind {
@@ -1521,6 +1516,8 @@ fn print_native_static_libs(
15211516
| NativeLibKind::RawDylib => None,
15221517
}
15231518
})
1519+
// deduplication of consecutive repeated libraries, see rust-lang/rust#113209
1520+
.dedup()
15241521
.collect();
15251522
for path in all_rust_dylibs {
15261523
// FIXME deduplicate with add_dynamic_crate

‎compiler/rustc_hir_analysis/src/check/mod.rs

+12-5
Original file line numberDiff line numberDiff line change
@@ -211,11 +211,18 @@ fn missing_items_err(
211211
.collect::<Vec<_>>()
212212
.join("`, `");
213213

214-
// `Span` before impl block closing brace.
215-
let hi = full_impl_span.hi() - BytePos(1);
216-
// Point at the place right before the closing brace of the relevant `impl` to suggest
217-
// adding the associated item at the end of its body.
218-
let sugg_sp = full_impl_span.with_lo(hi).with_hi(hi);
214+
let sugg_sp = if let Ok(snippet) = tcx.sess.source_map().span_to_snippet(full_impl_span)
215+
&& snippet.ends_with("}")
216+
{
217+
// `Span` before impl block closing brace.
218+
let hi = full_impl_span.hi() - BytePos(1);
219+
// Point at the place right before the closing brace of the relevant `impl` to suggest
220+
// adding the associated item at the end of its body.
221+
full_impl_span.with_lo(hi).with_hi(hi)
222+
} else {
223+
full_impl_span.shrink_to_hi()
224+
};
225+
219226
// Obtain the level of indentation ending in `sugg_sp`.
220227
let padding =
221228
tcx.sess.source_map().indentation_before(sugg_sp).unwrap_or_else(|| String::new());

‎compiler/rustc_hir_pretty/src/lib.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -1120,7 +1120,7 @@ impl<'a> State<'a> {
11201120
fn print_expr_call(&mut self, func: &hir::Expr<'_>, args: &[hir::Expr<'_>]) {
11211121
let prec = match func.kind {
11221122
hir::ExprKind::Field(..) => parser::PREC_FORCE_PAREN,
1123-
_ => parser::PREC_POSTFIX,
1123+
_ => parser::PREC_UNAMBIGUOUS,
11241124
};
11251125

11261126
self.print_expr_maybe_paren(func, prec);
@@ -1134,7 +1134,7 @@ impl<'a> State<'a> {
11341134
args: &[hir::Expr<'_>],
11351135
) {
11361136
let base_args = args;
1137-
self.print_expr_maybe_paren(receiver, parser::PREC_POSTFIX);
1137+
self.print_expr_maybe_paren(receiver, parser::PREC_UNAMBIGUOUS);
11381138
self.word(".");
11391139
self.print_ident(segment.ident);
11401140

@@ -1478,12 +1478,12 @@ impl<'a> State<'a> {
14781478
self.print_expr_maybe_paren(rhs, prec);
14791479
}
14801480
hir::ExprKind::Field(expr, ident) => {
1481-
self.print_expr_maybe_paren(expr, parser::PREC_POSTFIX);
1481+
self.print_expr_maybe_paren(expr, parser::PREC_UNAMBIGUOUS);
14821482
self.word(".");
14831483
self.print_ident(ident);
14841484
}
14851485
hir::ExprKind::Index(expr, index, _) => {
1486-
self.print_expr_maybe_paren(expr, parser::PREC_POSTFIX);
1486+
self.print_expr_maybe_paren(expr, parser::PREC_UNAMBIGUOUS);
14871487
self.word("[");
14881488
self.print_expr(index);
14891489
self.word("]");

‎compiler/rustc_hir_typeck/src/callee.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ use super::method::MethodCallee;
33
use super::{Expectation, FnCtxt, TupleArgumentsFlag};
44

55
use crate::errors;
6-
use rustc_ast::util::parser::PREC_POSTFIX;
6+
use rustc_ast::util::parser::PREC_UNAMBIGUOUS;
77
use rustc_errors::{Applicability, Diag, ErrorGuaranteed, StashKey};
88
use rustc_hir::def::{self, CtorKind, Namespace, Res};
99
use rustc_hir::def_id::DefId;
@@ -656,7 +656,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
656656
};
657657

658658
if let Ok(rest_snippet) = rest_snippet {
659-
let sugg = if callee_expr.precedence().order() >= PREC_POSTFIX {
659+
let sugg = if callee_expr.precedence().order() >= PREC_UNAMBIGUOUS {
660660
vec![
661661
(up_to_rcvr_span, "".to_string()),
662662
(rest_span, format!(".{}({rest_snippet}", segment.ident)),

‎compiler/rustc_hir_typeck/src/cast.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -946,7 +946,7 @@ impl<'a, 'tcx> CastCheck<'tcx> {
946946

947947
fn lossy_provenance_ptr2int_lint(&self, fcx: &FnCtxt<'a, 'tcx>, t_c: ty::cast::IntTy) {
948948
let expr_prec = self.expr.precedence().order();
949-
let needs_parens = expr_prec < rustc_ast::util::parser::PREC_POSTFIX;
949+
let needs_parens = expr_prec < rustc_ast::util::parser::PREC_UNAMBIGUOUS;
950950

951951
let needs_cast = !matches!(t_c, ty::cast::IntTy::U(ty::UintTy::Usize));
952952
let cast_span = self.expr_span.shrink_to_hi().to(self.cast_span);

‎compiler/rustc_hir_typeck/src/fn_ctxt/suggestions.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ use crate::method::probe::{IsSuggestion, Mode, ProbeScope};
99
use core::cmp::min;
1010
use core::iter;
1111
use hir::def_id::LocalDefId;
12-
use rustc_ast::util::parser::{ExprPrecedence, PREC_POSTFIX};
12+
use rustc_ast::util::parser::{ExprPrecedence, PREC_UNAMBIGUOUS};
1313
use rustc_data_structures::packed::Pu128;
1414
use rustc_errors::{Applicability, Diag, MultiSpan};
1515
use rustc_hir as hir;
@@ -1329,7 +1329,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
13291329
{
13301330
let span = expr.span.find_oldest_ancestor_in_same_ctxt();
13311331

1332-
let mut sugg = if expr.precedence().order() >= PREC_POSTFIX {
1332+
let mut sugg = if expr.precedence().order() >= PREC_UNAMBIGUOUS {
13331333
vec![(span.shrink_to_hi(), ".into()".to_owned())]
13341334
} else {
13351335
vec![
@@ -2868,7 +2868,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
28682868
"change the type of the numeric literal from `{checked_ty}` to `{expected_ty}`",
28692869
);
28702870

2871-
let close_paren = if expr.precedence().order() < PREC_POSTFIX {
2871+
let close_paren = if expr.precedence().order() < PREC_UNAMBIGUOUS {
28722872
sugg.push((expr.span.shrink_to_lo(), "(".to_string()));
28732873
")"
28742874
} else {
@@ -2893,7 +2893,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
28932893
let len = src.trim_end_matches(&checked_ty.to_string()).len();
28942894
expr.span.with_lo(expr.span.lo() + BytePos(len as u32))
28952895
},
2896-
if expr.precedence().order() < PREC_POSTFIX {
2896+
if expr.precedence().order() < PREC_UNAMBIGUOUS {
28972897
// Readd `)`
28982898
format!("{expected_ty})")
28992899
} else {

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

+4-2
Original file line numberDiff line numberDiff line change
@@ -209,8 +209,10 @@ impl<'tcx> TypeErrCtxt<'_, 'tcx> {
209209
}
210210
(Some(ty), _) if self.same_type_modulo_infer(ty, exp_found.found) => match cause.code()
211211
{
212-
ObligationCauseCode::Pattern { span: Some(then_span), .. } => {
213-
Some(ConsiderAddingAwait::FutureSugg { span: then_span.shrink_to_hi() })
212+
ObligationCauseCode::Pattern { span: Some(then_span), origin_expr, .. } => {
213+
origin_expr.then_some(ConsiderAddingAwait::FutureSugg {
214+
span: then_span.shrink_to_hi(),
215+
})
214216
}
215217
ObligationCauseCode::IfExpression(box IfExpressionCause { then_id, .. }) => {
216218
let then_span = self.find_block_span_from_hir_id(*then_id);

0 commit comments

Comments
 (0)