aboutsummaryrefslogtreecommitdiff
path: root/crates/hir_ty/src/infer/expr.rs
diff options
context:
space:
mode:
Diffstat (limited to 'crates/hir_ty/src/infer/expr.rs')
-rw-r--r--crates/hir_ty/src/infer/expr.rs12
1 files changed, 6 insertions, 6 deletions
diff --git a/crates/hir_ty/src/infer/expr.rs b/crates/hir_ty/src/infer/expr.rs
index 7278faeec..aab4d3153 100644
--- a/crates/hir_ty/src/infer/expr.rs
+++ b/crates/hir_ty/src/infer/expr.rs
@@ -98,7 +98,7 @@ impl<'a> InferenceContext<'a> {
98 goal: projection.trait_ref(self.db).cast(&Interner), 98 goal: projection.trait_ref(self.db).cast(&Interner),
99 environment: trait_env, 99 environment: trait_env,
100 }; 100 };
101 let canonical = self.canonicalizer().canonicalize_obligation(obligation.clone()); 101 let canonical = self.canonicalize(obligation.clone());
102 if self.db.trait_solve(krate, canonical.value).is_some() { 102 if self.db.trait_solve(krate, canonical.value).is_some() {
103 self.push_obligation(obligation.goal); 103 self.push_obligation(obligation.goal);
104 let return_ty = self.normalize_projection_ty(projection); 104 let return_ty = self.normalize_projection_ty(projection);
@@ -297,7 +297,7 @@ impl<'a> InferenceContext<'a> {
297 } 297 }
298 Expr::Call { callee, args } => { 298 Expr::Call { callee, args } => {
299 let callee_ty = self.infer_expr(*callee, &Expectation::none()); 299 let callee_ty = self.infer_expr(*callee, &Expectation::none());
300 let canonicalized = self.canonicalizer().canonicalize_ty(callee_ty.clone()); 300 let canonicalized = self.canonicalize(callee_ty.clone());
301 let mut derefs = autoderef( 301 let mut derefs = autoderef(
302 self.db, 302 self.db,
303 self.resolver.krate(), 303 self.resolver.krate(),
@@ -442,7 +442,7 @@ impl<'a> InferenceContext<'a> {
442 } 442 }
443 Expr::Field { expr, name } => { 443 Expr::Field { expr, name } => {
444 let receiver_ty = self.infer_expr_inner(*expr, &Expectation::none()); 444 let receiver_ty = self.infer_expr_inner(*expr, &Expectation::none());
445 let canonicalized = self.canonicalizer().canonicalize_ty(receiver_ty); 445 let canonicalized = self.canonicalize(receiver_ty);
446 let ty = autoderef::autoderef( 446 let ty = autoderef::autoderef(
447 self.db, 447 self.db,
448 self.resolver.krate(), 448 self.resolver.krate(),
@@ -559,7 +559,7 @@ impl<'a> InferenceContext<'a> {
559 match op { 559 match op {
560 UnaryOp::Deref => match self.resolver.krate() { 560 UnaryOp::Deref => match self.resolver.krate() {
561 Some(krate) => { 561 Some(krate) => {
562 let canonicalized = self.canonicalizer().canonicalize_ty(inner_ty); 562 let canonicalized = self.canonicalize(inner_ty);
563 match autoderef::deref( 563 match autoderef::deref(
564 self.db, 564 self.db,
565 krate, 565 krate,
@@ -676,7 +676,7 @@ impl<'a> InferenceContext<'a> {
676 if let (Some(index_trait), Some(krate)) = 676 if let (Some(index_trait), Some(krate)) =
677 (self.resolve_ops_index(), self.resolver.krate()) 677 (self.resolve_ops_index(), self.resolver.krate())
678 { 678 {
679 let canonicalized = self.canonicalizer().canonicalize_ty(base_ty); 679 let canonicalized = self.canonicalize(base_ty);
680 let self_ty = method_resolution::resolve_indexing_op( 680 let self_ty = method_resolution::resolve_indexing_op(
681 self.db, 681 self.db,
682 &canonicalized.value, 682 &canonicalized.value,
@@ -852,7 +852,7 @@ impl<'a> InferenceContext<'a> {
852 generic_args: Option<&GenericArgs>, 852 generic_args: Option<&GenericArgs>,
853 ) -> Ty { 853 ) -> Ty {
854 let receiver_ty = self.infer_expr(receiver, &Expectation::none()); 854 let receiver_ty = self.infer_expr(receiver, &Expectation::none());
855 let canonicalized_receiver = self.canonicalizer().canonicalize_ty(receiver_ty.clone()); 855 let canonicalized_receiver = self.canonicalize(receiver_ty.clone());
856 856
857 let traits_in_scope = self.resolver.traits_in_scope(self.db.upcast()); 857 let traits_in_scope = self.resolver.traits_in_scope(self.db.upcast());
858 858