mirror of
https://github.com/rust-lang/rust-analyzer.git
synced 2025-09-29 05:15:04 +00:00
Auto merge of #16398 - Urhengulas:satisfy-clippy, r=Veykril
`cargo clippy --fix` This PR is the result of running `cargo clippy --fix && cargo fmt` in the root of the repository. I did not manually review all the changes, but just skimmed through a few of them. The tests still pass, so it seems fine.
This commit is contained in:
commit
85c9a83262
175 changed files with 592 additions and 735 deletions
|
@ -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
|
||||
})
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue