diff options
author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2019-11-27 09:51:02 +0000 |
---|---|---|
committer | GitHub <[email protected]> | 2019-11-27 09:51:02 +0000 |
commit | 35f57f35ec484422f06772ebe109c8fd28966ec5 (patch) | |
tree | 1b8a22d7991901808f1801c25feaaeaf141901b5 /crates/ra_hir/src/ty/traits.rs | |
parent | 84bd7916ffa91081e8938d15c673142498442042 (diff) | |
parent | 1fe9656ba4fdb1369153d4f0f6a7c8bfea6bfe08 (diff) |
Merge #2427
2427: Decouple r=matklad a=matklad
Co-authored-by: Aleksey Kladov <[email protected]>
Diffstat (limited to 'crates/ra_hir/src/ty/traits.rs')
-rw-r--r-- | crates/ra_hir/src/ty/traits.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/crates/ra_hir/src/ty/traits.rs b/crates/ra_hir/src/ty/traits.rs index 93cb32869..76189a60b 100644 --- a/crates/ra_hir/src/ty/traits.rs +++ b/crates/ra_hir/src/ty/traits.rs | |||
@@ -8,7 +8,7 @@ use ra_db::{impl_intern_key, salsa, CrateId}; | |||
8 | use ra_prof::profile; | 8 | use ra_prof::profile; |
9 | use rustc_hash::FxHashSet; | 9 | use rustc_hash::FxHashSet; |
10 | 10 | ||
11 | use crate::{db::HirDatabase, ImplBlock}; | 11 | use crate::db::HirDatabase; |
12 | 12 | ||
13 | use super::{Canonical, GenericPredicate, HirDisplay, ProjectionTy, TraitRef, Ty, TypeWalk}; | 13 | use super::{Canonical, GenericPredicate, HirDisplay, ProjectionTy, TraitRef, Ty, TypeWalk}; |
14 | 14 | ||
@@ -302,7 +302,7 @@ pub struct ClosureFnTraitImplData { | |||
302 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] | 302 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] |
303 | pub enum Impl { | 303 | pub enum Impl { |
304 | /// A normal impl from an impl block. | 304 | /// A normal impl from an impl block. |
305 | ImplBlock(ImplBlock), | 305 | ImplBlock(ImplId), |
306 | /// Closure types implement the Fn traits synthetically. | 306 | /// Closure types implement the Fn traits synthetically. |
307 | ClosureFnTraitImpl(ClosureFnTraitImplData), | 307 | ClosureFnTraitImpl(ClosureFnTraitImplData), |
308 | } | 308 | } |