From 97ffe3c6e8289553e3b3bd22392a22eaa8d61f42 Mon Sep 17 00:00:00 2001
From: Mikhail Rakhmanov <rakhmanov.m@gmail.com>
Date: Fri, 22 May 2020 22:47:25 +0200
Subject: Refactor AssistDirector
---
crates/ra_assists/src/assist_context.rs | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/crates/ra_assists/src/assist_context.rs b/crates/ra_assists/src/assist_context.rs
index 52bc7820e..37de4f590 100644
--- a/crates/ra_assists/src/assist_context.rs
+++ b/crates/ra_assists/src/assist_context.rs
@@ -178,11 +178,10 @@ impl Assists {
label: Assist,
f: impl FnOnce(&mut AssistDirector),
) -> Option<()> {
- let change_label = label.label.clone();
if !self.resolve {
return None;
}
- let mut director = AssistDirector::new(change_label.clone());
+ let mut director = AssistDirector::new();
f(&mut director);
let changes = director.finish();
let file_edits: Vec<SourceFileEdit> =
@@ -295,12 +294,11 @@ impl AssistBuilder {
pub(crate) struct AssistDirector {
source_changes: Vec<SourceChange>,
builders: FxHashMap<FileId, AssistBuilder>,
- change_label: String,
}
impl AssistDirector {
- fn new(change_label: String) -> AssistDirector {
- AssistDirector { source_changes: vec![], builders: FxHashMap::default(), change_label }
+ fn new() -> AssistDirector {
+ AssistDirector { source_changes: vec![], builders: FxHashMap::default() }
}
pub(crate) fn perform(&mut self, file_id: FileId, f: impl FnOnce(&mut AssistBuilder)) {
@@ -309,7 +307,7 @@ impl AssistDirector {
}
fn finish(mut self) -> Vec<SourceChange> {
- for (file_id, builder) in
+ for (_, builder) in
self.builders.into_iter().collect::<Vec<(FileId, AssistBuilder)>>()
{
self.source_changes.push(builder.finish());
--
cgit v1.2.3