aboutsummaryrefslogtreecommitdiff
path: root/crates/ra_hir/src/ty/traits.rs
diff options
context:
space:
mode:
authorbors[bot] <26634292+bors[bot]@users.noreply.github.com>2019-11-25 15:58:54 +0000
committerGitHub <[email protected]>2019-11-25 15:58:54 +0000
commit58a3b3b502580e9f49dcfc9b7223e8aec258adf6 (patch)
tree3fe683f845d7b3b47f44337303dac2ff8312a832 /crates/ra_hir/src/ty/traits.rs
parentecd1204804a2a3c8b9b98e4b9d18feef06ab51c7 (diff)
parent1a0da6d4dad846568042f85ad7225b45b3275e49 (diff)
Merge #2404
2404: Use TypeAliasId in Ty, pt 2 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.rs5
1 files changed, 3 insertions, 2 deletions
diff --git a/crates/ra_hir/src/ty/traits.rs b/crates/ra_hir/src/ty/traits.rs
index 268fa09e4..b9a5d651f 100644
--- a/crates/ra_hir/src/ty/traits.rs
+++ b/crates/ra_hir/src/ty/traits.rs
@@ -2,13 +2,14 @@
2use std::sync::{Arc, Mutex}; 2use std::sync::{Arc, Mutex};
3 3
4use chalk_ir::{cast::Cast, family::ChalkIr}; 4use chalk_ir::{cast::Cast, family::ChalkIr};
5use hir_def::DefWithBodyId;
5use log::debug; 6use log::debug;
6use ra_db::{impl_intern_key, salsa}; 7use ra_db::{impl_intern_key, salsa};
7use ra_prof::profile; 8use ra_prof::profile;
8use rustc_hash::FxHashSet; 9use rustc_hash::FxHashSet;
9 10
10use super::{Canonical, GenericPredicate, HirDisplay, ProjectionTy, TraitRef, Ty, TypeWalk}; 11use super::{Canonical, GenericPredicate, HirDisplay, ProjectionTy, TraitRef, Ty, TypeWalk};
11use crate::{db::HirDatabase, expr::ExprId, Crate, DefWithBody, ImplBlock, Trait, TypeAlias}; 12use crate::{db::HirDatabase, expr::ExprId, Crate, ImplBlock, Trait, TypeAlias};
12 13
13use self::chalk::{from_chalk, ToChalk}; 14use self::chalk::{from_chalk, ToChalk};
14 15
@@ -290,7 +291,7 @@ impl FnTrait {
290 291
291#[derive(Debug, Clone, PartialEq, Eq, Hash)] 292#[derive(Debug, Clone, PartialEq, Eq, Hash)]
292pub struct ClosureFnTraitImplData { 293pub struct ClosureFnTraitImplData {
293 def: DefWithBody, 294 def: DefWithBodyId,
294 expr: ExprId, 295 expr: ExprId,
295 fn_trait: FnTrait, 296 fn_trait: FnTrait,
296} 297}