Skip to content

Commit 7501d3b

Browse files
committed
Auto merge of rust-lang#14551 - lowr:patch/no-unstable-item-compl-on-stable, r=Veykril
Fix faulty variable extraction Followup to rust-lang#14549 Fixes rust-lang/rust-analyzer#14549 (comment) and rust-lang/rust-analyzer#14549 (comment)
2 parents a1af8bb + 0a63867 commit 7501d3b

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

crates/ide-completion/src/completions/flyimport.rs

+8-8
Original file line numberDiff line numberDiff line change
@@ -267,10 +267,10 @@ fn import_on_the_fly(
267267
.into_iter()
268268
.filter(ns_filter)
269269
.filter(|import| {
270-
let item = &import.item_to_import;
271-
!ctx.is_item_hidden(item)
272-
&& !ctx.is_item_hidden(item)
273-
&& ctx.check_stability(item.attrs(ctx.db).as_deref())
270+
let original_item = &import.original_item;
271+
!ctx.is_item_hidden(&import.item_to_import)
272+
&& !ctx.is_item_hidden(original_item)
273+
&& ctx.check_stability(original_item.attrs(ctx.db).as_deref())
274274
})
275275
.sorted_by_key(|located_import| {
276276
compute_fuzzy_completion_order_key(
@@ -317,10 +317,10 @@ fn import_on_the_fly_pat_(
317317
.into_iter()
318318
.filter(ns_filter)
319319
.filter(|import| {
320-
let item = &import.item_to_import;
321-
!ctx.is_item_hidden(item)
322-
&& !ctx.is_item_hidden(item)
323-
&& ctx.check_stability(item.attrs(ctx.db).as_deref())
320+
let original_item = &import.original_item;
321+
!ctx.is_item_hidden(&import.item_to_import)
322+
&& !ctx.is_item_hidden(original_item)
323+
&& ctx.check_stability(original_item.attrs(ctx.db).as_deref())
324324
})
325325
.sorted_by_key(|located_import| {
326326
compute_fuzzy_completion_order_key(

0 commit comments

Comments
 (0)