From 1834bae5b86c54ed9dece26e82436919d59e6cb7 Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Thu, 4 Jul 2019 23:05:17 +0300 Subject: 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 --- crates/ra_db/src/input.rs | 2 +- crates/ra_db/src/lib.rs | 10 ++++------ 2 files changed, 5 insertions(+), 7 deletions(-) (limited to 'crates/ra_db') 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 { #[cfg(test)] mod tests { - use super::{CrateGraph, FileId, SmolStr, Edition::Edition2018}; + use super::{CrateGraph, Edition::Edition2018, FileId, SmolStr}; #[test] 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; use std::{panic, sync::Arc}; -use ra_syntax::{TextUnit, TextRange, SourceFile, Parse}; -use relative_path::RelativePathBuf; use ra_prof::profile; +use ra_syntax::{Parse, SourceFile, TextRange, TextUnit}; +use relative_path::RelativePathBuf; -pub use ::salsa as salsa; pub use crate::{ cancellation::Canceled, - input::{ - FileId, CrateId, SourceRoot, SourceRootId, CrateGraph, Dependency, Edition, - }, + input::{CrateGraph, CrateId, Dependency, Edition, FileId, SourceRoot, SourceRootId}, }; +pub use ::salsa; pub trait CheckCanceled { /// Aborts current query if there are pending changes. -- cgit v1.2.3