Unnamed repository; edit this file 'description' to name the repository.
Diffstat (limited to 'crates/ide/src/lib.rs')
| -rw-r--r-- | crates/ide/src/lib.rs | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/crates/ide/src/lib.rs b/crates/ide/src/lib.rs index 60a9367adc..81682e07e0 100644 --- a/crates/ide/src/lib.rs +++ b/crates/ide/src/lib.rs @@ -269,7 +269,7 @@ impl Analysis { /// Debug info about the current state of the analysis. pub fn status(&self, file_id: Option<FileId>) -> Cancellable<String> { - self.with_db(|db| status::status(&*db, file_id)) + self.with_db(|db| status::status(db, file_id)) } pub fn parallel_prime_caches<F>(&self, num_worker_threads: u8, cb: F) -> Cancellable<()> @@ -348,7 +348,7 @@ impl Analysis { } pub fn fetch_crates(&self) -> Cancellable<FxIndexSet<CrateInfo>> { - self.with_db(|db| fetch_crates::fetch_crates(db)) + self.with_db(fetch_crates::fetch_crates) } pub fn expand_macro(&self, position: FilePosition) -> Cancellable<Option<ExpandedMacro>> { @@ -667,8 +667,8 @@ impl Analysis { let assists = ide_assists::assists(db, assist_config, resolve, frange); let mut res = diagnostic_assists; - res.extend(ssr_assists.into_iter()); - res.extend(assists.into_iter()); + res.extend(ssr_assists); + res.extend(assists); res }) @@ -680,8 +680,9 @@ impl Analysis { &self, position: FilePosition, new_name: &str, + rename_external: bool, ) -> Cancellable<Result<SourceChange, RenameError>> { - self.with_db(|db| rename::rename(db, position, new_name)) + self.with_db(|db| rename::rename(db, position, new_name, rename_external)) } pub fn prepare_rename( |