diff options
| author | Zac Pullar-Strecker <[email protected]> | 2020-10-08 03:22:57 +0100 |
|---|---|---|
| committer | Zac Pullar-Strecker <[email protected]> | 2020-10-08 03:22:57 +0100 |
| commit | 8af1dd733760c51abadda8f2bd20139e11ebba04 (patch) | |
| tree | a8e2e671fa701b78b792b31833b897ed4bbdf2c0 /crates/hir/src | |
| parent | d2c68809ea3243ca68811e9b2e0f1592e2dc33fe (diff) | |
Rebase fixes
Diffstat (limited to 'crates/hir/src')
| -rw-r--r-- | crates/hir/src/code_model.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crates/hir/src/code_model.rs b/crates/hir/src/code_model.rs index 231ec0004..9989b9b56 100644 --- a/crates/hir/src/code_model.rs +++ b/crates/hir/src/code_model.rs | |||
| @@ -35,7 +35,7 @@ use hir_ty::{ | |||
| 35 | traits::SolutionVariables, | 35 | traits::SolutionVariables, |
| 36 | ApplicationTy, BoundVar, CallableDefId, Canonical, DebruijnIndex, FnSig, GenericPredicate, | 36 | ApplicationTy, BoundVar, CallableDefId, Canonical, DebruijnIndex, FnSig, GenericPredicate, |
| 37 | InEnvironment, Obligation, ProjectionPredicate, ProjectionTy, Substs, TraitEnvironment, Ty, | 37 | InEnvironment, Obligation, ProjectionPredicate, ProjectionTy, Substs, TraitEnvironment, Ty, |
| 38 | TyDefId, TyKind, TypeCtor, TyLoweringContext, TypeCtor, | 38 | TyDefId, TyKind, TypeCtor, TyLoweringContext, |
| 39 | }; | 39 | }; |
| 40 | use rustc_hash::FxHashSet; | 40 | use rustc_hash::FxHashSet; |
| 41 | use stdx::impl_from; | 41 | use stdx::impl_from; |