Merge #5631

5631: Finalize pattern grammar r=matklad a=matklad

bors r+
🤖

Co-authored-by: Aleksey Kladov <[email protected]>

121 files changed, 829 insertions, 837 deletions

diff --git a/crates/ra_assists/src/handlers/add_explicit_type.rs b/crates/ra_assists/src/handlers/add_explicit_type.rs
index d8b0af0f5..135a2ac9c 100644
--- a/crates/ra_assists/src/handlers/add_explicit_type.rs
+++ b/crates/ra_assists/src/handlers/add_explicit_type.rs
@@ -27,7 +27,7 @@ pub(crate) fn add_explicit_type(acc: &mut Assists, ctx: &AssistContext) -> Optio
     let expr = let_stmt.initializer()?;
     // Must be a binding
     let pat = match let_stmt.pat()? {
-        ast::Pat::BindPat(bind_pat) => bind_pat,
+        ast::Pat::IdentPat(bind_pat) => bind_pat,
         _ => return None,
     };
     let pat_range = pat.syntax().text_range();
diff --git a/crates/ra_assists/src/handlers/fill_match_arms.rs b/crates/ra_assists/src/handlers/fill_match_arms.rs
index 708e1bc6c..b2e14f9d7 100644
--- a/crates/ra_assists/src/handlers/fill_match_arms.rs
+++ b/crates/ra_assists/src/handlers/fill_match_arms.rs
@@ -43,7 +43,7 @@ pub(crate) fn fill_match_arms(acc: &mut Assists, ctx: &AssistContext) -> Option<
 
     let mut arms: Vec<MatchArm> = match_arm_list.arms().collect();
     if arms.len() == 1 {
-        if let Some(Pat::PlaceholderPat(..)) = arms[0].pat() {
+        if let Some(Pat::WildcardPat(..)) = arms[0].pat() {
             arms.clear();
         }
     }
@@ -116,17 +116,15 @@ pub(crate) fn fill_match_arms(acc: &mut Assists, ctx: &AssistContext) -> Option<
             match (first_new_arm, ctx.config.snippet_cap) {
                 (Some(first_new_arm), Some(cap)) => {
                     let extend_lifetime;
-                    let cursor = match first_new_arm
-                        .syntax()
-                        .descendants()
-                        .find_map(ast::PlaceholderPat::cast)
-                    {
-                        Some(it) => {
-                            extend_lifetime = it.syntax().clone();
-                            Cursor::Replace(&extend_lifetime)
-                        }
-                        None => Cursor::Before(first_new_arm.syntax()),
-                    };
+                    let cursor =
+                        match first_new_arm.syntax().descendants().find_map(ast::WildcardPat::cast)
+                        {
+                            Some(it) => {
+                                extend_lifetime = it.syntax().clone();
+                                Cursor::Replace(&extend_lifetime)
+                            }
+                            None => Cursor::Before(first_new_arm.syntax()),
+                        };
                     let snippet = render_snippet(cap, new_arm_list.syntax(), cursor);
                     builder.replace_snippet(cap, old_range, snippet);
                 }
@@ -152,7 +150,7 @@ fn does_pat_match_variant(pat: &Pat, var: &Pat) -> bool {
     let first_node_text = |pat: &Pat| pat.syntax().first_child().map(|node| node.text());
 
     let pat_head = match pat {
-        Pat::BindPat(bind_pat) => {
+        Pat::IdentPat(bind_pat) => {
             if let Some(p) = bind_pat.pat() {
                 first_node_text(&p)
             } else {
diff --git a/crates/ra_assists/src/handlers/inline_local_variable.rs b/crates/ra_assists/src/handlers/inline_local_variable.rs
index 2fdfabaf5..3c58020f8 100644
--- a/crates/ra_assists/src/handlers/inline_local_variable.rs
+++ b/crates/ra_assists/src/handlers/inline_local_variable.rs
@@ -29,7 +29,7 @@ use crate::{
 pub(crate) fn inline_local_variable(acc: &mut Assists, ctx: &AssistContext) -> Option<()> {
     let let_stmt = ctx.find_node_at_offset::<ast::LetStmt>()?;
     let bind_pat = match let_stmt.pat()? {
-        ast::Pat::BindPat(pat) => pat,
+        ast::Pat::IdentPat(pat) => pat,
         _ => return None,
     };
     if bind_pat.mut_token().is_some() {
diff --git a/crates/ra_assists/src/handlers/merge_match_arms.rs b/crates/ra_assists/src/handlers/merge_match_arms.rs
index 186a1f618..563292282 100644
--- a/crates/ra_assists/src/handlers/merge_match_arms.rs
+++ b/crates/ra_assists/src/handlers/merge_match_arms.rs
@@ -86,7 +86,7 @@ pub(crate) fn merge_match_arms(acc: &mut Assists, ctx: &AssistContext) -> Option
 }
 
 fn contains_placeholder(a: &ast::MatchArm) -> bool {
-    matches!(a.pat(), Some(ast::Pat::PlaceholderPat(..)))
+    matches!(a.pat(), Some(ast::Pat::WildcardPat(..)))
 }
 
 #[cfg(test)]
diff --git a/crates/ra_assists/src/handlers/reorder_fields.rs b/crates/ra_assists/src/handlers/reorder_fields.rs
index 120250e79..c9b743a06 100644
--- a/crates/ra_assists/src/handlers/reorder_fields.rs
+++ b/crates/ra_assists/src/handlers/reorder_fields.rs
@@ -57,7 +57,7 @@ fn reorder<R: AstNode>(acc: &mut Assists, ctx: &AssistContext) -> Option<()> {
 fn get_fields_kind(node: &SyntaxNode) -> Vec<SyntaxKind> {
     match node.kind() {
         RECORD_EXPR => vec![RECORD_EXPR_FIELD],
-        RECORD_PAT => vec![RECORD_FIELD_PAT, BIND_PAT],
+        RECORD_PAT => vec![RECORD_PAT_FIELD, IDENT_PAT],
         _ => vec![],
     }
 }
@@ -66,7 +66,7 @@ fn get_field_name(node: &SyntaxNode) -> String {
     let res = match_ast! {
         match node {
             ast::RecordExprField(field) => field.field_name().map(|it| it.to_string()),
-            ast::RecordFieldPat(field) => field.field_name().map(|it| it.to_string()),
+            ast::RecordPatField(field) => field.field_name().map(|it| it.to_string()),
             _ => None,
         }
     };
diff --git a/crates/ra_assists/src/handlers/replace_let_with_if_let.rs b/crates/ra_assists/src/handlers/replace_let_with_if_let.rs
index a49292c97..64ad15a23 100644
--- a/crates/ra_assists/src/handlers/replace_let_with_if_let.rs
+++ b/crates/ra_assists/src/handlers/replace_let_with_if_let.rs
@@ -62,8 +62,7 @@ pub(crate) fn replace_let_with_if_let(acc: &mut Assists, ctx: &AssistContext) ->
             let if_ = make::expr_if(make::condition(init, Some(with_placeholder)), block);
             let stmt = make::expr_stmt(if_);
 
-            let placeholder =
-                stmt.syntax().descendants().find_map(ast::PlaceholderPat::cast).unwrap();
+            let placeholder = stmt.syntax().descendants().find_map(ast::WildcardPat::cast).unwrap();
             let stmt = stmt.replace_descendant(placeholder.into(), original_pat);
 
             edit.replace_ast(ast::Stmt::from(let_stmt), ast::Stmt::from(stmt));
diff --git a/crates/ra_hir/src/code_model.rs b/crates/ra_hir/src/code_model.rs
index 36c0bdc9e..27cdabea0 100644
--- a/crates/ra_hir/src/code_model.rs
+++ b/crates/ra_hir/src/code_model.rs
@@ -1002,7 +1002,7 @@ impl Local {
         Type::new(db, krate, def, ty)
     }
 
-    pub fn source(self, db: &dyn HirDatabase) -> InFile<Either<ast::BindPat, ast::SelfParam>> {
+    pub fn source(self, db: &dyn HirDatabase) -> InFile<Either<ast::IdentPat, ast::SelfParam>> {
         let (_body, source_map) = db.body_with_source_map(self.parent.into());
         let src = source_map.pat_syntax(self.pat_id).unwrap(); // Hmm...
         let root = src.file_syntax(db.upcast());
diff --git a/crates/ra_hir/src/semantics.rs b/crates/ra_hir/src/semantics.rs
index 6f3b3dc9a..307b336f2 100644
--- a/crates/ra_hir/src/semantics.rs
+++ b/crates/ra_hir/src/semantics.rs
@@ -216,7 +216,7 @@ impl<'db, DB: HirDatabase> Semantics<'db, DB> {
         self.imp.resolve_record_field(field)
     }
 
-    pub fn resolve_record_field_pat(&self, field: &ast::RecordFieldPat) -> Option<Field> {
+    pub fn resolve_record_field_pat(&self, field: &ast::RecordPatField) -> Option<Field> {
         self.imp.resolve_record_field_pat(field)
     }
 
@@ -236,7 +236,7 @@ impl<'db, DB: HirDatabase> Semantics<'db, DB> {
         self.imp.lower_path(path)
     }
 
-    pub fn resolve_bind_pat_to_const(&self, pat: &ast::BindPat) -> Option<ModuleDef> {
+    pub fn resolve_bind_pat_to_const(&self, pat: &ast::IdentPat) -> Option<ModuleDef> {
         self.imp.resolve_bind_pat_to_const(pat)
     }
 
@@ -429,7 +429,7 @@ impl<'db> SemanticsImpl<'db> {
         self.analyze(field.syntax()).resolve_record_field(self.db, field)
     }
 
-    fn resolve_record_field_pat(&self, field: &ast::RecordFieldPat) -> Option<Field> {
+    fn resolve_record_field_pat(&self, field: &ast::RecordPatField) -> Option<Field> {
         self.analyze(field.syntax()).resolve_record_field_pat(self.db, field)
     }
 
@@ -452,7 +452,7 @@ impl<'db> SemanticsImpl<'db> {
         Path::from_src(path.clone(), &Hygiene::new(self.db.upcast(), src.file_id.into()))
     }
 
-    fn resolve_bind_pat_to_const(&self, pat: &ast::BindPat) -> Option<ModuleDef> {
+    fn resolve_bind_pat_to_const(&self, pat: &ast::IdentPat) -> Option<ModuleDef> {
         self.analyze(pat.syntax()).resolve_bind_pat_to_const(self.db, pat)
     }
 
@@ -594,7 +594,7 @@ to_def_impls![
     (crate::EnumVariant, ast::Variant, enum_variant_to_def),
     (crate::TypeParam, ast::TypeParam, type_param_to_def),
     (crate::MacroDef, ast::MacroCall, macro_call_to_def), // this one is dubious, not all calls are macros
-    (crate::Local, ast::BindPat, bind_pat_to_def),
+    (crate::Local, ast::IdentPat, bind_pat_to_def),
 ];
 
 fn find_root(node: &SyntaxNode) -> SyntaxNode {
diff --git a/crates/ra_hir/src/semantics/source_to_def.rs b/crates/ra_hir/src/semantics/source_to_def.rs
index d1994e2e7..863e8e5ff 100644
--- a/crates/ra_hir/src/semantics/source_to_def.rs
+++ b/crates/ra_hir/src/semantics/source_to_def.rs
@@ -106,7 +106,7 @@ impl SourceToDefCtx<'_, '_> {
     }
     pub(super) fn bind_pat_to_def(
         &mut self,
-        src: InFile<ast::BindPat>,
+        src: InFile<ast::IdentPat>,
     ) -> Option<(DefWithBodyId, PatId)> {
         let container = self.find_pat_container(src.as_ref().map(|it| it.syntax()))?;
         let (_body, source_map) = self.db.body_with_source_map(container);
diff --git a/crates/ra_hir/src/source_analyzer.rs b/crates/ra_hir/src/source_analyzer.rs
index f2e630ef1..d0cb62ef0 100644
--- a/crates/ra_hir/src/source_analyzer.rs
+++ b/crates/ra_hir/src/source_analyzer.rs
@@ -182,7 +182,7 @@ impl SourceAnalyzer {
     pub(crate) fn resolve_record_field_pat(
         &self,
         _db: &dyn HirDatabase,
-        field: &ast::RecordFieldPat,
+        field: &ast::RecordPatField,
     ) -> Option<Field> {
         let pat_id = self.pat_id(&field.pat()?)?;
         let struct_field = self.infer.as_ref()?.record_field_pat_resolution(pat_id)?;
@@ -202,7 +202,7 @@ impl SourceAnalyzer {
     pub(crate) fn resolve_bind_pat_to_const(
         &self,
         db: &dyn HirDatabase,
-        pat: &ast::BindPat,
+        pat: &ast::IdentPat,
     ) -> Option<ModuleDef> {
         let pat_id = self.pat_id(&pat.clone().into())?;
         let body = self.body.as_ref()?;
diff --git a/crates/ra_hir_def/src/body/lower.rs b/crates/ra_hir_def/src/body/lower.rs
index 6bedc6b56..3f210547e 100644
--- a/crates/ra_hir_def/src/body/lower.rs
+++ b/crates/ra_hir_def/src/body/lower.rs
@@ -1,6 +1,8 @@
 //! Transforms `ast::Expr` into an equivalent `hir_def::expr::Expr`
 //! representation.
 
+use std::{any::type_name, sync::Arc};
+
 use either::Either;
 use hir_expand::{
     hygiene::Hygiene,
@@ -10,11 +12,12 @@ use hir_expand::{
 use ra_arena::Arena;
 use ra_syntax::{
     ast::{
-        self, ArgListOwner, ArrayExprKind, LiteralKind, LoopBodyOwner, NameOwner,
+        self, ArgListOwner, ArrayExprKind, AstChildren, LiteralKind, LoopBodyOwner, NameOwner,
         SlicePatComponents,
     },
     AstNode, AstPtr,
 };
+use rustc_hash::FxHashMap;
 use test_utils::mark;
 
 use crate::{
@@ -35,9 +38,6 @@ use crate::{
 };
 
 use super::{ExprSource, PatSource};
-use ast::AstChildren;
-use rustc_hash::FxHashMap;
-use std::{any::type_name, sync::Arc};
 
 pub(crate) struct LowerCtx {
     hygiene: Hygiene,
@@ -723,7 +723,7 @@ impl ExprCollector<'_> {
 
     fn collect_pat(&mut self, pat: ast::Pat) -> PatId {
         let pattern = match &pat {
-            ast::Pat::BindPat(bp) => {
+            ast::Pat::IdentPat(bp) => {
                 let name = bp.name().map(|nr| nr.as_name()).unwrap_or_else(Name::missing);
                 let annotation =
                     BindingAnnotation::new(bp.mut_token().is_some(), bp.ref_token().is_some());
@@ -783,32 +783,28 @@ impl ExprCollector<'_> {
                 let (args, ellipsis) = self.collect_tuple_pat(p.args());
                 Pat::Tuple { args, ellipsis }
             }
-            ast::Pat::PlaceholderPat(_) => Pat::Wild,
+            ast::Pat::WildcardPat(_) => Pat::Wild,
             ast::Pat::RecordPat(p) => {
                 let path = p.path().and_then(|path| self.expander.parse_path(path));
-                let record_field_pat_list =
-                    p.record_field_pat_list().expect("every struct should have a field list");
-                let mut fields: Vec<_> = record_field_pat_list
-                    .bind_pats()
-                    .filter_map(|bind_pat| {
-                        let ast_pat =
-                            ast::Pat::cast(bind_pat.syntax().clone()).expect("bind pat is a pat");
+                let args: Vec<_> = p
+                    .record_pat_field_list()
+                    .expect("every struct should have a field list")
+                    .fields()
+                    .filter_map(|f| {
+                        let ast_pat = f.pat()?;
                         let pat = self.collect_pat(ast_pat);
-                        let name = bind_pat.name()?.as_name();
+                        let name = f.field_name()?.as_name();
                         Some(RecordFieldPat { name, pat })
                     })
                     .collect();
-                let iter = record_field_pat_list.record_field_pats().filter_map(|f| {
-                    let ast_pat = f.pat()?;
-                    let pat = self.collect_pat(ast_pat);
-                    let name = f.field_name()?.as_name();
-                    Some(RecordFieldPat { name, pat })
-                });
-                fields.extend(iter);
 
-                let ellipsis = record_field_pat_list.dotdot_token().is_some();
+                let ellipsis = p
+                    .record_pat_field_list()
+                    .expect("every struct should have a field list")
+                    .dotdot_token()
+                    .is_some();
 
-                Pat::Record { path, args: fields, ellipsis }
+                Pat::Record { path, args, ellipsis }
             }
             ast::Pat::SlicePat(p) => {
                 let SlicePatComponents { prefix, slice, suffix } = p.components();
diff --git a/crates/ra_hir_ty/src/diagnostics.rs b/crates/ra_hir_ty/src/diagnostics.rs
index f210c305a..977c0525b 100644
--- a/crates/ra_hir_ty/src/diagnostics.rs
+++ b/crates/ra_hir_ty/src/diagnostics.rs
@@ -92,7 +92,7 @@ impl AstDiagnostic for MissingFields {
 #[derive(Debug)]
 pub struct MissingPatFields {
     pub file: HirFileId,
-    pub field_list: AstPtr<ast::RecordFieldPatList>,
+    pub field_list: AstPtr<ast::RecordPatFieldList>,
     pub missed_fields: Vec<Name>,
 }
 
diff --git a/crates/ra_hir_ty/src/diagnostics/expr.rs b/crates/ra_hir_ty/src/diagnostics/expr.rs
index f0e0f2988..95bbf2d95 100644
--- a/crates/ra_hir_ty/src/diagnostics/expr.rs
+++ b/crates/ra_hir_ty/src/diagnostics/expr.rs
@@ -131,7 +131,7 @@ impl<'a, 'b> ExprValidator<'a, 'b> {
             if let Some(expr) = source_ptr.value.as_ref().left() {
                 let root = source_ptr.file_syntax(db.upcast());
                 if let ast::Pat::RecordPat(record_pat) = expr.to_node(&root) {
-                    if let Some(field_list) = record_pat.record_field_pat_list() {
+                    if let Some(field_list) = record_pat.record_pat_field_list() {
                         let variant_data = variant_data(db.upcast(), variant_def);
                         let missed_fields = missed_fields
                             .into_iter()
diff --git a/crates/ra_ide/src/completion/completion_context.rs b/crates/ra_ide/src/completion/completion_context.rs
index 2a5f3c3d2..6b03b30bb 100644
--- a/crates/ra_ide/src/completion/completion_context.rs
+++ b/crates/ra_ide/src/completion/completion_context.rs
@@ -265,7 +265,7 @@ impl<'a> CompletionContext<'a> {
                 return;
             }
             // FIXME: remove this (V) duplication and make the check more precise
-            if name_ref.syntax().ancestors().find_map(ast::RecordFieldPatList::cast).is_some() {
+            if name_ref.syntax().ancestors().find_map(ast::RecordPatFieldList::cast).is_some() {
                 self.record_pat_syntax =
                     self.sema.find_node_at_offset_with_macros(&original_file, offset);
             }
@@ -275,7 +275,7 @@ impl<'a> CompletionContext<'a> {
         // Otherwise, see if this is a declaration. We can use heuristics to
         // suggest declaration names, see `CompletionKind::Magic`.
         if let Some(name) = find_node_at_offset::<ast::Name>(&file_with_fake_ident, offset) {
-            if let Some(bind_pat) = name.syntax().ancestors().find_map(ast::BindPat::cast) {
+            if let Some(bind_pat) = name.syntax().ancestors().find_map(ast::IdentPat::cast) {
                 self.is_pat_binding_or_const = true;
                 if bind_pat.at_token().is_some()
                     || bind_pat.ref_token().is_some()
@@ -283,7 +283,7 @@ impl<'a> CompletionContext<'a> {
                 {
                     self.is_pat_binding_or_const = false;
                 }
-                if bind_pat.syntax().parent().and_then(ast::RecordFieldPatList::cast).is_some() {
+                if bind_pat.syntax().parent().and_then(ast::RecordPatFieldList::cast).is_some() {
                     self.is_pat_binding_or_const = false;
                 }
                 if let Some(let_stmt) = bind_pat.syntax().ancestors().find_map(ast::LetStmt::cast) {
@@ -300,7 +300,7 @@ impl<'a> CompletionContext<'a> {
                 return;
             }
             // FIXME: remove this (^) duplication and make the check more precise
-            if name.syntax().ancestors().find_map(ast::RecordFieldPatList::cast).is_some() {
+            if name.syntax().ancestors().find_map(ast::RecordPatFieldList::cast).is_some() {
                 self.record_pat_syntax =
                     self.sema.find_node_at_offset_with_macros(&original_file, offset);
             }
diff --git a/crates/ra_ide/src/completion/patterns.rs b/crates/ra_ide/src/completion/patterns.rs
index 9e654b373..7c4feff6d 100644
--- a/crates/ra_ide/src/completion/patterns.rs
+++ b/crates/ra_ide/src/completion/patterns.rs
@@ -44,7 +44,7 @@ fn test_has_block_expr_parent() {
 }
 
 pub(crate) fn has_bind_pat_parent(element: SyntaxElement) -> bool {
-    element.ancestors().find(|it| it.kind() == BIND_PAT).is_some()
+    element.ancestors().find(|it| it.kind() == IDENT_PAT).is_some()
 }
 #[test]
 fn test_has_bind_pat_parent() {
diff --git a/crates/ra_ide/src/display/navigation_target.rs b/crates/ra_ide/src/display/navigation_target.rs
index 45fbc86ef..d70e33e72 100644
--- a/crates/ra_ide/src/display/navigation_target.rs
+++ b/crates/ra_ide/src/display/navigation_target.rs
@@ -7,7 +7,7 @@ use ra_ide_db::{defs::Definition, RootDatabase};
 use ra_syntax::{
     ast::{self, DocCommentsOwner, NameOwner},
     match_ast, AstNode, SmolStr,
-    SyntaxKind::{self, BIND_PAT, TYPE_PARAM},
+    SyntaxKind::{self, IDENT_PAT, TYPE_PARAM},
     TextRange,
 };
 
@@ -339,7 +339,7 @@ impl ToNav for hir::Local {
         NavigationTarget {
             file_id: full_range.file_id,
             name,
-            kind: BIND_PAT,
+            kind: IDENT_PAT,
             full_range: full_range.range,
             focus_range: None,
             container_name: None,
diff --git a/crates/ra_ide/src/extend_selection.rs b/crates/ra_ide/src/extend_selection.rs
index 319fd500d..7230a0ff9 100644
--- a/crates/ra_ide/src/extend_selection.rs
+++ b/crates/ra_ide/src/extend_selection.rs
@@ -37,7 +37,7 @@ fn try_extend_selection(
 
     let string_kinds = [COMMENT, STRING, RAW_STRING, BYTE_STRING, RAW_BYTE_STRING];
     let list_kinds = [
-        RECORD_FIELD_PAT_LIST,
+        RECORD_PAT_FIELD_LIST,
         MATCH_ARM_LIST,
         RECORD_FIELD_LIST,
         TUPLE_FIELD_LIST,
diff --git a/crates/ra_ide/src/folding_ranges.rs b/crates/ra_ide/src/folding_ranges.rs
index 5a6e17936..903c34996 100644
--- a/crates/ra_ide/src/folding_ranges.rs
+++ b/crates/ra_ide/src/folding_ranges.rs
@@ -86,7 +86,7 @@ fn fold_kind(kind: SyntaxKind) -> Option<FoldKind> {
         USE => Some(FoldKind::Imports),
         ARG_LIST | PARAM_LIST => Some(FoldKind::ArgList),
         RECORD_FIELD_LIST
-        | RECORD_FIELD_PAT_LIST
+        | RECORD_PAT_FIELD_LIST
         | RECORD_EXPR_FIELD_LIST
         | ITEM_LIST
         | EXTERN_ITEM_LIST
diff --git a/crates/ra_ide/src/inlay_hints.rs b/crates/ra_ide/src/inlay_hints.rs
index 4bbbcd258..1bacead63 100644
--- a/crates/ra_ide/src/inlay_hints.rs
+++ b/crates/ra_ide/src/inlay_hints.rs
@@ -78,7 +78,7 @@ pub(crate) fn inlay_hints(
             match node {
                 ast::CallExpr(it) => { get_param_name_hints(&mut res, &sema, config, ast::Expr::from(it)); },
                 ast::MethodCallExpr(it) => { get_param_name_hints(&mut res, &sema, config, ast::Expr::from(it)); },
-                ast::BindPat(it) => { get_bind_pat_hints(&mut res, &sema, config, it); },
+                ast::IdentPat(it) => { get_bind_pat_hints(&mut res, &sema, config, it); },
                 _ => (),
             }
         }
@@ -161,7 +161,7 @@ fn get_param_name_hints(
             Either::Left(self_param) => Some((self_param.to_string(), arg)),
             Either::Right(pat) => {
                 let param_name = match pat {
-                    ast::Pat::BindPat(it) => it.name()?.to_string(),
+                    ast::Pat::IdentPat(it) => it.name()?.to_string(),
                     it => it.to_string(),
                 };
                 Some((param_name, arg))
@@ -182,7 +182,7 @@ fn get_bind_pat_hints(
     acc: &mut Vec<InlayHint>,
     sema: &Semantics<RootDatabase>,
     config: &InlayHintsConfig,
-    pat: ast::BindPat,
+    pat: ast::IdentPat,
 ) -> Option<()> {
     if !config.type_hints {
         return None;
@@ -202,7 +202,7 @@ fn get_bind_pat_hints(
     Some(())
 }
 
-fn pat_is_enum_variant(db: &RootDatabase, bind_pat: &ast::BindPat, pat_ty: &Type) -> bool {
+fn pat_is_enum_variant(db: &RootDatabase, bind_pat: &ast::IdentPat, pat_ty: &Type) -> bool {
     if let Some(Adt::Enum(enum_data)) = pat_ty.as_adt() {
         let pat_text = bind_pat.to_string();
         enum_data
@@ -215,7 +215,11 @@ fn pat_is_enum_variant(db: &RootDatabase, bind_pat: &ast::BindPat, pat_ty: &Type
     }
 }
 
-fn should_not_display_type_hint(db: &RootDatabase, bind_pat: &ast::BindPat, pat_ty: &Type) -> bool {
+fn should_not_display_type_hint(
+    db: &RootDatabase,
+    bind_pat: &ast::IdentPat,
+    pat_ty: &Type,
+) -> bool {
     if pat_ty.is_unknown() {
         return true;
     }
diff --git a/crates/ra_ide/src/references.rs b/crates/ra_ide/src/references.rs
index 519e4bf1a..cf456630a 100644
--- a/crates/ra_ide/src/references.rs
+++ b/crates/ra_ide/src/references.rs
@@ -150,7 +150,7 @@ fn decl_access(def: &Definition, syntax: &SyntaxNode, range: TextRange) -> Optio
     let stmt = find_node_at_offset::<ast::LetStmt>(syntax, range.start())?;
     if stmt.initializer().is_some() {
         let pat = stmt.pat()?;
-        if let ast::Pat::BindPat(it) = pat {
+        if let ast::Pat::IdentPat(it) = pat {
             if it.mut_token().is_some() {
                 return Some(ReferenceAccess::Write);
             }
@@ -290,7 +290,7 @@ fn main() {
         );
         check_result(
             refs,
-            "i BIND_PAT FileId(1) 24..25 Other Write",
+            "i IDENT_PAT FileId(1) 24..25 Other Write",
             &[
                 "FileId(1) 50..51 Other Write",
                 "FileId(1) 54..55 Other Read",
@@ -316,7 +316,7 @@ fn bar() {
         );
         check_result(
             refs,
-            "spam BIND_PAT FileId(1) 19..23 Other",
+            "spam IDENT_PAT FileId(1) 19..23 Other",
             &["FileId(1) 34..38 Other Read", "FileId(1) 41..45 Other Read"],
         );
     }
@@ -330,7 +330,7 @@ fn foo(i : u32) -> u32 {
 }
 "#,
         );
-        check_result(refs, "i BIND_PAT FileId(1) 7..8 Other", &["FileId(1) 29..30 Other Read"]);
+        check_result(refs, "i IDENT_PAT FileId(1) 7..8 Other", &["FileId(1) 29..30 Other Read"]);
     }
 
     #[test]
@@ -342,7 +342,7 @@ fn foo(i<|> : u32) -> u32 {
 }
 "#,
         );
-        check_result(refs, "i BIND_PAT FileId(1) 7..8 Other", &["FileId(1) 29..30 Other Read"]);
+        check_result(refs, "i IDENT_PAT FileId(1) 7..8 Other", &["FileId(1) 29..30 Other Read"]);
     }
 
     #[test]
@@ -559,7 +559,7 @@ fn foo() {
         );
         check_result(
             refs,
-            "i BIND_PAT FileId(1) 23..24 Other Write",
+            "i IDENT_PAT FileId(1) 23..24 Other Write",
             &["FileId(1) 34..35 Other Write", "FileId(1) 38..39 Other Read"],
         );
     }
@@ -595,7 +595,7 @@ fn foo() {
 }
 "#,
         );
-        check_result(refs, "i BIND_PAT FileId(1) 19..20 Other", &["FileId(1) 26..27 Other Write"]);
+        check_result(refs, "i IDENT_PAT FileId(1) 19..20 Other", &["FileId(1) 26..27 Other Write"]);
     }
 
     #[test]
diff --git a/crates/ra_ide/src/syntax_highlighting.rs b/crates/ra_ide/src/syntax_highlighting.rs
index e3a96f9d5..027fdecd0 100644
--- a/crates/ra_ide/src/syntax_highlighting.rs
+++ b/crates/ra_ide/src/syntax_highlighting.rs
@@ -717,7 +717,7 @@ fn highlight_name_by_syntax(name: ast::Name) -> Highlight {
         CONST => HighlightTag::Constant,
         STATIC => HighlightTag::Static,
         VARIANT => HighlightTag::EnumVariant,
-        BIND_PAT => HighlightTag::Local,
+        IDENT_PAT => HighlightTag::Local,
         _ => default,
     };
 
diff --git a/crates/ra_ide_db/src/defs.rs b/crates/ra_ide_db/src/defs.rs
index df56f2d9e..66c048714 100644
--- a/crates/ra_ide_db/src/defs.rs
+++ b/crates/ra_ide_db/src/defs.rs
@@ -111,7 +111,7 @@ pub fn classify_name(sema: &Semantics<RootDatabase>, name: &ast::Name) -> Option
 
     let parent = name.syntax().parent()?;
 
-    if let Some(bind_pat) = ast::BindPat::cast(parent.clone()) {
+    if let Some(bind_pat) = ast::IdentPat::cast(parent.clone()) {
         if let Some(def) = sema.resolve_bind_pat_to_const(&bind_pat) {
             return Some(NameClass::ConstReference(Definition::ModuleDef(def)));
         }
@@ -128,10 +128,10 @@ pub fn classify_name(sema: &Semantics<RootDatabase>, name: &ast::Name) -> Option
 
                 Some(NameClass::Definition(name_ref_class.definition()))
             },
-            ast::BindPat(it) => {
+            ast::IdentPat(it) => {
                 let local = sema.to_def(&it)?;
 
-                if let Some(record_field_pat) = it.syntax().parent().and_then(ast::RecordFieldPat::cast) {
+                if let Some(record_field_pat) = it.syntax().parent().and_then(ast::RecordPatField::cast) {
                     if record_field_pat.name_ref().is_none() {
                         if let Some(field) = sema.resolve_record_field_pat(&record_field_pat) {
                             let field = Definition::Field(field);
@@ -247,7 +247,7 @@ pub fn classify_name_ref(
         }
     }
 
-    if let Some(record_field_pat) = ast::RecordFieldPat::cast(parent.clone()) {
+    if let Some(record_field_pat) = ast::RecordPatField::cast(parent.clone()) {
         if let Some(field) = sema.resolve_record_field_pat(&record_field_pat) {
             let field = Definition::Field(field);
             return Some(NameRefClass::Definition(field));
diff --git a/crates/ra_mbe/src/tests.rs b/crates/ra_mbe/src/tests.rs
index 707e84f42..286983d60 100644
--- a/crates/ra_mbe/src/tests.rs
+++ b/crates/ra_mbe/src/tests.rs
@@ -625,7 +625,7 @@ fn test_tt_to_stmts() {
         r#"[email protected]
   [email protected]
     [email protected] "let"
-    BIN[email protected]
+    IDENT[email protected]
       [email protected]
         [email protected] "a"
     [email protected] "="
@@ -1116,7 +1116,7 @@ fn test_vec() {
   [email protected] "{"
   [email protected]
     [email protected] "let"
-    BIN[email protected]
+    IDENT[email protected]
       [email protected] "mut"
       [email protected]
         [email protected] "v"
diff --git a/crates/ra_parser/src/grammar/patterns.rs b/crates/ra_parser/src/grammar/patterns.rs
index 427c0eb49..623e8d6d4 100644
--- a/crates/ra_parser/src/grammar/patterns.rs
+++ b/crates/ra_parser/src/grammar/patterns.rs
@@ -217,7 +217,7 @@ fn record_field_pat_list(p: &mut Parser) {
                         bind_pat(p, false);
                     }
                 }
-                m.complete(p, RECORD_FIELD_PAT);
+                m.complete(p, RECORD_PAT_FIELD);
             }
         }
         if !p.at(T!['}']) {
@@ -225,7 +225,7 @@ fn record_field_pat_list(p: &mut Parser) {
         }
     }
     p.expect(T!['}']);
-    m.complete(p, RECORD_FIELD_PAT_LIST);
+    m.complete(p, RECORD_PAT_FIELD_LIST);
 }
 
 // test placeholder_pat
@@ -234,7 +234,7 @@ fn placeholder_pat(p: &mut Parser) -> CompletedMarker {
     assert!(p.at(T![_]));
     let m = p.start();
     p.bump(T![_]);
-    m.complete(p, PLACEHOLDER_PAT)
+    m.complete(p, WILDCARD_PAT)
 }
 
 // test dot_dot_pat
@@ -361,7 +361,7 @@ fn bind_pat(p: &mut Parser, with_at: bool) -> CompletedMarker {
     if with_at && p.eat(T![@]) {
         pattern_single(p);
     }
-    m.complete(p, BIND_PAT)
+    m.complete(p, IDENT_PAT)
 }
 
 // test box_pat
diff --git a/crates/ra_parser/src/syntax_kind/generated.rs b/crates/ra_parser/src/syntax_kind/generated.rs
index c3670fb62..b5dda25a9 100644
--- a/crates/ra_parser/src/syntax_kind/generated.rs
+++ b/crates/ra_parser/src/syntax_kind/generated.rs
@@ -156,13 +156,13 @@ pub enum SyntaxKind {
     PAREN_PAT,
     REF_PAT,
     BOX_PAT,
-    BIND_PAT,
-    PLACEHOLDER_PAT,
+    IDENT_PAT,
+    WILDCARD_PAT,
     DOT_DOT_PAT,
     PATH_PAT,
     RECORD_PAT,
-    RECORD_FIELD_PAT_LIST,
-    RECORD_FIELD_PAT,
+    RECORD_PAT_FIELD_LIST,
+    RECORD_PAT_FIELD,
     TUPLE_STRUCT_PAT,
     TUPLE_PAT,
     SLICE_PAT,
diff --git a/crates/ra_ssr/src/parsing.rs b/crates/ra_ssr/src/parsing.rs
index 4e046910c..f455eb5b7 100644
--- a/crates/ra_ssr/src/parsing.rs
+++ b/crates/ra_ssr/src/parsing.rs
@@ -109,7 +109,7 @@ impl RuleBuilder {
         // path refers to semantically the same thing, whereas the non-path-based rules could match
         // anything. Specifically, if we have a rule like `foo ==>> bar` we only want to match the
         // `foo` that is in the current scope, not any `foo`. However "foo" can be parsed as a
-        // pattern (BIND_PAT -> NAME -> IDENT). Allowing such a rule through would result in
+        // pattern (IDENT_PAT -> NAME -> IDENT). Allowing such a rule through would result in
         // renaming everything called `foo` to `bar`. It'd also be slow, since without a path, we'd
         // have to use the slow-scan search mechanism.
         if self.rules.iter().any(|rule| contains_path(&rule.pattern)) {
diff --git a/crates/ra_ssr/src/resolving.rs b/crates/ra_ssr/src/resolving.rs
index c2fd3b905..6f62000f4 100644
--- a/crates/ra_ssr/src/resolving.rs
+++ b/crates/ra_ssr/src/resolving.rs
@@ -198,7 +198,7 @@ fn pick_node_for_resolution(node: SyntaxNode) -> SyntaxNode {
                 return n;
             }
         }
-        SyntaxKind::LET_STMT | SyntaxKind::BIND_PAT => {
+        SyntaxKind::LET_STMT | SyntaxKind::IDENT_PAT => {
             if let Some(next) = node.next_sibling() {
                 return pick_node_for_resolution(next);
             }
diff --git a/crates/ra_ssr/src/tests.rs b/crates/ra_ssr/src/tests.rs
index a4fa2cb44..2ae03c64c 100644
--- a/crates/ra_ssr/src/tests.rs
+++ b/crates/ra_ssr/src/tests.rs
@@ -924,7 +924,7 @@ fn ufcs_matches_method_call() {
 fn pattern_is_a_single_segment_path() {
     mark::check!(pattern_is_a_single_segment_path);
     // The first function should not be altered because the `foo` in scope at the cursor position is
-    // a different `foo`. This case is special because "foo" can be parsed as a pattern (BIND_PAT ->
+    // a different `foo`. This case is special because "foo" can be parsed as a pattern (IDENT_PAT ->
     // NAME -> IDENT), which contains no path. If we're not careful we'll end up matching the `foo`
     // in `let foo` from the first function. Whether we should match the `let foo` in the second
     // function is less clear. At the moment, we don't. Doing so sounds like a rename operation,
diff --git a/crates/ra_syntax/src/ast/edit.rs b/crates/ra_syntax/src/ast/edit.rs
index 04746ef8f..667a9294f 100644
--- a/crates/ra_syntax/src/ast/edit.rs
+++ b/crates/ra_syntax/src/ast/edit.rs
@@ -390,7 +390,7 @@ impl ast::MatchArmList {
     #[must_use]
     pub fn remove_placeholder(&self) -> ast::MatchArmList {
         let placeholder =
-            self.arms().find(|arm| matches!(arm.pat(), Some(ast::Pat::PlaceholderPat(_))));
+            self.arms().find(|arm| matches!(arm.pat(), Some(ast::Pat::WildcardPat(_))));
         if let Some(placeholder) = placeholder {
             self.remove_arm(&placeholder)
         } else {
diff --git a/crates/ra_syntax/src/ast/generated/nodes.rs b/crates/ra_syntax/src/ast/generated/nodes.rs
index 6ce9c4adc..231a0f727 100644
--- a/crates/ra_syntax/src/ast/generated/nodes.rs
+++ b/crates/ra_syntax/src/ast/generated/nodes.rs
@@ -6,6 +6,20 @@ use crate::{
     SyntaxNode, SyntaxToken, T,
 };
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
+pub struct Name {
+    pub(crate) syntax: SyntaxNode,
+}
+impl Name {
+    pub fn ident_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![ident]) }
+}
+#[derive(Debug, Clone, PartialEq, Eq, Hash)]
+pub struct NameRef {
+    pub(crate) syntax: SyntaxNode,
+}
+impl NameRef {
+    pub fn ident_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![ident]) }
+}
+#[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub struct Path {
     pub(crate) syntax: SyntaxNode,
 }
@@ -33,13 +47,6 @@ impl PathSegment {
     pub fn r_angle_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![>]) }
 }
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct NameRef {
-    pub(crate) syntax: SyntaxNode,
-}
-impl NameRef {
-    pub fn ident_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![ident]) }
-}
-#[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub struct GenericArgList {
     pub(crate) syntax: SyntaxNode,
 }
@@ -116,13 +123,16 @@ impl TypeBoundList {
     pub fn bounds(&self) -> AstChildren<TypeBound> { support::children(&self.syntax) }
 }
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct SourceFile {
+pub struct MacroCall {
     pub(crate) syntax: SyntaxNode,
 }
-impl ast::AttrsOwner for SourceFile {}
-impl ast::ModuleItemOwner for SourceFile {}
-impl SourceFile {
-    pub fn shebang_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![shebang]) }
+impl ast::AttrsOwner for MacroCall {}
+impl ast::NameOwner for MacroCall {}
+impl MacroCall {
+    pub fn path(&self) -> Option<Path> { support::child(&self.syntax) }
+    pub fn excl_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![!]) }
+    pub fn token_tree(&self) -> Option<TokenTree> { support::child(&self.syntax) }
+    pub fn semicolon_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![;]) }
 }
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub struct Attr {
@@ -139,6 +149,41 @@ impl Attr {
     pub fn r_brack_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![']']) }
 }
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
+pub struct TokenTree {
+    pub(crate) syntax: SyntaxNode,
+}
+impl TokenTree {
+    pub fn l_paren_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T!['(']) }
+    pub fn r_paren_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![')']) }
+    pub fn l_curly_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T!['{']) }
+    pub fn r_curly_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T!['}']) }
+    pub fn l_brack_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T!['[']) }
+    pub fn r_brack_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![']']) }
+}
+#[derive(Debug, Clone, PartialEq, Eq, Hash)]
+pub struct MacroItems {
+    pub(crate) syntax: SyntaxNode,
+}
+impl ast::ModuleItemOwner for MacroItems {}
+impl MacroItems {}
+#[derive(Debug, Clone, PartialEq, Eq, Hash)]
+pub struct MacroStmts {
+    pub(crate) syntax: SyntaxNode,
+}
+impl MacroStmts {
+    pub fn statements(&self) -> AstChildren<Stmt> { support::children(&self.syntax) }
+    pub fn expr(&self) -> Option<Expr> { support::child(&self.syntax) }
+}
+#[derive(Debug, Clone, PartialEq, Eq, Hash)]
+pub struct SourceFile {
+    pub(crate) syntax: SyntaxNode,
+}
+impl ast::AttrsOwner for SourceFile {}
+impl ast::ModuleItemOwner for SourceFile {}
+impl SourceFile {
+    pub fn shebang_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![shebang]) }
+}
+#[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub struct Const {
     pub(crate) syntax: SyntaxNode,
 }
@@ -228,18 +273,6 @@ impl Impl {
     pub fn assoc_item_list(&self) -> Option<AssocItemList> { support::child(&self.syntax) }
 }
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct MacroCall {
-    pub(crate) syntax: SyntaxNode,
-}
-impl ast::AttrsOwner for MacroCall {}
-impl ast::NameOwner for MacroCall {}
-impl MacroCall {
-    pub fn path(&self) -> Option<Path> { support::child(&self.syntax) }
-    pub fn excl_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![!]) }
-    pub fn token_tree(&self) -> Option<TokenTree> { support::child(&self.syntax) }
-    pub fn semicolon_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![;]) }
-}
-#[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub struct Module {
     pub(crate) syntax: SyntaxNode,
 }
@@ -349,13 +382,6 @@ impl Visibility {
     pub fn r_paren_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![')']) }
 }
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct Name {
-    pub(crate) syntax: SyntaxNode,
-}
-impl Name {
-    pub fn ident_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![ident]) }
-}
-#[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub struct ItemList {
     pub(crate) syntax: SyntaxNode,
 }
@@ -589,18 +615,6 @@ pub struct Literal {
 impl ast::AttrsOwner for Literal {}
 impl Literal {}
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct TokenTree {
-    pub(crate) syntax: SyntaxNode,
-}
-impl TokenTree {
-    pub fn l_paren_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T!['(']) }
-    pub fn r_paren_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![')']) }
-    pub fn l_curly_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T!['{']) }
-    pub fn r_curly_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T!['}']) }
-    pub fn l_brack_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T!['[']) }
-    pub fn r_brack_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![']']) }
-}
-#[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub struct ExprStmt {
     pub(crate) syntax: SyntaxNode,
 }
@@ -1097,28 +1111,15 @@ impl TypeBound {
     pub fn ty(&self) -> Option<Type> { support::child(&self.syntax) }
 }
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct OrPat {
-    pub(crate) syntax: SyntaxNode,
-}
-impl OrPat {
-    pub fn pats(&self) -> AstChildren<Pat> { support::children(&self.syntax) }
-}
-#[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct ParenPat {
-    pub(crate) syntax: SyntaxNode,
-}
-impl ParenPat {
-    pub fn l_paren_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T!['(']) }
-    pub fn pat(&self) -> Option<Pat> { support::child(&self.syntax) }
-    pub fn r_paren_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![')']) }
-}
-#[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct RefPat {
+pub struct IdentPat {
     pub(crate) syntax: SyntaxNode,
 }
-impl RefPat {
-    pub fn amp_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![&]) }
+impl ast::AttrsOwner for IdentPat {}
+impl ast::NameOwner for IdentPat {}
+impl IdentPat {
+    pub fn ref_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![ref]) }
     pub fn mut_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![mut]) }
+    pub fn at_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![@]) }
     pub fn pat(&self) -> Option<Pat> { support::child(&self.syntax) }
 }
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
@@ -1127,137 +1128,130 @@ pub struct BoxPat {
 }
 impl BoxPat {
     pub fn box_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![box]) }
-    pub fn path(&self) -> Option<Path> { support::child(&self.syntax) }
+    pub fn pat(&self) -> Option<Pat> { support::child(&self.syntax) }
 }
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct BindPat {
+pub struct DotDotPat {
     pub(crate) syntax: SyntaxNode,
 }
-impl ast::AttrsOwner for BindPat {}
-impl ast::NameOwner for BindPat {}
-impl BindPat {
-    pub fn ref_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![ref]) }
-    pub fn mut_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![mut]) }
-    pub fn at_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![@]) }
-    pub fn pat(&self) -> Option<Pat> { support::child(&self.syntax) }
+impl DotDotPat {
+    pub fn dotdot_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![..]) }
 }
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct PlaceholderPat {
+pub struct LiteralPat {
     pub(crate) syntax: SyntaxNode,
 }
-impl PlaceholderPat {
-    pub fn underscore_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![_]) }
+impl LiteralPat {
+    pub fn literal(&self) -> Option<Literal> { support::child(&self.syntax) }
 }
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct DotDotPat {
+pub struct MacroPat {
     pub(crate) syntax: SyntaxNode,
 }
-impl DotDotPat {
-    pub fn dotdot_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![..]) }
+impl MacroPat {
+    pub fn macro_call(&self) -> Option<MacroCall> { support::child(&self.syntax) }
 }
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct PathPat {
+pub struct OrPat {
     pub(crate) syntax: SyntaxNode,
 }
-impl PathPat {
-    pub fn path(&self) -> Option<Path> { support::child(&self.syntax) }
+impl OrPat {
+    pub fn pats(&self) -> AstChildren<Pat> { support::children(&self.syntax) }
 }
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct SlicePat {
+pub struct ParenPat {
     pub(crate) syntax: SyntaxNode,
 }
-impl SlicePat {
-    pub fn l_brack_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T!['[']) }
-    pub fn args(&self) -> AstChildren<Pat> { support::children(&self.syntax) }
-    pub fn r_brack_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![']']) }
+impl ParenPat {
+    pub fn l_paren_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T!['(']) }
+    pub fn pat(&self) -> Option<Pat> { support::child(&self.syntax) }
+    pub fn r_paren_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![')']) }
 }
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct RangePat {
+pub struct PathPat {
     pub(crate) syntax: SyntaxNode,
 }
-impl RangePat {
-    pub fn dotdot_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![..]) }
-    pub fn dotdoteq_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![..=]) }
+impl PathPat {
+    pub fn path(&self) -> Option<Path> { support::child(&self.syntax) }
 }
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct LiteralPat {
+pub struct WildcardPat {
     pub(crate) syntax: SyntaxNode,
 }
-impl LiteralPat {
-    pub fn literal(&self) -> Option<Literal> { support::child(&self.syntax) }
+impl WildcardPat {
+    pub fn underscore_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![_]) }
 }
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct MacroPat {
+pub struct RangePat {
     pub(crate) syntax: SyntaxNode,
 }
-impl MacroPat {
-    pub fn macro_call(&self) -> Option<MacroCall> { support::child(&self.syntax) }
-}
+impl RangePat {}
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub struct RecordPat {
     pub(crate) syntax: SyntaxNode,
 }
 impl RecordPat {
     pub fn path(&self) -> Option<Path> { support::child(&self.syntax) }
-    pub fn record_field_pat_list(&self) -> Option<RecordFieldPatList> {
+    pub fn record_pat_field_list(&self) -> Option<RecordPatFieldList> {
         support::child(&self.syntax)
     }
 }
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct RecordFieldPatList {
+pub struct RefPat {
     pub(crate) syntax: SyntaxNode,
 }
-impl RecordFieldPatList {
-    pub fn l_curly_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T!['{']) }
-    pub fn record_field_pats(&self) -> AstChildren<RecordFieldPat> {
-        support::children(&self.syntax)
-    }
-    pub fn bind_pats(&self) -> AstChildren<BindPat> { support::children(&self.syntax) }
-    pub fn dotdot_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![..]) }
-    pub fn r_curly_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T!['}']) }
+impl RefPat {
+    pub fn amp_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![&]) }
+    pub fn mut_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![mut]) }
+    pub fn pat(&self) -> Option<Pat> { support::child(&self.syntax) }
 }
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct RecordFieldPat {
+pub struct SlicePat {
     pub(crate) syntax: SyntaxNode,
 }
-impl ast::AttrsOwner for RecordFieldPat {}
-impl RecordFieldPat {
-    pub fn name_ref(&self) -> Option<NameRef> { support::child(&self.syntax) }
-    pub fn colon_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![:]) }
-    pub fn pat(&self) -> Option<Pat> { support::child(&self.syntax) }
+impl SlicePat {
+    pub fn l_brack_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T!['[']) }
+    pub fn args(&self) -> AstChildren<Pat> { support::children(&self.syntax) }
+    pub fn r_brack_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![']']) }
 }
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct TupleStructPat {
+pub struct TuplePat {
     pub(crate) syntax: SyntaxNode,
 }
-impl TupleStructPat {
-    pub fn path(&self) -> Option<Path> { support::child(&self.syntax) }
+impl TuplePat {
     pub fn l_paren_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T!['(']) }
     pub fn args(&self) -> AstChildren<Pat> { support::children(&self.syntax) }
     pub fn r_paren_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![')']) }
 }
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct TuplePat {
+pub struct TupleStructPat {
     pub(crate) syntax: SyntaxNode,
 }
-impl TuplePat {
+impl TupleStructPat {
+    pub fn path(&self) -> Option<Path> { support::child(&self.syntax) }
     pub fn l_paren_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T!['(']) }
     pub fn args(&self) -> AstChildren<Pat> { support::children(&self.syntax) }
     pub fn r_paren_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![')']) }
 }
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct MacroItems {
+pub struct RecordPatFieldList {
     pub(crate) syntax: SyntaxNode,
 }
-impl ast::ModuleItemOwner for MacroItems {}
-impl MacroItems {}
+impl RecordPatFieldList {
+    pub fn l_curly_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T!['{']) }
+    pub fn fields(&self) -> AstChildren<RecordPatField> { support::children(&self.syntax) }
+    pub fn dotdot_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![..]) }
+    pub fn r_curly_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T!['}']) }
+}
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct MacroStmts {
+pub struct RecordPatField {
     pub(crate) syntax: SyntaxNode,
 }
-impl MacroStmts {
-    pub fn statements(&self) -> AstChildren<Stmt> { support::children(&self.syntax) }
-    pub fn expr(&self) -> Option<Expr> { support::child(&self.syntax) }
+impl ast::AttrsOwner for RecordPatField {}
+impl RecordPatField {
+    pub fn name_ref(&self) -> Option<NameRef> { support::child(&self.syntax) }
+    pub fn colon_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![:]) }
+    pub fn pat(&self) -> Option<Pat> { support::child(&self.syntax) }
 }
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub enum GenericArg {
@@ -1334,22 +1328,28 @@ pub enum Item {
 }
 impl ast::AttrsOwner for Item {}
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
+pub enum Stmt {
+    ExprStmt(ExprStmt),
+    Item(Item),
+    LetStmt(LetStmt),
+}
+#[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub enum Pat {
-    OrPat(OrPat),
-    ParenPat(ParenPat),
-    RefPat(RefPat),
+    IdentPat(IdentPat),
     BoxPat(BoxPat),
-    BindPat(BindPat),
-    PlaceholderPat(PlaceholderPat),
     DotDotPat(DotDotPat),
+    LiteralPat(LiteralPat),
+    MacroPat(MacroPat),
+    OrPat(OrPat),
+    ParenPat(ParenPat),
     PathPat(PathPat),
+    WildcardPat(WildcardPat),
+    RangePat(RangePat),
     RecordPat(RecordPat),
-    TupleStructPat(TupleStructPat),
-    TuplePat(TuplePat),
+    RefPat(RefPat),
     SlicePat(SlicePat),
-    RangePat(RangePat),
-    LiteralPat(LiteralPat),
-    MacroPat(MacroPat),
+    TuplePat(TuplePat),
+    TupleStructPat(TupleStructPat),
 }
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub enum FieldList {
@@ -1390,14 +1390,19 @@ pub enum GenericParam {
     TypeParam(TypeParam),
 }
 impl ast::AttrsOwner for GenericParam {}
-#[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub enum Stmt {
-    ExprStmt(ExprStmt),
-    Item(Item),
-    LetStmt(LetStmt),
+impl AstNode for Name {
+    fn can_cast(kind: SyntaxKind) -> bool { kind == NAME }
+    fn cast(syntax: SyntaxNode) -> Option<Self> {
+        if Self::can_cast(syntax.kind()) {
+            Some(Self { syntax })
+        } else {
+            None
+        }
+    }
+    fn syntax(&self) -> &SyntaxNode { &self.syntax }
 }
-impl AstNode for Path {
-    fn can_cast(kind: SyntaxKind) -> bool { kind == PATH }
+impl AstNode for NameRef {
+    fn can_cast(kind: SyntaxKind) -> bool { kind == NAME_REF }
     fn cast(syntax: SyntaxNode) -> Option<Self> {
         if Self::can_cast(syntax.kind()) {
             Some(Self { syntax })
@@ -1407,8 +1412,8 @@ impl AstNode for Path {
     }
     fn syntax(&self) -> &SyntaxNode { &self.syntax }
 }
-impl AstNode for PathSegment {
-    fn can_cast(kind: SyntaxKind) -> bool { kind == PATH_SEGMENT }
+impl AstNode for Path {
+    fn can_cast(kind: SyntaxKind) -> bool { kind == PATH }
     fn cast(syntax: SyntaxNode) -> Option<Self> {
         if Self::can_cast(syntax.kind()) {
             Some(Self { syntax })
@@ -1418,8 +1423,8 @@ impl AstNode for PathSegment {
     }
     fn syntax(&self) -> &SyntaxNode { &self.syntax }
 }
-impl AstNode for NameRef {
-    fn can_cast(kind: SyntaxKind) -> bool { kind == NAME_REF }
+impl AstNode for PathSegment {
+    fn can_cast(kind: SyntaxKind) -> bool { kind == PATH_SEGMENT }
     fn cast(syntax: SyntaxNode) -> Option<Self> {
         if Self::can_cast(syntax.kind()) {
             Some(Self { syntax })
@@ -1528,8 +1533,8 @@ impl AstNode for TypeBoundList {
     }
     fn syntax(&self) -> &SyntaxNode { &self.syntax }
 }
-impl AstNode for SourceFile {
-    fn can_cast(kind: SyntaxKind) -> bool { kind == SOURCE_FILE }
+impl AstNode for MacroCall {
+    fn can_cast(kind: SyntaxKind) -> bool { kind == MACRO_CALL }
     fn cast(syntax: SyntaxNode) -> Option<Self> {
         if Self::can_cast(syntax.kind()) {
             Some(Self { syntax })
@@ -1550,6 +1555,50 @@ impl AstNode for Attr {
     }
     fn syntax(&self) -> &SyntaxNode { &self.syntax }
 }
+impl AstNode for TokenTree {
+    fn can_cast(kind: SyntaxKind) -> bool { kind == TOKEN_TREE }
+    fn cast(syntax: SyntaxNode) -> Option<Self> {
+        if Self::can_cast(syntax.kind()) {
+            Some(Self { syntax })
+        } else {
+            None
+        }
+    }
+    fn syntax(&self) -> &SyntaxNode { &self.syntax }
+}
+impl AstNode for MacroItems {
+    fn can_cast(kind: SyntaxKind) -> bool { kind == MACRO_ITEMS }
+    fn cast(syntax: SyntaxNode) -> Option<Self> {
+        if Self::can_cast(syntax.kind()) {
+            Some(Self { syntax })
+        } else {
+            None
+        }
+    }
+    fn syntax(&self) -> &SyntaxNode { &self.syntax }
+}
+impl AstNode for MacroStmts {
+    fn can_cast(kind: SyntaxKind) -> bool { kind == MACRO_STMTS }
+    fn cast(syntax: SyntaxNode) -> Option<Self> {
+        if Self::can_cast(syntax.kind()) {
+            Some(Self { syntax })
+        } else {
+            None
+        }
+    }
+    fn syntax(&self) -> &SyntaxNode { &self.syntax }
+}
+impl AstNode for SourceFile {
+    fn can_cast(kind: SyntaxKind) -> bool { kind == SOURCE_FILE }
+    fn cast(syntax: SyntaxNode) -> Option<Self> {
+        if Self::can_cast(syntax.kind()) {
+            Some(Self { syntax })
+        } else {
+            None
+        }
+    }
+    fn syntax(&self) -> &SyntaxNode { &self.syntax }
+}
 impl AstNode for Const {
     fn can_cast(kind: SyntaxKind) -> bool { kind == CONST }
     fn cast(syntax: SyntaxNode) -> Option<Self> {
@@ -1616,17 +1665,6 @@ impl AstNode for Impl {
     }
     fn syntax(&self) -> &SyntaxNode { &self.syntax }
 }
-impl AstNode for MacroCall {
-    fn can_cast(kind: SyntaxKind) -> bool { kind == MACRO_CALL }
-    fn cast(syntax: SyntaxNode) -> Option<Self> {
-        if Self::can_cast(syntax.kind()) {
-            Some(Self { syntax })
-        } else {
-            None
-        }
-    }
-    fn syntax(&self) -> &SyntaxNode { &self.syntax }
-}
 impl AstNode for Module {
     fn can_cast(kind: SyntaxKind) -> bool { kind == MODULE }
     fn cast(syntax: SyntaxNode) -> Option<Self> {
@@ -1715,17 +1753,6 @@ impl AstNode for Visibility {
     }
     fn syntax(&self) -> &SyntaxNode { &self.syntax }
 }
-impl AstNode for Name {
-    fn can_cast(kind: SyntaxKind) -> bool { kind == NAME }
-    fn cast(syntax: SyntaxNode) -> Option<Self> {
-        if Self::can_cast(syntax.kind()) {
-            Some(Self { syntax })
-        } else {
-            None
-        }
-    }
-    fn syntax(&self) -> &SyntaxNode { &self.syntax }
-}
 impl AstNode for ItemList {
     fn can_cast(kind: SyntaxKind) -> bool { kind == ITEM_LIST }
     fn cast(syntax: SyntaxNode) -> Option<Self> {
@@ -1979,17 +2006,6 @@ impl AstNode for Literal {
     }
     fn syntax(&self) -> &SyntaxNode { &self.syntax }
 }
-impl AstNode for TokenTree {
-    fn can_cast(kind: SyntaxKind) -> bool { kind == TOKEN_TREE }
-    fn cast(syntax: SyntaxNode) -> Option<Self> {
-        if Self::can_cast(syntax.kind()) {
-            Some(Self { syntax })
-        } else {
-            None
-        }
-    }
-    fn syntax(&self) -> &SyntaxNode { &self.syntax }
-}
 impl AstNode for ExprStmt {
     fn can_cast(kind: SyntaxKind) -> bool { kind == EXPR_STMT }
     fn cast(syntax: SyntaxNode) -> Option<Self> {
@@ -2540,8 +2556,8 @@ impl AstNode for TypeBound {
     }
     fn syntax(&self) -> &SyntaxNode { &self.syntax }
 }
-impl AstNode for OrPat {
-    fn can_cast(kind: SyntaxKind) -> bool { kind == OR_PAT }
+impl AstNode for IdentPat {
+    fn can_cast(kind: SyntaxKind) -> bool { kind == IDENT_PAT }
     fn cast(syntax: SyntaxNode) -> Option<Self> {
         if Self::can_cast(syntax.kind()) {
             Some(Self { syntax })
@@ -2551,8 +2567,8 @@ impl AstNode for OrPat {
     }
     fn syntax(&self) -> &SyntaxNode { &self.syntax }
 }
-impl AstNode for ParenPat {
-    fn can_cast(kind: SyntaxKind) -> bool { kind == PAREN_PAT }
+impl AstNode for BoxPat {
+    fn can_cast(kind: SyntaxKind) -> bool { kind == BOX_PAT }
     fn cast(syntax: SyntaxNode) -> Option<Self> {
         if Self::can_cast(syntax.kind()) {
             Some(Self { syntax })
@@ -2562,8 +2578,8 @@ impl AstNode for ParenPat {
     }
     fn syntax(&self) -> &SyntaxNode { &self.syntax }
 }
-impl AstNode for RefPat {
-    fn can_cast(kind: SyntaxKind) -> bool { kind == REF_PAT }
+impl AstNode for DotDotPat {
+    fn can_cast(kind: SyntaxKind) -> bool { kind == DOT_DOT_PAT }
     fn cast(syntax: SyntaxNode) -> Option<Self> {
         if Self::can_cast(syntax.kind()) {
             Some(Self { syntax })
@@ -2573,8 +2589,8 @@ impl AstNode for RefPat {
     }
     fn syntax(&self) -> &SyntaxNode { &self.syntax }
 }
-impl AstNode for BoxPat {
-    fn can_cast(kind: SyntaxKind) -> bool { kind == BOX_PAT }
+impl AstNode for LiteralPat {
+    fn can_cast(kind: SyntaxKind) -> bool { kind == LITERAL_PAT }
     fn cast(syntax: SyntaxNode) -> Option<Self> {
         if Self::can_cast(syntax.kind()) {
             Some(Self { syntax })
@@ -2584,8 +2600,8 @@ impl AstNode for BoxPat {
     }
     fn syntax(&self) -> &SyntaxNode { &self.syntax }
 }
-impl AstNode for BindPat {
-    fn can_cast(kind: SyntaxKind) -> bool { kind == BIND_PAT }
+impl AstNode for MacroPat {
+    fn can_cast(kind: SyntaxKind) -> bool { kind == MACRO_PAT }
     fn cast(syntax: SyntaxNode) -> Option<Self> {
         if Self::can_cast(syntax.kind()) {
             Some(Self { syntax })
@@ -2595,8 +2611,8 @@ impl AstNode for BindPat {
     }
     fn syntax(&self) -> &SyntaxNode { &self.syntax }
 }
-impl AstNode for PlaceholderPat {
-    fn can_cast(kind: SyntaxKind) -> bool { kind == PLACEHOLDER_PAT }
+impl AstNode for OrPat {
+    fn can_cast(kind: SyntaxKind) -> bool { kind == OR_PAT }
     fn cast(syntax: SyntaxNode) -> Option<Self> {
         if Self::can_cast(syntax.kind()) {
             Some(Self { syntax })
@@ -2606,8 +2622,8 @@ impl AstNode for PlaceholderPat {
     }
     fn syntax(&self) -> &SyntaxNode { &self.syntax }
 }
-impl AstNode for DotDotPat {
-    fn can_cast(kind: SyntaxKind) -> bool { kind == DOT_DOT_PAT }
+impl AstNode for ParenPat {
+    fn can_cast(kind: SyntaxKind) -> bool { kind == PAREN_PAT }
     fn cast(syntax: SyntaxNode) -> Option<Self> {
         if Self::can_cast(syntax.kind()) {
             Some(Self { syntax })
@@ -2628,8 +2644,8 @@ impl AstNode for PathPat {
     }
     fn syntax(&self) -> &SyntaxNode { &self.syntax }
 }
-impl AstNode for SlicePat {
-    fn can_cast(kind: SyntaxKind) -> bool { kind == SLICE_PAT }
+impl AstNode for WildcardPat {
+    fn can_cast(kind: SyntaxKind) -> bool { kind == WILDCARD_PAT }
     fn cast(syntax: SyntaxNode) -> Option<Self> {
         if Self::can_cast(syntax.kind()) {
             Some(Self { syntax })
@@ -2650,28 +2666,6 @@ impl AstNode for RangePat {
     }
     fn syntax(&self) -> &SyntaxNode { &self.syntax }
 }
-impl AstNode for LiteralPat {
-    fn can_cast(kind: SyntaxKind) -> bool { kind == LITERAL_PAT }
-    fn cast(syntax: SyntaxNode) -> Option<Self> {
-        if Self::can_cast(syntax.kind()) {
-            Some(Self { syntax })
-        } else {
-            None
-        }
-    }
-    fn syntax(&self) -> &SyntaxNode { &self.syntax }
-}
-impl AstNode for MacroPat {
-    fn can_cast(kind: SyntaxKind) -> bool { kind == MACRO_PAT }
-    fn cast(syntax: SyntaxNode) -> Option<Self> {
-        if Self::can_cast(syntax.kind()) {
-            Some(Self { syntax })
-        } else {
-            None
-        }
-    }
-    fn syntax(&self) -> &SyntaxNode { &self.syntax }
-}
 impl AstNode for RecordPat {
     fn can_cast(kind: SyntaxKind) -> bool { kind == RECORD_PAT }
     fn cast(syntax: SyntaxNode) -> Option<Self> {
@@ -2683,8 +2677,8 @@ impl AstNode for RecordPat {
     }
     fn syntax(&self) -> &SyntaxNode { &self.syntax }
 }
-impl AstNode for RecordFieldPatList {
-    fn can_cast(kind: SyntaxKind) -> bool { kind == RECORD_FIELD_PAT_LIST }
+impl AstNode for RefPat {
+    fn can_cast(kind: SyntaxKind) -> bool { kind == REF_PAT }
     fn cast(syntax: SyntaxNode) -> Option<Self> {
         if Self::can_cast(syntax.kind()) {
             Some(Self { syntax })
@@ -2694,8 +2688,8 @@ impl AstNode for RecordFieldPatList {
     }
     fn syntax(&self) -> &SyntaxNode { &self.syntax }
 }
-impl AstNode for RecordFieldPat {
-    fn can_cast(kind: SyntaxKind) -> bool { kind == RECORD_FIELD_PAT }
+impl AstNode for SlicePat {
+    fn can_cast(kind: SyntaxKind) -> bool { kind == SLICE_PAT }
     fn cast(syntax: SyntaxNode) -> Option<Self> {
         if Self::can_cast(syntax.kind()) {
             Some(Self { syntax })
@@ -2705,8 +2699,8 @@ impl AstNode for RecordFieldPat {
     }
     fn syntax(&self) -> &SyntaxNode { &self.syntax }
 }
-impl AstNode for TupleStructPat {
-    fn can_cast(kind: SyntaxKind) -> bool { kind == TUPLE_STRUCT_PAT }
+impl AstNode for TuplePat {
+    fn can_cast(kind: SyntaxKind) -> bool { kind == TUPLE_PAT }
     fn cast(syntax: SyntaxNode) -> Option<Self> {
         if Self::can_cast(syntax.kind()) {
             Some(Self { syntax })
@@ -2716,8 +2710,8 @@ impl AstNode for TupleStructPat {
     }
     fn syntax(&self) -> &SyntaxNode { &self.syntax }
 }
-impl AstNode for TuplePat {
-    fn can_cast(kind: SyntaxKind) -> bool { kind == TUPLE_PAT }
+impl AstNode for TupleStructPat {
+    fn can_cast(kind: SyntaxKind) -> bool { kind == TUPLE_STRUCT_PAT }
     fn cast(syntax: SyntaxNode) -> Option<Self> {
         if Self::can_cast(syntax.kind()) {
             Some(Self { syntax })
@@ -2727,8 +2721,8 @@ impl AstNode for TuplePat {
     }
     fn syntax(&self) -> &SyntaxNode { &self.syntax }
 }
-impl AstNode for MacroItems {
-    fn can_cast(kind: SyntaxKind) -> bool { kind == MACRO_ITEMS }
+impl AstNode for RecordPatFieldList {
+    fn can_cast(kind: SyntaxKind) -> bool { kind == RECORD_PAT_FIELD_LIST }
     fn cast(syntax: SyntaxNode) -> Option<Self> {
         if Self::can_cast(syntax.kind()) {
             Some(Self { syntax })
@@ -2738,8 +2732,8 @@ impl AstNode for MacroItems {
     }
     fn syntax(&self) -> &SyntaxNode { &self.syntax }
 }
-impl AstNode for MacroStmts {
-    fn can_cast(kind: SyntaxKind) -> bool { kind == MACRO_STMTS }
+impl AstNode for RecordPatField {
+    fn can_cast(kind: SyntaxKind) -> bool { kind == RECORD_PAT_FIELD }
     fn cast(syntax: SyntaxNode) -> Option<Self> {
         if Self::can_cast(syntax.kind()) {
             Some(Self { syntax })
@@ -3133,98 +3127,107 @@ impl AstNode for Item {
         }
     }
 }
-impl From<OrPat> for Pat {
-    fn from(node: OrPat) -> Pat { Pat::OrPat(node) }
+impl From<ExprStmt> for Stmt {
+    fn from(node: ExprStmt) -> Stmt { Stmt::ExprStmt(node) }
 }
-impl From<ParenPat> for Pat {
-    fn from(node: ParenPat) -> Pat { Pat::ParenPat(node) }
+impl From<Item> for Stmt {
+    fn from(node: Item) -> Stmt { Stmt::Item(node) }
 }
-impl From<RefPat> for Pat {
-    fn from(node: RefPat) -> Pat { Pat::RefPat(node) }
+impl From<LetStmt> for Stmt {
+    fn from(node: LetStmt) -> Stmt { Stmt::LetStmt(node) }
+}
+impl From<IdentPat> for Pat {
+    fn from(node: IdentPat) -> Pat { Pat::IdentPat(node) }
 }
 impl From<BoxPat> for Pat {
     fn from(node: BoxPat) -> Pat { Pat::BoxPat(node) }
 }
-impl From<BindPat> for Pat {
-    fn from(node: BindPat) -> Pat { Pat::BindPat(node) }
-}
-impl From<PlaceholderPat> for Pat {
-    fn from(node: PlaceholderPat) -> Pat { Pat::PlaceholderPat(node) }
-}
 impl From<DotDotPat> for Pat {
     fn from(node: DotDotPat) -> Pat { Pat::DotDotPat(node) }
 }
+impl From<LiteralPat> for Pat {
+    fn from(node: LiteralPat) -> Pat { Pat::LiteralPat(node) }
+}
+impl From<MacroPat> for Pat {
+    fn from(node: MacroPat) -> Pat { Pat::MacroPat(node) }
+}
+impl From<OrPat> for Pat {
+    fn from(node: OrPat) -> Pat { Pat::OrPat(node) }
+}
+impl From<ParenPat> for Pat {
+    fn from(node: ParenPat) -> Pat { Pat::ParenPat(node) }
+}
 impl From<PathPat> for Pat {
     fn from(node: PathPat) -> Pat { Pat::PathPat(node) }
 }
+impl From<WildcardPat> for Pat {
+    fn from(node: WildcardPat) -> Pat { Pat::WildcardPat(node) }
+}
+impl From<RangePat> for Pat {
+    fn from(node: RangePat) -> Pat { Pat::RangePat(node) }
+}
 impl From<RecordPat> for Pat {
     fn from(node: RecordPat) -> Pat { Pat::RecordPat(node) }
 }
-impl From<TupleStructPat> for Pat {
-    fn from(node: TupleStructPat) -> Pat { Pat::TupleStructPat(node) }
-}
-impl From<TuplePat> for Pat {
-    fn from(node: TuplePat) -> Pat { Pat::TuplePat(node) }
+impl From<RefPat> for Pat {
+    fn from(node: RefPat) -> Pat { Pat::RefPat(node) }
 }
 impl From<SlicePat> for Pat {
     fn from(node: SlicePat) -> Pat { Pat::SlicePat(node) }
 }
-impl From<RangePat> for Pat {
-    fn from(node: RangePat) -> Pat { Pat::RangePat(node) }
-}
-impl From<LiteralPat> for Pat {
-    fn from(node: LiteralPat) -> Pat { Pat::LiteralPat(node) }
+impl From<TuplePat> for Pat {
+    fn from(node: TuplePat) -> Pat { Pat::TuplePat(node) }
 }
-impl From<MacroPat> for Pat {
-    fn from(node: MacroPat) -> Pat { Pat::MacroPat(node) }
+impl From<TupleStructPat> for Pat {
+    fn from(node: TupleStructPat) -> Pat { Pat::TupleStructPat(node) }
 }
 impl AstNode for Pat {
     fn can_cast(kind: SyntaxKind) -> bool {
         match kind {
-            OR_PAT | PAREN_PAT | REF_PAT | BOX_PAT | BIND_PAT | PLACEHOLDER_PAT | DOT_DOT_PAT
-            | PATH_PAT | RECORD_PAT | TUPLE_STRUCT_PAT | TUPLE_PAT | SLICE_PAT | RANGE_PAT
-            | LITERAL_PAT | MACRO_PAT => true,
+            IDENT_PAT | BOX_PAT | DOT_DOT_PAT | LITERAL_PAT | MACRO_PAT | OR_PAT | PAREN_PAT
+            | PATH_PAT | WILDCARD_PAT | RANGE_PAT | RECORD_PAT | REF_PAT | SLICE_PAT
+            | TUPLE_PAT | TUPLE_STRUCT_PAT => true,
             _ => false,
         }
     }
     fn cast(syntax: SyntaxNode) -> Option<Self> {
         let res = match syntax.kind() {
-            OR_PAT => Pat::OrPat(OrPat { syntax }),
-            PAREN_PAT => Pat::ParenPat(ParenPat { syntax }),
-            REF_PAT => Pat::RefPat(RefPat { syntax }),
+            IDENT_PAT => Pat::IdentPat(IdentPat { syntax }),
             BOX_PAT => Pat::BoxPat(BoxPat { syntax }),
-            BIND_PAT => Pat::BindPat(BindPat { syntax }),
-            PLACEHOLDER_PAT => Pat::PlaceholderPat(PlaceholderPat { syntax }),
             DOT_DOT_PAT => Pat::DotDotPat(DotDotPat { syntax }),
+            LITERAL_PAT => Pat::LiteralPat(LiteralPat { syntax }),
+            MACRO_PAT => Pat::MacroPat(MacroPat { syntax }),
+            OR_PAT => Pat::OrPat(OrPat { syntax }),
+            PAREN_PAT => Pat::ParenPat(ParenPat { syntax }),
             PATH_PAT => Pat::PathPat(PathPat { syntax }),
+            WILDCARD_PAT => Pat::WildcardPat(WildcardPat { syntax }),
+            RANGE_PAT => Pat::RangePat(RangePat { syntax }),
             RECORD_PAT => Pat::RecordPat(RecordPat { syntax }),
-            TUPLE_STRUCT_PAT => Pat::TupleStructPat(TupleStructPat { syntax }),
-            TUPLE_PAT => Pat::TuplePat(TuplePat { syntax }),
+            REF_PAT => Pat::RefPat(RefPat { syntax }),
             SLICE_PAT => Pat::SlicePat(SlicePat { syntax }),
-            RANGE_PAT => Pat::RangePat(RangePat { syntax }),
-            LITERAL_PAT => Pat::LiteralPat(LiteralPat { syntax }),
-            MACRO_PAT => Pat::MacroPat(MacroPat { syntax }),
+            TUPLE_PAT => Pat::TuplePat(TuplePat { syntax }),
+            TUPLE_STRUCT_PAT => Pat::TupleStructPat(TupleStructPat { syntax }),
             _ => return None,
         };
         Some(res)
     }
     fn syntax(&self) -> &SyntaxNode {
         match self {
-            Pat::OrPat(it) => &it.syntax,
-            Pat::ParenPat(it) => &it.syntax,
-            Pat::RefPat(it) => &it.syntax,
+            Pat::IdentPat(it) => &it.syntax,
             Pat::BoxPat(it) => &it.syntax,
-            Pat::BindPat(it) => &it.syntax,
-            Pat::PlaceholderPat(it) => &it.syntax,
             Pat::DotDotPat(it) => &it.syntax,
+            Pat::LiteralPat(it) => &it.syntax,
+            Pat::MacroPat(it) => &it.syntax,
+            Pat::OrPat(it) => &it.syntax,
+            Pat::ParenPat(it) => &it.syntax,
             Pat::PathPat(it) => &it.syntax,
+            Pat::WildcardPat(it) => &it.syntax,
+            Pat::RangePat(it) => &it.syntax,
             Pat::RecordPat(it) => &it.syntax,
-            Pat::TupleStructPat(it) => &it.syntax,
-            Pat::TuplePat(it) => &it.syntax,
+            Pat::RefPat(it) => &it.syntax,
             Pat::SlicePat(it) => &it.syntax,
-            Pat::RangePat(it) => &it.syntax,
-            Pat::LiteralPat(it) => &it.syntax,
-            Pat::MacroPat(it) => &it.syntax,
+            Pat::TuplePat(it) => &it.syntax,
+            Pat::TupleStructPat(it) => &it.syntax,
         }
     }
 }
@@ -3393,15 +3396,6 @@ impl AstNode for GenericParam {
         }
     }
 }
-impl From<ExprStmt> for Stmt {
-    fn from(node: ExprStmt) -> Stmt { Stmt::ExprStmt(node) }
-}
-impl From<Item> for Stmt {
-    fn from(node: Item) -> Stmt { Stmt::Item(node) }
-}
-impl From<LetStmt> for Stmt {
-    fn from(node: LetStmt) -> Stmt { Stmt::LetStmt(node) }
-}
 impl std::fmt::Display for GenericArg {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         std::fmt::Display::fmt(self.syntax(), f)
@@ -3422,6 +3416,11 @@ impl std::fmt::Display for Item {
         std::fmt::Display::fmt(self.syntax(), f)
     }
 }
+impl std::fmt::Display for Stmt {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        std::fmt::Display::fmt(self.syntax(), f)
+    }
+}
 impl std::fmt::Display for Pat {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         std::fmt::Display::fmt(self.syntax(), f)
@@ -3452,22 +3451,22 @@ impl std::fmt::Display for GenericParam {
         std::fmt::Display::fmt(self.syntax(), f)
     }
 }
-impl std::fmt::Display for Stmt {
+impl std::fmt::Display for Name {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         std::fmt::Display::fmt(self.syntax(), f)
     }
 }
-impl std::fmt::Display for Path {
+impl std::fmt::Display for NameRef {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         std::fmt::Display::fmt(self.syntax(), f)
     }
 }
-impl std::fmt::Display for PathSegment {
+impl std::fmt::Display for Path {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         std::fmt::Display::fmt(self.syntax(), f)
     }
 }
-impl std::fmt::Display for NameRef {
+impl std::fmt::Display for PathSegment {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         std::fmt::Display::fmt(self.syntax(), f)
     }
@@ -3517,7 +3516,7 @@ impl std::fmt::Display for TypeBoundList {
         std::fmt::Display::fmt(self.syntax(), f)
     }
 }
-impl std::fmt::Display for SourceFile {
+impl std::fmt::Display for MacroCall {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         std::fmt::Display::fmt(self.syntax(), f)
     }
@@ -3527,6 +3526,26 @@ impl std::fmt::Display for Attr {
         std::fmt::Display::fmt(self.syntax(), f)
     }
 }
+impl std::fmt::Display for TokenTree {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        std::fmt::Display::fmt(self.syntax(), f)
+    }
+}
+impl std::fmt::Display for MacroItems {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        std::fmt::Display::fmt(self.syntax(), f)
+    }
+}
+impl std::fmt::Display for MacroStmts {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        std::fmt::Display::fmt(self.syntax(), f)
+    }
+}
+impl std::fmt::Display for SourceFile {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        std::fmt::Display::fmt(self.syntax(), f)
+    }
+}
 impl std::fmt::Display for Const {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         std::fmt::Display::fmt(self.syntax(), f)
@@ -3557,11 +3576,6 @@ impl std::fmt::Display for Impl {
         std::fmt::Display::fmt(self.syntax(), f)
     }
 }
-impl std::fmt::Display for MacroCall {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        std::fmt::Display::fmt(self.syntax(), f)
-    }
-}
 impl std::fmt::Display for Module {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         std::fmt::Display::fmt(self.syntax(), f)
@@ -3602,11 +3616,6 @@ impl std::fmt::Display for Visibility {
         std::fmt::Display::fmt(self.syntax(), f)
     }
 }
-impl std::fmt::Display for Name {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        std::fmt::Display::fmt(self.syntax(), f)
-    }
-}
 impl std::fmt::Display for ItemList {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         std::fmt::Display::fmt(self.syntax(), f)
@@ -3722,11 +3731,6 @@ impl std::fmt::Display for Literal {
         std::fmt::Display::fmt(self.syntax(), f)
     }
 }
-impl std::fmt::Display for TokenTree {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        std::fmt::Display::fmt(self.syntax(), f)
-    }
-}
 impl std::fmt::Display for ExprStmt {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         std::fmt::Display::fmt(self.syntax(), f)
@@ -3977,37 +3981,37 @@ impl std::fmt::Display for TypeBound {
         std::fmt::Display::fmt(self.syntax(), f)
     }
 }
-impl std::fmt::Display for OrPat {
+impl std::fmt::Display for IdentPat {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         std::fmt::Display::fmt(self.syntax(), f)
     }
 }
-impl std::fmt::Display for ParenPat {
+impl std::fmt::Display for BoxPat {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         std::fmt::Display::fmt(self.syntax(), f)
     }
 }
-impl std::fmt::Display for RefPat {
+impl std::fmt::Display for DotDotPat {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         std::fmt::Display::fmt(self.syntax(), f)
     }
 }
-impl std::fmt::Display for BoxPat {
+impl std::fmt::Display for LiteralPat {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         std::fmt::Display::fmt(self.syntax(), f)
     }
 }
-impl std::fmt::Display for BindPat {
+impl std::fmt::Display for MacroPat {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         std::fmt::Display::fmt(self.syntax(), f)
     }
 }
-impl std::fmt::Display for PlaceholderPat {
+impl std::fmt::Display for OrPat {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         std::fmt::Display::fmt(self.syntax(), f)
     }
 }
-impl std::fmt::Display for DotDotPat {
+impl std::fmt::Display for ParenPat {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         std::fmt::Display::fmt(self.syntax(), f)
     }
@@ -4017,7 +4021,7 @@ impl std::fmt::Display for PathPat {
         std::fmt::Display::fmt(self.syntax(), f)
     }
 }
-impl std::fmt::Display for SlicePat {
+impl std::fmt::Display for WildcardPat {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         std::fmt::Display::fmt(self.syntax(), f)
     }
@@ -4027,47 +4031,37 @@ impl std::fmt::Display for RangePat {
         std::fmt::Display::fmt(self.syntax(), f)
     }
 }
-impl std::fmt::Display for LiteralPat {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        std::fmt::Display::fmt(self.syntax(), f)
-    }
-}
-impl std::fmt::Display for MacroPat {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        std::fmt::Display::fmt(self.syntax(), f)
-    }
-}
 impl std::fmt::Display for RecordPat {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         std::fmt::Display::fmt(self.syntax(), f)
     }
 }
-impl std::fmt::Display for RecordFieldPatList {
+impl std::fmt::Display for RefPat {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         std::fmt::Display::fmt(self.syntax(), f)
     }
 }
-impl std::fmt::Display for RecordFieldPat {
+impl std::fmt::Display for SlicePat {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         std::fmt::Display::fmt(self.syntax(), f)
     }
 }
-impl std::fmt::Display for TupleStructPat {
+impl std::fmt::Display for TuplePat {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         std::fmt::Display::fmt(self.syntax(), f)
     }
 }
-impl std::fmt::Display for TuplePat {
+impl std::fmt::Display for TupleStructPat {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         std::fmt::Display::fmt(self.syntax(), f)
     }
 }
-impl std::fmt::Display for MacroItems {
+impl std::fmt::Display for RecordPatFieldList {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         std::fmt::Display::fmt(self.syntax(), f)
     }
 }
-impl std::fmt::Display for MacroStmts {
+impl std::fmt::Display for RecordPatField {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         std::fmt::Display::fmt(self.syntax(), f)
     }
diff --git a/crates/ra_syntax/src/ast/make.rs b/crates/ra_syntax/src/ast/make.rs
index 3d4fed64c..673777015 100644
--- a/crates/ra_syntax/src/ast/make.rs
+++ b/crates/ra_syntax/src/ast/make.rs
@@ -148,18 +148,18 @@ pub fn condition(expr: ast::Expr, pattern: Option<ast::Pat>) -> ast::Condition {
     }
 }
 
-pub fn bind_pat(name: ast::Name) -> ast::BindPat {
+pub fn bind_pat(name: ast::Name) -> ast::IdentPat {
     return from_text(name.text());
 
-    fn from_text(text: &str) -> ast::BindPat {
+    fn from_text(text: &str) -> ast::IdentPat {
         ast_from_text(&format!("fn f({}: ())", text))
     }
 }
 
-pub fn placeholder_pat() -> ast::PlaceholderPat {
+pub fn placeholder_pat() -> ast::WildcardPat {
     return from_text("_");
 
-    fn from_text(text: &str) -> ast::PlaceholderPat {
+    fn from_text(text: &str) -> ast::WildcardPat {
         ast_from_text(&format!("fn f({}: ())", text))
     }
 }
diff --git a/crates/ra_syntax/src/ast/node_ext.rs b/crates/ra_syntax/src/ast/node_ext.rs
index 69726fb93..4b4a72375 100644
--- a/crates/ra_syntax/src/ast/node_ext.rs
+++ b/crates/ra_syntax/src/ast/node_ext.rs
@@ -227,13 +227,13 @@ impl fmt::Display for NameOrNameRef {
     }
 }
 
-impl ast::RecordFieldPat {
+impl ast::RecordPatField {
     /// Deals with field init shorthand
     pub fn field_name(&self) -> Option<NameOrNameRef> {
         if let Some(name_ref) = self.name_ref() {
             return Some(NameOrNameRef::NameRef(name_ref));
         }
-        if let Some(ast::Pat::BindPat(pat)) = self.pat() {
+        if let Some(ast::Pat::IdentPat(pat)) = self.pat() {
             let name = pat.name()?;
             return Some(NameOrNameRef::Name(name));
         }
@@ -294,13 +294,13 @@ impl ast::SlicePat {
         let prefix = args
             .peeking_take_while(|p| match p {
                 ast::Pat::DotDotPat(_) => false,
-                ast::Pat::BindPat(bp) => match bp.pat() {
+                ast::Pat::IdentPat(bp) => match bp.pat() {
                     Some(ast::Pat::DotDotPat(_)) => false,
                     _ => true,
                 },
                 ast::Pat::RefPat(rp) => match rp.pat() {
                     Some(ast::Pat::DotDotPat(_)) => false,
-                    Some(ast::Pat::BindPat(bp)) => match bp.pat() {
+                    Some(ast::Pat::IdentPat(bp)) => match bp.pat() {
                         Some(ast::Pat::DotDotPat(_)) => false,
                         _ => true,
                     },
diff --git a/crates/ra_syntax/test_data/parser/err/0012_broken_lambda.rast b/crates/ra_syntax/test_data/parser/err/0012_broken_lambda.rast
index 307d9b31b..c131b79a7 100644
--- a/crates/ra_syntax/test_data/parser/err/0012_broken_lambda.rast
+++ b/crates/ra_syntax/test_data/parser/err/0012_broken_lambda.rast
@@ -34,7 +34,7 @@ [email protected]
     [email protected]
       [email protected]
       [email protected]
-        BIN[email protected]
+        IDENT[email protected]
           [email protected]
             [email protected] "builder"
         [email protected]
@@ -51,7 +51,7 @@ [email protected]
       [email protected]
       [email protected]
       [email protected]
-        BIN[email protected]
+        IDENT[email protected]
           [email protected]
             [email protected] "tokens"
         [email protected]
@@ -69,7 +69,7 @@ [email protected]
       [email protected]
       [email protected]
       [email protected]
-        BIN[email protected]
+        IDENT[email protected]
           [email protected]
             [email protected] "events"
         [email protected]
@@ -96,7 +96,7 @@ [email protected]
       [email protected]
         [email protected]
         [email protected]
-        BIN[email protected]
+        IDENT[email protected]
           [email protected]
           [email protected]
           [email protected]
@@ -111,7 +111,7 @@ [email protected]
       [email protected]
         [email protected]
         [email protected]
-        BIN[email protected]
+        IDENT[email protected]
           [email protected]
             [email protected] "eat_ws"
         [email protected]
@@ -121,7 +121,7 @@ [email protected]
           [email protected]
             [email protected]
             [email protected]
-              BIN[email protected]
+              IDENT[email protected]
                 [email protected]
                   [email protected] "idx"
               [email protected]
@@ -172,7 +172,7 @@ [email protected]
                     [email protected]
                       [email protected] "Some"
                 [email protected]
-                BIN[email protected]
+                IDENT[email protected]
                   [email protected]
                     [email protected] "token"
                 [email protected]
@@ -185,7 +185,7 @@ [email protected]
                 err: `expected COMMA`
             [email protected]
             [email protected]
-              BIN[email protected]
+              IDENT[email protected]
                 [email protected]
                   [email protected] "tokens"
                   err: `expected COMMA`
@@ -205,7 +205,7 @@ [email protected]
                 [email protected]
                   [email protected]
                   err: `expected COMMA`
-                BIN[email protected]
+                IDENT[email protected]
                   [email protected]
                     [email protected] "idx"
                 [email protected]
@@ -229,7 +229,7 @@ [email protected]
                 [email protected]
                 err: `expected COMMA`
             [email protected]
-              BIN[email protected]
+              IDENT[email protected]
                 [email protected]
                   [email protected] "token"
                   err: `expected COMMA`
@@ -239,7 +239,7 @@ [email protected]
                 [email protected]
                 err: `expected COMMA`
             [email protected]
-              BIN[email protected]
+              IDENT[email protected]
                 [email protected]
                   [email protected] "kind"
                   err: `expected COMMA`
@@ -265,7 +265,7 @@ [email protected]
                 err: `expected COMMA`
             [email protected]
             [email protected]
-              BIN[email protected]
+              IDENT[email protected]
                 [email protected]
                   [email protected] "break"
                   err: `expected COMMA`
@@ -282,7 +282,7 @@ [email protected]
                 err: `expected COMMA`
             [email protected]
             [email protected]
-              BIN[email protected]
+              IDENT[email protected]
                 [email protected]
                   [email protected] "builder"
                   err: `expected COMMA`
@@ -298,7 +298,7 @@ [email protected]
                     [email protected]
                       [email protected] "leaf"
                 [email protected]
-                BIN[email protected]
+                IDENT[email protected]
                   [email protected]
                     [email protected] "token"
                     err: `expected COMMA`
@@ -306,12 +306,12 @@ [email protected]
                 [email protected]
                   [email protected]
                   err: `expected COMMA`
-                BIN[email protected]
+                IDENT[email protected]
                   [email protected]
                     [email protected] "kind"
                 [email protected]
                 [email protected]
-                BIN[email protected]
+                IDENT[email protected]
                   [email protected]
                     [email protected] "token"
                     err: `expected COMMA`
@@ -319,7 +319,7 @@ [email protected]
                 [email protected]
                   [email protected]
                   err: `expected COMMA`
-                BIN[email protected]
+                IDENT[email protected]
                   [email protected]
                     [email protected] "len"
                 [email protected]
@@ -336,7 +336,7 @@ [email protected]
                 [email protected]
                 err: `expected COMMA`
             [email protected]
-              BIN[email protected]
+              IDENT[email protected]
                 [email protected]
                   [email protected] "idx"
                   err: `expected COMMA`
diff --git a/crates/ra_syntax/test_data/parser/err/0017_incomplete_binexpr.rast b/crates/ra_syntax/test_data/parser/err/0017_incomplete_binexpr.rast
index bb4a28f4e..fe094f61c 100644
--- a/crates/ra_syntax/test_data/parser/err/0017_incomplete_binexpr.rast
+++ b/crates/ra_syntax/test_data/parser/err/0017_incomplete_binexpr.rast
@@ -7,7 +7,7 @@ [email protected]
     [email protected]
       [email protected] "("
       [email protected]
-        BIN[email protected]
+        IDENT[email protected]
           [email protected]
             [email protected] "foo"
         [email protected] ":"
@@ -25,7 +25,7 @@ [email protected]
       [email protected]
         [email protected] "let"
         [email protected] " "
-        BIN[email protected]
+        IDENT[email protected]
           [email protected]
             [email protected] "bar"
         [email protected] " "
diff --git a/crates/ra_syntax/test_data/parser/err/0018_incomplete_fn.rast b/crates/ra_syntax/test_data/parser/err/0018_incomplete_fn.rast
index bc95b8512..72939fc98 100644
--- a/crates/ra_syntax/test_data/parser/err/0018_incomplete_fn.rast
+++ b/crates/ra_syntax/test_data/parser/err/0018_incomplete_fn.rast
@@ -38,7 +38,7 @@ [email protected]
           [email protected]
             [email protected] "let"
             [email protected] " "
-            BIN[email protected]
+            IDENT[email protected]
               [email protected]
                 [email protected] "res"
             [email protected] " "
diff --git a/crates/ra_syntax/test_data/parser/err/0019_let_recover.rast b/crates/ra_syntax/test_data/parser/err/0019_let_recover.rast
index f6fa964b7..72c05bd96 100644
--- a/crates/ra_syntax/test_data/parser/err/0019_let_recover.rast
+++ b/crates/ra_syntax/test_data/parser/err/0019_let_recover.rast
@@ -14,7 +14,7 @@ [email protected]
       [email protected]
         [email protected] "let"
         [email protected] " "
-        BIN[email protected]
+        IDENT[email protected]
           [email protected]
             [email protected] "foo"
         [email protected] " "
@@ -23,7 +23,7 @@ [email protected]
       [email protected]
         [email protected] "let"
         [email protected] " "
-        BIN[email protected]
+        IDENT[email protected]
           [email protected]
             [email protected] "bar"
         [email protected] " "
@@ -39,7 +39,7 @@ [email protected]
       [email protected]
         [email protected] "let"
         [email protected] " "
-        BIN[email protected]
+        IDENT[email protected]
           [email protected]
             [email protected] "baz"
         [email protected] " "
diff --git a/crates/ra_syntax/test_data/parser/err/0021_incomplete_param.rast b/crates/ra_syntax/test_data/parser/err/0021_incomplete_param.rast
index ba4ce4795..b32845537 100644
--- a/crates/ra_syntax/test_data/parser/err/0021_incomplete_param.rast
+++ b/crates/ra_syntax/test_data/parser/err/0021_incomplete_param.rast
@@ -7,7 +7,7 @@ [email protected]
     [email protected]
       [email protected] "("
       [email protected]
-        BIN[email protected]
+        IDENT[email protected]
           [email protected]
             [email protected] "x"
         [email protected] ":"
@@ -20,7 +20,7 @@ [email protected]
       [email protected] ","
       [email protected] " "
       [email protected]
-        BIN[email protected]
+        IDENT[email protected]
           [email protected]
             [email protected] "y"
       [email protected] ")"
diff --git a/crates/ra_syntax/test_data/parser/err/0024_many_type_parens.rast b/crates/ra_syntax/test_data/parser/err/0024_many_type_parens.rast
index 1cb1e9757..e3be6b22e 100644
--- a/crates/ra_syntax/test_data/parser/err/0024_many_type_parens.rast
+++ b/crates/ra_syntax/test_data/parser/err/0024_many_type_parens.rast
@@ -80,7 +80,7 @@ [email protected]
       [email protected]
         [email protected] "let"
         [email protected] " "
-        PLACEHOLDE[email protected]
+        WILDCARD[email protected]
           [email protected] "_"
         [email protected] ":"
         [email protected] " "
@@ -147,7 +147,7 @@ [email protected]
       [email protected]
         [email protected] "let"
         [email protected] " "
-        PLACEHOLDE[email protected]
+        WILDCARD[email protected]
           [email protected] "_"
         [email protected] ":"
         [email protected] " "
@@ -223,7 +223,7 @@ [email protected]
       [email protected]
         [email protected] "let"
         [email protected] " "
-        PLACEHOLDE[email protected]
+        WILDCARD[email protected]
           [email protected] "_"
         [email protected] ":"
         [email protected] " "
diff --git a/crates/ra_syntax/test_data/parser/err/0025_nope.rast b/crates/ra_syntax/test_data/parser/err/0025_nope.rast
index fca646557..83fc9fe77 100644
--- a/crates/ra_syntax/test_data/parser/err/0025_nope.rast
+++ b/crates/ra_syntax/test_data/parser/err/0025_nope.rast
@@ -69,7 +69,7 @@ [email protected]
       [email protected]
         [email protected] "let"
         [email protected] " "
-        BIN[email protected]
+        IDENT[email protected]
           [email protected]
             [email protected] "a"
         [email protected] " "
@@ -175,7 +175,7 @@ [email protected]
       [email protected]
         [email protected] "let"
         [email protected] " "
-        BIN[email protected]
+        IDENT[email protected]
           [email protected]
             [email protected] "bad_syntax"
         [email protected] " "
diff --git a/crates/ra_syntax/test_data/parser/err/0029_field_completion.rast b/crates/ra_syntax/test_data/parser/err/0029_field_completion.rast
index bfcd0149e..c6402cdd8 100644
--- a/crates/ra_syntax/test_data/parser/err/0029_field_completion.rast
+++ b/crates/ra_syntax/test_data/parser/err/0029_field_completion.rast
@@ -7,7 +7,7 @@ [email protected]
     [email protected]
       [email protected] "("
       [email protected]
-        BIN[email protected]
+        IDENT[email protected]
           [email protected]
             [email protected] "a"
         [email protected] ":"
diff --git a/crates/ra_syntax/test_data/parser/err/0031_block_inner_attrs.rast b/crates/ra_syntax/test_data/parser/err/0031_block_inner_attrs.rast
index 55ff3943f..a443b37db 100644
--- a/crates/ra_syntax/test_data/parser/err/0031_block_inner_attrs.rast
+++ b/crates/ra_syntax/test_data/parser/err/0031_block_inner_attrs.rast
@@ -14,7 +14,7 @@ [email protected]
       [email protected]
         [email protected] "let"
         [email protected] " "
-        BIN[email protected]
+        IDENT[email protected]
           [email protected]
             [email protected] "inner"
         [email protected] " "
diff --git a/crates/ra_syntax/test_data/parser/err/0032_match_arms_inner_attrs.rast b/crates/ra_syntax/test_data/parser/err/0032_match_arms_inner_attrs.rast
index ec9f556aa..672dd054a 100644
--- a/crates/ra_syntax/test_data/parser/err/0032_match_arms_inner_attrs.rast
+++ b/crates/ra_syntax/test_data/parser/err/0032_match_arms_inner_attrs.rast
@@ -23,7 +23,7 @@ [email protected]
             [email protected] "{"
             [email protected] "\n        "
             [email protected]
-              PLACEHOLDE[email protected]
+              WILDCARD[email protected]
                 [email protected] "_"
               [email protected] " "
               [email protected] "=>"
@@ -54,7 +54,7 @@ [email protected]
                 [email protected] "]"
             [email protected] "\n        "
             [email protected]
-              PLACEHOLDE[email protected]
+              WILDCARD[email protected]
                 [email protected] "_"
               [email protected] " "
               [email protected] "=>"
@@ -78,7 +78,7 @@ [email protected]
             [email protected] "{"
             [email protected] "\n        "
             [email protected]
-              PLACEHOLDE[email protected]
+              WILDCARD[email protected]
                 [email protected] "_"
               [email protected] " "
               [email protected] "=>"
@@ -89,7 +89,7 @@ [email protected]
             [email protected] ","
             [email protected] "\n        "
             [email protected]
-              PLACEHOLDE[email protected]
+              WILDCARD[email protected]
                 [email protected] "_"
               [email protected] " "
               [email protected] "=>"
@@ -165,7 +165,7 @@ [email protected]
               [email protected] "]"
           [email protected] "\n        "
           [email protected]
-            PLACEHOLDE[email protected]
+            WILDCARD[email protected]
               [email protected] "_"
             [email protected] " "
             [email protected] "=>"
@@ -176,7 +176,7 @@ [email protected]
           [email protected] ","
           [email protected] "\n        "
           [email protected]
-            PLACEHOLDE[email protected]
+            WILDCARD[email protected]
               [email protected] "_"
             [email protected] " "
             [email protected] "=>"
diff --git a/crates/ra_syntax/test_data/parser/err/0033_match_arms_outer_attrs.rast b/crates/ra_syntax/test_data/parser/err/0033_match_arms_outer_attrs.rast
index 063532e02..33bb085e9 100644
--- a/crates/ra_syntax/test_data/parser/err/0033_match_arms_outer_attrs.rast
+++ b/crates/ra_syntax/test_data/parser/err/0033_match_arms_outer_attrs.rast
@@ -22,7 +22,7 @@ [email protected]
           [email protected] "{"
           [email protected] "\n        "
           [email protected]
-            PLACEHOLDE[email protected]
+            WILDCARD[email protected]
               [email protected] "_"
             [email protected] " "
             [email protected] "=>"
@@ -33,7 +33,7 @@ [email protected]
           [email protected] ","
           [email protected] "\n        "
           [email protected]
-            PLACEHOLDE[email protected]
+            WILDCARD[email protected]
               [email protected] "_"
             [email protected] " "
             [email protected] "=>"
diff --git a/crates/ra_syntax/test_data/parser/err/0034_bad_box_pattern.rast b/crates/ra_syntax/test_data/parser/err/0034_bad_box_pattern.rast
index 303a49576..d9d49bfb5 100644
--- a/crates/ra_syntax/test_data/parser/err/0034_bad_box_pattern.rast
+++ b/crates/ra_syntax/test_data/parser/err/0034_bad_box_pattern.rast
@@ -14,7 +14,7 @@ [email protected]
       [email protected]
         [email protected] "let"
         [email protected] " "
-        BIN[email protected]
+        IDENT[email protected]
           [email protected] "ref"
           [email protected] " "
           [email protected]
@@ -38,7 +38,7 @@ [email protected]
       [email protected]
         [email protected] "let"
         [email protected] " "
-        BIN[email protected]
+        IDENT[email protected]
           [email protected] "mut"
           [email protected] " "
           [email protected]
@@ -62,7 +62,7 @@ [email protected]
       [email protected]
         [email protected] "let"
         [email protected] " "
-        BIN[email protected]
+        IDENT[email protected]
           [email protected] "ref"
           [email protected] " "
           [email protected] "mut"
diff --git a/crates/ra_syntax/test_data/parser/err/0039_lambda_recovery.rast b/crates/ra_syntax/test_data/parser/err/0039_lambda_recovery.rast
index 7a5e115bc..a9c5b70fd 100644
--- a/crates/ra_syntax/test_data/parser/err/0039_lambda_recovery.rast
+++ b/crates/ra_syntax/test_data/parser/err/0039_lambda_recovery.rast
@@ -53,7 +53,7 @@ [email protected]
                 [email protected]
                   [email protected] "|"
                   [email protected]
-                    BIN[email protected]
+                    IDENT[email protected]
                       [email protected]
                         [email protected] "it"
                   [email protected] "|"
diff --git a/crates/ra_syntax/test_data/parser/fragments/pattern/ok/0000_enum.rast b/crates/ra_syntax/test_data/parser/fragments/pattern/ok/0000_enum.rast
index 15eb7f9c6..dcf102339 100644
--- a/crates/ra_syntax/test_data/parser/fragments/pattern/ok/0000_enum.rast
+++ b/crates/ra_syntax/test_data/parser/fragments/pattern/ok/0000_enum.rast
@@ -4,7 +4,7 @@ [email protected]
       [email protected]
         [email protected] "Some"
   [email protected] "("
-  BIN[email protected]
+  IDENT[email protected]
     [email protected]
       [email protected] "x"
   [email protected] ")"
diff --git a/crates/ra_syntax/test_data/parser/inline/err/0007_async_without_semicolon.rast b/crates/ra_syntax/test_data/parser/inline/err/0007_async_without_semicolon.rast
index 3f3a7f1b9..2c9570678 100644
--- a/crates/ra_syntax/test_data/parser/inline/err/0007_async_without_semicolon.rast
+++ b/crates/ra_syntax/test_data/parser/inline/err/0007_async_without_semicolon.rast
@@ -14,7 +14,7 @@ [email protected]
       [email protected]
         [email protected] "let"
         [email protected] " "
-        PLACEHOLDE[email protected]
+        WILDCARD[email protected]
           [email protected] "_"
         [email protected] " "
         [email protected] "="
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0006_self_param.rast b/crates/ra_syntax/test_data/parser/inline/ok/0006_self_param.rast
index ae61cbad8..d24ad7423 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0006_self_param.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0006_self_param.rast
@@ -79,7 +79,7 @@ [email protected]
           [email protected] ","
           [email protected] " "
           [email protected]
-            BIN[email protected]
+            IDENT[email protected]
               [email protected]
                 [email protected] "x"
             [email protected] ":"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0008_path_part.rast b/crates/ra_syntax/test_data/parser/inline/ok/0008_path_part.rast
index 3ce2acfae..d848f3c88 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0008_path_part.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0008_path_part.rast
@@ -58,7 +58,7 @@ [email protected]
               [email protected]
                 [email protected] "Bar"
           [email protected] " "
-          RECORD_FIELD_PAT_[email protected]
+          RECORD_PAT_[email protected]
             [email protected] "{"
             [email protected] " "
             [email protected] ".."
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0024_slice_pat.rast b/crates/ra_syntax/test_data/parser/inline/ok/0024_slice_pat.rast
index dea0c73f7..66f906fae 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0024_slice_pat.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0024_slice_pat.rast
@@ -16,12 +16,12 @@ [email protected]
         [email protected] " "
         [email protected]
           [email protected] "["
-          BIN[email protected]
+          IDENT[email protected]
             [email protected]
               [email protected] "a"
           [email protected] ","
           [email protected] " "
-          BIN[email protected]
+          IDENT[email protected]
             [email protected]
               [email protected] "b"
           [email protected] ","
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0026_tuple_pat_fields.rast b/crates/ra_syntax/test_data/parser/inline/ok/0026_tuple_pat_fields.rast
index e5f550347..e049e4df7 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0026_tuple_pat_fields.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0026_tuple_pat_fields.rast
@@ -38,7 +38,7 @@ [email protected]
               [email protected]
                 [email protected] "S"
           [email protected] "("
-          PLACEHOLDE[email protected]
+          WILDCARD[email protected]
             [email protected] "_"
           [email protected] ")"
         [email protected] " "
@@ -58,7 +58,7 @@ [email protected]
               [email protected]
                 [email protected] "S"
           [email protected] "("
-          PLACEHOLDE[email protected]
+          WILDCARD[email protected]
             [email protected] "_"
           [email protected] ","
           [email protected] ")"
@@ -79,7 +79,7 @@ [email protected]
               [email protected]
                 [email protected] "S"
           [email protected] "("
-          PLACEHOLDE[email protected]
+          WILDCARD[email protected]
             [email protected] "_"
           [email protected] ","
           [email protected] " "
@@ -88,7 +88,7 @@ [email protected]
           [email protected] " "
           [email protected] ","
           [email protected] " "
-          BIN[email protected]
+          IDENT[email protected]
             [email protected]
               [email protected] "x"
           [email protected] ")"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0027_ref_pat.rast b/crates/ra_syntax/test_data/parser/inline/ok/0027_ref_pat.rast
index 9e76d881e..348b54dc9 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0027_ref_pat.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0027_ref_pat.rast
@@ -16,7 +16,7 @@ [email protected]
         [email protected] " "
         [email protected]
           [email protected] "&"
-          BIN[email protected]
+          IDENT[email protected]
             [email protected]
               [email protected] "a"
         [email protected] " "
@@ -34,7 +34,7 @@ [email protected]
           [email protected] "&"
           [email protected] "mut"
           [email protected] " "
-          BIN[email protected]
+          IDENT[email protected]
             [email protected]
               [email protected] "b"
         [email protected] " "
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0030_cond.rast b/crates/ra_syntax/test_data/parser/inline/ok/0030_cond.rast
index 381284dc5..58a97d3ad 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0030_cond.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0030_cond.rast
@@ -23,7 +23,7 @@ [email protected]
                 [email protected]
                   [email protected] "Some"
             [email protected] "("
-            PLACEHOLDE[email protected]
+            WILDCARD[email protected]
               [email protected] "_"
             [email protected] ")"
           [email protected] " "
@@ -67,7 +67,7 @@ [email protected]
                     [email protected]
                       [email protected] "Some"
                 [email protected] "("
-                PLACEHOLDE[email protected]
+                WILDCARD[email protected]
                   [email protected] "_"
                 [email protected] ")"
               [email protected] " "
@@ -79,7 +79,7 @@ [email protected]
                     [email protected]
                       [email protected] "Some"
                 [email protected] "("
-                PLACEHOLDE[email protected]
+                WILDCARD[email protected]
                   [email protected] "_"
                 [email protected] ")"
             [email protected] " "
@@ -110,7 +110,7 @@ [email protected]
                   [email protected]
                     [email protected] "Some"
               [email protected] "("
-              PLACEHOLDE[email protected]
+              WILDCARD[email protected]
                 [email protected] "_"
               [email protected] ")"
             [email protected] " "
@@ -140,7 +140,7 @@ [email protected]
                     [email protected]
                       [email protected] "Some"
                 [email protected] "("
-                PLACEHOLDE[email protected]
+                WILDCARD[email protected]
                   [email protected] "_"
                 [email protected] ")"
               [email protected] " "
@@ -152,7 +152,7 @@ [email protected]
                     [email protected]
                       [email protected] "Some"
                 [email protected] "("
-                PLACEHOLDE[email protected]
+                WILDCARD[email protected]
                   [email protected] "_"
                 [email protected] ")"
             [email protected] " "
@@ -182,7 +182,7 @@ [email protected]
                 [email protected]
                   [email protected] "Some"
             [email protected] "("
-            PLACEHOLDE[email protected]
+            WILDCARD[email protected]
               [email protected] "_"
             [email protected] ")"
           [email protected] " "
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0031_while_expr.rast b/crates/ra_syntax/test_data/parser/inline/ok/0031_while_expr.rast
index ffe1a3a01..173cecf6d 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0031_while_expr.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0031_while_expr.rast
@@ -37,7 +37,7 @@ [email protected]
                   [email protected]
                     [email protected] "Some"
               [email protected] "("
-              BIN[email protected]
+              IDENT[email protected]
                 [email protected]
                   [email protected] "x"
               [email protected] ")"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0042_call_expr.rast b/crates/ra_syntax/test_data/parser/inline/ok/0042_call_expr.rast
index 40875ae1e..fa38e9466 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0042_call_expr.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0042_call_expr.rast
@@ -14,7 +14,7 @@ [email protected]
       [email protected]
         [email protected] "let"
         [email protected] " "
-        PLACEHOLDE[email protected]
+        WILDCARD[email protected]
           [email protected] "_"
         [email protected] " "
         [email protected] "="
@@ -33,7 +33,7 @@ [email protected]
       [email protected]
         [email protected] "let"
         [email protected] " "
-        PLACEHOLDE[email protected]
+        WILDCARD[email protected]
           [email protected] "_"
         [email protected] " "
         [email protected] "="
@@ -69,7 +69,7 @@ [email protected]
       [email protected]
         [email protected] "let"
         [email protected] " "
-        PLACEHOLDE[email protected]
+        WILDCARD[email protected]
           [email protected] "_"
         [email protected] " "
         [email protected] "="
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0053_path_expr.rast b/crates/ra_syntax/test_data/parser/inline/ok/0053_path_expr.rast
index de2016f18..c34cfeb31 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0053_path_expr.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0053_path_expr.rast
@@ -14,7 +14,7 @@ [email protected]
       [email protected]
         [email protected] "let"
         [email protected] " "
-        PLACEHOLDE[email protected]
+        WILDCARD[email protected]
           [email protected] "_"
         [email protected] " "
         [email protected] "="
@@ -29,7 +29,7 @@ [email protected]
       [email protected]
         [email protected] "let"
         [email protected] " "
-        PLACEHOLDE[email protected]
+        WILDCARD[email protected]
           [email protected] "_"
         [email protected] " "
         [email protected] "="
@@ -49,7 +49,7 @@ [email protected]
       [email protected]
         [email protected] "let"
         [email protected] " "
-        PLACEHOLDE[email protected]
+        WILDCARD[email protected]
           [email protected] "_"
         [email protected] " "
         [email protected] "="
@@ -75,7 +75,7 @@ [email protected]
       [email protected]
         [email protected] "let"
         [email protected] " "
-        PLACEHOLDE[email protected]
+        WILDCARD[email protected]
           [email protected] "_"
         [email protected] " "
         [email protected] "="
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0059_match_arms_commas.rast b/crates/ra_syntax/test_data/parser/inline/ok/0059_match_arms_commas.rast
index fa659c19b..984829317 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0059_match_arms_commas.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0059_match_arms_commas.rast
@@ -22,7 +22,7 @@ [email protected]
           [email protected] "{"
           [email protected] "\n        "
           [email protected]
-            PLACEHOLDE[email protected]
+            WILDCARD[email protected]
               [email protected] "_"
             [email protected] " "
             [email protected] "=>"
@@ -33,7 +33,7 @@ [email protected]
           [email protected] ","
           [email protected] "\n        "
           [email protected]
-            PLACEHOLDE[email protected]
+            WILDCARD[email protected]
               [email protected] "_"
             [email protected] " "
             [email protected] "=>"
@@ -43,7 +43,7 @@ [email protected]
               [email protected] "}"
           [email protected] "\n        "
           [email protected]
-            PLACEHOLDE[email protected]
+            WILDCARD[email protected]
               [email protected] "_"
             [email protected] " "
             [email protected] "=>"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0066_match_arm.rast b/crates/ra_syntax/test_data/parser/inline/ok/0066_match_arm.rast
index 37ca478e6..57d0661a5 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0066_match_arm.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0066_match_arm.rast
@@ -23,7 +23,7 @@ [email protected]
             [email protected] "{"
             [email protected] "\n        "
             [email protected]
-              PLACEHOLDE[email protected]
+              WILDCARD[email protected]
                 [email protected] "_"
               [email protected] " "
               [email protected] "=>"
@@ -34,7 +34,7 @@ [email protected]
             [email protected] ","
             [email protected] "\n        "
             [email protected]
-              PLACEHOLDE[email protected]
+              WILDCARD[email protected]
                 [email protected] "_"
               [email protected] " "
               [email protected]
@@ -74,13 +74,13 @@ [email protected]
             [email protected] "\n        "
             [email protected]
               [email protected]
-                BIN[email protected]
+                IDENT[email protected]
                   [email protected]
                     [email protected] "X"
                 [email protected] " "
                 [email protected] "|"
                 [email protected] " "
-                BIN[email protected]
+                IDENT[email protected]
                   [email protected]
                     [email protected] "Y"
               [email protected] " "
@@ -104,13 +104,13 @@ [email protected]
               [email protected] "|"
               [email protected] " "
               [email protected]
-                BIN[email protected]
+                IDENT[email protected]
                   [email protected]
                     [email protected] "X"
                 [email protected] " "
                 [email protected] "|"
                 [email protected] " "
-                BIN[email protected]
+                IDENT[email protected]
                   [email protected]
                     [email protected] "Y"
               [email protected] " "
@@ -133,7 +133,7 @@ [email protected]
             [email protected]
               [email protected] "|"
               [email protected] " "
-              BIN[email protected]
+              IDENT[email protected]
                 [email protected]
                   [email protected] "X"
               [email protected] " "
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0070_stmt_bin_expr_ambiguity.rast b/crates/ra_syntax/test_data/parser/inline/ok/0070_stmt_bin_expr_ambiguity.rast
index 4c1165dc8..36c9cd5bb 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0070_stmt_bin_expr_ambiguity.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0070_stmt_bin_expr_ambiguity.rast
@@ -14,7 +14,7 @@ [email protected]
       [email protected]
         [email protected] "let"
         [email protected] " "
-        PLACEHOLDE[email protected]
+        WILDCARD[email protected]
           [email protected] "_"
         [email protected] " "
         [email protected] "="
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0071_match_expr.rast b/crates/ra_syntax/test_data/parser/inline/ok/0071_match_expr.rast
index 673d396ee..d34d98ced 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0071_match_expr.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0071_match_expr.rast
@@ -53,7 +53,7 @@ [email protected]
             [email protected] "{"
             [email protected] " "
             [email protected]
-              PLACEHOLDE[email protected]
+              WILDCARD[email protected]
                 [email protected] "_"
               [email protected] " "
               [email protected] "=>"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0074_stmt_postfix_expr_ambiguity.rast b/crates/ra_syntax/test_data/parser/inline/ok/0074_stmt_postfix_expr_ambiguity.rast
index 3ca70f021..3a789b9f5 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0074_stmt_postfix_expr_ambiguity.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0074_stmt_postfix_expr_ambiguity.rast
@@ -22,7 +22,7 @@ [email protected]
           [email protected] "{"
           [email protected] "\n        "
           [email protected]
-            PLACEHOLDE[email protected]
+            WILDCARD[email protected]
               [email protected] "_"
             [email protected] " "
             [email protected] "=>"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0075_block.rast b/crates/ra_syntax/test_data/parser/inline/ok/0075_block.rast
index 5cefc5076..e847ce9b2 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0075_block.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0075_block.rast
@@ -27,7 +27,7 @@ [email protected]
       [email protected]
         [email protected] "let"
         [email protected] " "
-        PLACEHOLDE[email protected]
+        WILDCARD[email protected]
           [email protected] "_"
         [email protected] " "
         [email protected] "="
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0080_postfix_range.rast b/crates/ra_syntax/test_data/parser/inline/ok/0080_postfix_range.rast
index 3c80846db..b3003577c 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0080_postfix_range.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0080_postfix_range.rast
@@ -14,7 +14,7 @@ [email protected]
       [email protected]
         [email protected] "let"
         [email protected] " "
-        BIN[email protected]
+        IDENT[email protected]
           [email protected]
             [email protected] "x"
         [email protected] " "
@@ -39,7 +39,7 @@ [email protected]
             [email protected] "{"
             [email protected] " "
             [email protected]
-              PLACEHOLDE[email protected]
+              WILDCARD[email protected]
                 [email protected] "_"
               [email protected] " "
               [email protected] "=>"
@@ -79,7 +79,7 @@ [email protected]
             [email protected] "{"
             [email protected] " "
             [email protected]
-              PLACEHOLDE[email protected]
+              WILDCARD[email protected]
                 [email protected] "_"
               [email protected] " "
               [email protected] "=>"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0082_ref_expr.rast b/crates/ra_syntax/test_data/parser/inline/ok/0082_ref_expr.rast
index 1563b1988..70b975c0b 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0082_ref_expr.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0082_ref_expr.rast
@@ -16,7 +16,7 @@ [email protected]
       [email protected]
         [email protected] "let"
         [email protected] " "
-        PLACEHOLDE[email protected]
+        WILDCARD[email protected]
           [email protected] "_"
         [email protected] " "
         [email protected] "="
@@ -30,7 +30,7 @@ [email protected]
       [email protected]
         [email protected] "let"
         [email protected] " "
-        PLACEHOLDE[email protected]
+        WILDCARD[email protected]
           [email protected] "_"
         [email protected] " "
         [email protected] "="
@@ -55,7 +55,7 @@ [email protected]
       [email protected]
         [email protected] "let"
         [email protected] " "
-        PLACEHOLDE[email protected]
+        WILDCARD[email protected]
           [email protected] "_"
         [email protected] " "
         [email protected] "="
@@ -72,7 +72,7 @@ [email protected]
       [email protected]
         [email protected] "let"
         [email protected] " "
-        PLACEHOLDE[email protected]
+        WILDCARD[email protected]
           [email protected] "_"
         [email protected] " "
         [email protected] "="
@@ -95,7 +95,7 @@ [email protected]
       [email protected]
         [email protected] "let"
         [email protected] " "
-        PLACEHOLDE[email protected]
+        WILDCARD[email protected]
           [email protected] "_"
         [email protected] " "
         [email protected] "="
@@ -116,7 +116,7 @@ [email protected]
       [email protected]
         [email protected] "let"
         [email protected] " "
-        PLACEHOLDE[email protected]
+        WILDCARD[email protected]
           [email protected] "_"
         [email protected] " "
         [email protected] "="
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0085_expr_literals.rast b/crates/ra_syntax/test_data/parser/inline/ok/0085_expr_literals.rast
index ded36949a..9a87b5b93 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0085_expr_literals.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0085_expr_literals.rast
@@ -14,7 +14,7 @@ [email protected]
       [email protected]
         [email protected] "let"
         [email protected] " "
-        PLACEHOLDE[email protected]
+        WILDCARD[email protected]
           [email protected] "_"
         [email protected] " "
         [email protected] "="
@@ -26,7 +26,7 @@ [email protected]
       [email protected]
         [email protected] "let"
         [email protected] " "
-        PLACEHOLDE[email protected]
+        WILDCARD[email protected]
           [email protected] "_"
         [email protected] " "
         [email protected] "="
@@ -38,7 +38,7 @@ [email protected]
       [email protected]
         [email protected] "let"
         [email protected] " "
-        PLACEHOLDE[email protected]
+        WILDCARD[email protected]
           [email protected] "_"
         [email protected] " "
         [email protected] "="
@@ -50,7 +50,7 @@ [email protected]
       [email protected]
         [email protected] "let"
         [email protected] " "
-        PLACEHOLDE[email protected]
+        WILDCARD[email protected]
           [email protected] "_"
         [email protected] " "
         [email protected] "="
@@ -62,7 +62,7 @@ [email protected]
       [email protected]
         [email protected] "let"
         [email protected] " "
-        PLACEHOLDE[email protected]
+        WILDCARD[email protected]
           [email protected] "_"
         [email protected] " "
         [email protected] "="
@@ -74,7 +74,7 @@ [email protected]
       [email protected]
         [email protected] "let"
         [email protected] " "
-        PLACEHOLDE[email protected]
+        WILDCARD[email protected]
           [email protected] "_"
         [email protected] " "
         [email protected] "="
@@ -86,7 +86,7 @@ [email protected]
       [email protected]
         [email protected] "let"
         [email protected] " "
-        PLACEHOLDE[email protected]
+        WILDCARD[email protected]
           [email protected] "_"
         [email protected] " "
         [email protected] "="
@@ -98,7 +98,7 @@ [email protected]
       [email protected]
         [email protected] "let"
         [email protected] " "
-        PLACEHOLDE[email protected]
+        WILDCARD[email protected]
           [email protected] "_"
         [email protected] " "
         [email protected] "="
@@ -110,7 +110,7 @@ [email protected]
       [email protected]
         [email protected] "let"
         [email protected] " "
-        PLACEHOLDE[email protected]
+        WILDCARD[email protected]
           [email protected] "_"
         [email protected] " "
         [email protected] "="
@@ -122,7 +122,7 @@ [email protected]
       [email protected]
         [email protected] "let"
         [email protected] " "
-        PLACEHOLDE[email protected]
+        WILDCARD[email protected]
           [email protected] "_"
         [email protected] " "
         [email protected] "="
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0088_break_ambiguity.rast b/crates/ra_syntax/test_data/parser/inline/ok/0088_break_ambiguity.rast
index 34f520994..f7b839303 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0088_break_ambiguity.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0088_break_ambiguity.rast
@@ -38,7 +38,7 @@ [email protected]
         [email protected]
           [email protected] "for"
           [email protected] " "
-          BIN[email protected]
+          IDENT[email protected]
             [email protected]
               [email protected] "i"
           [email protected] " "
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0095_placeholder_pat.rast b/crates/ra_syntax/test_data/parser/inline/ok/0095_placeholder_pat.rast
index 25706d2a4..c1fdc6e25 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0095_placeholder_pat.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0095_placeholder_pat.rast
@@ -14,7 +14,7 @@ [email protected]
       [email protected]
         [email protected] "let"
         [email protected] " "
-        PLACEHOLDE[email protected]
+        WILDCARD[email protected]
           [email protected] "_"
         [email protected] " "
         [email protected] "="
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0096_no_semi_after_block.rast b/crates/ra_syntax/test_data/parser/inline/ok/0096_no_semi_after_block.rast
index cb5316a0d..e757249f0 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0096_no_semi_after_block.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0096_no_semi_after_block.rast
@@ -59,7 +59,7 @@ [email protected]
         [email protected]
           [email protected] "for"
           [email protected] " "
-          PLACEHOLDE[email protected]
+          WILDCARD[email protected]
             [email protected] "_"
           [email protected] " "
           [email protected] "in"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0099_param_list.rast b/crates/ra_syntax/test_data/parser/inline/ok/0099_param_list.rast
index 1627556c8..f19e9fd52 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0099_param_list.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0099_param_list.rast
@@ -20,7 +20,7 @@ [email protected]
     [email protected]
       [email protected] "("
       [email protected]
-        BIN[email protected]
+        IDENT[email protected]
           [email protected]
             [email protected] "x"
         [email protected] ":"
@@ -44,7 +44,7 @@ [email protected]
     [email protected]
       [email protected] "("
       [email protected]
-        BIN[email protected]
+        IDENT[email protected]
           [email protected]
             [email protected] "x"
         [email protected] ":"
@@ -70,7 +70,7 @@ [email protected]
     [email protected]
       [email protected] "("
       [email protected]
-        BIN[email protected]
+        IDENT[email protected]
           [email protected]
             [email protected] "x"
         [email protected] ":"
@@ -83,7 +83,7 @@ [email protected]
       [email protected] ","
       [email protected] " "
       [email protected]
-        BIN[email protected]
+        IDENT[email protected]
           [email protected]
             [email protected] "y"
         [email protected] ":"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0100_for_expr.rast b/crates/ra_syntax/test_data/parser/inline/ok/0100_for_expr.rast
index 766de4efe..5c4055e44 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0100_for_expr.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0100_for_expr.rast
@@ -15,7 +15,7 @@ [email protected]
         [email protected]
           [email protected] "for"
           [email protected] " "
-          BIN[email protected]
+          IDENT[email protected]
             [email protected]
               [email protected] "x"
           [email protected] " "
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0102_record_field_pat_list.rast b/crates/ra_syntax/test_data/parser/inline/ok/0102_record_field_pat_list.rast
index fe1c290c3..866e60ed8 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0102_record_field_pat_list.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0102_record_field_pat_list.rast
@@ -20,7 +20,7 @@ [email protected]
               [email protected]
                 [email protected] "S"
           [email protected] " "
-          RECORD_FIELD_PAT_[email protected]
+          RECORD_PAT_[email protected]
             [email protected] "{"
             [email protected] "}"
         [email protected] " "
@@ -40,17 +40,17 @@ [email protected]
               [email protected]
                 [email protected] "S"
           [email protected] " "
-          RECORD_FIELD_PAT_[email protected]
+          RECORD_PAT_[email protected]
             [email protected] "{"
             [email protected] " "
-            RECORD_FIELD_PAT@42..43
-              BIN[email protected]
+            RECORD_PAT_[email protected]
+              IDENT[email protected]
                 [email protected]
                   [email protected] "f"
             [email protected] ","
             [email protected] " "
-            RECORD_FIELD_PAT@45..54
-              BIN[email protected]
+            RECORD_PAT_[email protected]
+              IDENT[email protected]
                 [email protected] "ref"
                 [email protected] " "
                 [email protected] "mut"
@@ -76,15 +76,15 @@ [email protected]
               [email protected]
                 [email protected] "S"
           [email protected] " "
-          RECORD_FIELD_PAT_[email protected]
+          RECORD_PAT_[email protected]
             [email protected] "{"
             [email protected] " "
-            RECORD_FIELD_PAT@75..79
+            RECORD_PAT_[email protected]
               [email protected]
                 [email protected] "h"
               [email protected] ":"
               [email protected] " "
-              PLACEHOLDE[email protected]
+              WILDCARD[email protected]
                 [email protected] "_"
             [email protected] ","
             [email protected] " "
@@ -107,15 +107,15 @@ [email protected]
               [email protected]
                 [email protected] "S"
           [email protected] " "
-          RECORD_FIELD_PAT_[email protected]
+          RECORD_PAT_[email protected]
             [email protected] "{"
             [email protected] " "
-            RECORD_FIELD_PAT@103..107
+            RECORD_PAT_[email protected]
               [email protected]
                 [email protected] "h"
               [email protected] ":"
               [email protected] " "
-              PLACEHOLDE[email protected]
+              WILDCARD[email protected]
                 [email protected] "_"
             [email protected] ","
             [email protected] " "
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0106_lambda_expr.rast b/crates/ra_syntax/test_data/parser/inline/ok/0106_lambda_expr.rast
index a80d79563..9b8381619 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0106_lambda_expr.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0106_lambda_expr.rast
@@ -51,7 +51,7 @@ [email protected]
           [email protected]
             [email protected] "|"
             [email protected]
-              BIN[email protected]
+              IDENT[email protected]
                 [email protected]
                   [email protected] "x"
             [email protected] "|"
@@ -70,7 +70,7 @@ [email protected]
           [email protected]
             [email protected] "|"
             [email protected]
-              BIN[email protected]
+              IDENT[email protected]
                 [email protected]
                   [email protected] "x"
               [email protected] ":"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0109_label.rast b/crates/ra_syntax/test_data/parser/inline/ok/0109_label.rast
index a6a169f1b..c9588025c 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0109_label.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0109_label.rast
@@ -46,7 +46,7 @@ [email protected]
         [email protected] " "
         [email protected] "for"
         [email protected] " "
-        BIN[email protected]
+        IDENT[email protected]
           [email protected]
             [email protected] "x"
         [email protected] " "
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0111_tuple_pat.rast b/crates/ra_syntax/test_data/parser/inline/ok/0111_tuple_pat.rast
index 432318da0..f94a2ebde 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0111_tuple_pat.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0111_tuple_pat.rast
@@ -16,12 +16,12 @@ [email protected]
         [email protected] " "
         [email protected]
           [email protected] "("
-          BIN[email protected]
+          IDENT[email protected]
             [email protected]
               [email protected] "a"
           [email protected] ","
           [email protected] " "
-          BIN[email protected]
+          IDENT[email protected]
             [email protected]
               [email protected] "b"
           [email protected] ","
@@ -42,7 +42,7 @@ [email protected]
         [email protected] " "
         [email protected]
           [email protected] "("
-          BIN[email protected]
+          IDENT[email protected]
             [email protected]
               [email protected] "a"
           [email protected] ","
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0112_bind_pat.rast b/crates/ra_syntax/test_data/parser/inline/ok/0112_bind_pat.rast
index 3cd554d45..7b9a498c8 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0112_bind_pat.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0112_bind_pat.rast
@@ -14,7 +14,7 @@ [email protected]
       [email protected]
         [email protected] "let"
         [email protected] " "
-        BIN[email protected]
+        IDENT[email protected]
           [email protected]
             [email protected] "a"
         [email protected] " "
@@ -28,7 +28,7 @@ [email protected]
       [email protected]
         [email protected] "let"
         [email protected] " "
-        BIN[email protected]
+        IDENT[email protected]
           [email protected] "mut"
           [email protected] " "
           [email protected]
@@ -44,7 +44,7 @@ [email protected]
       [email protected]
         [email protected] "let"
         [email protected] " "
-        BIN[email protected]
+        IDENT[email protected]
           [email protected] "ref"
           [email protected] " "
           [email protected]
@@ -60,7 +60,7 @@ [email protected]
       [email protected]
         [email protected] "let"
         [email protected] " "
-        BIN[email protected]
+        IDENT[email protected]
           [email protected] "ref"
           [email protected] " "
           [email protected] "mut"
@@ -78,13 +78,13 @@ [email protected]
       [email protected]
         [email protected] "let"
         [email protected] " "
-        BIN[email protected]
+        IDENT[email protected]
           [email protected]
             [email protected] "e"
           [email protected] " "
           [email protected] "@"
           [email protected] " "
-          PLACEHOLDE[email protected]
+          WILDCARD[email protected]
             [email protected] "_"
         [email protected] " "
         [email protected] "="
@@ -97,7 +97,7 @@ [email protected]
       [email protected]
         [email protected] "let"
         [email protected] " "
-        BIN[email protected]
+        IDENT[email protected]
           [email protected] "ref"
           [email protected] " "
           [email protected] "mut"
@@ -107,13 +107,13 @@ [email protected]
           [email protected] " "
           [email protected] "@"
           [email protected] " "
-          BIN[email protected]
+          IDENT[email protected]
             [email protected]
               [email protected] "g"
             [email protected] " "
             [email protected] "@"
             [email protected] " "
-            PLACEHOLDE[email protected]
+            WILDCARD[email protected]
               [email protected] "_"
         [email protected] " "
         [email protected] "="
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0118_match_guard.rast b/crates/ra_syntax/test_data/parser/inline/ok/0118_match_guard.rast
index aaaf803b7..0cf4eb0a5 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0118_match_guard.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0118_match_guard.rast
@@ -22,7 +22,7 @@ [email protected]
           [email protected] "{"
           [email protected] "\n        "
           [email protected]
-            PLACEHOLDE[email protected]
+            WILDCARD[email protected]
               [email protected] "_"
             [email protected] " "
             [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0120_match_arms_inner_attribute.rast b/crates/ra_syntax/test_data/parser/inline/ok/0120_match_arms_inner_attribute.rast
index 4b5f9cdc9..ec7a00f1d 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0120_match_arms_inner_attribute.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0120_match_arms_inner_attribute.rast
@@ -64,7 +64,7 @@ [email protected]
             [email protected] "]"
           [email protected] "\n        "
           [email protected]
-            PLACEHOLDE[email protected]
+            WILDCARD[email protected]
               [email protected] "_"
             [email protected] " "
             [email protected] "=>"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0121_match_arms_outer_attributes.rast b/crates/ra_syntax/test_data/parser/inline/ok/0121_match_arms_outer_attributes.rast
index 54cc3be3a..97924da05 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0121_match_arms_outer_attributes.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0121_match_arms_outer_attributes.rast
@@ -39,7 +39,7 @@ [email protected]
                 [email protected] ")"
               [email protected] "]"
             [email protected] "\n        "
-            PLACEHOLDE[email protected]
+            WILDCARD[email protected]
               [email protected] "_"
             [email protected] " "
             [email protected] "=>"
@@ -67,7 +67,7 @@ [email protected]
                 [email protected] ")"
               [email protected] "]"
             [email protected] "\n        "
-            PLACEHOLDE[email protected]
+            WILDCARD[email protected]
               [email protected] "_"
             [email protected] " "
             [email protected] "=>"
@@ -129,7 +129,7 @@ [email protected]
                 [email protected] ")"
               [email protected] "]"
             [email protected] "\n        "
-            PLACEHOLDE[email protected]
+            WILDCARD[email protected]
               [email protected] "_"
             [email protected] " "
             [email protected] "=>"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0122_generic_lifetime_type_attribute.rast b/crates/ra_syntax/test_data/parser/inline/ok/0122_generic_lifetime_type_attribute.rast
index edac8d5d9..8d029b592 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0122_generic_lifetime_type_attribute.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0122_generic_lifetime_type_attribute.rast
@@ -43,7 +43,7 @@ [email protected]
     [email protected]
       [email protected] "("
       [email protected]
-        PLACEHOLDE[email protected]
+        WILDCARD[email protected]
           [email protected] "_"
         [email protected] ":"
         [email protected] " "
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0123_param_list_vararg.rast b/crates/ra_syntax/test_data/parser/inline/ok/0123_param_list_vararg.rast
index f155743cf..27c4f141f 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0123_param_list_vararg.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0123_param_list_vararg.rast
@@ -16,7 +16,7 @@ [email protected]
         [email protected]
           [email protected] "("
           [email protected]
-            BIN[email protected]
+            IDENT[email protected]
               [email protected]
                 [email protected] "format"
             [email protected] ":"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0130_let_stmt.rast b/crates/ra_syntax/test_data/parser/inline/ok/0130_let_stmt.rast
index d2fd6e567..4c07cefa6 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0130_let_stmt.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0130_let_stmt.rast
@@ -14,7 +14,7 @@ [email protected]
       [email protected]
         [email protected] "let"
         [email protected] " "
-        BIN[email protected]
+        IDENT[email protected]
           [email protected]
             [email protected] "a"
         [email protected] ";"
@@ -22,7 +22,7 @@ [email protected]
       [email protected]
         [email protected] "let"
         [email protected] " "
-        BIN[email protected]
+        IDENT[email protected]
           [email protected]
             [email protected] "b"
         [email protected] ":"
@@ -37,7 +37,7 @@ [email protected]
       [email protected]
         [email protected] "let"
         [email protected] " "
-        BIN[email protected]
+        IDENT[email protected]
           [email protected]
             [email protected] "c"
         [email protected] " "
@@ -50,7 +50,7 @@ [email protected]
       [email protected]
         [email protected] "let"
         [email protected] " "
-        BIN[email protected]
+        IDENT[email protected]
           [email protected]
             [email protected] "d"
         [email protected] ":"
@@ -70,7 +70,7 @@ [email protected]
       [email protected]
         [email protected] "let"
         [email protected] " "
-        BIN[email protected]
+        IDENT[email protected]
           [email protected]
             [email protected] "e"
         [email protected] ":"
@@ -82,7 +82,7 @@ [email protected]
       [email protected]
         [email protected] "let"
         [email protected] " "
-        PLACEHOLDE[email protected]
+        WILDCARD[email protected]
           [email protected] "_"
         [email protected] ":"
         [email protected] " "
@@ -99,7 +99,7 @@ [email protected]
       [email protected]
         [email protected] "let"
         [email protected] " "
-        BIN[email protected]
+        IDENT[email protected]
           [email protected]
             [email protected] "f"
         [email protected] " "
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0130_try_block_expr.rast b/crates/ra_syntax/test_data/parser/inline/ok/0130_try_block_expr.rast
index 0fe3bf582..ffdffe2f8 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0130_try_block_expr.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0130_try_block_expr.rast
@@ -14,7 +14,7 @@ [email protected]
       [email protected]
         [email protected] "let"
         [email protected] " "
-        PLACEHOLDE[email protected]
+        WILDCARD[email protected]
           [email protected] "_"
         [email protected] " "
         [email protected] "="
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0132_box_expr.rast b/crates/ra_syntax/test_data/parser/inline/ok/0132_box_expr.rast
index 48f483813..c55038247 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0132_box_expr.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0132_box_expr.rast
@@ -14,7 +14,7 @@ [email protected]
       [email protected]
         [email protected] "let"
         [email protected] " "
-        BIN[email protected]
+        IDENT[email protected]
           [email protected]
             [email protected] "x"
         [email protected] " "
@@ -30,7 +30,7 @@ [email protected]
       [email protected]
         [email protected] "let"
         [email protected] " "
-        BIN[email protected]
+        IDENT[email protected]
           [email protected]
             [email protected] "y"
         [email protected] " "
@@ -56,7 +56,7 @@ [email protected]
       [email protected]
         [email protected] "let"
         [email protected] " "
-        BIN[email protected]
+        IDENT[email protected]
           [email protected]
             [email protected] "z"
         [email protected] " "
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0138_associated_type_bounds.rast b/crates/ra_syntax/test_data/parser/inline/ok/0138_associated_type_bounds.rast
index e0a82df75..3870ec135 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0138_associated_type_bounds.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0138_associated_type_bounds.rast
@@ -37,7 +37,7 @@ [email protected]
     [email protected]
       [email protected] "("
       [email protected]
-        BIN[email protected]
+        IDENT[email protected]
           [email protected]
             [email protected] "printables"
         [email protected] ":"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0138_expression_after_block.rast b/crates/ra_syntax/test_data/parser/inline/ok/0138_expression_after_block.rast
index a7f87c020..f7c0e0ab0 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0138_expression_after_block.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0138_expression_after_block.rast
@@ -14,7 +14,7 @@ [email protected]
       [email protected]
         [email protected] "let"
         [email protected] " "
-        BIN[email protected]
+        IDENT[email protected]
           [email protected] "mut"
           [email protected] " "
           [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0139_param_outer_arg.rast b/crates/ra_syntax/test_data/parser/inline/ok/0139_param_outer_arg.rast
index 36fd2997b..495e4c51b 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0139_param_outer_arg.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0139_param_outer_arg.rast
@@ -16,7 +16,7 @@ [email protected]
         [email protected] "]"
       [email protected] " "
       [email protected]
-        BIN[email protected]
+        IDENT[email protected]
           [email protected]
             [email protected] "pat"
         [email protected] ":"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0142_for_range_from.rast b/crates/ra_syntax/test_data/parser/inline/ok/0142_for_range_from.rast
index d11019076..36e448c94 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0142_for_range_from.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0142_for_range_from.rast
@@ -14,7 +14,7 @@ [email protected]
       [email protected]
         [email protected] "for"
         [email protected] " "
-        BIN[email protected]
+        IDENT[email protected]
           [email protected]
             [email protected] "x"
         [email protected] " "
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0143_box_pat.rast b/crates/ra_syntax/test_data/parser/inline/ok/0143_box_pat.rast
index 09fd9e9b8..65887b962 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0143_box_pat.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0143_box_pat.rast
@@ -17,7 +17,7 @@ [email protected]
         [email protected]
           [email protected] "box"
           [email protected] " "
-          BIN[email protected]
+          IDENT[email protected]
             [email protected]
               [email protected] "i"
         [email protected] " "
@@ -40,19 +40,19 @@ [email protected]
                 [email protected]
                   [email protected] "Outer"
             [email protected] " "
-            RECORD_FIELD_PAT_[email protected]
+            RECORD_PAT_[email protected]
               [email protected] "{"
               [email protected] " "
-              RECORD_FIELD_PAT@52..57
+              RECORD_PAT_[email protected]
                 [email protected]
                   [email protected] "box"
                   [email protected] " "
-                  BIN[email protected]
+                  IDENT[email protected]
                     [email protected]
                       [email protected] "i"
               [email protected] ","
               [email protected] " "
-              RECORD_FIELD_PAT@59..79
+              RECORD_PAT_[email protected]
                 [email protected]
                   [email protected] "j"
                 [email protected] ":"
@@ -71,7 +71,7 @@ [email protected]
                       [email protected] " "
                       [email protected]
                         [email protected] "&"
-                        BIN[email protected]
+                        IDENT[email protected]
                           [email protected]
                             [email protected] "x"
                     [email protected] ")"
@@ -91,7 +91,7 @@ [email protected]
         [email protected]
           [email protected] "box"
           [email protected] " "
-          BIN[email protected]
+          IDENT[email protected]
             [email protected] "ref"
             [email protected] " "
             [email protected] "mut"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0144_dot_dot_pat.rast b/crates/ra_syntax/test_data/parser/inline/ok/0144_dot_dot_pat.rast
index 8d0f1ead5..8fb0db031 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0144_dot_dot_pat.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0144_dot_dot_pat.rast
@@ -35,7 +35,7 @@ [email protected]
         [email protected] " "
         [email protected]
           [email protected] "("
-          BIN[email protected]
+          IDENT[email protected]
             [email protected]
               [email protected] "a"
           [email protected] ","
@@ -56,7 +56,7 @@ [email protected]
         [email protected] " "
         [email protected]
           [email protected] "("
-          BIN[email protected]
+          IDENT[email protected]
             [email protected]
               [email protected] "a"
           [email protected] ","
@@ -82,7 +82,7 @@ [email protected]
               [email protected]
                 [email protected] "Tuple"
           [email protected] "("
-          BIN[email protected]
+          IDENT[email protected]
             [email protected]
               [email protected] "a"
           [email protected] ","
@@ -107,7 +107,7 @@ [email protected]
               [email protected]
                 [email protected] "Tuple"
           [email protected] "("
-          BIN[email protected]
+          IDENT[email protected]
             [email protected]
               [email protected] "a"
           [email protected] ","
@@ -177,7 +177,7 @@ [email protected]
             [email protected] ".."
           [email protected] ","
           [email protected] " "
-          BIN[email protected]
+          IDENT[email protected]
             [email protected]
               [email protected] "a"
           [email protected] ","
@@ -206,7 +206,7 @@ [email protected]
             [email protected] ".."
           [email protected] ","
           [email protected] " "
-          BIN[email protected]
+          IDENT[email protected]
             [email protected]
               [email protected] "a"
           [email protected] ","
@@ -249,7 +249,7 @@ [email protected]
         [email protected] " "
         [email protected]
           [email protected] "["
-          BIN[email protected]
+          IDENT[email protected]
             [email protected]
               [email protected] "head"
           [email protected] ","
@@ -270,12 +270,12 @@ [email protected]
         [email protected] " "
         [email protected]
           [email protected] "["
-          BIN[email protected]
+          IDENT[email protected]
             [email protected]
               [email protected] "head"
           [email protected] ","
           [email protected] " "
-          BIN[email protected]
+          IDENT[email protected]
             [email protected]
               [email protected] "tail"
             [email protected] " "
@@ -297,7 +297,7 @@ [email protected]
         [email protected] " "
         [email protected]
           [email protected] "["
-          BIN[email protected]
+          IDENT[email protected]
             [email protected]
               [email protected] "head"
           [email protected] ","
@@ -306,7 +306,7 @@ [email protected]
             [email protected] ".."
           [email protected] ","
           [email protected] " "
-          BIN[email protected]
+          IDENT[email protected]
             [email protected]
               [email protected] "cons"
           [email protected] "]"
@@ -323,12 +323,12 @@ [email protected]
         [email protected] " "
         [email protected]
           [email protected] "["
-          BIN[email protected]
+          IDENT[email protected]
             [email protected]
               [email protected] "head"
           [email protected] ","
           [email protected] " "
-          BIN[email protected]
+          IDENT[email protected]
             [email protected]
               [email protected] "mid"
             [email protected] " "
@@ -338,7 +338,7 @@ [email protected]
               [email protected] ".."
           [email protected] ","
           [email protected] " "
-          BIN[email protected]
+          IDENT[email protected]
             [email protected]
               [email protected] "cons"
           [email protected] "]"
@@ -355,7 +355,7 @@ [email protected]
         [email protected] " "
         [email protected]
           [email protected] "["
-          BIN[email protected]
+          IDENT[email protected]
             [email protected]
               [email protected] "head"
           [email protected] ","
@@ -368,7 +368,7 @@ [email protected]
             [email protected] ".."
           [email protected] ","
           [email protected] " "
-          BIN[email protected]
+          IDENT[email protected]
             [email protected]
               [email protected] "cons"
           [email protected] "]"
@@ -385,7 +385,7 @@ [email protected]
         [email protected] " "
         [email protected]
           [email protected] "["
-          BIN[email protected]
+          IDENT[email protected]
             [email protected]
               [email protected] "head"
           [email protected] ","
@@ -394,12 +394,12 @@ [email protected]
             [email protected] ".."
           [email protected] ","
           [email protected] " "
-          BIN[email protected]
+          IDENT[email protected]
             [email protected]
               [email protected] "mid"
           [email protected] ","
           [email protected] " "
-          BIN[email protected]
+          IDENT[email protected]
             [email protected]
               [email protected] "tail"
             [email protected] " "
@@ -421,7 +421,7 @@ [email protected]
         [email protected] " "
         [email protected]
           [email protected] "["
-          BIN[email protected]
+          IDENT[email protected]
             [email protected]
               [email protected] "head"
           [email protected] ","
@@ -430,7 +430,7 @@ [email protected]
             [email protected] ".."
           [email protected] ","
           [email protected] " "
-          BIN[email protected]
+          IDENT[email protected]
             [email protected]
               [email protected] "mid"
           [email protected] ","
@@ -439,7 +439,7 @@ [email protected]
             [email protected] ".."
           [email protected] ","
           [email protected] " "
-          BIN[email protected]
+          IDENT[email protected]
             [email protected]
               [email protected] "cons"
           [email protected] "]"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0145_record_field_pat.rast b/crates/ra_syntax/test_data/parser/inline/ok/0145_record_field_pat.rast
index b41ef4098..925409bdf 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0145_record_field_pat.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0145_record_field_pat.rast
@@ -20,10 +20,10 @@ [email protected]
               [email protected]
                 [email protected] "S"
           [email protected] " "
-          RECORD_FIELD_PAT_[email protected]
+          RECORD_PAT_[email protected]
             [email protected] "{"
             [email protected] " "
-            RECORD_FIELD_PAT@23..27
+            RECORD_PAT_[email protected]
               [email protected]
                 [email protected] "0"
               [email protected] ":"
@@ -50,10 +50,10 @@ [email protected]
               [email protected]
                 [email protected] "S"
           [email protected] " "
-          RECORD_FIELD_PAT_[email protected]
+          RECORD_PAT_[email protected]
             [email protected] "{"
             [email protected] " "
-            RECORD_FIELD_PAT@48..52
+            RECORD_PAT_[email protected]
               [email protected]
                 [email protected] "x"
               [email protected] ":"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0146_as_precedence.rast b/crates/ra_syntax/test_data/parser/inline/ok/0146_as_precedence.rast
index 2d0c83458..ca739825a 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0146_as_precedence.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0146_as_precedence.rast
@@ -14,7 +14,7 @@ [email protected]
       [email protected]
         [email protected] "let"
         [email protected] " "
-        PLACEHOLDE[email protected]
+        WILDCARD[email protected]
           [email protected] "_"
         [email protected] " "
         [email protected] "="
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0154_fn_pointer_param_ident_path.rast b/crates/ra_syntax/test_data/parser/inline/ok/0154_fn_pointer_param_ident_path.rast
index 69b4d73d7..c48fed03e 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0154_fn_pointer_param_ident_path.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0154_fn_pointer_param_ident_path.rast
@@ -38,7 +38,7 @@ [email protected]
       [email protected]
         [email protected] "("
         [email protected]
-          BIN[email protected]
+          IDENT[email protected]
             [email protected]
               [email protected] "baz"
           [email protected] ":"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0155_closure_params.rast b/crates/ra_syntax/test_data/parser/inline/ok/0155_closure_params.rast
index 0a9f7c137..31671b420 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0155_closure_params.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0155_closure_params.rast
@@ -14,7 +14,7 @@ [email protected]
       [email protected]
         [email protected] "let"
         [email protected] " "
-        BIN[email protected]
+        IDENT[email protected]
           [email protected]
             [email protected] "foo"
         [email protected] " "
@@ -24,13 +24,13 @@ [email protected]
           [email protected]
             [email protected] "|"
             [email protected]
-              BIN[email protected]
+              IDENT[email protected]
                 [email protected]
                   [email protected] "bar"
             [email protected] ","
             [email protected] " "
             [email protected]
-              BIN[email protected]
+              IDENT[email protected]
                 [email protected]
                   [email protected] "baz"
               [email protected] ":"
@@ -43,7 +43,7 @@ [email protected]
             [email protected] ","
             [email protected] " "
             [email protected]
-              BIN[email protected]
+              IDENT[email protected]
                 [email protected]
                   [email protected] "qux"
               [email protected] ":"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0156_fn_def_param.rast b/crates/ra_syntax/test_data/parser/inline/ok/0156_fn_def_param.rast
index 3b8dfefc6..508b4aca7 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0156_fn_def_param.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0156_fn_def_param.rast
@@ -9,12 +9,12 @@ [email protected]
       [email protected]
         [email protected]
           [email protected] "("
-          BIN[email protected]
+          IDENT[email protected]
             [email protected]
               [email protected] "x"
           [email protected] ","
           [email protected] " "
-          BIN[email protected]
+          IDENT[email protected]
             [email protected]
               [email protected] "y"
           [email protected] ")"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0156_or_pattern.rast b/crates/ra_syntax/test_data/parser/inline/ok/0156_or_pattern.rast
index 4d4c41f1a..88a513cee 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0156_or_pattern.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0156_or_pattern.rast
@@ -25,12 +25,12 @@ [email protected]
             [email protected]
               [email protected] "("
               [email protected]
-                PLACEHOLDE[email protected]
+                WILDCARD[email protected]
                   [email protected] "_"
                 [email protected] " "
                 [email protected] "|"
                 [email protected] " "
-                PLACEHOLDE[email protected]
+                WILDCARD[email protected]
                   [email protected] "_"
               [email protected] ")"
             [email protected] " "
@@ -47,12 +47,12 @@ [email protected]
               [email protected]
                 [email protected] "("
                 [email protected]
-                  PLACEHOLDE[email protected]
+                  WILDCARD[email protected]
                     [email protected] "_"
                   [email protected] " "
                   [email protected] "|"
                   [email protected] " "
-                  PLACEHOLDE[email protected]
+                  WILDCARD[email protected]
                     [email protected] "_"
                 [email protected] ")"
             [email protected] " "
@@ -67,12 +67,12 @@ [email protected]
             [email protected]
               [email protected] "("
               [email protected]
-                PLACEHOLDE[email protected]
+                WILDCARD[email protected]
                   [email protected] "_"
                 [email protected] " "
                 [email protected] "|"
                 [email protected] " "
-                PLACEHOLDE[email protected]
+                WILDCARD[email protected]
                   [email protected] "_"
               [email protected] ","
               [email protected] ")"
@@ -88,12 +88,12 @@ [email protected]
             [email protected]
               [email protected] "["
               [email protected]
-                PLACEHOLDE[email protected]
+                WILDCARD[email protected]
                   [email protected] "_"
                 [email protected] " "
                 [email protected] "|"
                 [email protected] " "
-                PLACEHOLDE[email protected]
+                WILDCARD[email protected]
                   [email protected] "_"
               [email protected] ","
               [email protected] "]"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0157_fn_pointer_unnamed_arg.rast b/crates/ra_syntax/test_data/parser/inline/ok/0157_fn_pointer_unnamed_arg.rast
index ccca045b6..3079e5bf8 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0157_fn_pointer_unnamed_arg.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0157_fn_pointer_unnamed_arg.rast
@@ -12,7 +12,7 @@ [email protected]
       [email protected]
         [email protected] "("
         [email protected]
-          PLACEHOLDE[email protected]
+          WILDCARD[email protected]
             [email protected] "_"
           [email protected] ":"
           [email protected] " "
diff --git a/crates/ra_syntax/test_data/parser/ok/0028_operator_binding_power.rast b/crates/ra_syntax/test_data/parser/ok/0028_operator_binding_power.rast
index efe018484..3271a4695 100644
--- a/crates/ra_syntax/test_data/parser/ok/0028_operator_binding_power.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0028_operator_binding_power.rast
@@ -14,7 +14,7 @@ [email protected]
       [email protected]
         [email protected] "let"
         [email protected] " "
-        BIN[email protected]
+        IDENT[email protected]
           [email protected]
             [email protected] "x"
         [email protected] " "
diff --git a/crates/ra_syntax/test_data/parser/ok/0029_range_forms.rast b/crates/ra_syntax/test_data/parser/ok/0029_range_forms.rast
index 47e46f009..a732f11c4 100644
--- a/crates/ra_syntax/test_data/parser/ok/0029_range_forms.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0029_range_forms.rast
@@ -67,7 +67,7 @@ [email protected]
       [email protected]
         [email protected] "let"
         [email protected] " "
-        BIN[email protected]
+        IDENT[email protected]
           [email protected]
             [email protected] "x"
         [email protected] " "
@@ -135,7 +135,7 @@ [email protected]
       [email protected]
         [email protected] "let"
         [email protected] " "
-        BIN[email protected]
+        IDENT[email protected]
           [email protected]
             [email protected] "x"
         [email protected] " "
diff --git a/crates/ra_syntax/test_data/parser/ok/0030_string_suffixes.rast b/crates/ra_syntax/test_data/parser/ok/0030_string_suffixes.rast
index 93f766149..80f7f5942 100644
--- a/crates/ra_syntax/test_data/parser/ok/0030_string_suffixes.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0030_string_suffixes.rast
@@ -14,7 +14,7 @@ [email protected]
       [email protected]
         [email protected] "let"
         [email protected] " "
-        PLACEHOLDE[email protected]
+        WILDCARD[email protected]
           [email protected] "_"
         [email protected] " "
         [email protected] "="
@@ -26,7 +26,7 @@ [email protected]
       [email protected]
         [email protected] "let"
         [email protected] " "
-        PLACEHOLDE[email protected]
+        WILDCARD[email protected]
           [email protected] "_"
         [email protected] " "
         [email protected] "="
@@ -38,7 +38,7 @@ [email protected]
       [email protected]
         [email protected] "let"
         [email protected] " "
-        PLACEHOLDE[email protected]
+        WILDCARD[email protected]
           [email protected] "_"
         [email protected] " "
         [email protected] "="
@@ -50,7 +50,7 @@ [email protected]
       [email protected]
         [email protected] "let"
         [email protected] " "
-        PLACEHOLDE[email protected]
+        WILDCARD[email protected]
           [email protected] "_"
         [email protected] " "
         [email protected] "="
diff --git a/crates/ra_syntax/test_data/parser/ok/0030_traits.rast b/crates/ra_syntax/test_data/parser/ok/0030_traits.rast
index 280d4cb82..d07c6683a 100644
--- a/crates/ra_syntax/test_data/parser/ok/0030_traits.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0030_traits.rast
@@ -37,7 +37,7 @@ [email protected]
         [email protected]
           [email protected] "("
           [email protected]
-            BIN[email protected]
+            IDENT[email protected]
               [email protected]
                 [email protected] "x"
             [email protected] ":"
diff --git a/crates/ra_syntax/test_data/parser/ok/0031_extern.rast b/crates/ra_syntax/test_data/parser/ok/0031_extern.rast
index 0509f7504..79ea098a2 100644
--- a/crates/ra_syntax/test_data/parser/ok/0031_extern.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0031_extern.rast
@@ -17,7 +17,7 @@ [email protected]
         [email protected]
           [email protected] "("
           [email protected]
-            BIN[email protected]
+            IDENT[email protected]
               [email protected]
                 [email protected] "domain"
             [email protected] ":"
@@ -31,7 +31,7 @@ [email protected]
           [email protected] ","
           [email protected] " "
           [email protected]
-            BIN[email protected]
+            IDENT[email protected]
               [email protected]
                 [email protected] "ty"
             [email protected] ":"
@@ -45,7 +45,7 @@ [email protected]
           [email protected] ","
           [email protected] " "
           [email protected]
-            BIN[email protected]
+            IDENT[email protected]
               [email protected]
                 [email protected] "protocol"
             [email protected] ":"
@@ -80,7 +80,7 @@ [email protected]
         [email protected]
           [email protected] "("
           [email protected]
-            BIN[email protected]
+            IDENT[email protected]
               [email protected]
                 [email protected] "fd"
             [email protected] ":"
@@ -94,7 +94,7 @@ [email protected]
           [email protected] ","
           [email protected] " "
           [email protected]
-            BIN[email protected]
+            IDENT[email protected]
               [email protected]
                 [email protected] "addr"
             [email protected] ":"
@@ -111,7 +111,7 @@ [email protected]
           [email protected] ","
           [email protected] " "
           [email protected]
-            BIN[email protected]
+            IDENT[email protected]
               [email protected]
                 [email protected] "len"
             [email protected] ":"
@@ -145,7 +145,7 @@ [email protected]
         [email protected]
           [email protected] "("
           [email protected]
-            BIN[email protected]
+            IDENT[email protected]
               [email protected]
                 [email protected] "socket"
             [email protected] ":"
@@ -159,7 +159,7 @@ [email protected]
           [email protected] ","
           [email protected] " "
           [email protected]
-            BIN[email protected]
+            IDENT[email protected]
               [email protected]
                 [email protected] "address"
             [email protected] ":"
@@ -176,7 +176,7 @@ [email protected]
           [email protected] ","
           [email protected] "\n                   "
           [email protected]
-            BIN[email protected]
+            IDENT[email protected]
               [email protected]
                 [email protected] "len"
             [email protected] ":"
@@ -210,7 +210,7 @@ [email protected]
         [email protected]
           [email protected] "("
           [email protected]
-            BIN[email protected]
+            IDENT[email protected]
               [email protected]
                 [email protected] "socket"
             [email protected] ":"
@@ -224,7 +224,7 @@ [email protected]
           [email protected] ","
           [email protected] " "
           [email protected]
-            BIN[email protected]
+            IDENT[email protected]
               [email protected]
                 [email protected] "backlog"
             [email protected] ":"
@@ -259,7 +259,7 @@ [email protected]
         [email protected]
           [email protected] "("
           [email protected]
-            BIN[email protected]
+            IDENT[email protected]
               [email protected]
                 [email protected] "socket"
             [email protected] ":"
@@ -273,7 +273,7 @@ [email protected]
           [email protected] ","
           [email protected] " "
           [email protected]
-            BIN[email protected]
+            IDENT[email protected]
               [email protected]
                 [email protected] "address"
             [email protected] ":"
@@ -290,7 +290,7 @@ [email protected]
           [email protected] ","
           [email protected] "\n                       "
           [email protected]
-            BIN[email protected]
+            IDENT[email protected]
               [email protected]
                 [email protected] "address_len"
             [email protected] ":"
@@ -328,7 +328,7 @@ [email protected]
         [email protected]
           [email protected] "("
           [email protected]
-            BIN[email protected]
+            IDENT[email protected]
               [email protected]
                 [email protected] "sockfd"
             [email protected] ":"
@@ -342,7 +342,7 @@ [email protected]
           [email protected] ","
           [email protected] "\n                      "
           [email protected]
-            BIN[email protected]
+            IDENT[email protected]
               [email protected]
                 [email protected] "level"
             [email protected] ":"
@@ -356,7 +356,7 @@ [email protected]
           [email protected] ","
           [email protected] "\n                      "
           [email protected]
-            BIN[email protected]
+            IDENT[email protected]
               [email protected]
                 [email protected] "optname"
             [email protected] ":"
@@ -370,7 +370,7 @@ [email protected]
           [email protected] ","
           [email protected] "\n                      "
           [email protected]
-            BIN[email protected]
+            IDENT[email protected]
               [email protected]
                 [email protected] "optval"
             [email protected] ":"
@@ -388,7 +388,7 @@ [email protected]
           [email protected] ","
           [email protected] "\n                      "
           [email protected]
-            BIN[email protected]
+            IDENT[email protected]
               [email protected]
                 [email protected] "optlen"
             [email protected] ":"
@@ -427,7 +427,7 @@ [email protected]
         [email protected]
           [email protected] "("
           [email protected]
-            BIN[email protected]
+            IDENT[email protected]
               [email protected]
                 [email protected] "socket"
             [email protected] ":"
@@ -441,7 +441,7 @@ [email protected]
           [email protected] ","
           [email protected] " "
           [email protected]
-            BIN[email protected]
+            IDENT[email protected]
               [email protected]
                 [email protected] "level"
             [email protected] ":"
@@ -455,7 +455,7 @@ [email protected]
           [email protected] ","
           [email protected] " "
           [email protected]
-            BIN[email protected]
+            IDENT[email protected]
               [email protected]
                 [email protected] "name"
             [email protected] ":"
@@ -469,7 +469,7 @@ [email protected]
           [email protected] ","
           [email protected] "\n                      "
           [email protected]
-            BIN[email protected]
+            IDENT[email protected]
               [email protected]
                 [email protected] "value"
             [email protected] ":"
@@ -487,7 +487,7 @@ [email protected]
           [email protected] ","
           [email protected] "\n                      "
           [email protected]
-            BIN[email protected]
+            IDENT[email protected]
               [email protected]
                 [email protected] "option_len"
             [email protected] ":"
@@ -521,7 +521,7 @@ [email protected]
         [email protected]
           [email protected] "("
           [email protected]
-            BIN[email protected]
+            IDENT[email protected]
               [email protected]
                 [email protected] "socket"
             [email protected] ":"
@@ -535,7 +535,7 @@ [email protected]
           [email protected] ","
           [email protected] " "
           [email protected]
-            BIN[email protected]
+            IDENT[email protected]
               [email protected]
                 [email protected] "address"
             [email protected] ":"
@@ -552,7 +552,7 @@ [email protected]
           [email protected] ","
           [email protected] "\n                       "
           [email protected]
-            BIN[email protected]
+            IDENT[email protected]
               [email protected]
                 [email protected] "address_len"
             [email protected] ":"
@@ -590,7 +590,7 @@ [email protected]
         [email protected]
           [email protected] "("
           [email protected]
-            BIN[email protected]
+            IDENT[email protected]
               [email protected]
                 [email protected] "socket"
             [email protected] ":"
@@ -604,7 +604,7 @@ [email protected]
           [email protected] ","
           [email protected] " "
           [email protected]
-            BIN[email protected]
+            IDENT[email protected]
               [email protected]
                 [email protected] "buf"
             [email protected] ":"
@@ -622,7 +622,7 @@ [email protected]
           [email protected] ","
           [email protected] " "
           [email protected]
-            BIN[email protected]
+            IDENT[email protected]
               [email protected]
                 [email protected] "len"
             [email protected] ":"
@@ -636,7 +636,7 @@ [email protected]
           [email protected] ","
           [email protected] "\n                  "
           [email protected]
-            BIN[email protected]
+            IDENT[email protected]
               [email protected]
                 [email protected] "flags"
             [email protected] ":"
@@ -650,7 +650,7 @@ [email protected]
           [email protected] ","
           [email protected] " "
           [email protected]
-            BIN[email protected]
+            IDENT[email protected]
               [email protected]
                 [email protected] "addr"
             [email protected] ":"
@@ -667,7 +667,7 @@ [email protected]
           [email protected] ","
           [email protected] "\n                  "
           [email protected]
-            BIN[email protected]
+            IDENT[email protected]
               [email protected]
                 [email protected] "addrlen"
             [email protected] ":"
@@ -701,7 +701,7 @@ [email protected]
         [email protected]
           [email protected] "("
           [email protected]
-            BIN[email protected]
+            IDENT[email protected]
               [email protected]
                 [email protected] "socket"
             [email protected] ":"
@@ -715,7 +715,7 @@ [email protected]
           [email protected] ","
           [email protected] " "
           [email protected]
-            BIN[email protected]
+            IDENT[email protected]
               [email protected]
                 [email protected] "buf"
             [email protected] ":"
@@ -733,7 +733,7 @@ [email protected]
           [email protected] ","
           [email protected] " "
           [email protected]
-            BIN[email protected]
+            IDENT[email protected]
               [email protected]
                 [email protected] "len"
             [email protected] ":"
@@ -747,7 +747,7 @@ [email protected]
           [email protected] ","
           [email protected] "\n                "
           [email protected]
-            BIN[email protected]
+            IDENT[email protected]
               [email protected]
                 [email protected] "flags"
             [email protected] ":"
@@ -782,7 +782,7 @@ [email protected]
         [email protected]
           [email protected] "("
           [email protected]
-            BIN[email protected]
+            IDENT[email protected]
               [email protected]
                 [email protected] "socket"
             [email protected] ":"
@@ -796,7 +796,7 @@ [email protected]
           [email protected] ","
           [email protected] " "
           [email protected]
-            BIN[email protected]
+            IDENT[email protected]
               [email protected]
                 [email protected] "buf"
             [email protected] ":"
@@ -814,7 +814,7 @@ [email protected]
           [email protected] ","
           [email protected] " "
           [email protected]
-            BIN[email protected]
+            IDENT[email protected]
               [email protected]
                 [email protected] "len"
             [email protected] ":"
@@ -828,7 +828,7 @@ [email protected]
           [email protected] ","
           [email protected] "\n                    "
           [email protected]
-            BIN[email protected]
+            IDENT[email protected]
               [email protected]
                 [email protected] "flags"
             [email protected] ":"
@@ -842,7 +842,7 @@ [email protected]
           [email protected] ","
           [email protected] " "
           [email protected]
-            BIN[email protected]
+            IDENT[email protected]
               [email protected]
                 [email protected] "addr"
             [email protected] ":"
@@ -860,7 +860,7 @@ [email protected]
           [email protected] ","
           [email protected] "\n                    "
           [email protected]
-            BIN[email protected]
+            IDENT[email protected]
               [email protected]
                 [email protected] "addrlen"
             [email protected] ":"
@@ -899,7 +899,7 @@ [email protected]
         [email protected]
           [email protected] "("
           [email protected]
-            BIN[email protected]
+            IDENT[email protected]
               [email protected]
                 [email protected] "socket"
             [email protected] ":"
@@ -913,7 +913,7 @@ [email protected]
           [email protected] ","
           [email protected] " "
           [email protected]
-            BIN[email protected]
+            IDENT[email protected]
               [email protected]
                 [email protected] "buf"
             [email protected] ":"
@@ -931,7 +931,7 @@ [email protected]
           [email protected] ","
           [email protected] " "
           [email protected]
-            BIN[email protected]
+            IDENT[email protected]
               [email protected]
                 [email protected] "len"
             [email protected] ":"
@@ -945,7 +945,7 @@ [email protected]
           [email protected] ","
           [email protected] "\n                "
           [email protected]
-            BIN[email protected]
+            IDENT[email protected]
               [email protected]
                 [email protected] "flags"
             [email protected] ":"
diff --git a/crates/ra_syntax/test_data/parser/ok/0033_label_break.rast b/crates/ra_syntax/test_data/parser/ok/0033_label_break.rast
index b3f29638c..88800ca7a 100644
--- a/crates/ra_syntax/test_data/parser/ok/0033_label_break.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0033_label_break.rast
@@ -127,7 +127,7 @@ [email protected]
       [email protected]
         [email protected] "let"
         [email protected] " "
-        BIN[email protected]
+        IDENT[email protected]
           [email protected]
             [email protected] "result"
         [email protected] " "
diff --git a/crates/ra_syntax/test_data/parser/ok/0035_weird_exprs.rast b/crates/ra_syntax/test_data/parser/ok/0035_weird_exprs.rast
index 0e0c8c9dc..ac9c1fa79 100644
--- a/crates/ra_syntax/test_data/parser/ok/0035_weird_exprs.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0035_weird_exprs.rast
@@ -144,7 +144,7 @@ [email protected]
       [email protected]
         [email protected] "let"
         [email protected] " "
-        BIN[email protected]
+        IDENT[email protected]
           [email protected]
             [email protected] "_x"
         [email protected] ":"
@@ -186,7 +186,7 @@ [email protected]
         [email protected]
           [email protected] "("
           [email protected]
-            BIN[email protected]
+            IDENT[email protected]
               [email protected]
                 [email protected] "_x"
             [email protected] ":"
@@ -237,7 +237,7 @@ [email protected]
         [email protected]
           [email protected] "("
           [email protected]
-            BIN[email protected]
+            IDENT[email protected]
               [email protected]
                 [email protected] "x"
             [email protected] ":"
@@ -314,7 +314,7 @@ [email protected]
       [email protected]
         [email protected] "let"
         [email protected] " "
-        BIN[email protected]
+        IDENT[email protected]
           [email protected]
             [email protected] "i"
         [email protected] " "
@@ -343,7 +343,7 @@ [email protected]
       [email protected]
         [email protected] "let"
         [email protected] " "
-        BIN[email protected]
+        IDENT[email protected]
           [email protected]
             [email protected] "dont"
         [email protected] " "
@@ -506,7 +506,7 @@ [email protected]
                               [email protected] "}"
                           [email protected] "\n                    "
                           [email protected]
-                            PLACEHOLDE[email protected]
+                            WILDCARD[email protected]
                               [email protected] "_"
                             [email protected] " "
                             [email protected] "=>"
@@ -587,7 +587,7 @@ [email protected]
       [email protected]
         [email protected] "let"
         [email protected] " "
-        BIN[email protected]
+        IDENT[email protected]
           [email protected] "mut"
           [email protected] " "
           [email protected]
@@ -604,7 +604,7 @@ [email protected]
       [email protected]
         [email protected] "let"
         [email protected] " "
-        BIN[email protected]
+        IDENT[email protected]
           [email protected] "mut"
           [email protected] " "
           [email protected]
@@ -649,7 +649,7 @@ [email protected]
       [email protected]
         [email protected] "let"
         [email protected] " "
-        BIN[email protected]
+        IDENT[email protected]
           [email protected] "mut"
           [email protected] " "
           [email protected]
@@ -694,7 +694,7 @@ [email protected]
       [email protected]
         [email protected] "let"
         [email protected] " "
-        BIN[email protected]
+        IDENT[email protected]
           [email protected]
             [email protected] "_a"
         [email protected] " "
@@ -737,7 +737,7 @@ [email protected]
       [email protected]
         [email protected] "let"
         [email protected] " "
-        BIN[email protected]
+        IDENT[email protected]
           [email protected]
             [email protected] "_b"
         [email protected] " "
@@ -859,7 +859,7 @@ [email protected]
       [email protected]
         [email protected] "let"
         [email protected] " "
-        BIN[email protected]
+        IDENT[email protected]
           [email protected]
             [email protected] "_a"
         [email protected] " "
@@ -906,7 +906,7 @@ [email protected]
       [email protected]
         [email protected] "let"
         [email protected] " "
-        BIN[email protected]
+        IDENT[email protected]
           [email protected]
             [email protected] "_c"
         [email protected] " "
@@ -943,7 +943,7 @@ [email protected]
       [email protected]
         [email protected] "let"
         [email protected] " "
-        BIN[email protected]
+        IDENT[email protected]
           [email protected]
             [email protected] "_b"
         [email protected] ":"
@@ -1024,7 +1024,7 @@ [email protected]
       [email protected]
         [email protected] "let"
         [email protected] " "
-        BIN[email protected]
+        IDENT[email protected]
           [email protected] "mut"
           [email protected] " "
           [email protected]
@@ -1102,7 +1102,7 @@ [email protected]
                     [email protected] ","
                     [email protected] " "
                     [email protected]
-                      PLACEHOLDE[email protected]
+                      WILDCARD[email protected]
                         [email protected] "_"
                       [email protected] " "
                       [email protected] "=>"
@@ -1146,7 +1146,7 @@ [email protected]
       [email protected]
         [email protected] "let"
         [email protected] " "
-        BIN[email protected]
+        IDENT[email protected]
           [email protected]
             [email protected] "_evil"
         [email protected] " "
@@ -1292,7 +1292,7 @@ [email protected]
     [email protected]
       [email protected] "("
       [email protected]
-        BIN[email protected]
+        IDENT[email protected]
           [email protected]
             [email protected] "u8"
         [email protected] ":"
@@ -1614,7 +1614,7 @@ [email protected]
       [email protected]
         [email protected] "let"
         [email protected] " "
-        BIN[email protected]
+        IDENT[email protected]
           [email protected]
             [email protected] "val"
         [email protected] " "
@@ -1648,11 +1648,11 @@ [email protected]
                           [email protected] ")"
                       [email protected] ","
                       [email protected]
-                        BIN[email protected]
+                        IDENT[email protected]
                           [email protected]
                             [email protected] "__"
                           [email protected] "@"
-                          PLACEHOLDE[email protected]
+                          WILDCARD[email protected]
                             [email protected] "_"
                       [email protected] "|"
                     [email protected]
diff --git a/crates/ra_syntax/test_data/parser/ok/0041_raw_keywords.rast b/crates/ra_syntax/test_data/parser/ok/0041_raw_keywords.rast
index 92ede8ccb..4035aef6f 100644
--- a/crates/ra_syntax/test_data/parser/ok/0041_raw_keywords.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0041_raw_keywords.rast
@@ -14,7 +14,7 @@ [email protected]
       [email protected]
         [email protected] "let"
         [email protected] " "
-        BIN[email protected]
+        IDENT[email protected]
           [email protected]
             [email protected] "r#struct"
         [email protected] " "
@@ -27,7 +27,7 @@ [email protected]
       [email protected]
         [email protected] "let"
         [email protected] " "
-        BIN[email protected]
+        IDENT[email protected]
           [email protected]
             [email protected] "r#trait"
         [email protected] " "
diff --git a/crates/ra_syntax/test_data/parser/ok/0042_ufcs_call_list.rast b/crates/ra_syntax/test_data/parser/ok/0042_ufcs_call_list.rast
index ed29b0812..e71e069f1 100644
--- a/crates/ra_syntax/test_data/parser/ok/0042_ufcs_call_list.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0042_ufcs_call_list.rast
@@ -63,7 +63,7 @@ [email protected]
     [email protected]
       [email protected] "("
       [email protected]
-        PLACEHOLDE[email protected]
+        WILDCARD[email protected]
           [email protected] "_"
         [email protected] ":"
         [email protected] " "
diff --git a/crates/ra_syntax/test_data/parser/ok/0044_let_attrs.rast b/crates/ra_syntax/test_data/parser/ok/0044_let_attrs.rast
index 650f4e310..af44a4dbe 100644
--- a/crates/ra_syntax/test_data/parser/ok/0044_let_attrs.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0044_let_attrs.rast
@@ -33,7 +33,7 @@ [email protected]
         [email protected] "\n    "
         [email protected] "let"
         [email protected] " "
-        BIN[email protected]
+        IDENT[email protected]
           [email protected]
             [email protected] "exit_code"
         [email protected] " "
diff --git a/crates/ra_syntax/test_data/parser/ok/0045_block_inner_attrs.rast b/crates/ra_syntax/test_data/parser/ok/0045_block_inner_attrs.rast
index bd152ffa3..0ac56df6d 100644
--- a/crates/ra_syntax/test_data/parser/ok/0045_block_inner_attrs.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0045_block_inner_attrs.rast
@@ -114,7 +114,7 @@ [email protected]
           [email protected] ","
           [email protected] " "
           [email protected]
-            BIN[email protected]
+            IDENT[email protected]
               [email protected]
                 [email protected] "event_fn"
             [email protected] ":"
diff --git a/crates/ra_syntax/test_data/parser/ok/0047_minus_in_inner_pattern.rast b/crates/ra_syntax/test_data/parser/ok/0047_minus_in_inner_pattern.rast
index 7a54fa113..4f8dff909 100644
--- a/crates/ra_syntax/test_data/parser/ok/0047_minus_in_inner_pattern.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0047_minus_in_inner_pattern.rast
@@ -55,7 +55,7 @@ [email protected]
             [email protected] ","
             [email protected] "\n        "
             [email protected]
-              PLACEHOLDE[email protected]
+              WILDCARD[email protected]
                 [email protected] "_"
               [email protected] " "
               [email protected] "=>"
@@ -127,7 +127,7 @@ [email protected]
             [email protected] ","
             [email protected] "\n        "
             [email protected]
-              PLACEHOLDE[email protected]
+              WILDCARD[email protected]
                 [email protected] "_"
               [email protected] " "
               [email protected] "=>"
@@ -203,7 +203,7 @@ [email protected]
             [email protected] ","
             [email protected] "\n        "
             [email protected]
-              PLACEHOLDE[email protected]
+              WILDCARD[email protected]
                 [email protected] "_"
               [email protected] " "
               [email protected] "=>"
diff --git a/crates/ra_syntax/test_data/parser/ok/0048_compound_assignment.rast b/crates/ra_syntax/test_data/parser/ok/0048_compound_assignment.rast
index 662576e5f..eaab47843 100644
--- a/crates/ra_syntax/test_data/parser/ok/0048_compound_assignment.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0048_compound_assignment.rast
@@ -16,7 +16,7 @@ [email protected]
       [email protected]
         [email protected] "let"
         [email protected] " "
-        BIN[email protected]
+        IDENT[email protected]
           [email protected] "mut"
           [email protected] " "
           [email protected]
diff --git a/crates/ra_syntax/test_data/parser/ok/0050_async_block_as_argument.rast b/crates/ra_syntax/test_data/parser/ok/0050_async_block_as_argument.rast
index 48e1f07d1..c7ce12e93 100644
--- a/crates/ra_syntax/test_data/parser/ok/0050_async_block_as_argument.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0050_async_block_as_argument.rast
@@ -7,7 +7,7 @@ [email protected]
     [email protected]
       [email protected] "("
       [email protected]
-        BIN[email protected]
+        IDENT[email protected]
           [email protected]
             [email protected] "x"
         [email protected] ":"
diff --git a/crates/ra_syntax/test_data/parser/ok/0051_parameter_attrs.rast b/crates/ra_syntax/test_data/parser/ok/0051_parameter_attrs.rast
index 706ccdc39..0303b198f 100644
--- a/crates/ra_syntax/test_data/parser/ok/0051_parameter_attrs.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0051_parameter_attrs.rast
@@ -25,7 +25,7 @@ [email protected]
         [email protected] "]"
       [email protected] " "
       [email protected]
-        BIN[email protected]
+        IDENT[email protected]
           [email protected]
             [email protected] "pat"
         [email protected] ":"
@@ -58,7 +58,7 @@ [email protected]
         [email protected] "]"
       [email protected] " "
       [email protected]
-        BIN[email protected]
+        IDENT[email protected]
           [email protected]
             [email protected] "x"
         [email protected] ":"
@@ -91,7 +91,7 @@ [email protected]
         [email protected]
           [email protected] "("
           [email protected]
-            BIN[email protected]
+            IDENT[email protected]
               [email protected]
                 [email protected] "format"
             [email protected] ":"
@@ -212,7 +212,7 @@ [email protected]
             [email protected] "]"
           [email protected] " "
           [email protected]
-            PLACEHOLDE[email protected]
+            WILDCARD[email protected]
               [email protected] "_"
             [email protected] ":"
             [email protected] " "
@@ -234,7 +234,7 @@ [email protected]
             [email protected] "]"
           [email protected] " "
           [email protected]
-            BIN[email protected]
+            IDENT[email protected]
               [email protected] "mut"
               [email protected] " "
               [email protected]
diff --git a/crates/ra_syntax/test_data/parser/ok/0052_for_range_block.rast b/crates/ra_syntax/test_data/parser/ok/0052_for_range_block.rast
index fd4f4f242..350823ba3 100644
--- a/crates/ra_syntax/test_data/parser/ok/0052_for_range_block.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0052_for_range_block.rast
@@ -14,7 +14,7 @@ [email protected]
       [email protected]
         [email protected] "for"
         [email protected] " "
-        BIN[email protected]
+        IDENT[email protected]
           [email protected]
             [email protected] "_x"
         [email protected] " "
diff --git a/crates/ra_syntax/test_data/parser/ok/0054_qual_path_in_type_arg.rast b/crates/ra_syntax/test_data/parser/ok/0054_qual_path_in_type_arg.rast
index 0d48c7e81..f71ceecd7 100644
--- a/crates/ra_syntax/test_data/parser/ok/0054_qual_path_in_type_arg.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0054_qual_path_in_type_arg.rast
@@ -43,7 +43,7 @@ [email protected]
     [email protected]
       [email protected] "("
       [email protected]
-        PLACEHOLDE[email protected]
+        WILDCARD[email protected]
           [email protected] "_"
         [email protected] ":"
         [email protected] " "
@@ -85,7 +85,7 @@ [email protected]
     [email protected]
       [email protected] "("
       [email protected]
-        PLACEHOLDE[email protected]
+        WILDCARD[email protected]
           [email protected] "_"
         [email protected] ":"
         [email protected] " "
diff --git a/crates/ra_syntax/test_data/parser/ok/0057_loop_in_call.rast b/crates/ra_syntax/test_data/parser/ok/0057_loop_in_call.rast
index 53410a1ee..76301004a 100644
--- a/crates/ra_syntax/test_data/parser/ok/0057_loop_in_call.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0057_loop_in_call.rast
@@ -7,7 +7,7 @@ [email protected]
     [email protected]
       [email protected] "("
       [email protected]
-        BIN[email protected]
+        IDENT[email protected]
           [email protected]
             [email protected] "x"
         [email protected] ":"
diff --git a/crates/ra_syntax/test_data/parser/ok/0059_loops_in_parens.rast b/crates/ra_syntax/test_data/parser/ok/0059_loops_in_parens.rast
index 767b516a2..213f7b381 100644
--- a/crates/ra_syntax/test_data/parser/ok/0059_loops_in_parens.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0059_loops_in_parens.rast
@@ -23,7 +23,7 @@ [email protected]
             [email protected]
               [email protected] "for"
               [email protected] " "
-              PLACEHOLDE[email protected]
+              WILDCARD[email protected]
                 [email protected] "_"
               [email protected] " "
               [email protected] "in"
diff --git a/crates/ra_syntax/test_data/parser/ok/0063_trait_fn_patterns.rast b/crates/ra_syntax/test_data/parser/ok/0063_trait_fn_patterns.rast
index facce8167..42680b283 100644
--- a/crates/ra_syntax/test_data/parser/ok/0063_trait_fn_patterns.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0063_trait_fn_patterns.rast
@@ -18,12 +18,12 @@ [email protected]
           [email protected]
             [email protected]
               [email protected] "("
-              BIN[email protected]
+              IDENT[email protected]
                 [email protected]
                   [email protected] "a"
               [email protected] ","
               [email protected] " "
-              BIN[email protected]
+              IDENT[email protected]
                 [email protected]
                   [email protected] "b"
               [email protected] ")"
@@ -64,17 +64,17 @@ [email protected]
                   [email protected]
                     [email protected] "S"
               [email protected] " "
-              RECORD_FIELD_PAT_[email protected]
+              RECORD_PAT_[email protected]
                 [email protected] "{"
                 [email protected] " "
-                RECORD_FIELD_PAT@61..62
-                  BIN[email protected]
+                RECORD_PAT_[email protected]
+                  IDENT[email protected]
                     [email protected]
                       [email protected] "a"
                 [email protected] ","
                 [email protected] " "
-                RECORD_FIELD_PAT@64..65
-                  BIN[email protected]
+                RECORD_PAT_[email protected]
+                  IDENT[email protected]
                     [email protected]
                       [email protected] "b"
                 [email protected] " "
@@ -106,7 +106,7 @@ [email protected]
                   [email protected]
                     [email protected] "NewType"
               [email protected] "("
-              BIN[email protected]
+              IDENT[email protected]
                 [email protected]
                   [email protected] "a"
               [email protected] ")"
@@ -135,7 +135,7 @@ [email protected]
               [email protected] "&"
               [email protected]
                 [email protected] "&"
-                BIN[email protected]
+                IDENT[email protected]
                   [email protected]
                     [email protected] "a"
             [email protected] ":"
@@ -163,7 +163,7 @@ [email protected]
         [email protected]
           [email protected] "("
           [email protected]
-            PLACEHOLDE[email protected]
+            WILDCARD[email protected]
               [email protected] "_"
             [email protected] ":"
             [email protected] " "
@@ -175,7 +175,7 @@ [email protected]
           [email protected] ","
           [email protected] " "
           [email protected]
-            BIN[email protected]
+            IDENT[email protected]
               [email protected] "mut"
               [email protected] " "
               [email protected]
diff --git a/crates/ra_syntax/test_data/parser/ok/0063_variadic_fun.rast b/crates/ra_syntax/test_data/parser/ok/0063_variadic_fun.rast
index 7adedb02e..a132591f0 100644
--- a/crates/ra_syntax/test_data/parser/ok/0063_variadic_fun.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0063_variadic_fun.rast
@@ -16,7 +16,7 @@ [email protected]
         [email protected]
           [email protected] "("
           [email protected]
-            PLACEHOLDE[email protected]
+            WILDCARD[email protected]
               [email protected] "_"
             [email protected] ":"
             [email protected] " "
@@ -45,7 +45,7 @@ [email protected]
         [email protected]
           [email protected] "("
           [email protected]
-            PLACEHOLDE[email protected]
+            WILDCARD[email protected]
               [email protected] "_"
             [email protected] ":"
             [email protected] " "
@@ -61,7 +61,7 @@ [email protected]
           [email protected] ","
           [email protected] " "
           [email protected]
-            PLACEHOLDE[email protected]
+            WILDCARD[email protected]
               [email protected] "_"
             [email protected] ":"
             [email protected] " "
@@ -77,7 +77,7 @@ [email protected]
         [email protected]
           [email protected] "("
           [email protected]
-            PLACEHOLDE[email protected]
+            WILDCARD[email protected]
               [email protected] "_"
             [email protected] ":"
             [email protected] " "
@@ -108,17 +108,17 @@ [email protected]
           [email protected]
             [email protected]
               [email protected] "["
-              BIN[email protected]
+              IDENT[email protected]
                 [email protected]
                   [email protected] "w"
               [email protected] ","
               [email protected] " "
-              BIN[email protected]
+              IDENT[email protected]
                 [email protected]
                   [email protected] "t"
               [email protected] ","
               [email protected] " "
-              BIN[email protected]
+              IDENT[email protected]
                 [email protected]
                   [email protected] "f"
               [email protected] "]"
diff --git a/crates/ra_syntax/test_data/parser/ok/0064_impl_fn_params.rast b/crates/ra_syntax/test_data/parser/ok/0064_impl_fn_params.rast
index 453757c3c..94260db7c 100644
--- a/crates/ra_syntax/test_data/parser/ok/0064_impl_fn_params.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0064_impl_fn_params.rast
@@ -21,12 +21,12 @@ [email protected]
           [email protected]
             [email protected]
               [email protected] "("
-              BIN[email protected]
+              IDENT[email protected]
                 [email protected]
                   [email protected] "a"
               [email protected] ","
               [email protected] " "
-              BIN[email protected]
+              IDENT[email protected]
                 [email protected]
                   [email protected] "b"
               [email protected] ")"
@@ -67,17 +67,17 @@ [email protected]
                   [email protected]
                     [email protected] "S"
               [email protected] " "
-              RECORD_FIELD_PAT_[email protected]
+              RECORD_PAT_[email protected]
                 [email protected] "{"
                 [email protected] " "
-                RECORD_FIELD_PAT@60..61
-                  BIN[email protected]
+                RECORD_PAT_[email protected]
+                  IDENT[email protected]
                     [email protected]
                       [email protected] "a"
                 [email protected] ","
                 [email protected] " "
-                RECORD_FIELD_PAT@63..64
-                  BIN[email protected]
+                RECORD_PAT_[email protected]
+                  IDENT[email protected]
                     [email protected]
                       [email protected] "b"
                 [email protected] " "
@@ -109,7 +109,7 @@ [email protected]
                   [email protected]
                     [email protected] "NewType"
               [email protected] "("
-              BIN[email protected]
+              IDENT[email protected]
                 [email protected]
                   [email protected] "a"
               [email protected] ")"
@@ -138,7 +138,7 @@ [email protected]
               [email protected] "&"
               [email protected]
                 [email protected] "&"
-                BIN[email protected]
+                IDENT[email protected]
                   [email protected]
                     [email protected] "a"
             [email protected] ":"
diff --git a/crates/ra_syntax/test_data/parser/ok/0067_where_for_pred.rast b/crates/ra_syntax/test_data/parser/ok/0067_where_for_pred.rast
index a368ac1e8..fae9467fc 100644
--- a/crates/ra_syntax/test_data/parser/ok/0067_where_for_pred.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0067_where_for_pred.rast
@@ -245,7 +245,7 @@ [email protected]
     [email protected]
       [email protected] "("
       [email protected]
-        BIN[email protected]
+        IDENT[email protected]
           [email protected]
             [email protected] "_t"
         [email protected] ":"
diff --git a/xtask/src/ast_src.rs b/xtask/src/ast_src.rs
index 762d9265e..2ff029158 100644
--- a/xtask/src/ast_src.rs
+++ b/xtask/src/ast_src.rs
@@ -126,13 +126,13 @@ pub(crate) const KINDS_SRC: KindsSrc = KindsSrc {
         "PAREN_PAT",
         "REF_PAT",
         "BOX_PAT",
-        "BIND_PAT",
-        "PLACEHOLDER_PAT",
+        "IDENT_PAT",
+        "WILDCARD_PAT",
         "DOT_DOT_PAT",
         "PATH_PAT",
         "RECORD_PAT",
-        "RECORD_FIELD_PAT_LIST",
-        "RECORD_FIELD_PAT",
+        "RECORD_PAT_FIELD_LIST",
+        "RECORD_PAT_FIELD",
         "TUPLE_STRUCT_PAT",
         "TUPLE_PAT",
         "SLICE_PAT",
diff --git a/xtask/src/codegen/rust.ungram b/xtask/src/codegen/rust.ungram
index 2e3b45011..7685f4f06 100644
--- a/xtask/src/codegen/rust.ungram
+++ b/xtask/src/codegen/rust.ungram
@@ -1,3 +1,9 @@
+Name =
+  'ident'
+
+NameRef =
+  'ident' | 'int_number'
+
 Path =
   (qualifier:Path '::')? segment:PathSegment
 
@@ -29,6 +35,21 @@ LifetimeArg =
 ConstArg =
   Expr
 
+MacroCall =
+  Attr* Path '!' Name? TokenTree ';'?
+
+TokenTree =
+  '(' ')'
+| '{' '}'
+| '[' ']'
+
+MacroItems =
+  Item*
+
+MacroStmts =
+  statements:Stmt*
+  Expr?
+
 SourceFile =
   'shebang'?
   Attr*
@@ -475,93 +496,73 @@ TypeBound =
   'lifetime'
 | '?'? Type
 
-OrPat =
-  Pat*
-
-ParenPat =
-  '(' Pat ')'
-
-RefPat =
-  '&' 'mut'? Pat
+Pat =
+  IdentPat
+| BoxPat
+| DotDotPat
+| LiteralPat
+| MacroPat
+| OrPat
+| ParenPat
+| PathPat
+| WildcardPat
+| RangePat
+| RecordPat
+| RefPat
+| SlicePat
+| TuplePat
+| TupleStructPat
 
-BoxPat =
-  'box' Path
+LiteralPat =
+  Literal
 
-BindPat =
+IdentPat =
   Attr* 'ref'? 'mut'? Name ('@' Pat)?
 
-PlaceholderPat =
+WildcardPat =
   '_'
 
-DotDotPat =
-  '..'
-
-PathPat =
-  Path
-
-SlicePat =
-  '[' args:Pat* ']'
-
 RangePat =
-  '..' | '..='
-
-LiteralPat =
-  Literal
+  start:Pat op:('..' | '..=') end:Pat
 
-MacroPat =
-  MacroCall
+RefPat =
+  '&' 'mut'? Pat
 
 RecordPat =
-  Path RecordFieldPatList
+  Path RecordPatFieldList
 
-RecordFieldPatList =
+RecordPatFieldList =
   '{'
-    record_field_pats:RecordFieldPat*
-    BindPat*
+    fields:(RecordPatField (',' RecordPatField)* ','?)
     '..'?
   '}'
 
-RecordFieldPat =
-  Attr* NameRef ':' Pat
+RecordPatField =
+  Attr* (NameRef ':')? Pat
 
 TupleStructPat =
-   Path '(' args:Pat* ')'
+   Path '(' args:(Pat (',' Pat)* ','?)? ')'
 
 TuplePat =
-   '(' args:Pat* ')'
+   '(' args:(Pat (',' Pat)* ','?)? ')'
 
-Name =
-  'ident'
+ParenPat =
+  '(' Pat ')'
 
-NameRef =
-  'ident' | 'int_number'
+SlicePat =
+  '[' args:(Pat (',' Pat)* ','?)? ']'
 
-MacroCall =
-  Attr* Path '!' Name? TokenTree ';'?
+PathPat =
+  Path
 
-TokenTree =
-  '(' ')' | '{' '}' | '[' ']'
+OrPat =
+  (Pat ('|' Pat)* '|'?)
 
-MacroItems =
-  Item*
+BoxPat =
+  'box' Pat
 
-MacroStmts =
-  statements:Stmt*
-  Expr?
+DotDotPat =
+  '..'
 
-Pat =
-  OrPat
-| ParenPat
-| RefPat
-| BoxPat
-| BindPat
-| PlaceholderPat
-| DotDotPat
-| PathPat
-| RecordPat
-| TupleStructPat
-| TuplePat
-| SlicePat
-| RangePat
-| LiteralPat
-| MacroPat
+MacroPat =
+  MacroCall