diff options
author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2020-03-18 18:35:11 +0000 |
---|---|---|
committer | GitHub <[email protected]> | 2020-03-18 18:35:11 +0000 |
commit | b28d41186698a6e2aa3d679ee63dd48304ca4262 (patch) | |
tree | 7be0684f1c2660eb5da089d1067d13a343e8bcff /crates/ra_assists/src/lib.rs | |
parent | 12c952f8010afb583989a6e72f81ded4aa9110d2 (diff) | |
parent | 3f6dc20d3cf3fa101552a9067b98a1314260a679 (diff) |
Merge #3640
3640: Merge imports assist r=matklad a=matklad
Work towards #2220
bors r+
🤖
Co-authored-by: Aleksey Kladov <[email protected]>
Diffstat (limited to 'crates/ra_assists/src/lib.rs')
-rw-r--r-- | crates/ra_assists/src/lib.rs | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/crates/ra_assists/src/lib.rs b/crates/ra_assists/src/lib.rs index 260ada716..b8704ea7d 100644 --- a/crates/ra_assists/src/lib.rs +++ b/crates/ra_assists/src/lib.rs | |||
@@ -110,6 +110,7 @@ mod handlers { | |||
110 | mod inline_local_variable; | 110 | mod inline_local_variable; |
111 | mod introduce_variable; | 111 | mod introduce_variable; |
112 | mod invert_if; | 112 | mod invert_if; |
113 | mod merge_imports; | ||
113 | mod merge_match_arms; | 114 | mod merge_match_arms; |
114 | mod move_bounds; | 115 | mod move_bounds; |
115 | mod move_guard; | 116 | mod move_guard; |
@@ -140,6 +141,7 @@ mod handlers { | |||
140 | inline_local_variable::inline_local_variable, | 141 | inline_local_variable::inline_local_variable, |
141 | introduce_variable::introduce_variable, | 142 | introduce_variable::introduce_variable, |
142 | invert_if::invert_if, | 143 | invert_if::invert_if, |
144 | merge_imports::merge_imports, | ||
143 | merge_match_arms::merge_match_arms, | 145 | merge_match_arms::merge_match_arms, |
144 | move_bounds::move_bounds_to_where_clause, | 146 | move_bounds::move_bounds_to_where_clause, |
145 | move_guard::move_arm_cond_to_match_guard, | 147 | move_guard::move_arm_cond_to_match_guard, |