Skip to content

Commit 0cc64a3

Browse files
borsbors
committed
Auto merge of #82935 - henryboisdequin:diagnostic-cleanups, r=estebank
Diagnostic cleanups Follow up to #81503 Helps with #82916 (don't show note if `span` is `DUMMY_SP`)
2 parents 77b996e + 26478c8 commit 0cc64a3

File tree

6 files changed

+46
-12
lines changed

6 files changed

+46
-12
lines changed

‎compiler/rustc_mir/src/borrow_check/diagnostics/conflict_errors.rs

+7-6
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ use rustc_middle::mir::{
1313
use rustc_middle::ty::{self, suggest_constraining_type_param, Ty, TypeFoldable};
1414
use rustc_span::source_map::DesugaringKind;
1515
use rustc_span::symbol::sym;
16-
use rustc_span::Span;
16+
use rustc_span::{Span, DUMMY_SP};
1717

1818
use crate::dataflow::drop_flag_effects;
1919
use crate::dataflow::indexes::{MoveOutIndex, MovePathIndex};
@@ -216,12 +216,13 @@ impl<'cx, 'tcx> MirBorrowckCtxt<'cx, 'tcx> {
216216
);
217217
}
218218
// Avoid pointing to the same function in multiple different
219-
// error messages
220-
if self.fn_self_span_reported.insert(self_arg.span) {
219+
// error messages.
220+
if span != DUMMY_SP && self.fn_self_span_reported.insert(self_arg.span)
221+
{
221222
err.span_note(
222-
self_arg.span,
223-
&format!("this function takes ownership of the receiver `self`, which moves {}", place_name)
224-
);
223+
self_arg.span,
224+
&format!("this function takes ownership of the receiver `self`, which moves {}", place_name)
225+
);
225226
}
226227
}
227228
// Deref::deref takes &self, which cannot cause a move

‎compiler/rustc_trait_selection/src/traits/error_reporting/suggestions.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1908,15 +1908,15 @@ impl<'a, 'tcx> InferCtxtExt<'tcx> for InferCtxt<'a, 'tcx> {
19081908

19091909
if is_const_fn {
19101910
err.help(
1911-
"consider creating a new `const` item and initializing with the result \
1911+
"consider creating a new `const` item and initializing it with the result \
19121912
of the function call to be used in the repeat position, like \
19131913
`const VAL: Type = const_fn();` and `let x = [VAL; 42];`",
19141914
);
19151915
}
19161916

19171917
if self.tcx.sess.is_nightly_build() && is_const_fn {
19181918
err.help(
1919-
"create an inline `const` block, see PR \
1919+
"create an inline `const` block, see RFC \
19201920
#2920 <https://github.com/rust-lang/rfcs/pull/2920> \
19211921
for more information",
19221922
);

‎src/test/ui/consts/const-blocks/fn-call-in-non-const.stderr

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ LL | let _: [Option<Bar>; 2] = [no_copy(); 2];
77
= help: the following implementations were found:
88
<Option<T> as Copy>
99
= note: the `Copy` trait is required because the repeated element will be copied
10-
= help: consider creating a new `const` item and initializing with the result of the function call to be used in the repeat position, like `const VAL: Type = const_fn();` and `let x = [VAL; 42];`
11-
= help: create an inline `const` block, see PR #2920 <https://github.com/rust-lang/rfcs/pull/2920> for more information
10+
= help: consider creating a new `const` item and initializing it with the result of the function call to be used in the repeat position, like `const VAL: Type = const_fn();` and `let x = [VAL; 42];`
11+
= help: create an inline `const` block, see RFC #2920 <https://github.com/rust-lang/rfcs/pull/2920> for more information
1212

1313
error: aborting due to previous error
1414

‎src/test/ui/consts/const-fn-in-vec.stderr

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ LL | let strings: [String; 5] = [String::new(); 5];
55
| ^^^^^^^^^^^^^^^^^^ the trait `Copy` is not implemented for `String`
66
|
77
= note: the `Copy` trait is required because the repeated element will be copied
8-
= help: consider creating a new `const` item and initializing with the result of the function call to be used in the repeat position, like `const VAL: Type = const_fn();` and `let x = [VAL; 42];`
9-
= help: create an inline `const` block, see PR #2920 <https://github.com/rust-lang/rfcs/pull/2920> for more information
8+
= help: consider creating a new `const` item and initializing it with the result of the function call to be used in the repeat position, like `const VAL: Type = const_fn();` and `let x = [VAL; 42];`
9+
= help: create an inline `const` block, see RFC #2920 <https://github.com/rust-lang/rfcs/pull/2920> for more information
1010

1111
error: aborting due to previous error
1212

‎src/test/ui/loops/issue-82916.rs

+10
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
struct S(i32);
2+
3+
fn foo(x: Vec<S>) {
4+
for y in x {
5+
6+
}
7+
let z = x; //~ ERROR use of moved value: `x`
8+
}
9+
10+
fn main() {}

‎src/test/ui/loops/issue-82916.stderr

+23
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
error[E0382]: use of moved value: `x`
2+
--> $DIR/issue-82916.rs:7:13
3+
|
4+
LL | fn foo(x: Vec<S>) {
5+
| - move occurs because `x` has type `Vec<S>`, which does not implement the `Copy` trait
6+
LL | for y in x {
7+
| -
8+
| |
9+
| `x` moved due to this implicit call to `.into_iter()`
10+
| help: consider borrowing to avoid moving into the for loop: `&x`
11+
...
12+
LL | let z = x;
13+
| ^ value used here after move
14+
|
15+
note: this function takes ownership of the receiver `self`, which moves `x`
16+
--> $SRC_DIR/core/src/iter/traits/collect.rs:LL:COL
17+
|
18+
LL | fn into_iter(self) -> Self::IntoIter;
19+
| ^^^^
20+
21+
error: aborting due to previous error
22+
23+
For more information about this error, try `rustc --explain E0382`.

0 commit comments

Comments
 (0)