diff options
author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2019-07-04 21:09:32 +0100 |
---|---|---|
committer | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2019-07-04 21:09:32 +0100 |
commit | cacdb0eab8131bfb945eb7ed0150c92ec56eefe2 (patch) | |
tree | f762de90ce813591bc640ae0bce36493a3dcafa9 /crates/ra_ide_api/src/db.rs | |
parent | 4e8664d9d37021e85d72b6228fa45e7edf4a1a74 (diff) | |
parent | 1834bae5b86c54ed9dece26e82436919d59e6cb7 (diff) |
Merge #1486
1486: allow rustfmt to reorder imports r=matklad a=matklad
Co-authored-by: Aleksey Kladov <[email protected]>
Diffstat (limited to 'crates/ra_ide_api/src/db.rs')
-rw-r--r-- | crates/ra_ide_api/src/db.rs | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/crates/ra_ide_api/src/db.rs b/crates/ra_ide_api/src/db.rs index 94977764c..fc5b06ca8 100644 --- a/crates/ra_ide_api/src/db.rs +++ b/crates/ra_ide_api/src/db.rs | |||
@@ -1,14 +1,14 @@ | |||
1 | use std::{ | 1 | use std::{sync::Arc, time}; |
2 | sync::Arc, | ||
3 | time, | ||
4 | }; | ||
5 | 2 | ||
6 | use ra_db::{ | 3 | use ra_db::{ |
7 | CheckCanceled, FileId, Canceled, SourceDatabase, | ||
8 | salsa::{self, Database}, | 4 | salsa::{self, Database}, |
5 | Canceled, CheckCanceled, FileId, SourceDatabase, | ||
9 | }; | 6 | }; |
10 | 7 | ||
11 | use crate::{LineIndex, symbol_index::{self, SymbolsDatabase}}; | 8 | use crate::{ |
9 | symbol_index::{self, SymbolsDatabase}, | ||
10 | LineIndex, | ||
11 | }; | ||
12 | 12 | ||
13 | #[salsa::database( | 13 | #[salsa::database( |
14 | ra_db::SourceDatabaseStorage, | 14 | ra_db::SourceDatabaseStorage, |