mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix span after rebase

Browse Source
This commit is contained in:
Esteban Küber 2019-03-23 14:10:29 -07:00
parent 81394ce9ae
commit 59f0f2edc1
3 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/librustc_typeck/check/method/suggest.rs
View File

@ -69,6 +69,7 @@ impl<'a, 'gcx, 'tcx> FnCtxt<'a, 'gcx, 'tcx> {
error: MethodError<'tcx>,
args: Option<&'gcx [hir::Expr]>,
) {
let orig_span = span;
let mut span = span;
// Avoid suggestions when we don't know what's going on.
if rcvr_ty.references_error() {
@ -397,7 +398,7 @@ impl<'a, 'gcx, 'tcx> FnCtxt<'a, 'gcx, 'tcx> {
}
} else {
err.span_label(span, format!("{} not found in `{}`", item_kind, ty_str));
self.tcx.sess.trait_methods_not_found.borrow_mut().insert(span);
self.tcx.sess.trait_methods_not_found.borrow_mut().insert(orig_span);
}
if self.is_fn_ty(&rcvr_ty, span) {

8
src/test/ui/did_you_mean/bad-assoc-pat.stderr
View File

@ -65,9 +65,7 @@ error[E0599]: no associated item named `AssocItem` found for type `u8` in the cu
--> $DIR/bad-assoc-pat.rs:21:24
|
LL | ($ty: ty) => ($ty::AssocItem)
| -----^^^^^^^^^
| |
| associated item not found in `u8`
| ^^^^^^^^^ associated item not found in `u8`
...
LL | pat!(u8) => {}
| -------- in this macro invocation
@ -76,9 +74,7 @@ error[E0599]: no associated item named `AssocItem` found for type `u8` in the cu
--> $DIR/bad-assoc-pat.rs:32:16
|
LL | ty!()::AssocItem => {}
| -------^^^^^^^^^
| |
| associated item not found in `u8`
| ^^^^^^^^^ associated item not found in `u8`
error: aborting due to 12 previous errors

4
src/test/ui/issues/issue-58734.stderr
View File

@ -2,9 +2,7 @@ error[E0599]: no function or associated item named `nonexistent` found for type
--> $DIR/issue-58734.rs:20:12
|
LL | Trait::nonexistent(());
| -------^^^^^^^^^^^
| |
| function or associated item not found in `dyn Trait`
| ^^^^^^^^^^^ function or associated item not found in `dyn Trait`
error: aborting due to previous error