Mirrors/rust-analyzer
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer synced 2025-01-14 14:13:58 +00:00
Code Issues Projects Releases Packages Wiki Activity

#11986 Aliases break resolution of qualified variants in patterns

Browse source
This commit is contained in:
bitgaoshu 2022-04-27 23:34:08 +08:00
parent 198c075580
commit 7900d99e3e
2 changed files with 21 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
crates/hir_ty/src/infer.rs
View file

@ -735,7 +735,8 @@ impl<'a> InferenceContext<'a> {
unresolved: Option<usize>,
path: &Path,
) -> (Ty, Option<VariantId>) {
match unresolved {
let remaining = unresolved.map(|x| path.segments().skip(x).len()).filter(|x| x > &0);
match remaining {
None => {
let variant = ty.as_adt().and_then(|(adt_id, _)| match adt_id {
AdtId::StructId(s) => Some(VariantId::StructId(s)),

19
crates/hir_ty/src/tests/simple.rs
View file

@ -1588,6 +1588,16 @@ fn infer_type_alias() {
z.x;
z.y;
}
mod m {
pub enum Enum {
Foo(u8),
}
pub type Alias = Enum;
}
fn f() {
let e = m::Alias::Foo(0);
let m::Alias::Foo(x) = &e;
}
"#,
expect![[r#"
115..116 'x': A<u32, i128>
@ -1606,6 +1616,15 @@ fn infer_type_alias() {
195..198 'z.x': u8
204..205 'z': A<u8, i8>
204..207 'z.y': i8
298..362 '{ ... &e; }': ()
308..309 'e': Enum
312..325 'm::Alias::Foo': Foo(u8) -> Enum
312..328 'm::Ali...Foo(0)': Enum
326..327 '0': u8
338..354 'm::Ali...Foo(x)': Enum
352..353 'x': &u8
357..359 '&e': &Enum
358..359 'e': Enum
"#]],
)
}