Reorder imports

This commit is contained in:
Aleksey Kladov 2020-07-13 15:34:46 +02:00
parent 5ca7cd960b
commit 82b025b05a
3 changed files with 7 additions and 8 deletions

View file

@ -12,9 +12,9 @@ use crate::{
diagnostics::{ diagnostics::{
MismatchedArgCount, MissingFields, MissingMatchArms, MissingOkInTailExpr, MissingPatFields, MismatchedArgCount, MissingFields, MissingMatchArms, MissingOkInTailExpr, MissingPatFields,
}, },
match_checking::{is_useful, MatchCheckCtx, Matrix, PatStack, Usefulness},
utils::variant_data, utils::variant_data,
ApplicationTy, InferenceResult, Ty, TypeCtor, ApplicationTy, InferenceResult, Ty, TypeCtor,
_match::{is_useful, MatchCheckCtx, Matrix, PatStack, Usefulness},
}; };
pub use hir_def::{ pub use hir_def::{

View file

@ -31,9 +31,11 @@ pub mod traits;
pub mod method_resolution; pub mod method_resolution;
mod op; mod op;
mod lower; mod lower;
mod match_checking;
pub(crate) mod infer; pub(crate) mod infer;
pub mod display;
pub(crate) mod utils; pub(crate) mod utils;
pub mod display;
pub mod db; pub mod db;
pub mod diagnostics; pub mod diagnostics;
pub mod expr; pub mod expr;
@ -43,11 +45,8 @@ pub mod unsafe_validation;
mod tests; mod tests;
#[cfg(test)] #[cfg(test)]
mod test_db; mod test_db;
mod _match;
use std::ops::Deref; use std::{iter, mem, ops::Deref, sync::Arc};
use std::sync::Arc;
use std::{iter, mem};
use hir_def::{ use hir_def::{
expr::ExprId, expr::ExprId,
@ -55,14 +54,15 @@ use hir_def::{
AdtId, AssocContainerId, DefWithBodyId, GenericDefId, HasModule, Lookup, TraitId, TypeAliasId, AdtId, AssocContainerId, DefWithBodyId, GenericDefId, HasModule, Lookup, TraitId, TypeAliasId,
TypeParamId, TypeParamId,
}; };
use itertools::Itertools;
use ra_db::{impl_intern_key, salsa, CrateId}; use ra_db::{impl_intern_key, salsa, CrateId};
use crate::{ use crate::{
db::HirDatabase, db::HirDatabase,
display::HirDisplay,
primitive::{FloatTy, IntTy}, primitive::{FloatTy, IntTy},
utils::{generics, make_mut_slice, Generics}, utils::{generics, make_mut_slice, Generics},
}; };
use display::HirDisplay;
pub use autoderef::autoderef; pub use autoderef::autoderef;
pub use infer::{InferTy, InferenceResult}; pub use infer::{InferTy, InferenceResult};
@ -74,7 +74,6 @@ pub use lower::{
pub use traits::{InEnvironment, Obligation, ProjectionPredicate, TraitEnvironment}; pub use traits::{InEnvironment, Obligation, ProjectionPredicate, TraitEnvironment};
pub use chalk_ir::{BoundVar, DebruijnIndex}; pub use chalk_ir::{BoundVar, DebruijnIndex};
use itertools::Itertools;
/// A type constructor or type name: this might be something like the primitive /// A type constructor or type name: this might be something like the primitive
/// type `bool`, a struct like `Vec`, or things like function pointers or /// type `bool`, a struct like `Vec`, or things like function pointers or