diff options
author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2020-07-31 13:13:31 +0100 |
---|---|---|
committer | GitHub <[email protected]> | 2020-07-31 13:13:31 +0100 |
commit | eccb5d52d3c4b82b6b61e231aa137b4aeb8c94ec (patch) | |
tree | a40a875cf0c364144d656f77b30b464f372f3667 /crates/ra_parser | |
parent | 8c802a3dbb5ea1dea8de17f59d0620e3a710474a (diff) | |
parent | a6e45c6c69bf258118940941c12d057deb79e60c (diff) |
Merge #5619
5619: Reame PlaceholderType -> InferType r=matklad a=matklad
bors r+
🤖
Co-authored-by: Aleksey Kladov <[email protected]>
Diffstat (limited to 'crates/ra_parser')
-rw-r--r-- | crates/ra_parser/src/grammar/types.rs | 2 | ||||
-rw-r--r-- | crates/ra_parser/src/syntax_kind/generated.rs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/crates/ra_parser/src/grammar/types.rs b/crates/ra_parser/src/grammar/types.rs index 9e8e3bd97..e9a20fbf1 100644 --- a/crates/ra_parser/src/grammar/types.rs +++ b/crates/ra_parser/src/grammar/types.rs | |||
@@ -172,7 +172,7 @@ fn placeholder_type(p: &mut Parser) { | |||
172 | assert!(p.at(T![_])); | 172 | assert!(p.at(T![_])); |
173 | let m = p.start(); | 173 | let m = p.start(); |
174 | p.bump(T![_]); | 174 | p.bump(T![_]); |
175 | m.complete(p, PLACEHOLDER_TYPE); | 175 | m.complete(p, INFER_TYPE); |
176 | } | 176 | } |
177 | 177 | ||
178 | // test fn_pointer_type | 178 | // test fn_pointer_type |
diff --git a/crates/ra_parser/src/syntax_kind/generated.rs b/crates/ra_parser/src/syntax_kind/generated.rs index be4da67bc..64ab18217 100644 --- a/crates/ra_parser/src/syntax_kind/generated.rs +++ b/crates/ra_parser/src/syntax_kind/generated.rs | |||
@@ -147,7 +147,7 @@ pub enum SyntaxKind { | |||
147 | ARRAY_TYPE, | 147 | ARRAY_TYPE, |
148 | SLICE_TYPE, | 148 | SLICE_TYPE, |
149 | REFERENCE_TYPE, | 149 | REFERENCE_TYPE, |
150 | PLACEHOLDER_TYPE, | 150 | INFER_TYPE, |
151 | FN_POINTER_TYPE, | 151 | FN_POINTER_TYPE, |
152 | FOR_TYPE, | 152 | FOR_TYPE, |
153 | IMPL_TRAIT_TYPE, | 153 | IMPL_TRAIT_TYPE, |