Skip to content

Commit

Permalink
Rollup merge of rust-lang#58931 - estebank:elide-receiver-tyerr, r=va…
Browse files Browse the repository at this point in the history
…rkor

Elide invalid method receiver error when it contains TyErr

Fix rust-lang#58712.
  • Loading branch information
pietroalbini authored Mar 8, 2019
2 parents 40daa06 + 2983d9c commit 254bc42
Show file tree
Hide file tree
Showing 3 changed files with 33 additions and 1 deletion.
4 changes: 3 additions & 1 deletion src/librustc_typeck/check/wfcheck.rs
Original file line number Diff line number Diff line change
Expand Up @@ -881,7 +881,9 @@ fn receiver_is_valid<'fcx, 'tcx, 'gcx>(
} else {
debug!("receiver_is_valid: type `{:?}` does not deref to `{:?}`",
receiver_ty, self_ty);
return false
// If he receiver already has errors reported due to it, consider it valid to avoid
// unecessary errors (#58712).
return receiver_ty.references_error();
}

// without the `arbitrary_self_types` feature, `receiver_ty` must directly deref to
Expand Down
15 changes: 15 additions & 0 deletions src/test/ui/issues/issue-58712.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
struct AddrVec<H, A> {
h: H,
a: A,
}

impl<H> AddrVec<H, DeviceId> {
//~^ ERROR cannot find type `DeviceId` in this scope
pub fn device(&self) -> DeviceId {
//~^ ERROR cannot find type `DeviceId` in this scope
self.tail()
}
}

fn main() {}

15 changes: 15 additions & 0 deletions src/test/ui/issues/issue-58712.stderr
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
error[E0412]: cannot find type `DeviceId` in this scope
--> $DIR/issue-58712.rs:6:20
|
LL | impl<H> AddrVec<H, DeviceId> {
| ^^^^^^^^ not found in this scope

error[E0412]: cannot find type `DeviceId` in this scope
--> $DIR/issue-58712.rs:8:29
|
LL | pub fn device(&self) -> DeviceId {
| ^^^^^^^^ not found in this scope

error: aborting due to 2 previous errors

For more information about this error, try `rustc --explain E0412`.

0 comments on commit 254bc42

Please sign in to comment.