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_project_model/src/cargo_workspace.rs | 6 +++--- crates/ra_project_model/src/lib.rs | 4 ++-- crates/ra_project_model/src/sysroot.rs | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) (limited to 'crates/ra_project_model') diff --git a/crates/ra_project_model/src/cargo_workspace.rs b/crates/ra_project_model/src/cargo_workspace.rs index d5ebf2c7a..2b06e9e37 100644 --- a/crates/ra_project_model/src/cargo_workspace.rs +++ b/crates/ra_project_model/src/cargo_workspace.rs @@ -1,9 +1,9 @@ use std::path::{Path, PathBuf}; -use cargo_metadata::{MetadataCommand, CargoOpt}; -use ra_arena::{Arena, RawId, impl_arena_id}; -use rustc_hash::FxHashMap; +use cargo_metadata::{CargoOpt, MetadataCommand}; +use ra_arena::{impl_arena_id, Arena, RawId}; use ra_db::Edition; +use rustc_hash::FxHashMap; use crate::Result; diff --git a/crates/ra_project_model/src/lib.rs b/crates/ra_project_model/src/lib.rs index 42156bea6..74b7efa9a 100644 --- a/crates/ra_project_model/src/lib.rs +++ b/crates/ra_project_model/src/lib.rs @@ -3,15 +3,15 @@ mod json_project; mod sysroot; use std::{ + error::Error, fs::File, io::BufReader, path::{Path, PathBuf}, - error::Error }; use rustc_hash::FxHashMap; -use ra_db::{CrateGraph, FileId, Edition}; +use ra_db::{CrateGraph, Edition, FileId}; use serde_json::from_reader; diff --git a/crates/ra_project_model/src/sysroot.rs b/crates/ra_project_model/src/sysroot.rs index 9e0d8aaac..a419b81e8 100644 --- a/crates/ra_project_model/src/sysroot.rs +++ b/crates/ra_project_model/src/sysroot.rs @@ -3,7 +3,7 @@ use std::{ process::Command, }; -use ra_arena::{Arena, RawId, impl_arena_id}; +use ra_arena::{impl_arena_id, Arena, RawId}; use crate::Result; -- cgit v1.2.3