aboutsummaryrefslogtreecommitdiff
path: root/crates/ra_assists/src/handlers
diff options
context:
space:
mode:
authorMikhail Rakhmanov <[email protected]>2020-06-04 09:03:44 +0100
committerMikhail Rakhmanov <[email protected]>2020-06-04 09:03:44 +0100
commitb0c8a2be7bd0d053eb9dd0e02fe2cf08b093a19a (patch)
treef80f886e29294e00f50a6e477cf770e71aa143b5 /crates/ra_assists/src/handlers
parenta6d3c77bdd998499941a6aceccde85f7a94b804d (diff)
Remove AsName import
Diffstat (limited to 'crates/ra_assists/src/handlers')
-rw-r--r--crates/ra_assists/src/handlers/extract_struct_from_enum_variant.rs13
1 files changed, 9 insertions, 4 deletions
diff --git a/crates/ra_assists/src/handlers/extract_struct_from_enum_variant.rs b/crates/ra_assists/src/handlers/extract_struct_from_enum_variant.rs
index 2b1951aff..72e5dd735 100644
--- a/crates/ra_assists/src/handlers/extract_struct_from_enum_variant.rs
+++ b/crates/ra_assists/src/handlers/extract_struct_from_enum_variant.rs
@@ -9,11 +9,11 @@ use ra_syntax::{
9 9
10use crate::{ 10use crate::{
11 assist_context::{AssistBuilder, AssistDirector}, 11 assist_context::{AssistBuilder, AssistDirector},
12 utils::insert_use_statement, 12 utils::insert_use::insert_use_statement_with_string_path,
13 AssistContext, AssistId, Assists, 13 AssistContext, AssistId, Assists,
14}; 14};
15use ast::{ArgListOwner, VisibilityOwner}; 15use ast::{ArgListOwner, VisibilityOwner};
16use hir::{AsName, EnumVariant, Module, ModuleDef}; 16use hir::{EnumVariant, Module, ModuleDef};
17use ra_db::FileId; 17use ra_db::FileId;
18use ra_fmt::leading_indent; 18use ra_fmt::leading_indent;
19use rustc_hash::FxHashSet; 19use rustc_hash::FxHashSet;
@@ -109,8 +109,13 @@ fn insert_import(
109 let mod_path = module.find_use_path(db, module_def.clone()); 109 let mod_path = module.find_use_path(db, module_def.clone());
110 if let Some(mut mod_path) = mod_path { 110 if let Some(mut mod_path) = mod_path {
111 mod_path.segments.pop(); 111 mod_path.segments.pop();
112 mod_path.segments.push(path_segment.as_name()); 112 let use_path = format!("{}::{}", mod_path.to_string(), path_segment.to_string());
113 insert_use_statement(path.syntax(), &mod_path, ctx, builder.text_edit_builder()); 113 insert_use_statement_with_string_path(
114 path.syntax(),
115 &use_path,
116 ctx,
117 builder.text_edit_builder(),
118 );
114 } 119 }
115 Some(()) 120 Some(())
116} 121}