diff options
author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2019-07-15 07:50:36 +0100 |
---|---|---|
committer | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2019-07-15 07:50:36 +0100 |
commit | 8de56ec43e44ee227617de27ba8eddc328a90f5d (patch) | |
tree | 81f3523f2d78ac65697489a3ca43c03a768d05bc /crates/ra_hir/src/ty.rs | |
parent | c4e2e36e4c3cdaf5243a4d481221804e2d71bc8e (diff) | |
parent | c8284d8424691dc348af8708abfc2172b7dd5dc5 (diff) |
Merge #1532
1532: Some refactorings & update Chalk r=flodiebold a=flodiebold
This does some of the renamings proposed in #1515, refactors `InferenceContext` a bit, and does a Cargo update, including fixing the build since I broke it by already pushing an updated branch to my Chalk fork :disappointed:
We could also consider switching back to Chalk master; I couldn't reproduce any hangs with the floundering even on the rustc repo...
Co-authored-by: Florian Diebold <[email protected]>
Diffstat (limited to 'crates/ra_hir/src/ty.rs')
-rw-r--r-- | crates/ra_hir/src/ty.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crates/ra_hir/src/ty.rs b/crates/ra_hir/src/ty.rs index 9accffcbc..4cf714f5d 100644 --- a/crates/ra_hir/src/ty.rs +++ b/crates/ra_hir/src/ty.rs | |||
@@ -26,7 +26,7 @@ pub(crate) use lower::{ | |||
26 | callable_item_sig, generic_defaults_query, generic_predicates_query, type_for_def, | 26 | callable_item_sig, generic_defaults_query, generic_predicates_query, type_for_def, |
27 | type_for_field, TypableDef, | 27 | type_for_field, TypableDef, |
28 | }; | 28 | }; |
29 | pub(crate) use traits::{Environment, InEnvironment, Obligation, ProjectionPredicate}; | 29 | pub(crate) use traits::{InEnvironment, Obligation, ProjectionPredicate, TraitEnvironment}; |
30 | 30 | ||
31 | /// A type constructor or type name: this might be something like the primitive | 31 | /// A type constructor or type name: this might be something like the primitive |
32 | /// type `bool`, a struct like `Vec`, or things like function pointers or | 32 | /// type `bool`, a struct like `Vec`, or things like function pointers or |