From fce10200a0d666fbd2e2faa84b0526f586485bb3 Mon Sep 17 00:00:00 2001
From: Mikhail Rakhmanov <rakhmanov.m@gmail.com>
Date: Sat, 23 May 2020 01:23:40 +0200
Subject: Better naming and fix some review comments

---
 crates/ra_assists/src/assist_context.rs | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

(limited to 'crates/ra_assists/src/assist_context.rs')

diff --git a/crates/ra_assists/src/assist_context.rs b/crates/ra_assists/src/assist_context.rs
index e7220eea9..94286b497 100644
--- a/crates/ra_assists/src/assist_context.rs
+++ b/crates/ra_assists/src/assist_context.rs
@@ -292,13 +292,12 @@ impl AssistBuilder {
 }
 
 pub(crate) struct AssistDirector {
-    source_changes: Vec<SourceChange>,
     builders: FxHashMap<FileId, AssistBuilder>,
 }
 
 impl AssistDirector {
     fn new() -> AssistDirector {
-        AssistDirector { source_changes: vec![], builders: FxHashMap::default() }
+        AssistDirector { builders: FxHashMap::default() }
     }
 
     pub(crate) fn perform(&mut self, file_id: FileId, f: impl FnOnce(&mut AssistBuilder)) {
@@ -306,10 +305,10 @@ impl AssistDirector {
         f(&mut builder);
     }
 
-    fn finish(mut self) -> Vec<SourceChange> {
-        for (_, builder) in self.builders.into_iter().collect::<Vec<(FileId, AssistBuilder)>>() {
-            self.source_changes.push(builder.finish());
-        }
-        self.source_changes
+    fn finish(self) -> Vec<SourceChange> {
+        self.builders
+            .into_iter()
+            .map(|(_, builder)| builder.finish())
+            .collect::<Vec<SourceChange>>()
     }
 }
-- 
cgit v1.2.3