From 6777a4975d6a88928fda3e3b3f0bb05d98c61060 Mon Sep 17 00:00:00 2001 From: Florian Diebold Date: Wed, 7 Apr 2021 20:40:01 +0200 Subject: Move hir_trait_id to extension trait --- crates/hir/src/lib.rs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'crates/hir') diff --git a/crates/hir/src/lib.rs b/crates/hir/src/lib.rs index 13aaa408a..f5cb7a4df 100644 --- a/crates/hir/src/lib.rs +++ b/crates/hir/src/lib.rs @@ -59,7 +59,8 @@ use hir_ty::{ traits::FnTrait, AliasEq, AliasTy, BoundVar, CallableDefId, CallableSig, Canonical, CanonicalVarKinds, Cast, DebruijnIndex, InEnvironment, Interner, QuantifiedWhereClause, Scalar, Solution, Substitution, - TraitEnvironment, Ty, TyBuilder, TyDefId, TyExt, TyKind, TyVariableKind, WhereClause, + TraitEnvironment, TraitRefExt, Ty, TyBuilder, TyDefId, TyExt, TyKind, TyVariableKind, + WhereClause, }; use itertools::Itertools; use rustc_hash::FxHashSet; -- cgit v1.2.3 From d1b645d2360fb6e74aaa774ff713af02f685a110 Mon Sep 17 00:00:00 2001 From: Florian Diebold Date: Wed, 7 Apr 2021 20:47:04 +0200 Subject: Make Canonical::new a free-standing function --- crates/hir/src/lib.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'crates/hir') diff --git a/crates/hir/src/lib.rs b/crates/hir/src/lib.rs index f5cb7a4df..7ac9118fa 100644 --- a/crates/hir/src/lib.rs +++ b/crates/hir/src/lib.rs @@ -1808,7 +1808,7 @@ impl Type { .push(self.ty.clone()) .fill(args.iter().map(|t| t.ty.clone())) .build(); - let goal = Canonical::new( + let goal = hir_ty::make_canonical( InEnvironment::new( self.env.env.clone(), AliasEq { -- cgit v1.2.3 From be0084a0bc903544835d5c87df9eb9ce29a191d1 Mon Sep 17 00:00:00 2001 From: Florian Diebold Date: Wed, 7 Apr 2021 20:48:58 +0200 Subject: InEnvironment::new takes a reference --- crates/hir/src/lib.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'crates/hir') diff --git a/crates/hir/src/lib.rs b/crates/hir/src/lib.rs index 7ac9118fa..0afc06906 100644 --- a/crates/hir/src/lib.rs +++ b/crates/hir/src/lib.rs @@ -1791,7 +1791,7 @@ impl Type { .build(); let goal = Canonical { - value: hir_ty::InEnvironment::new(self.env.env.clone(), trait_ref.cast(&Interner)), + value: hir_ty::InEnvironment::new(&self.env.env, trait_ref.cast(&Interner)), binders: CanonicalVarKinds::empty(&Interner), }; @@ -1810,7 +1810,7 @@ impl Type { .build(); let goal = hir_ty::make_canonical( InEnvironment::new( - self.env.env.clone(), + &self.env.env, AliasEq { alias: AliasTy::Projection(projection), ty: TyKind::BoundVar(BoundVar::new(DebruijnIndex::INNERMOST, 0)) -- cgit v1.2.3