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_hir/src/code_model/docs.rs | 4 ++-- crates/ra_hir/src/code_model/src.rs | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'crates/ra_hir/src/code_model') diff --git a/crates/ra_hir/src/code_model/docs.rs b/crates/ra_hir/src/code_model/docs.rs index da2b9b854..f696307a7 100644 --- a/crates/ra_hir/src/code_model/docs.rs +++ b/crates/ra_hir/src/code_model/docs.rs @@ -3,8 +3,8 @@ use std::sync::Arc; use ra_syntax::ast; use crate::{ - HirDatabase, DefDatabase, AstDatabase, HasSource, - Module, StructField, Struct, Enum, EnumVariant, Static, Const, Function, Union, Trait, TypeAlias, FieldSource, MacroDef, + AstDatabase, Const, DefDatabase, Enum, EnumVariant, FieldSource, Function, HasSource, + HirDatabase, MacroDef, Module, Static, Struct, StructField, Trait, TypeAlias, Union, }; #[derive(Clone, Copy, Debug, PartialEq, Eq, Hash)] diff --git a/crates/ra_hir/src/code_model/src.rs b/crates/ra_hir/src/code_model/src.rs index 5785d3b26..72451e0e7 100644 --- a/crates/ra_hir/src/code_model/src.rs +++ b/crates/ra_hir/src/code_model/src.rs @@ -1,9 +1,9 @@ -use ra_syntax::{TreeArc, ast}; +use ra_syntax::{ast, TreeArc}; use crate::{ - HirFileId, DefDatabase, AstDatabase, Module, ModuleSource, - StructField, Struct, Enum, Union, EnumVariant, Function, Static, Trait, Const, TypeAlias, - FieldSource, MacroDef, ids::AstItemDef, + ids::AstItemDef, AstDatabase, Const, DefDatabase, Enum, EnumVariant, FieldSource, Function, + HirFileId, MacroDef, Module, ModuleSource, Static, Struct, StructField, Trait, TypeAlias, + Union, }; pub struct Source { -- cgit v1.2.3