diff options
| author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2019-07-04 21:09:32 +0100 |
|---|---|---|
| committer | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2019-07-04 21:09:32 +0100 |
| commit | cacdb0eab8131bfb945eb7ed0150c92ec56eefe2 (patch) | |
| tree | f762de90ce813591bc640ae0bce36493a3dcafa9 /crates/ra_hir/src/ty/infer | |
| parent | 4e8664d9d37021e85d72b6228fa45e7edf4a1a74 (diff) | |
| parent | 1834bae5b86c54ed9dece26e82436919d59e6cb7 (diff) | |
Merge #1486
1486: allow rustfmt to reorder imports r=matklad a=matklad
Co-authored-by: Aleksey Kladov <[email protected]>
Diffstat (limited to 'crates/ra_hir/src/ty/infer')
| -rw-r--r-- | crates/ra_hir/src/ty/infer/unify.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/crates/ra_hir/src/ty/infer/unify.rs b/crates/ra_hir/src/ty/infer/unify.rs index bc9719725..04633bdb2 100644 --- a/crates/ra_hir/src/ty/infer/unify.rs +++ b/crates/ra_hir/src/ty/infer/unify.rs | |||
| @@ -1,8 +1,8 @@ | |||
| 1 | //! Unification and canonicalization logic. | 1 | //! Unification and canonicalization logic. |
| 2 | 2 | ||
| 3 | use crate::db::HirDatabase; | ||
| 4 | use crate::ty::{Ty, Canonical, TraitRef, InferTy}; | ||
| 5 | use super::InferenceContext; | 3 | use super::InferenceContext; |
| 4 | use crate::db::HirDatabase; | ||
| 5 | use crate::ty::{Canonical, InferTy, TraitRef, Ty}; | ||
| 6 | 6 | ||
| 7 | impl<'a, D: HirDatabase> InferenceContext<'a, D> { | 7 | impl<'a, D: HirDatabase> InferenceContext<'a, D> { |
| 8 | pub(super) fn canonicalizer<'b>(&'b mut self) -> Canonicalizer<'a, 'b, D> | 8 | pub(super) fn canonicalizer<'b>(&'b mut self) -> Canonicalizer<'a, 'b, D> |