aboutsummaryrefslogtreecommitdiff
path: root/crates/ra_hir/src/name.rs
diff options
context:
space:
mode:
authorbors[bot] <26634292+bors[bot]@users.noreply.github.com>2019-07-07 16:20:09 +0100
committerbors[bot] <26634292+bors[bot]@users.noreply.github.com>2019-07-07 16:20:09 +0100
commit1b38ca3b8739230af1cc69884b5b11650b5fcb46 (patch)
tree02f5ae58fed812857cc299299ae5e0bd6f5836ce /crates/ra_hir/src/name.rs
parent6c31f5b0a79c8b97110aaf854b839b57811c375a (diff)
parentf7cd40d8306dfd3f2c55ad97de5167319350a592 (diff)
Merge #1501
1501: Infer for loop variable r=flodiebold a=unrealhoang My take on https://github.com/rust-analyzer/rust-analyzer/issues/1425 Co-authored-by: Unreal Hoang <[email protected]>
Diffstat (limited to 'crates/ra_hir/src/name.rs')
-rw-r--r--crates/ra_hir/src/name.rs14
1 files changed, 14 insertions, 0 deletions
diff --git a/crates/ra_hir/src/name.rs b/crates/ra_hir/src/name.rs
index 06a2dbc76..b71590560 100644
--- a/crates/ra_hir/src/name.rs
+++ b/crates/ra_hir/src/name.rs
@@ -86,6 +86,11 @@ impl Name {
86 "Self" => KnownName::SelfType, 86 "Self" => KnownName::SelfType,
87 "self" => KnownName::SelfParam, 87 "self" => KnownName::SelfParam,
88 "macro_rules" => KnownName::MacroRules, 88 "macro_rules" => KnownName::MacroRules,
89
90 "std" => KnownName::Std,
91 "iter" => KnownName::Iter,
92 "IntoIterator" => KnownName::IntoIterator,
93 "Item" => KnownName::Item,
89 _ => return None, 94 _ => return None,
90 }; 95 };
91 Some(name) 96 Some(name)
@@ -157,6 +162,11 @@ pub(crate) enum KnownName {
157 SelfParam, 162 SelfParam,
158 163
159 MacroRules, 164 MacroRules,
165
166 Std,
167 Iter,
168 IntoIterator,
169 Item,
160} 170}
161 171
162impl AsName for KnownName { 172impl AsName for KnownName {
@@ -182,6 +192,10 @@ impl AsName for KnownName {
182 KnownName::SelfType => "Self", 192 KnownName::SelfType => "Self",
183 KnownName::SelfParam => "self", 193 KnownName::SelfParam => "self",
184 KnownName::MacroRules => "macro_rules", 194 KnownName::MacroRules => "macro_rules",
195 KnownName::Std => "std",
196 KnownName::Iter => "iter",
197 KnownName::IntoIterator => "IntoIterator",
198 KnownName::Item => "Item",
185 }; 199 };
186 Name::new(s.into()) 200 Name::new(s.into())
187 } 201 }