Skip to content

Commit 0b69c60

Browse files
committed
Fix term_search filtering enum variant generics incorrectly
1 parent 04b6b04 commit 0b69c60

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

src/tools/rust-analyzer/crates/ide-assists/src/handlers/term_search.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ fn f() { let a = A { x: 1, y: true }; let b: i32 = a.x; }"#,
144144
term_search,
145145
r#"//- minicore: todo, unimplemented, option
146146
fn f() { let a: i32 = 1; let b: Option<i32> = todo$0!(); }"#,
147-
r#"fn f() { let a: i32 = 1; let b: Option<i32> = Some(a); }"#,
147+
r#"fn f() { let a: i32 = 1; let b: Option<i32> = Some::<i32>(a); }"#,
148148
)
149149
}
150150

@@ -156,7 +156,7 @@ fn f() { let a: i32 = 1; let b: Option<i32> = todo$0!(); }"#,
156156
enum Option<T> { None, Some(T) }
157157
fn f() { let a: i32 = 1; let b: Option<i32> = todo$0!(); }"#,
158158
r#"enum Option<T> { None, Some(T) }
159-
fn f() { let a: i32 = 1; let b: Option<i32> = Option::Some(a); }"#,
159+
fn f() { let a: i32 = 1; let b: Option<i32> = Option::Some::<i32>(a); }"#,
160160
)
161161
}
162162

@@ -168,7 +168,7 @@ fn f() { let a: i32 = 1; let b: Option<i32> = Option::Some(a); }"#,
168168
enum Option<T> { None, Some(T) }
169169
fn f() { let a: Option<i32> = Option::None; let b: Option<Option<i32>> = todo$0!(); }"#,
170170
r#"enum Option<T> { None, Some(T) }
171-
fn f() { let a: Option<i32> = Option::None; let b: Option<Option<i32>> = Option::Some(a); }"#,
171+
fn f() { let a: Option<i32> = Option::None; let b: Option<Option<i32>> = Option::Some::<Option<i32>>(a); }"#,
172172
)
173173
}
174174

@@ -180,7 +180,7 @@ fn f() { let a: Option<i32> = Option::None; let b: Option<Option<i32>> = Option:
180180
enum Foo<T = i32> { Foo(T) }
181181
fn f() { let a = 0; let b: Foo = todo$0!(); }"#,
182182
r#"enum Foo<T = i32> { Foo(T) }
183-
fn f() { let a = 0; let b: Foo = Foo::Foo(a); }"#,
183+
fn f() { let a = 0; let b: Foo = Foo::Foo::<i32>(a); }"#,
184184
);
185185

186186
check_assist(

src/tools/rust-analyzer/crates/ide-completion/src/render.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2641,7 +2641,7 @@ fn foo() {
26412641
expect![[r#"
26422642
lc foo [type+local]
26432643
ex foo [type]
2644-
ex Foo::B [type]
2644+
ex Foo::B::<u32> [type]
26452645
ev Foo::A(…) [type_could_unify]
26462646
ev Foo::B [type_could_unify]
26472647
en Foo [type_could_unify]

0 commit comments

Comments
 (0)