diff options
| author | Takayuki Maeda <takoyaki0316@gmail.com> | 2022-10-19 11:17:46 +0900 |
|---|---|---|
| committer | Takayuki Maeda <takoyaki0316@gmail.com> | 2022-10-19 11:17:46 +0900 |
| commit | 0b2716415f1bd26e80887c2d8459fd436fc8e9b3 (patch) | |
| tree | c5ae601fbd5cbed0d4c6061f7e3bbd0393d5f487 | |
| parent | ee1c3b385b6673b6ef37d80dfabe048e993c2ae2 (diff) | |
| download | rust-0b2716415f1bd26e80887c2d8459fd436fc8e9b3.tar.gz rust-0b2716415f1bd26e80887c2d8459fd436fc8e9b3.zip | |
fix `SelfVisitor::is_self_ty` ICE
| -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 cc877e2fd30..5b99cd1e264 100644 --- a/compiler/rustc_resolve/src/late.rs +++ b/compiler/rustc_resolve/src/late.rs @@ -1928,11 +1928,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 + 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`. |
