diff options
| author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2020-09-14 11:12:08 +0100 |
|---|---|---|
| committer | GitHub <[email protected]> | 2020-09-14 11:12:08 +0100 |
| commit | a61178d2186b8d9ca324231ab03368819be0ff6e (patch) | |
| tree | c9169fd4a7a1dd40cd7cee9e41456a0e17fdbb09 /crates/assists/src/utils.rs | |
| parent | 0d03fe6ef57d3956e92382e0e1f1a916015191cb (diff) | |
| parent | adc4c6b9d7fd91827c4cf383a1e95dc7e27138e0 (diff) | |
Merge #5985
5985: Make MergeBehaviour configurable r=jonas-schievink a=Veykril
This should make the newly implemented `MergeBehaviour` for import insertion configurable as roughly outlined in https://github.com/rust-analyzer/rust-analyzer/pull/5935#issuecomment-685834257. For the config name and the like I just picked what came to mind so that might be up for bikeshedding.
Co-authored-by: Lukas Wirth <[email protected]>
Diffstat (limited to 'crates/assists/src/utils.rs')
| -rw-r--r-- | crates/assists/src/utils.rs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/crates/assists/src/utils.rs b/crates/assists/src/utils.rs index 7559ddd63..b0511ceb6 100644 --- a/crates/assists/src/utils.rs +++ b/crates/assists/src/utils.rs | |||
| @@ -16,7 +16,8 @@ use syntax::{ | |||
| 16 | 16 | ||
| 17 | use crate::assist_config::SnippetCap; | 17 | use crate::assist_config::SnippetCap; |
| 18 | 18 | ||
| 19 | pub(crate) use insert_use::{insert_use, ImportScope, MergeBehaviour}; | 19 | pub use insert_use::MergeBehaviour; |
| 20 | pub(crate) use insert_use::{insert_use, ImportScope}; | ||
| 20 | 21 | ||
| 21 | pub(crate) fn unwrap_trivial_block(block: ast::BlockExpr) -> ast::Expr { | 22 | pub(crate) fn unwrap_trivial_block(block: ast::BlockExpr) -> ast::Expr { |
| 22 | extract_trivial_expression(&block) | 23 | extract_trivial_expression(&block) |