Skip to content

Commit 6f2b30d

Browse files
jyn514jyn514
authored
Rollup merge of rust-lang#106245 - estebank:mutability-suggestions, r=eholk
Use verbose suggestions for mutability errors
2 parents 266f92c + b9439eb commit 6f2b30d

34 files changed

+338
-181
lines changed

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

Lines changed: 12 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -333,7 +333,7 @@ impl<'a, 'tcx> MirBorrowckCtxt<'a, 'tcx> {
333333
let local_decl = &self.body.local_decls[local];
334334
assert_eq!(local_decl.mutability, Mutability::Not);
335335

336-
err.span_label(span, format!("cannot {ACT}", ACT = act));
336+
err.span_label(span, format!("cannot {act}"));
337337
err.span_suggestion(
338338
local_decl.source_info.span,
339339
"consider changing this to be mutable",
@@ -357,7 +357,7 @@ impl<'a, 'tcx> MirBorrowckCtxt<'a, 'tcx> {
357357

358358
let captured_place = &self.upvars[upvar_index.index()].place;
359359

360-
err.span_label(span, format!("cannot {ACT}", ACT = act));
360+
err.span_label(span, format!("cannot {act}"));
361361

362362
let upvar_hir_id = captured_place.get_root_variable();
363363

@@ -397,7 +397,7 @@ impl<'a, 'tcx> MirBorrowckCtxt<'a, 'tcx> {
397397
.span_to_snippet(span)
398398
.map_or(false, |snippet| snippet.starts_with("&mut ")) =>
399399
{
400-
err.span_label(span, format!("cannot {ACT}", ACT = act));
400+
err.span_label(span, format!("cannot {act}"));
401401
err.span_suggestion(
402402
span,
403403
"try removing `&mut` here",
@@ -409,7 +409,7 @@ impl<'a, 'tcx> MirBorrowckCtxt<'a, 'tcx> {
409409
PlaceRef { local, projection: [ProjectionElem::Deref] }
410410
if self.body.local_decls[local].is_ref_for_guard() =>
411411
{
412-
err.span_label(span, format!("cannot {ACT}", ACT = act));
412+
err.span_label(span, format!("cannot {act}"));
413413
err.note(
414414
"variables bound in patterns are immutable until the end of the pattern guard",
415415
);
@@ -537,7 +537,7 @@ impl<'a, 'tcx> MirBorrowckCtxt<'a, 'tcx> {
537537
Some((true, err_help_span, suggested_code)) => {
538538
let (is_trait_sig, local_trait) = self.is_error_in_trait(local);
539539
if !is_trait_sig {
540-
err.span_suggestion(
540+
err.span_suggestion_verbose(
541541
err_help_span,
542542
&format!(
543543
"consider changing this to be a mutable {pointer_desc}"
@@ -546,7 +546,7 @@ impl<'a, 'tcx> MirBorrowckCtxt<'a, 'tcx> {
546546
Applicability::MachineApplicable,
547547
);
548548
} else if let Some(x) = local_trait {
549-
err.span_suggestion(
549+
err.span_suggestion_verbose(
550550
x,
551551
&format!(
552552
"consider changing that to be a mutable {pointer_desc}"
@@ -569,24 +569,15 @@ impl<'a, 'tcx> MirBorrowckCtxt<'a, 'tcx> {
569569
err.span_label(
570570
span,
571571
format!(
572-
"`{NAME}` is a `{SIGIL}` {DESC}, \
573-
so the data it refers to cannot be {ACTED_ON}",
574-
NAME = name,
575-
SIGIL = pointer_sigil,
576-
DESC = pointer_desc,
577-
ACTED_ON = acted_on
572+
"`{name}` is a `{pointer_sigil}` {pointer_desc}, \
573+
so the data it refers to cannot be {acted_on}",
578574
),
579575
);
580576
}
581577
_ => {
582578
err.span_label(
583579
span,
584-
format!(
585-
"cannot {ACT} through `{SIGIL}` {DESC}",
586-
ACT = act,
587-
SIGIL = pointer_sigil,
588-
DESC = pointer_desc
589-
),
580+
format!("cannot {act} through `{pointer_sigil}` {pointer_desc}"),
590581
);
591582
}
592583
}
@@ -605,13 +596,13 @@ impl<'a, 'tcx> MirBorrowckCtxt<'a, 'tcx> {
605596
Some(BorrowedContentSource::OverloadedDeref(ty)) => {
606597
err.help(&format!(
607598
"trait `DerefMut` is required to modify through a dereference, \
608-
but it is not implemented for `{ty}`",
599+
but it is not implemented for `{ty}`",
609600
));
610601
}
611602
Some(BorrowedContentSource::OverloadedIndex(ty)) => {
612603
err.help(&format!(
613604
"trait `IndexMut` is required to modify indexed content, \
614-
but it is not implemented for `{ty}`",
605+
but it is not implemented for `{ty}`",
615606
));
616607
self.suggest_map_index_mut_alternatives(ty, &mut err, span);
617608
}
@@ -620,7 +611,7 @@ impl<'a, 'tcx> MirBorrowckCtxt<'a, 'tcx> {
620611
}
621612

622613
_ => {
623-
err.span_label(span, format!("cannot {ACT}", ACT = act));
614+
err.span_label(span, format!("cannot {act}"));
624615
}
625616
}
626617

‎src/test/ui/array-slice-vec/slice-mut-2.stderr‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
11
error[E0596]: cannot borrow `*x` as mutable, as it is behind a `&` reference
22
--> $DIR/slice-mut-2.rs:7:18
33
|
4-
LL | let x: &[isize] = &[1, 2, 3, 4, 5];
5-
| ---------------- help: consider changing this to be a mutable reference: `&mut [1, 2, 3, 4, 5]`
6-
...
74
LL | let _ = &mut x[2..4];
85
| ^ `x` is a `&` reference, so the data it refers to cannot be borrowed as mutable
6+
|
7+
help: consider changing this to be a mutable reference
8+
|
9+
LL | let x: &[isize] = &mut [1, 2, 3, 4, 5];
10+
| ~~~~~~~~~~~~~~~~~~~~
911

1012
error: aborting due to previous error
1113

‎src/test/ui/borrowck/borrow-raw-address-of-deref-mutability.stderr‎

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,24 @@
11
error[E0596]: cannot borrow `*x` as mutable, as it is behind a `&` reference
22
--> $DIR/borrow-raw-address-of-deref-mutability.rs:8:13
33
|
4-
LL | let x = &0;
5-
| -- help: consider changing this to be a mutable reference: `&mut 0`
6-
LL |
74
LL | let q = &raw mut *x;
85
| ^^^^^^^^^^^ `x` is a `&` reference, so the data it refers to cannot be borrowed as mutable
6+
|
7+
help: consider changing this to be a mutable reference
8+
|
9+
LL | let x = &mut 0;
10+
| ~~~~~~
911

1012
error[E0596]: cannot borrow `*x` as mutable, as it is behind a `*const` pointer
1113
--> $DIR/borrow-raw-address-of-deref-mutability.rs:14:13
1214
|
13-
LL | let x = &0 as *const i32;
14-
| -- help: consider changing this to be a mutable pointer: `&mut 0`
15-
LL |
1615
LL | let q = &raw mut *x;
1716
| ^^^^^^^^^^^ `x` is a `*const` pointer, so the data it refers to cannot be borrowed as mutable
17+
|
18+
help: consider changing this to be a mutable pointer
19+
|
20+
LL | let x = &mut 0 as *const i32;
21+
| ~~~~~~
1822

1923
error: aborting due to 2 previous errors
2024

‎src/test/ui/borrowck/borrowck-access-permissions.stderr‎

Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -25,28 +25,35 @@ LL | let _y1 = &mut *box_x;
2525
error[E0596]: cannot borrow `*ref_x` as mutable, as it is behind a `&` reference
2626
--> $DIR/borrowck-access-permissions.rs:30:19
2727
|
28-
LL | let ref_x = &x;
29-
| -- help: consider changing this to be a mutable reference: `&mut x`
30-
...
3128
LL | let _y1 = &mut *ref_x;
3229
| ^^^^^^^^^^^ `ref_x` is a `&` reference, so the data it refers to cannot be borrowed as mutable
30+
|
31+
help: consider changing this to be a mutable reference
32+
|
33+
LL | let ref_x = &mut x;
34+
| ~~~~~~
3335

3436
error[E0596]: cannot borrow `*ptr_x` as mutable, as it is behind a `*const` pointer
3537
--> $DIR/borrowck-access-permissions.rs:39:23
3638
|
37-
LL | let ptr_x : *const _ = &x;
38-
| -- help: consider changing this to be a mutable pointer: `&mut x`
39-
...
4039
LL | let _y1 = &mut *ptr_x;
4140
| ^^^^^^^^^^^ `ptr_x` is a `*const` pointer, so the data it refers to cannot be borrowed as mutable
41+
|
42+
help: consider changing this to be a mutable pointer
43+
|
44+
LL | let ptr_x : *const _ = &mut x;
45+
| ~~~~~~
4246

4347
error[E0596]: cannot borrow `*foo_ref.f` as mutable, as it is behind a `&` reference
4448
--> $DIR/borrowck-access-permissions.rs:48:18
4549
|
46-
LL | let foo_ref = &foo;
47-
| ---- help: consider changing this to be a mutable reference: `&mut foo`
4850
LL | let _y = &mut *foo_ref.f;
4951
| ^^^^^^^^^^^^^^^ `foo_ref` is a `&` reference, so the data it refers to cannot be borrowed as mutable
52+
|
53+
help: consider changing this to be a mutable reference
54+
|
55+
LL | let foo_ref = &mut foo;
56+
| ~~~~~~~~
5057

5158
error: aborting due to 6 previous errors
5259

‎src/test/ui/borrowck/borrowck-assign-to-andmut-in-aliasable-loc.stderr‎

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,24 @@
11
error[E0594]: cannot assign to `*s.pointer`, which is behind a `&` reference
22
--> $DIR/borrowck-assign-to-andmut-in-aliasable-loc.rs:9:5
33
|
4-
LL | fn a(s: &S) {
5-
| -- help: consider changing this to be a mutable reference: `&mut S<'_>`
64
LL | *s.pointer += 1;
75
| ^^^^^^^^^^^^^^^ `s` is a `&` reference, so the data it refers to cannot be written
6+
|
7+
help: consider changing this to be a mutable reference
8+
|
9+
LL | fn a(s: &mut S<'_>) {
10+
| ~~~~~~~~~~
811

912
error[E0594]: cannot assign to `*s.pointer`, which is behind a `&` reference
1013
--> $DIR/borrowck-assign-to-andmut-in-aliasable-loc.rs:17:5
1114
|
12-
LL | fn c(s: & &mut S) {
13-
| -------- help: consider changing this to be a mutable reference: `&mut &mut S<'_>`
1415
LL | *s.pointer += 1;
1516
| ^^^^^^^^^^^^^^^ `s` is a `&` reference, so the data it refers to cannot be written
17+
|
18+
help: consider changing this to be a mutable reference
19+
|
20+
LL | fn c(s: &mut &mut S<'_>) {
21+
| ~~~~~~~~~~~~~~~
1622

1723
error: aborting due to 2 previous errors
1824

‎src/test/ui/borrowck/borrowck-borrow-mut-base-ptr-in-aliasable-loc.stderr‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,13 @@ LL | **t1 = 22;
2020
error[E0596]: cannot borrow `**t0` as mutable, as it is behind a `&` reference
2121
--> $DIR/borrowck-borrow-mut-base-ptr-in-aliasable-loc.rs:19:26
2222
|
23-
LL | fn foo4(t0: & &mut isize) {
24-
| ------------ help: consider changing this to be a mutable reference: `&mut &mut isize`
2523
LL | let x: &mut isize = &mut **t0;
2624
| ^^^^^^^^^ `t0` is a `&` reference, so the data it refers to cannot be borrowed as mutable
25+
|
26+
help: consider changing this to be a mutable reference
27+
|
28+
LL | fn foo4(t0: &mut &mut isize) {
29+
| ~~~~~~~~~~~~~~~
2730

2831
error: aborting due to 3 previous errors
2932

‎src/test/ui/borrowck/borrowck-issue-14498.stderr‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,13 @@
11
error[E0594]: cannot assign to `***p`, which is behind a `&` reference
22
--> $DIR/borrowck-issue-14498.rs:16:5
33
|
4-
LL | let p = &y;
5-
| -- help: consider changing this to be a mutable reference: `&mut y`
64
LL | ***p = 2;
75
| ^^^^^^^^ `p` is a `&` reference, so the data it refers to cannot be written
6+
|
7+
help: consider changing this to be a mutable reference
8+
|
9+
LL | let p = &mut y;
10+
| ~~~~~~
811

912
error[E0506]: cannot assign to `**y` because it is borrowed
1013
--> $DIR/borrowck-issue-14498.rs:25:5

‎src/test/ui/borrowck/borrowck-reborrow-from-mut.stderr‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -105,10 +105,13 @@ LL | use_imm(_bar1);
105105
error[E0596]: cannot borrow `foo.bar1` as mutable, as it is behind a `&` reference
106106
--> $DIR/borrowck-reborrow-from-mut.rs:88:17
107107
|
108-
LL | fn borrow_mut_from_imm(foo: &Foo) {
109-
| ---- help: consider changing this to be a mutable reference: `&mut Foo`
110108
LL | let _bar1 = &mut foo.bar1;
111109
| ^^^^^^^^^^^^^ `foo` is a `&` reference, so the data it refers to cannot be borrowed as mutable
110+
|
111+
help: consider changing this to be a mutable reference
112+
|
113+
LL | fn borrow_mut_from_imm(foo: &mut Foo) {
114+
| ~~~~~~~~
112115

113116
error: aborting due to 11 previous errors
114117

‎src/test/ui/borrowck/issue-85765.stderr‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,13 @@ LL | rofl.push(Vec::new());
1010
error[E0594]: cannot assign to `*r`, which is behind a `&` reference
1111
--> $DIR/issue-85765.rs:12:5
1212
|
13-
LL | let r = &mutvar;
14-
| ------- help: consider changing this to be a mutable reference: `&mut mutvar`
15-
LL |
1613
LL | *r = 0;
1714
| ^^^^^^ `r` is a `&` reference, so the data it refers to cannot be written
15+
|
16+
help: consider changing this to be a mutable reference
17+
|
18+
LL | let r = &mut mutvar;
19+
| ~~~~~~~~~~~
1820

1921
error[E0594]: cannot assign to `*x`, which is behind a `&` reference
2022
--> $DIR/issue-85765.rs:19:5

‎src/test/ui/borrowck/issue-93093.stderr‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
11
error[E0594]: cannot assign to `self.foo`, which is behind a `&` reference
22
--> $DIR/issue-93093.rs:8:9
33
|
4-
LL | async fn bar(&self) {
5-
| ----- help: consider changing this to be a mutable reference: `&mut self`
6-
LL |
74
LL | self.foo += 1;
85
| ^^^^^^^^^^^^^ `self` is a `&` reference, so the data it refers to cannot be written
6+
|
7+
help: consider changing this to be a mutable reference
8+
|
9+
LL | async fn bar(&mut self) {
10+
| ~~~~~~~~~
911

1012
error: aborting due to previous error
1113

0 commit comments

Comments
 (0)