diff options
author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2020-10-13 15:59:37 +0100 |
---|---|---|
committer | GitHub <[email protected]> | 2020-10-13 15:59:37 +0100 |
commit | 5091b5e9739a283329b475cab84a83117eb5814a (patch) | |
tree | f8e3bc969b502075cf1157fe33fc044d204cb022 /crates/assists/src/handlers | |
parent | 2d79bb9413b3e30d15d70b49ca19fcf47a97e592 (diff) | |
parent | 2620b8d42f2d9c41ead1af518158691840141583 (diff) |
Merge #6209
6209: Fix MergeBehaviour::Full/Last not working when merging nested long paths r=matklad a=Veykril
Prior to this inserting `std::foo::bar::Baz` with a nested import containing a multi segment path like `use std::{foo::bar::Qux};` present would result in `use std::{foo::bar::Baz, foo::bar::Qux};` with Full/Last Mergebehaviour.
Co-authored-by: Lukas Wirth <[email protected]>
Diffstat (limited to 'crates/assists/src/handlers')
-rw-r--r-- | crates/assists/src/handlers/replace_qualified_name_with_use.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crates/assists/src/handlers/replace_qualified_name_with_use.rs b/crates/assists/src/handlers/replace_qualified_name_with_use.rs index 74afc123b..e95b971a4 100644 --- a/crates/assists/src/handlers/replace_qualified_name_with_use.rs +++ b/crates/assists/src/handlers/replace_qualified_name_with_use.rs | |||
@@ -393,7 +393,7 @@ impl std::fmt::Display<|> for Foo { | |||
393 | } | 393 | } |
394 | ", | 394 | ", |
395 | r" | 395 | r" |
396 | use std::fmt::{Display, nested::Debug}; | 396 | use std::fmt::{nested::Debug, Display}; |
397 | 397 | ||
398 | impl Display for Foo { | 398 | impl Display for Foo { |
399 | } | 399 | } |