diff options
author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2020-10-07 12:52:05 +0100 |
---|---|---|
committer | GitHub <[email protected]> | 2020-10-07 12:52:05 +0100 |
commit | 83a651b123c08d786d1328293fc0327252a6d5d3 (patch) | |
tree | 916f7c1ff5f24d3d27cb14e82044696751414843 /crates/hir/src/lib.rs | |
parent | 5359e8f7429a7b6db7b1ab1ced5b19ff05d79123 (diff) | |
parent | 783af171f74d95b498662e5168c3ba320cca8553 (diff) |
Merge #6154
6154: Shorten type hints for std::iter Iterators r=SomeoneToIgnore a=Veykril
Fixes #3750.
This re-exports the `hir_expand::name::known` module to be able to fetch the `Iterator` and `iter` names.
I'm not sure if there is anything to do with `Solution::Ambig` in `normalize_trait_assoc_type` or whether discarding those results is always wanted.
Co-authored-by: Lukas Wirth <[email protected]>
Diffstat (limited to 'crates/hir/src/lib.rs')
-rw-r--r-- | crates/hir/src/lib.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crates/hir/src/lib.rs b/crates/hir/src/lib.rs index 171118d98..4094a76cb 100644 --- a/crates/hir/src/lib.rs +++ b/crates/hir/src/lib.rs | |||
@@ -55,7 +55,7 @@ pub use hir_def::{ | |||
55 | type_ref::{Mutability, TypeRef}, | 55 | type_ref::{Mutability, TypeRef}, |
56 | }; | 56 | }; |
57 | pub use hir_expand::{ | 57 | pub use hir_expand::{ |
58 | name::AsName, name::Name, HirFileId, InFile, MacroCallId, MacroCallLoc, | 58 | name::known, name::AsName, name::Name, HirFileId, InFile, MacroCallId, MacroCallLoc, |
59 | /* FIXME */ MacroDefId, MacroFile, Origin, | 59 | /* FIXME */ MacroDefId, MacroFile, Origin, |
60 | }; | 60 | }; |
61 | pub use hir_ty::display::HirDisplay; | 61 | pub use hir_ty::display::HirDisplay; |