Merge #11481

[rust.git] / crates / ide_assists / src / handlers / destructure_tuple_binding.rs

diff --git a/crates/ide_assists/src/handlers/destructure_tuple_binding.rs b/crates/ide_assists/src/handlers/destructure_tuple_binding.rs
index a57b3c39043ca4b1785155cab9fd2388a8296e0c..5f361f01dc1dadfffcd8c1a299a62355e38a23cc 100644 (file)
--- a/crates/ide_assists/src/handlers/destructure_tuple_binding.rs
+++ b/crates/ide_assists/src/handlers/destructure_tuple_binding.rs
@@ -3,7 +3,6 @@
     defs::Definition,
     search::{FileReference, SearchScope, UsageSearchResult},
 };
-use itertools::Itertools;
 use syntax::{
     ast::{self, AstNode, FieldExpr, HasName, IdentPat, MethodCallExpr},
     TextRange,
@@ -115,13 +114,13 @@ fn collect_data(ident_pat: IdentPat, ctx: &AssistContext) -> Option<TupleData> {
     let usages = ctx.sema.to_def(&ident_pat).map(|def| {
         Definition::Local(def)
             .usages(&ctx.sema)
-            .in_scope(SearchScope::single_file(ctx.frange.file_id))
+            .in_scope(SearchScope::single_file(ctx.file_id()))
             .all()
     });
 
     let field_names = (0..field_types.len())
         .map(|i| generate_name(ctx, i, &name, &ident_pat, &usages))
-        .collect_vec();
+        .collect::<Vec<_>>();
 
     Some(TupleData { ident_pat, range, ref_type, field_names, usages })
 }
@@ -174,7 +173,7 @@ fn edit_tuple_assignment(
 
     // with sub_pattern: keep original tuple and add subpattern: `tup @ (_0, _1)`
     if in_sub_pattern {
-        let text = format!(" @ {}", tuple_pat.to_string());
+        let text = format!(" @ {}", tuple_pat);
         match ctx.config.snippet_cap {
             Some(cap) => {
                 let snip = add_cursor(&text);