aboutsummaryrefslogtreecommitdiff
path: root/crates/ide_assists
diff options
context:
space:
mode:
authorbors[bot] <26634292+bors[bot]@users.noreply.github.com>2021-05-23 18:37:36 +0100
committerGitHub <[email protected]>2021-05-23 18:37:36 +0100
commit16054887102104208f4a0fc0e75e702b85a2eae8 (patch)
tree0f9f18647a70d38fc1c02761de8f4d9f16fb3283 /crates/ide_assists
parentf04daf693aec9f3ffbd98bd368b79646246d506b (diff)
parentda74c66947ec847f2ca8e99d96cc7e36fd494c75 (diff)
Merge #8947
8947: Correctly resolve crate name in use paths when import shadows it r=Veykril a=Veykril Fixes #7763 bors r+ Co-authored-by: Lukas Tobias Wirth <[email protected]>
Diffstat (limited to 'crates/ide_assists')
-rw-r--r--crates/ide_assists/src/lib.rs3
1 files changed, 1 insertions, 2 deletions
diff --git a/crates/ide_assists/src/lib.rs b/crates/ide_assists/src/lib.rs
index 05644b6ff..4cd82f8c1 100644
--- a/crates/ide_assists/src/lib.rs
+++ b/crates/ide_assists/src/lib.rs
@@ -20,8 +20,7 @@ pub mod path_transform;
20use std::str::FromStr; 20use std::str::FromStr;
21 21
22use hir::Semantics; 22use hir::Semantics;
23use ide_db::base_db::FileRange; 23use ide_db::{base_db::FileRange, label::Label, source_change::SourceChange, RootDatabase};
24use ide_db::{label::Label, source_change::SourceChange, RootDatabase};
25use syntax::TextRange; 24use syntax::TextRange;
26 25
27pub(crate) use crate::assist_context::{AssistContext, Assists}; 26pub(crate) use crate::assist_context::{AssistContext, Assists};