diff options
Diffstat (limited to 'crates/ra_hir')
-rw-r--r-- | crates/ra_hir/src/code_model.rs | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/crates/ra_hir/src/code_model.rs b/crates/ra_hir/src/code_model.rs index cc72964ff..1b3525011 100644 --- a/crates/ra_hir/src/code_model.rs +++ b/crates/ra_hir/src/code_model.rs | |||
@@ -1189,7 +1189,7 @@ impl Type { | |||
1189 | None => return false, | 1189 | None => return false, |
1190 | }; | 1190 | }; |
1191 | 1191 | ||
1192 | let canonical_ty = Canonical { value: self.ty.value.clone(), num_vars: 0 }; | 1192 | let canonical_ty = Canonical { value: self.ty.value.clone(), kinds: Arc::new([]) }; |
1193 | method_resolution::implements_trait( | 1193 | method_resolution::implements_trait( |
1194 | &canonical_ty, | 1194 | &canonical_ty, |
1195 | db, | 1195 | db, |
@@ -1213,7 +1213,7 @@ impl Type { | |||
1213 | self.ty.environment.clone(), | 1213 | self.ty.environment.clone(), |
1214 | hir_ty::Obligation::Trait(trait_ref), | 1214 | hir_ty::Obligation::Trait(trait_ref), |
1215 | ), | 1215 | ), |
1216 | num_vars: 0, | 1216 | kinds: Arc::new([]), |
1217 | }; | 1217 | }; |
1218 | 1218 | ||
1219 | db.trait_solve(self.krate, goal).is_some() | 1219 | db.trait_solve(self.krate, goal).is_some() |
@@ -1288,7 +1288,7 @@ impl Type { | |||
1288 | pub fn autoderef<'a>(&'a self, db: &'a dyn HirDatabase) -> impl Iterator<Item = Type> + 'a { | 1288 | pub fn autoderef<'a>(&'a self, db: &'a dyn HirDatabase) -> impl Iterator<Item = Type> + 'a { |
1289 | // There should be no inference vars in types passed here | 1289 | // There should be no inference vars in types passed here |
1290 | // FIXME check that? | 1290 | // FIXME check that? |
1291 | let canonical = Canonical { value: self.ty.value.clone(), num_vars: 0 }; | 1291 | let canonical = Canonical { value: self.ty.value.clone(), kinds: Arc::new([]) }; |
1292 | let environment = self.ty.environment.clone(); | 1292 | let environment = self.ty.environment.clone(); |
1293 | let ty = InEnvironment { value: canonical, environment }; | 1293 | let ty = InEnvironment { value: canonical, environment }; |
1294 | autoderef(db, Some(self.krate), ty) | 1294 | autoderef(db, Some(self.krate), ty) |
@@ -1329,7 +1329,7 @@ impl Type { | |||
1329 | // There should be no inference vars in types passed here | 1329 | // There should be no inference vars in types passed here |
1330 | // FIXME check that? | 1330 | // FIXME check that? |
1331 | // FIXME replace Unknown by bound vars here | 1331 | // FIXME replace Unknown by bound vars here |
1332 | let canonical = Canonical { value: self.ty.value.clone(), num_vars: 0 }; | 1332 | let canonical = Canonical { value: self.ty.value.clone(), kinds: Arc::new([]) }; |
1333 | 1333 | ||
1334 | let env = self.ty.environment.clone(); | 1334 | let env = self.ty.environment.clone(); |
1335 | let krate = krate.id; | 1335 | let krate = krate.id; |
@@ -1360,7 +1360,7 @@ impl Type { | |||
1360 | // There should be no inference vars in types passed here | 1360 | // There should be no inference vars in types passed here |
1361 | // FIXME check that? | 1361 | // FIXME check that? |
1362 | // FIXME replace Unknown by bound vars here | 1362 | // FIXME replace Unknown by bound vars here |
1363 | let canonical = Canonical { value: self.ty.value.clone(), num_vars: 0 }; | 1363 | let canonical = Canonical { value: self.ty.value.clone(), kinds: Arc::new([]) }; |
1364 | 1364 | ||
1365 | let env = self.ty.environment.clone(); | 1365 | let env = self.ty.environment.clone(); |
1366 | let krate = krate.id; | 1366 | let krate = krate.id; |