Skip to content

Commit e4c1446

Browse files
borsbors
committed
Auto merge of #114481 - matthiaskrgr:rollup-58pczpl, r=matthiaskrgr
Rollup of 9 pull requests Successful merges: - #113945 (Fix wrong span for trait selection failure error reporting) - #114351 ([rustc_span][perf] Remove unnecessary string joins and allocs.) - #114418 (bump parking_lot to 0.12) - #114434 (Improve spans for indexing expressions) - #114450 (Fix ICE failed to get layout for ReferencesError) - #114461 (Fix unwrap on None) - #114462 (interpret: add mplace_to_ref helper method) - #114472 (Reword `confusable_idents` lint) - #114477 (Account for `Rc` and `Arc` when suggesting to clone) r? `@ghost` `@rustbot` modify labels: rollup
2 parents fe896ef + 35b2713 commit e4c1446

File tree

111 files changed

+466
-202
lines changed

Some content is hidden

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

111 files changed

+466
-202
lines changed

‎Cargo.lock

+2-2
Original file line numberDiff line numberDiff line change
@@ -3469,7 +3469,7 @@ dependencies = [
34693469
"libc",
34703470
"measureme",
34713471
"memmap2",
3472-
"parking_lot 0.11.2",
3472+
"parking_lot 0.12.1",
34733473
"rustc-hash",
34743474
"rustc-rayon",
34753475
"rustc-rayon-core",
@@ -4190,7 +4190,7 @@ dependencies = [
41904190
name = "rustc_query_system"
41914191
version = "0.0.0"
41924192
dependencies = [
4193-
"parking_lot 0.11.2",
4193+
"parking_lot 0.12.1",
41944194
"rustc-rayon-core",
41954195
"rustc_ast",
41964196
"rustc_data_structures",

‎compiler/rustc_ast/src/ast.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -1462,7 +1462,8 @@ pub enum ExprKind {
14621462
/// Access of a named (e.g., `obj.foo`) or unnamed (e.g., `obj.0`) struct field.
14631463
Field(P<Expr>, Ident),
14641464
/// An indexing operation (e.g., `foo[2]`).
1465-
Index(P<Expr>, P<Expr>),
1465+
/// The span represents the span of the `[2]`, including brackets.
1466+
Index(P<Expr>, P<Expr>, Span),
14661467
/// A range (e.g., `1..2`, `1..`, `..2`, `1..=2`, `..=2`; and `..` in destructuring assignment).
14671468
Range(Option<P<Expr>>, Option<P<Expr>>, RangeLimits),
14681469
/// An underscore, used in destructuring assignment to ignore a value.

‎compiler/rustc_ast/src/mut_visit.rs

+6-3
Original file line numberDiff line numberDiff line change
@@ -1400,14 +1400,15 @@ pub fn noop_visit_expr<T: MutVisitor>(
14001400
fn_decl,
14011401
body,
14021402
fn_decl_span,
1403-
fn_arg_span: _,
1403+
fn_arg_span,
14041404
}) => {
14051405
vis.visit_closure_binder(binder);
14061406
visit_constness(constness, vis);
14071407
vis.visit_asyncness(asyncness);
14081408
vis.visit_fn_decl(fn_decl);
14091409
vis.visit_expr(body);
14101410
vis.visit_span(fn_decl_span);
1411+
vis.visit_span(fn_arg_span);
14111412
}
14121413
ExprKind::Block(blk, label) => {
14131414
vis.visit_block(blk);
@@ -1420,9 +1421,10 @@ pub fn noop_visit_expr<T: MutVisitor>(
14201421
vis.visit_expr(expr);
14211422
vis.visit_span(await_kw_span);
14221423
}
1423-
ExprKind::Assign(el, er, _) => {
1424+
ExprKind::Assign(el, er, span) => {
14241425
vis.visit_expr(el);
14251426
vis.visit_expr(er);
1427+
vis.visit_span(span);
14261428
}
14271429
ExprKind::AssignOp(_op, el, er) => {
14281430
vis.visit_expr(el);
@@ -1432,9 +1434,10 @@ pub fn noop_visit_expr<T: MutVisitor>(
14321434
vis.visit_expr(el);
14331435
vis.visit_ident(ident);
14341436
}
1435-
ExprKind::Index(el, er) => {
1437+
ExprKind::Index(el, er, brackets_span) => {
14361438
vis.visit_expr(el);
14371439
vis.visit_expr(er);
1440+
vis.visit_span(brackets_span);
14381441
}
14391442
ExprKind::Range(e1, e2, _lim) => {
14401443
visit_opt(e1, |e1| vis.visit_expr(e1));

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -390,7 +390,7 @@ pub fn contains_exterior_struct_lit(value: &ast::Expr) -> bool {
390390
| ast::ExprKind::Cast(x, _)
391391
| ast::ExprKind::Type(x, _)
392392
| ast::ExprKind::Field(x, _)
393-
| ast::ExprKind::Index(x, _) => {
393+
| ast::ExprKind::Index(x, _, _) => {
394394
// &X { y: 1 }, X { y: 1 }.y
395395
contains_exterior_struct_lit(x)
396396
}

‎compiler/rustc_ast/src/visit.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -885,7 +885,7 @@ pub fn walk_expr<'a, V: Visitor<'a>>(visitor: &mut V, expression: &'a Expr) {
885885
visitor.visit_expr(subexpression);
886886
visitor.visit_ident(*ident);
887887
}
888-
ExprKind::Index(main_expression, index_expression) => {
888+
ExprKind::Index(main_expression, index_expression, _) => {
889889
visitor.visit_expr(main_expression);
890890
visitor.visit_expr(index_expression)
891891
}

‎compiler/rustc_ast_lowering/src/expr.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -240,8 +240,8 @@ impl<'hir> LoweringContext<'_, 'hir> {
240240
ExprKind::Field(el, ident) => {
241241
hir::ExprKind::Field(self.lower_expr(el), self.lower_ident(*ident))
242242
}
243-
ExprKind::Index(el, er) => {
244-
hir::ExprKind::Index(self.lower_expr(el), self.lower_expr(er))
243+
ExprKind::Index(el, er, brackets_span) => {
244+
hir::ExprKind::Index(self.lower_expr(el), self.lower_expr(er), *brackets_span)
245245
}
246246
ExprKind::Range(Some(e1), Some(e2), RangeLimits::Closed) => {
247247
self.lower_expr_range_closed(e.span, e1, e2)

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -477,7 +477,7 @@ impl<'a> State<'a> {
477477
self.word(".");
478478
self.print_ident(*ident);
479479
}
480-
ast::ExprKind::Index(expr, index) => {
480+
ast::ExprKind::Index(expr, index, _) => {
481481
self.print_expr_maybe_paren(expr, parser::PREC_POSTFIX);
482482
self.word("[");
483483
self.print_expr(index);

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

+11-1
Original file line numberDiff line numberDiff line change
@@ -751,9 +751,19 @@ impl<'cx, 'tcx> MirBorrowckCtxt<'cx, 'tcx> {
751751
)
752752
.must_apply_modulo_regions()
753753
{
754+
let msg = if let ty::Adt(def, _) = ty.kind()
755+
&& [
756+
tcx.get_diagnostic_item(sym::Arc),
757+
tcx.get_diagnostic_item(sym::Rc),
758+
].contains(&Some(def.did()))
759+
{
760+
"clone the value to increment its reference count"
761+
} else {
762+
"consider cloning the value if the performance cost is acceptable"
763+
};
754764
err.span_suggestion_verbose(
755765
span.shrink_to_hi(),
756-
"consider cloning the value if the performance cost is acceptable",
766+
msg,
757767
suggestion,
758768
Applicability::MachineApplicable,
759769
);

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ impl<'tcx> BorrowExplanation<'tcx> {
7979
| hir::ExprKind::Unary(hir::UnOp::Deref, inner)
8080
| hir::ExprKind::Field(inner, _)
8181
| hir::ExprKind::MethodCall(_, inner, _, _)
82-
| hir::ExprKind::Index(inner, _) = &expr.kind
82+
| hir::ExprKind::Index(inner, _, _) = &expr.kind
8383
{
8484
expr = inner;
8585
}

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -567,7 +567,7 @@ impl<'a, 'tcx> MirBorrowckCtxt<'a, 'tcx> {
567567
}
568568
};
569569
if let hir::ExprKind::Assign(place, rv, _sp) = expr.kind
570-
&& let hir::ExprKind::Index(val, index) = place.kind
570+
&& let hir::ExprKind::Index(val, index, _) = place.kind
571571
&& (expr.span == self.assign_span || place.span == self.assign_span)
572572
{
573573
// val[index] = rv;
@@ -620,7 +620,7 @@ impl<'a, 'tcx> MirBorrowckCtxt<'a, 'tcx> {
620620
);
621621
self.suggested = true;
622622
} else if let hir::ExprKind::MethodCall(_path, receiver, _, sp) = expr.kind
623-
&& let hir::ExprKind::Index(val, index) = receiver.kind
623+
&& let hir::ExprKind::Index(val, index, _) = receiver.kind
624624
&& expr.span == self.assign_span
625625
{
626626
// val[index].path(args..);

‎compiler/rustc_builtin_macros/src/assert/context.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -237,7 +237,7 @@ impl<'cx, 'a> Context<'cx, 'a> {
237237
ExprKind::If(local_expr, _, _) => {
238238
self.manage_cond_expr(local_expr);
239239
}
240-
ExprKind::Index(prefix, suffix) => {
240+
ExprKind::Index(prefix, suffix, _) => {
241241
self.manage_cond_expr(prefix);
242242
self.manage_cond_expr(suffix);
243243
}

‎compiler/rustc_codegen_cranelift/src/common.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -477,7 +477,7 @@ impl<'tcx> LayoutOfHelpers<'tcx> for RevealAllLayoutCx<'tcx> {
477477

478478
#[inline]
479479
fn handle_layout_err(&self, err: LayoutError<'tcx>, span: Span, ty: Ty<'tcx>) -> ! {
480-
if let layout::LayoutError::SizeOverflow(_) = err {
480+
if let LayoutError::SizeOverflow(_) | LayoutError::ReferencesError(_) = err {
481481
self.0.sess.span_fatal(span, err.to_string())
482482
} else {
483483
span_bug!(span, "failed to get layout for `{}`: {}", ty, err)

‎compiler/rustc_codegen_gcc/src/context.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -476,7 +476,7 @@ impl<'gcc, 'tcx> LayoutOfHelpers<'tcx> for CodegenCx<'gcc, 'tcx> {
476476

477477
#[inline]
478478
fn handle_layout_err(&self, err: LayoutError<'tcx>, span: Span, ty: Ty<'tcx>) -> ! {
479-
if let LayoutError::SizeOverflow(_) = err {
479+
if let LayoutError::SizeOverflow(_) | LayoutError::ReferencesError(_) = err {
480480
self.sess().emit_fatal(respan(span, err.into_diagnostic()))
481481
} else {
482482
span_bug!(span, "failed to get layout for `{}`: {}", ty, err)

‎compiler/rustc_codegen_llvm/src/context.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -985,7 +985,7 @@ impl<'tcx> LayoutOfHelpers<'tcx> for CodegenCx<'_, 'tcx> {
985985

986986
#[inline]
987987
fn handle_layout_err(&self, err: LayoutError<'tcx>, span: Span, ty: Ty<'tcx>) -> ! {
988-
if let LayoutError::SizeOverflow(_) = err {
988+
if let LayoutError::SizeOverflow(_) | LayoutError::ReferencesError(_) = err {
989989
self.sess().emit_fatal(Spanned { span, node: err.into_diagnostic() })
990990
} else {
991991
span_bug!(span, "failed to get layout for `{ty}`: {err:?}")

‎compiler/rustc_const_eval/src/interpret/place.rs

+13-2
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,6 @@ impl<Prov: Provenance> MemPlace<Prov> {
157157
}
158158

159159
/// Turn a mplace into a (thin or wide) pointer, as a reference, pointing to the same space.
160-
/// This is the inverse of `ref_to_mplace`.
161160
#[inline(always)]
162161
pub fn to_ref(self, cx: &impl HasDataLayout) -> Immediate<Prov> {
163162
match self.meta {
@@ -415,7 +414,7 @@ where
415414
}
416415

417416
/// Take a value, which represents a (thin or wide) reference, and make it a place.
418-
/// Alignment is just based on the type. This is the inverse of `MemPlace::to_ref()`.
417+
/// Alignment is just based on the type. This is the inverse of `mplace_to_ref()`.
419418
///
420419
/// Only call this if you are sure the place is "valid" (aligned and inbounds), or do not
421420
/// want to ever use the place for memory access!
@@ -438,6 +437,18 @@ where
438437
Ok(MPlaceTy::from_aligned_ptr_with_meta(ptr.to_pointer(self)?, layout, meta))
439438
}
440439

440+
/// Turn a mplace into a (thin or wide) mutable raw pointer, pointing to the same space.
441+
/// `align` information is lost!
442+
/// This is the inverse of `ref_to_mplace`.
443+
pub fn mplace_to_ref(
444+
&self,
445+
mplace: &MPlaceTy<'tcx, M::Provenance>,
446+
) -> InterpResult<'tcx, ImmTy<'tcx, M::Provenance>> {
447+
let imm = mplace.to_ref(self);
448+
let layout = self.layout_of(Ty::new_mut_ptr(self.tcx.tcx, mplace.layout.ty))?;
449+
Ok(ImmTy::from_immediate(imm, layout))
450+
}
451+
441452
/// Take an operand, representing a pointer, and dereference it to a place.
442453
/// Corresponds to the `*` operator in Rust.
443454
#[instrument(skip(self), level = "debug")]

‎compiler/rustc_const_eval/src/interpret/terminator.rs

+1-4
Original file line numberDiff line numberDiff line change
@@ -852,10 +852,7 @@ impl<'mir, 'tcx: 'mir, M: Machine<'mir, 'tcx>> InterpCx<'mir, 'tcx, M> {
852852
let instance = ty::Instance::resolve_drop_in_place(*self.tcx, place.layout.ty);
853853
let fn_abi = self.fn_abi_of_instance(instance, ty::List::empty())?;
854854

855-
let arg = ImmTy::from_immediate(
856-
place.to_ref(self),
857-
self.layout_of(Ty::new_mut_ptr(self.tcx.tcx, place.layout.ty))?,
858-
);
855+
let arg = self.mplace_to_ref(&place)?;
859856
let ret = MPlaceTy::fake_alloc_zst(self.layout_of(self.tcx.types.unit)?);
860857

861858
self.eval_fn_call(

‎compiler/rustc_data_structures/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ elsa = "=1.7.1"
3535
itertools = "0.10.1"
3636

3737
[dependencies.parking_lot]
38-
version = "0.11"
38+
version = "0.12"
3939

4040
[target.'cfg(windows)'.dependencies.windows]
4141
version = "0.48.0"

‎compiler/rustc_hir/src/hir.rs

+5-3
Original file line numberDiff line numberDiff line change
@@ -1754,7 +1754,7 @@ impl Expr<'_> {
17541754

17551755
ExprKind::Unary(UnOp::Deref, _) => true,
17561756

1757-
ExprKind::Field(ref base, _) | ExprKind::Index(ref base, _) => {
1757+
ExprKind::Field(ref base, _) | ExprKind::Index(ref base, _, _) => {
17581758
allow_projections_from(base) || base.is_place_expr(allow_projections_from)
17591759
}
17601760

@@ -1831,7 +1831,7 @@ impl Expr<'_> {
18311831
ExprKind::Type(base, _)
18321832
| ExprKind::Unary(_, base)
18331833
| ExprKind::Field(base, _)
1834-
| ExprKind::Index(base, _)
1834+
| ExprKind::Index(base, _, _)
18351835
| ExprKind::AddrOf(.., base)
18361836
| ExprKind::Cast(base, _) => {
18371837
// This isn't exactly true for `Index` and all `Unary`, but we are using this
@@ -2015,7 +2015,9 @@ pub enum ExprKind<'hir> {
20152015
/// Access of a named (e.g., `obj.foo`) or unnamed (e.g., `obj.0`) struct or tuple field.
20162016
Field(&'hir Expr<'hir>, Ident),
20172017
/// An indexing operation (`foo[2]`).
2018-
Index(&'hir Expr<'hir>, &'hir Expr<'hir>),
2018+
/// Similar to [`ExprKind::MethodCall`], the final `Span` represents the span of the brackets
2019+
/// and index.
2020+
Index(&'hir Expr<'hir>, &'hir Expr<'hir>, Span),
20192021

20202022
/// Path to a definition, possibly containing lifetime or type parameters.
20212023
Path(QPath<'hir>),

‎compiler/rustc_hir/src/intravisit.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -780,7 +780,7 @@ pub fn walk_expr<'v, V: Visitor<'v>>(visitor: &mut V, expression: &'v Expr<'v>)
780780
visitor.visit_expr(subexpression);
781781
visitor.visit_ident(ident);
782782
}
783-
ExprKind::Index(ref main_expression, ref index_expression) => {
783+
ExprKind::Index(ref main_expression, ref index_expression, _) => {
784784
visitor.visit_expr(main_expression);
785785
visitor.visit_expr(index_expression)
786786
}

‎compiler/rustc_hir_pretty/src/lib.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1526,7 +1526,7 @@ impl<'a> State<'a> {
15261526
self.word(".");
15271527
self.print_ident(ident);
15281528
}
1529-
hir::ExprKind::Index(expr, index) => {
1529+
hir::ExprKind::Index(expr, index, _) => {
15301530
self.print_expr_maybe_paren(expr, parser::PREC_POSTFIX);
15311531
self.word("[");
15321532
self.print_expr(index);
@@ -2419,7 +2419,7 @@ fn contains_exterior_struct_lit(value: &hir::Expr<'_>) -> bool {
24192419
| hir::ExprKind::Cast(x, _)
24202420
| hir::ExprKind::Type(x, _)
24212421
| hir::ExprKind::Field(x, _)
2422-
| hir::ExprKind::Index(x, _) => {
2422+
| hir::ExprKind::Index(x, _, _) => {
24232423
// `&X { y: 1 }, X { y: 1 }.y`
24242424
contains_exterior_struct_lit(x)
24252425
}

‎compiler/rustc_hir_typeck/src/expr.rs

+13-12
Original file line numberDiff line numberDiff line change
@@ -345,7 +345,9 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
345345
self.check_expr_struct(expr, expected, qpath, fields, base_expr)
346346
}
347347
ExprKind::Field(base, field) => self.check_field(expr, &base, field, expected),
348-
ExprKind::Index(base, idx) => self.check_expr_index(base, idx, expr),
348+
ExprKind::Index(base, idx, brackets_span) => {
349+
self.check_expr_index(base, idx, expr, brackets_span)
350+
}
349351
ExprKind::Yield(value, ref src) => self.check_expr_yield(value, expr, src),
350352
hir::ExprKind::Err(guar) => Ty::new_error(tcx, guar),
351353
}
@@ -2840,6 +2842,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
28402842
base: &'tcx hir::Expr<'tcx>,
28412843
idx: &'tcx hir::Expr<'tcx>,
28422844
expr: &'tcx hir::Expr<'tcx>,
2845+
brackets_span: Span,
28432846
) -> Ty<'tcx> {
28442847
let base_t = self.check_expr(&base);
28452848
let idx_t = self.check_expr(&idx);
@@ -2873,7 +2876,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
28732876

28742877
let mut err = type_error_struct!(
28752878
self.tcx.sess,
2876-
expr.span,
2879+
brackets_span,
28772880
base_t,
28782881
E0608,
28792882
"cannot index into a value of type `{base_t}`",
@@ -2887,16 +2890,14 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
28872890
&& let ast::LitKind::Int(i, ast::LitIntType::Unsuffixed) = lit.node
28882891
&& i < types.len().try_into().expect("expected tuple index to be < usize length")
28892892
{
2890-
let snip = self.tcx.sess.source_map().span_to_snippet(base.span);
2891-
if let Ok(snip) = snip {
2892-
err.span_suggestion(
2893-
expr.span,
2894-
"to access tuple elements, use",
2895-
format!("{snip}.{i}"),
2896-
Applicability::MachineApplicable,
2897-
);
2898-
needs_note = false;
2899-
}
2893+
2894+
err.span_suggestion(
2895+
brackets_span,
2896+
"to access tuple elements, use",
2897+
format!(".{i}"),
2898+
Applicability::MachineApplicable,
2899+
);
2900+
needs_note = false;
29002901
} else if let ExprKind::Path(..) = idx.peel_borrows().kind {
29012902
err.span_label(idx.span, "cannot access tuple elements at a variable index");
29022903
}

‎compiler/rustc_hir_typeck/src/expr_use_visitor.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,7 @@ impl<'a, 'tcx> ExprUseVisitor<'a, 'tcx> {
211211
self.select_from_expr(base);
212212
}
213213

214-
hir::ExprKind::Index(lhs, rhs) => {
214+
hir::ExprKind::Index(lhs, rhs, _) => {
215215
// lhs[rhs]
216216
self.select_from_expr(lhs);
217217
self.consume_expr(rhs);

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

+1-2
Original file line numberDiff line numberDiff line change
@@ -1620,8 +1620,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
16201620
.iter()
16211621
.enumerate()
16221622
.filter(|x| x.1.hir_id == *hir_id)
1623-
.map(|(i, _)| init_tup.get(i).unwrap())
1624-
.next()
1623+
.find_map(|(i, _)| init_tup.get(i))
16251624
{
16261625
self.note_type_is_not_clone_inner_expr(init)
16271626
} else {

‎compiler/rustc_hir_typeck/src/mem_categorization.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -332,7 +332,7 @@ impl<'a, 'tcx> MemCategorizationContext<'a, 'tcx> {
332332
))
333333
}
334334

335-
hir::ExprKind::Index(ref base, _) => {
335+
hir::ExprKind::Index(ref base, _, _) => {
336336
if self.typeck_results.is_method_call(expr) {
337337
// If this is an index implemented by a method call, then it
338338
// will include an implicit deref of the result.

‎compiler/rustc_hir_typeck/src/place_op.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -284,7 +284,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
284284
let mut exprs = vec![expr];
285285

286286
while let hir::ExprKind::Field(ref expr, _)
287-
| hir::ExprKind::Index(ref expr, _)
287+
| hir::ExprKind::Index(ref expr, _, _)
288288
| hir::ExprKind::Unary(hir::UnOp::Deref, ref expr) = exprs.last().unwrap().kind
289289
{
290290
exprs.push(expr);

0 commit comments

Comments
 (0)