diff options
| author | Matthias Krüger <matthias.krueger@famsik.de> | 2022-10-20 22:42:38 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-10-20 22:42:38 +0200 |
| commit | 7ee4b218a86ae091de768729318b4ca1610610e3 (patch) | |
| tree | a7bec2b721c63056d6eb92fd1c2085f77d8a33aa | |
| parent | 5ffa67d7309047ff47b9c624ba4061fb8c004c31 (diff) | |
| parent | 9a9e2fe15fd0a730e929db88fcf73b0cb3a99ddc (diff) | |
| download | rust-7ee4b218a86ae091de768729318b4ca1610610e3.tar.gz rust-7ee4b218a86ae091de768729318b4ca1610610e3.zip | |
Rollup merge of #103221 - TaKO8Ki:fix-103202, r=oli-obk
Fix `SelfVisitor::is_self_ty` ICE Fixes #103202
| -rw-r--r-- | compiler/rustc_resolve/src/late.rs | 6 | ||||
| -rw-r--r-- | src/test/ui/resolve/issue-103202.rs | 7 | ||||
| -rw-r--r-- | src/test/ui/resolve/issue-103202.stderr | 9 |
3 files changed, 19 insertions, 3 deletions
diff --git a/compiler/rustc_resolve/src/late.rs b/compiler/rustc_resolve/src/late.rs index 59efb5aff75..ba3d8f64bbc 100644 --- a/compiler/rustc_resolve/src/late.rs +++ b/compiler/rustc_resolve/src/late.rs @@ -1939,11 +1939,11 @@ impl<'a: 'ast, 'b, 'ast> LateResolutionVisitor<'a, 'b, 'ast> { match ty.kind { TyKind::ImplicitSelf => true, TyKind::Path(None, _) => { - let path_res = self.r.partial_res_map[&ty.id].expect_full_res(); - if let Res::SelfTyParam { .. } | Res::SelfTyAlias { .. } = path_res { + let path_res = self.r.partial_res_map[&ty.id].full_res(); + if let Some(Res::SelfTyParam { .. } | Res::SelfTyAlias { .. }) = path_res { return true; } - Some(path_res) == self.impl_self + self.impl_self.is_some() && path_res == self.impl_self } _ => false, } diff --git a/src/test/ui/resolve/issue-103202.rs b/src/test/ui/resolve/issue-103202.rs new file mode 100644 index 00000000000..469d9d7c860 --- /dev/null +++ b/src/test/ui/resolve/issue-103202.rs @@ -0,0 +1,7 @@ +struct S {} + +impl S { + fn f(self: &S::x) {} //~ ERROR ambiguous associated type +} + +fn main() {} diff --git a/src/test/ui/resolve/issue-103202.stderr b/src/test/ui/resolve/issue-103202.stderr new file mode 100644 index 00000000000..880389371ef --- /dev/null +++ b/src/test/ui/resolve/issue-103202.stderr @@ -0,0 +1,9 @@ +error[E0223]: ambiguous associated type + --> $DIR/issue-103202.rs:4:17 + | +LL | fn f(self: &S::x) {} + | ^^^^ help: use fully-qualified syntax: `<S as Trait>::x` + +error: aborting due to previous error + +For more information about this error, try `rustc --explain E0223`. |