From a6e45c6c69bf258118940941c12d057deb79e60c Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Fri, 31 Jul 2020 13:22:47 +0200 Subject: Reame PlaceholderType -> InferType --- xtask/src/ast_src.rs | 2 +- xtask/src/codegen/rust.ungram | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) (limited to 'xtask/src') diff --git a/xtask/src/ast_src.rs b/xtask/src/ast_src.rs index 114898e38..38b60b2a5 100644 --- a/xtask/src/ast_src.rs +++ b/xtask/src/ast_src.rs @@ -117,7 +117,7 @@ pub(crate) const KINDS_SRC: KindsSrc = KindsSrc { "ARRAY_TYPE", "SLICE_TYPE", "REFERENCE_TYPE", - "PLACEHOLDER_TYPE", + "INFER_TYPE", "FN_POINTER_TYPE", "FOR_TYPE", "IMPL_TRAIT_TYPE", diff --git a/xtask/src/codegen/rust.ungram b/xtask/src/codegen/rust.ungram index 8f0e66278..5dee85c2d 100644 --- a/xtask/src/codegen/rust.ungram +++ b/xtask/src/codegen/rust.ungram @@ -197,7 +197,7 @@ Type = | ArrayType | SliceType | ReferenceType -| PlaceholderType +| InferType | FnPointerType | ForType | ImplTraitType @@ -206,28 +206,28 @@ Type = ParenType = '(' Type ')' -TupleType = - '(' fields:Type* ')' - NeverType = '!' PathType = Path +TupleType = + '(' fields:(Type (',' Type)* ','?)? ')' + PointerType = '*' ('const' | 'mut') Type +ReferenceType = + '&' 'lifetime'? 'mut'? Type + ArrayType = '[' Type ';' Expr ']' SliceType = '[' Type ']' -ReferenceType = - '&' 'lifetime'? 'mut'? Type - -PlaceholderType = +InferType = '_' FnPointerType = -- cgit v1.2.3