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_assists/src/auto_import.rs | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) (limited to 'crates/ra_assists/src/auto_import.rs') diff --git a/crates/ra_assists/src/auto_import.rs b/crates/ra_assists/src/auto_import.rs index 9617beb5c..75ab8fa0f 100644 --- a/crates/ra_assists/src/auto_import.rs +++ b/crates/ra_assists/src/auto_import.rs @@ -1,14 +1,15 @@ +use hir::{self, db::HirDatabase}; use ra_text_edit::TextEditBuilder; -use hir::{ self, db::HirDatabase}; -use ra_syntax::{ - T, - ast::{ self, NameOwner }, AstNode, SyntaxNode, Direction, TextRange, SmolStr, - SyntaxKind::{ PATH, PATH_SEGMENT } -}; use crate::{ + assist_ctx::{Assist, AssistCtx}, AssistId, - assist_ctx::{AssistCtx, Assist}, +}; +use ra_syntax::{ + ast::{self, NameOwner}, + AstNode, Direction, SmolStr, + SyntaxKind::{PATH, PATH_SEGMENT}, + SyntaxNode, TextRange, T, }; fn collect_path_segments_raw<'a>( @@ -577,7 +578,7 @@ pub(crate) fn auto_import(mut ctx: AssistCtx) -> Option