diff options
author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2019-12-13 19:49:01 +0000 |
---|---|---|
committer | GitHub <[email protected]> | 2019-12-13 19:49:01 +0000 |
commit | 9c9f4635b4eb7d987717b4064a7de789f7983e2a (patch) | |
tree | a90ec3dd748d8e4f9fcd6e808bf39c234a25c6d7 /crates/ra_hir_ty/src/infer.rs | |
parent | ebc95af2b5b91239fc1d8a5fc8344ded6f6ef3e4 (diff) | |
parent | 77052090515c1bb2a00236b3a57cdd778e581c8c (diff) |
Merge #2550
2550: Infer - and ! using std::ops::{Neg, Not} r=flodiebold a=kiljacken
Found some low hanging fruit while taking a cursory look at index inferring.
Co-authored-by: Emil Lauridsen <[email protected]>
Diffstat (limited to 'crates/ra_hir_ty/src/infer.rs')
-rw-r--r-- | crates/ra_hir_ty/src/infer.rs | 34 |
1 files changed, 32 insertions, 2 deletions
diff --git a/crates/ra_hir_ty/src/infer.rs b/crates/ra_hir_ty/src/infer.rs index d16f1eb46..a1201b3e4 100644 --- a/crates/ra_hir_ty/src/infer.rs +++ b/crates/ra_hir_ty/src/infer.rs | |||
@@ -36,8 +36,8 @@ use ra_prof::profile; | |||
36 | use super::{ | 36 | use super::{ |
37 | primitive::{FloatTy, IntTy}, | 37 | primitive::{FloatTy, IntTy}, |
38 | traits::{Guidance, Obligation, ProjectionPredicate, Solution}, | 38 | traits::{Guidance, Obligation, ProjectionPredicate, Solution}, |
39 | ApplicationTy, InEnvironment, ProjectionTy, TraitEnvironment, TraitRef, Ty, TypeCtor, TypeWalk, | 39 | ApplicationTy, InEnvironment, ProjectionTy, Substs, TraitEnvironment, TraitRef, Ty, TypeCtor, |
40 | Uncertain, | 40 | TypeWalk, Uncertain, |
41 | }; | 41 | }; |
42 | use crate::{db::HirDatabase, infer::diagnostics::InferenceDiagnostic}; | 42 | use crate::{db::HirDatabase, infer::diagnostics::InferenceDiagnostic}; |
43 | 43 | ||
@@ -338,6 +338,24 @@ impl<'a, D: HirDatabase> InferenceContext<'a, D> { | |||
338 | self.table.resolve_ty_shallow(ty) | 338 | self.table.resolve_ty_shallow(ty) |
339 | } | 339 | } |
340 | 340 | ||
341 | fn resolve_associated_type(&mut self, inner_ty: Ty, assoc_ty: Option<TypeAliasId>) -> Ty { | ||
342 | match assoc_ty { | ||
343 | Some(res_assoc_ty) => { | ||
344 | let ty = self.table.new_type_var(); | ||
345 | let projection = ProjectionPredicate { | ||
346 | ty: ty.clone(), | ||
347 | projection_ty: ProjectionTy { | ||
348 | associated_ty: res_assoc_ty, | ||
349 | parameters: Substs::single(inner_ty), | ||
350 | }, | ||
351 | }; | ||
352 | self.obligations.push(Obligation::Projection(projection)); | ||
353 | self.resolve_ty_as_possible(ty) | ||
354 | } | ||
355 | None => Ty::Unknown, | ||
356 | } | ||
357 | } | ||
358 | |||
341 | /// Recurses through the given type, normalizing associated types mentioned | 359 | /// Recurses through the given type, normalizing associated types mentioned |
342 | /// in it by replacing them by type variables and registering obligations to | 360 | /// in it by replacing them by type variables and registering obligations to |
343 | /// resolve later. This should be done once for every type we get from some | 361 | /// resolve later. This should be done once for every type we get from some |
@@ -415,6 +433,18 @@ impl<'a, D: HirDatabase> InferenceContext<'a, D> { | |||
415 | self.db.trait_data(trait_).associated_type_by_name(&name::OK_TYPE) | 433 | self.db.trait_data(trait_).associated_type_by_name(&name::OK_TYPE) |
416 | } | 434 | } |
417 | 435 | ||
436 | fn resolve_ops_neg_output(&self) -> Option<TypeAliasId> { | ||
437 | let path = known::std_ops_neg(); | ||
438 | let trait_ = self.resolver.resolve_known_trait(self.db, &path)?; | ||
439 | self.db.trait_data(trait_).associated_type_by_name(&name::OUTPUT_TYPE) | ||
440 | } | ||
441 | |||
442 | fn resolve_ops_not_output(&self) -> Option<TypeAliasId> { | ||
443 | let path = known::std_ops_not(); | ||
444 | let trait_ = self.resolver.resolve_known_trait(self.db, &path)?; | ||
445 | self.db.trait_data(trait_).associated_type_by_name(&name::OUTPUT_TYPE) | ||
446 | } | ||
447 | |||
418 | fn resolve_future_future_output(&self) -> Option<TypeAliasId> { | 448 | fn resolve_future_future_output(&self) -> Option<TypeAliasId> { |
419 | let path = known::std_future_future(); | 449 | let path = known::std_future_future(); |
420 | let trait_ = self.resolver.resolve_known_trait(self.db, &path)?; | 450 | let trait_ = self.resolver.resolve_known_trait(self.db, &path)?; |