diff options
| author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2021-01-15 19:43:59 +0000 |
|---|---|---|
| committer | GitHub <[email protected]> | 2021-01-15 19:43:59 +0000 |
| commit | d93d3d6d7334bc94bdbfe9f3ab50cafd0113211e (patch) | |
| tree | 5bd9f3c17f87851325565c3fb0aa698d5583f62c /crates/ide_db/src/helpers | |
| parent | 8a869e870ac6328967fb120a0ebe44a9c900eaf0 (diff) | |
| parent | c303014f3923e46ae63fbcdc6cf6f166bb040b1e (diff) | |
Merge #7289
7289: Add Unmerge Use assist r=matklad a=unexge
Closes https://github.com/rust-analyzer/rust-analyzer/issues/7185
Co-authored-by: unexge <[email protected]>
Diffstat (limited to 'crates/ide_db/src/helpers')
| -rw-r--r-- | crates/ide_db/src/helpers/insert_use.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crates/ide_db/src/helpers/insert_use.rs b/crates/ide_db/src/helpers/insert_use.rs index 0c180e9bc..d2f9f5d25 100644 --- a/crates/ide_db/src/helpers/insert_use.rs +++ b/crates/ide_db/src/helpers/insert_use.rs | |||
| @@ -97,7 +97,7 @@ pub fn insert_use<'a>( | |||
| 97 | ) -> SyntaxRewriter<'a> { | 97 | ) -> SyntaxRewriter<'a> { |
| 98 | let _p = profile::span("insert_use"); | 98 | let _p = profile::span("insert_use"); |
| 99 | let mut rewriter = SyntaxRewriter::default(); | 99 | let mut rewriter = SyntaxRewriter::default(); |
| 100 | let use_item = make::use_(make::use_tree(path.clone(), None, None, false)); | 100 | let use_item = make::use_(None, make::use_tree(path.clone(), None, None, false)); |
| 101 | // merge into existing imports if possible | 101 | // merge into existing imports if possible |
| 102 | if let Some(mb) = merge { | 102 | if let Some(mb) = merge { |
| 103 | for existing_use in scope.as_syntax_node().children().filter_map(ast::Use::cast) { | 103 | for existing_use in scope.as_syntax_node().children().filter_map(ast::Use::cast) { |