Merge #5619

5619: Reame PlaceholderType -> InferType r=matklad a=matklad



bors r+
🤖

Co-authored-by: Aleksey Kladov <aleksey.kladov@gmail.com>

crates/ra_assists/src/handlers/add_explicit_type.rs

@@ -46,7 +46,7 @@ pub(crate) fn add_explicit_type(acc: &mut Assists, ctx: &AssistContext) -> Optio
     // and it has no placeholders
     let ascribed_ty = let_stmt.ty();
     if let Some(ty) = &ascribed_ty {
-        if ty.syntax().descendants().find_map(ast::PlaceholderType::cast).is_none() {
+        if ty.syntax().descendants().find_map(ast::InferType::cast).is_none() {
             return None;
         }
     }

crates/ra_hir_def/src/type_ref.rs

@@ -111,7 +111,7 @@ pub(crate) fn from_ast(ctx: &LowerCtx, node: ast::Type) -> Self {
                 let mutability = Mutability::from_mutable(inner.mut_token().is_some());
                 TypeRef::Reference(Box::new(inner_ty), mutability)
             }
-            ast::Type::PlaceholderType(_inner) => TypeRef::Placeholder,
+            ast::Type::InferType(_inner) => TypeRef::Placeholder,
             ast::Type::FnPointerType(inner) => {
                 let ret_ty = inner
                     .ret_type()

crates/ra_parser/src/grammar/types.rs

@@ -172,7 +172,7 @@ fn placeholder_type(p: &mut Parser) {
     assert!(p.at(T![_]));
     let m = p.start();
     p.bump(T![_]);
-    m.complete(p, PLACEHOLDER_TYPE);
+    m.complete(p, INFER_TYPE);
 }
 
 // test fn_pointer_type

crates/ra_parser/src/syntax_kind/generated.rs

@@ -147,7 +147,7 @@ pub enum SyntaxKind {
     ARRAY_TYPE,
     SLICE_TYPE,
     REFERENCE_TYPE,
-    PLACEHOLDER_TYPE,
+    INFER_TYPE,
     FN_POINTER_TYPE,
     FOR_TYPE,
     IMPL_TRAIT_TYPE,

crates/ra_syntax/src/ast/generated/nodes.rs

@@ -594,10 +594,10 @@ pub fn mut_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T!
     pub fn ty(&self) -> Option<Type> { support::child(&self.syntax) }
 }
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct PlaceholderType {
+pub struct InferType {
     pub(crate) syntax: SyntaxNode,
 }
-impl PlaceholderType {
+impl InferType {
     pub fn underscore_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![_]) }
 }
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
@@ -1291,7 +1291,7 @@ pub enum Type {
     ArrayType(ArrayType),
     SliceType(SliceType),
     ReferenceType(ReferenceType),
-    PlaceholderType(PlaceholderType),
+    InferType(InferType),
     FnPointerType(FnPointerType),
     ForType(ForType),
     ImplTraitType(ImplTraitType),
@@ -1988,8 +1988,8 @@ fn cast(syntax: SyntaxNode) -> Option<Self> {
     }
     fn syntax(&self) -> &SyntaxNode { &self.syntax }
 }
-impl AstNode for PlaceholderType {
+impl AstNode for InferType {
-    fn can_cast(kind: SyntaxKind) -> bool { kind == PLACEHOLDER_TYPE }
+    fn can_cast(kind: SyntaxKind) -> bool { kind == INFER_TYPE }
     fn cast(syntax: SyntaxNode) -> Option<Self> {
         if Self::can_cast(syntax.kind()) {
             Some(Self { syntax })
@@ -2871,8 +2871,8 @@ fn from(node: SliceType) -> Type { Type::SliceType(node) }
 impl From<ReferenceType> for Type {
     fn from(node: ReferenceType) -> Type { Type::ReferenceType(node) }
 }
-impl From<PlaceholderType> for Type {
+impl From<InferType> for Type {
-    fn from(node: PlaceholderType) -> Type { Type::PlaceholderType(node) }
+    fn from(node: InferType) -> Type { Type::InferType(node) }
 }
 impl From<FnPointerType> for Type {
     fn from(node: FnPointerType) -> Type { Type::FnPointerType(node) }
@@ -2890,7 +2890,7 @@ impl AstNode for Type {
     fn can_cast(kind: SyntaxKind) -> bool {
         match kind {
             PAREN_TYPE | TUPLE_TYPE | NEVER_TYPE | PATH_TYPE | POINTER_TYPE | ARRAY_TYPE
-            | SLICE_TYPE | REFERENCE_TYPE | PLACEHOLDER_TYPE | FN_POINTER_TYPE | FOR_TYPE
+            | SLICE_TYPE | REFERENCE_TYPE | INFER_TYPE | FN_POINTER_TYPE | FOR_TYPE
             | IMPL_TRAIT_TYPE | DYN_TRAIT_TYPE => true,
             _ => false,
         }
@@ -2905,7 +2905,7 @@ fn cast(syntax: SyntaxNode) -> Option<Self> {
             ARRAY_TYPE => Type::ArrayType(ArrayType { syntax }),
             SLICE_TYPE => Type::SliceType(SliceType { syntax }),
             REFERENCE_TYPE => Type::ReferenceType(ReferenceType { syntax }),
-            PLACEHOLDER_TYPE => Type::PlaceholderType(PlaceholderType { syntax }),
+            INFER_TYPE => Type::InferType(InferType { syntax }),
             FN_POINTER_TYPE => Type::FnPointerType(FnPointerType { syntax }),
             FOR_TYPE => Type::ForType(ForType { syntax }),
             IMPL_TRAIT_TYPE => Type::ImplTraitType(ImplTraitType { syntax }),
@@ -2924,7 +2924,7 @@ fn syntax(&self) -> &SyntaxNode {
             Type::ArrayType(it) => &it.syntax,
             Type::SliceType(it) => &it.syntax,
             Type::ReferenceType(it) => &it.syntax,
-            Type::PlaceholderType(it) => &it.syntax,
+            Type::InferType(it) => &it.syntax,
             Type::FnPointerType(it) => &it.syntax,
             Type::ForType(it) => &it.syntax,
             Type::ImplTraitType(it) => &it.syntax,
@@ -3719,7 +3719,7 @@ fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         std::fmt::Display::fmt(self.syntax(), f)
     }
 }
-impl std::fmt::Display for PlaceholderType {
+impl std::fmt::Display for InferType {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         std::fmt::Display::fmt(self.syntax(), f)
     }

crates/ra_syntax/test_data/parser/inline/ok/0023_placeholder_type.rast

@@ -7,7 +7,7 @@ SOURCE_FILE@0..22
     WHITESPACE@16..17 " "
     EQ@17..18 "="
     WHITESPACE@18..19 " "
-    PLACEHOLDER_TYPE@19..20
+    INFER_TYPE@19..20
       UNDERSCORE@19..20 "_"
     SEMICOLON@20..21 ";"
   WHITESPACE@21..22 "\n"

crates/ra_syntax/test_data/parser/inline/ok/0164_type_path_in_pattern.rast

@@ -19,7 +19,7 @@ SOURCE_FILE@0..33
             PATH@16..19
               PATH_SEGMENT@16..19
                 L_ANGLE@16..17 "<"
-                PLACEHOLDER_TYPE@17..18
+                INFER_TYPE@17..18
                   UNDERSCORE@17..18 "_"
                 R_ANGLE@18..19 ">"
             COLON2@19..21 "::"

crates/ra_syntax/test_data/parser/ok/0035_weird_exprs.rast

@@ -1640,10 +1640,10 @@ SOURCE_FILE@0..3813
                         COLON@2956..2957 ":"
                         TUPLE_TYPE@2957..2962
                           L_PAREN@2957..2958 "("
-                          PLACEHOLDER_TYPE@2958..2959
+                          INFER_TYPE@2958..2959
                             UNDERSCORE@2958..2959 "_"
                           COMMA@2959..2960 ","
-                          PLACEHOLDER_TYPE@2960..2961
+                          INFER_TYPE@2960..2961
                             UNDERSCORE@2960..2961 "_"
                           R_PAREN@2961..2962 ")"
                       COMMA@2962..2963 ","

xtask/src/ast_src.rs

@@ -117,7 +117,7 @@ pub(crate) struct KindsSrc<'a> {
         "ARRAY_TYPE",
         "SLICE_TYPE",
         "REFERENCE_TYPE",
-        "PLACEHOLDER_TYPE",
+        "INFER_TYPE",
         "FN_POINTER_TYPE",
         "FOR_TYPE",
         "IMPL_TRAIT_TYPE",

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 =
+InferType =
-  '&' 'lifetime'? 'mut'? Type
-
-PlaceholderType =
    '_'
 
 FnPointerType =