From 1834bae5b86c54ed9dece26e82436919d59e6cb7 Mon Sep 17 00:00:00 2001 From: Aleksey Kladov <aleksey.kladov@gmail.com> 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_cli/src/analysis_bench.rs | 6 +++--- crates/ra_cli/src/analysis_stats.rs | 4 ++-- crates/ra_cli/src/main.rs | 6 +++--- 3 files changed, 8 insertions(+), 8 deletions(-) (limited to 'crates/ra_cli') diff --git a/crates/ra_cli/src/analysis_bench.rs b/crates/ra_cli/src/analysis_bench.rs index 33d472838..639ac763e 100644 --- a/crates/ra_cli/src/analysis_bench.rs +++ b/crates/ra_cli/src/analysis_bench.rs @@ -1,10 +1,10 @@ use std::{ - path::{PathBuf, Path}, + path::{Path, PathBuf}, time::Instant, }; -use ra_db::{SourceDatabase, salsa::Database}; -use ra_ide_api::{AnalysisHost, Analysis, LineCol, FilePosition}; +use ra_db::{salsa::Database, SourceDatabase}; +use ra_ide_api::{Analysis, AnalysisHost, FilePosition, LineCol}; use crate::Result; diff --git a/crates/ra_cli/src/analysis_stats.rs b/crates/ra_cli/src/analysis_stats.rs index a01c07c3f..b8ad6aebc 100644 --- a/crates/ra_cli/src/analysis_stats.rs +++ b/crates/ra_cli/src/analysis_stats.rs @@ -1,7 +1,7 @@ -use std::{collections::HashSet, time::Instant, fmt::Write, path::Path}; +use std::{collections::HashSet, fmt::Write, path::Path, time::Instant}; use ra_db::SourceDatabase; -use ra_hir::{Crate, ModuleDef, Ty, ImplItem, HasSource}; +use ra_hir::{Crate, HasSource, ImplItem, ModuleDef, Ty}; use ra_syntax::AstNode; use crate::Result; diff --git a/crates/ra_cli/src/main.rs b/crates/ra_cli/src/main.rs index d2f6544f8..25edbd5f7 100644 --- a/crates/ra_cli/src/main.rs +++ b/crates/ra_cli/src/main.rs @@ -1,13 +1,13 @@ mod analysis_stats; mod analysis_bench; -use std::{io::Read, error::Error}; +use std::{error::Error, io::Read}; use clap::{App, Arg, SubCommand}; -use ra_ide_api::{file_structure, Analysis}; -use ra_syntax::{SourceFile, TreeArc, AstNode}; use flexi_logger::Logger; +use ra_ide_api::{file_structure, Analysis}; use ra_prof::profile; +use ra_syntax::{AstNode, SourceFile, TreeArc}; type Result<T> = std::result::Result<T, Box<dyn Error + Send + Sync>>; -- cgit v1.2.3