Add impl trait lowering mode

2 files changed, 9 insertions, 8 deletions

diff --git a/crates/ra_hir/src/code_model.rs b/crates/ra_hir/src/code_model.rs
index 837a3ed6d..fda31d517 100644
--- a/crates/ra_hir/src/code_model.rs
+++ b/crates/ra_hir/src/code_model.rs
@@ -733,8 +733,7 @@ impl Local {
         let ty = infer[self.pat_id].clone();
         let resolver = def.resolver(db);
         let krate = def.module(db).krate;
-        let ctx = hir_ty::TyLoweringContext { db, resolver: &resolver };
-        let environment = TraitEnvironment::lower(&ctx);
+        let environment = TraitEnvironment::lower(db, &resolver);
         Type { krate, ty: InEnvironment { value: ty, environment } }
     }
 
@@ -790,8 +789,12 @@ impl ImplBlock {
     pub fn target_ty(&self, db: &impl HirDatabase) -> Type {
         let impl_data = db.impl_data(self.id);
         let resolver = self.id.resolver(db);
-        let ctx = hir_ty::TyLoweringContext { db, resolver: &resolver };
-        let environment = TraitEnvironment::lower(&ctx);
+        let ctx = hir_ty::TyLoweringContext {
+            db,
+            resolver: &resolver,
+            impl_trait_mode: hir_ty::ImplTraitLoweringMode::Disallowed,
+        };
+        let environment = TraitEnvironment::lower(db, &resolver);
         let ty = Ty::from_hir(&ctx, &impl_data.target_type);
         Type {
             krate: self.id.lookup(db).container.module(db).krate,
@@ -846,8 +849,7 @@ pub struct Type {
 impl Type {
     fn new(db: &impl HirDatabase, krate: CrateId, lexical_env: impl HasResolver, ty: Ty) -> Type {
         let resolver = lexical_env.resolver(db);
-        let ctx = hir_ty::TyLoweringContext { db, resolver: &resolver };
-        let environment = TraitEnvironment::lower(&ctx);
+        let environment = TraitEnvironment::lower(db, &resolver);
         Type { krate, ty: InEnvironment { value: ty, environment } }
     }
 
diff --git a/crates/ra_hir/src/source_analyzer.rs b/crates/ra_hir/src/source_analyzer.rs
index 9cfd52856..bb9a35c5d 100644
--- a/crates/ra_hir/src/source_analyzer.rs
+++ b/crates/ra_hir/src/source_analyzer.rs
@@ -179,8 +179,7 @@ impl SourceAnalyzer {
     }
 
     fn trait_env(&self, db: &impl HirDatabase) -> Arc<TraitEnvironment> {
-        let ctx = hir_ty::TyLoweringContext { db, resolver: &self.resolver };
-        TraitEnvironment::lower(&ctx)
+        TraitEnvironment::lower(db, &self.resolver)
     }
 
     pub fn type_of(&self, db: &impl HirDatabase, expr: &ast::Expr) -> Option<Type> {