aboutsummaryrefslogtreecommitdiff
path: root/crates/ra_db
diff options
context:
space:
mode:
authorAleksey Kladov <[email protected]>2019-07-04 21:05:17 +0100
committerAleksey Kladov <[email protected]>2019-07-04 21:09:09 +0100
commit1834bae5b86c54ed9dece26e82436919d59e6cb7 (patch)
tree92c8b984e874b67fa1831613464bbe356c1af3dd /crates/ra_db
parent2b2cd829b0f95aef338227deb05ec7503dae9b6c (diff)
allow rustfmt to reorder imports
This wasn't a right decision in the first place, the feature flag was broken in the last rustfmt release, and syntax highlighting of imports is more important anyway
Diffstat (limited to 'crates/ra_db')
-rw-r--r--crates/ra_db/src/input.rs2
-rw-r--r--crates/ra_db/src/lib.rs10
2 files changed, 5 insertions, 7 deletions
diff --git a/crates/ra_db/src/input.rs b/crates/ra_db/src/input.rs
index c103503bd..5d3a6b3c9 100644
--- a/crates/ra_db/src/input.rs
+++ b/crates/ra_db/src/input.rs
@@ -197,7 +197,7 @@ impl CrateGraph {
197 197
198#[cfg(test)] 198#[cfg(test)]
199mod tests { 199mod tests {
200 use super::{CrateGraph, FileId, SmolStr, Edition::Edition2018}; 200 use super::{CrateGraph, Edition::Edition2018, FileId, SmolStr};
201 201
202 #[test] 202 #[test]
203 fn it_should_panic_because_of_cycle_dependencies() { 203 fn it_should_panic_because_of_cycle_dependencies() {
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
5use std::{panic, sync::Arc}; 5use std::{panic, sync::Arc};
6 6
7use ra_syntax::{TextUnit, TextRange, SourceFile, Parse};
8use relative_path::RelativePathBuf;
9use ra_prof::profile; 7use ra_prof::profile;
8use ra_syntax::{Parse, SourceFile, TextRange, TextUnit};
9use relative_path::RelativePathBuf;
10 10
11pub use ::salsa as salsa;
12pub use crate::{ 11pub 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};
15pub use ::salsa;
18 16
19pub trait CheckCanceled { 17pub trait CheckCanceled {
20 /// Aborts current query if there are pending changes. 18 /// Aborts current query if there are pending changes.