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/ty.rs | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'crates/ra_hir/src/ty.rs') diff --git a/crates/ra_hir/src/ty.rs b/crates/ra_hir/src/ty.rs index 842d49e1f..11afdc0f3 100644 --- a/crates/ra_hir/src/ty.rs +++ b/crates/ra_hir/src/ty.rs @@ -12,17 +12,20 @@ mod lower; mod infer; pub(crate) mod display; -use std::sync::Arc; use std::ops::Deref; +use std::sync::Arc; use std::{fmt, mem}; -use crate::{Name, AdtDef, type_ref::Mutability, db::HirDatabase, Trait, GenericParams, TypeAlias}; +use crate::{db::HirDatabase, type_ref::Mutability, AdtDef, GenericParams, Name, Trait, TypeAlias}; use display::{HirDisplay, HirFormatter}; -pub(crate) use lower::{TypableDef, type_for_def, type_for_field, callable_item_sig, generic_predicates, generic_defaults}; -pub(crate) use infer::{infer_query, InferenceResult, InferTy}; -pub use lower::CallableDef; pub(crate) use autoderef::autoderef; +pub(crate) use infer::{infer_query, InferTy, InferenceResult}; +pub use lower::CallableDef; +pub(crate) use lower::{ + callable_item_sig, generic_defaults, generic_predicates, type_for_def, type_for_field, + TypableDef, +}; pub(crate) use traits::ProjectionPredicate; /// A type constructor or type name: this might be something like the primitive -- cgit v1.2.3