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_db/src/lib.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_db/src/lib.rs')
-rw-r--r-- | crates/ra_db/src/lib.rs | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/crates/ra_db/src/lib.rs b/crates/ra_db/src/lib.rs index f08616100..11e18a03d 100644 --- a/crates/ra_db/src/lib.rs +++ b/crates/ra_db/src/lib.rs | |||
@@ -4,17 +4,15 @@ mod input; | |||
4 | 4 | ||
5 | use std::{panic, sync::Arc}; | 5 | use std::{panic, sync::Arc}; |
6 | 6 | ||
7 | use ra_syntax::{TextUnit, TextRange, SourceFile, Parse}; | ||
8 | use relative_path::RelativePathBuf; | ||
9 | use ra_prof::profile; | 7 | use ra_prof::profile; |
8 | use ra_syntax::{Parse, SourceFile, TextRange, TextUnit}; | ||
9 | use relative_path::RelativePathBuf; | ||
10 | 10 | ||
11 | pub use ::salsa as salsa; | ||
12 | pub use crate::{ | 11 | pub use crate::{ |
13 | cancellation::Canceled, | 12 | cancellation::Canceled, |
14 | input::{ | 13 | input::{CrateGraph, CrateId, Dependency, Edition, FileId, SourceRoot, SourceRootId}, |
15 | FileId, CrateId, SourceRoot, SourceRootId, CrateGraph, Dependency, Edition, | ||
16 | }, | ||
17 | }; | 14 | }; |
15 | pub use ::salsa; | ||
18 | 16 | ||
19 | pub trait CheckCanceled { | 17 | pub trait CheckCanceled { |
20 | /// Aborts current query if there are pending changes. | 18 | /// Aborts current query if there are pending changes. |