288 files changed, 3920 insertions, 5418 deletions

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 02a3b6228..00f299ff1 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -20,25 +20,14 @@ jobs:
     name: Audit Rust vulnerabilities
     runs-on: ubuntu-latest
     steps:
-    - name: Install Rust toolchain
-      uses: actions-rs/toolchain@v1
-      with:
-        toolchain: stable
-        profile: minimal
-        override: true
-
     - name: Checkout repository
       uses: actions/checkout@v2
 
-    - run: sudo chown -R $(whoami):$(id -ng) ~/.cargo/
-
-    - name: Cache cargo
-      uses: actions/cache@v1
+    - uses: actions-rs/[email protected]
       with:
-        path: ~/.cargo/
-        key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
+        crate: cargo-audit
+        use-tool-cache: true
 
-    - run: cargo install cargo-audit
     - run: cargo audit
 
   rust:
diff --git a/Cargo.lock b/Cargo.lock
index 34f05e83a..975c1aef8 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -425,6 +425,17 @@ dependencies = [
 ]
 
 [[package]]
+name = "goblin"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ddd5e3132801a1ac34ac53b97acde50c4685414dd2f291b9ea52afa6f07468c8"
+dependencies = [
+ "log",
+ "plain",
+ "scroll",
+]
+
+[[package]]
 name = "heck"
 version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -587,6 +598,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "dea0c0405123bba743ee3f91f49b1c7cfb684eef0da0a50110f758ccf24cdff0"
 
 [[package]]
+name = "libloading"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2c979a19ffb457f0273965c333053f3d586bf759bf7b683fbebc37f9a9ebedc4"
+dependencies = [
+ "winapi 0.3.8",
+]
+
+[[package]]
 name = "linked-hash-map"
 version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -594,9 +614,9 @@ checksum = "ae91b68aebc4ddb91978b11a1b02ddd8602a05ec19002801c5666000e05e0f83"
 
 [[package]]
 name = "lock_api"
-version = "0.3.3"
+version = "0.3.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "79b2de95ecb4691949fea4716ca53cdbcfccb2c612e19644a8bad05edcf9f47b"
+checksum = "c4da24a77a3d8a6d4862d95f72e6fdb9c09a643ecdb402d754004a557f2bec75"
 dependencies = [
  "scopeguard",
 ]
@@ -759,9 +779,9 @@ checksum = "a86ed3f5f244b372d6b1a00b72ef7f8876d0bc6a78a4c9985c53614041512063"
 
 [[package]]
 name = "parking_lot"
-version = "0.10.0"
+version = "0.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "92e98c49ab0b7ce5b222f2cc9193fc4efe11c6d0bd4f648e374684a6857b1cfc"
+checksum = "6fdfcb5f20930a79e326f7ec992a9fdb5b7bd809254b1e735bdd5a99f78bee0d"
 dependencies = [
  "lock_api",
  "parking_lot_core",
@@ -769,9 +789,9 @@ dependencies = [
 
 [[package]]
 name = "parking_lot_core"
-version = "0.7.0"
+version = "0.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7582838484df45743c8434fbff785e8edf260c28748353d44bc0da32e0ceabf1"
+checksum = "0e136c1904604defe99ce5fd71a28d473fa60a12255d511aa78a9ddf11237aeb"
 dependencies = [
  "cfg-if",
  "cloudabi",
@@ -826,6 +846,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3ad1f1b834a05d42dae330066e9699a173b28185b3bdc3dbf14ca239585de8cc"
 
 [[package]]
+name = "plain"
+version = "0.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b4596b6d070b27117e987119b4dac604f3c58cfb0b191112e24771b2faeac1a6"
+
+[[package]]
 name = "ppv-lite86"
 version = "0.2.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -995,6 +1021,7 @@ dependencies = [
  "ra_prof",
  "ra_syntax",
  "rustc-hash",
+ "scoped-tls",
  "smallvec",
  "stdx",
  "test_utils",
@@ -1081,10 +1108,13 @@ version = "0.1.0"
 dependencies = [
  "cargo_metadata",
  "difference",
+ "goblin",
+ "libloading",
  "ra_mbe",
  "ra_proc_macro",
  "ra_tt",
  "serde_derive",
+ "test_utils",
 ]
 
 [[package]]
@@ -1391,12 +1421,38 @@ dependencies = [
 ]
 
 [[package]]
+name = "scoped-tls"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ea6a9290e3c9cf0f18145ef7ffa62d68ee0bf5fcd651017e586dc7fd5da448c2"
+
+[[package]]
 name = "scopeguard"
 version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"
 
 [[package]]
+name = "scroll"
+version = "0.10.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "abb2332cb595d33f7edd5700f4cbf94892e680c7f0ae56adab58a35190b66cb1"
+dependencies = [
+ "scroll_derive",
+]
+
+[[package]]
+name = "scroll_derive"
+version = "0.10.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f8584eea9b9ff42825b46faf46a8c24d2cff13ec152fa2a50df788b87c07ee28"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
 name = "semver"
 version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -1474,9 +1530,9 @@ checksum = "c111b5bd5695e56cffe5129854aa230b39c93a305372fdbb2668ca2394eea9f8"
 
 [[package]]
 name = "smallvec"
-version = "1.2.0"
+version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c2fb2ec9bcd216a5b0d0ccf31ab17b5ed1d627960edff65bbe95d3ce221cefc"
+checksum = "05720e22615919e4734f6a99ceae50d00226c3c5aca406e102ebc33298214e0a"
 
 [[package]]
 name = "smol_str"
@@ -1524,9 +1580,9 @@ dependencies = [
 
 [[package]]
 name = "termios"
-version = "0.3.1"
+version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72b620c5ea021d75a735c943269bb07d30c9b77d6ac6b236bc8b5c496ef05625"
+checksum = "6f0fcee7b24a25675de40d5bb4de6e41b0df07bc9856295e7e2b3a3600c400c2"
 dependencies = [
  "libc",
 ]
diff --git a/crates/ra_assists/src/doc_tests/generated.rs b/crates/ra_assists/src/doc_tests/generated.rs
index 64444ee3a..b63b4d81a 100644
--- a/crates/ra_assists/src/doc_tests/generated.rs
+++ b/crates/ra_assists/src/doc_tests/generated.rs
@@ -180,7 +180,7 @@ trait Trait<T> {
 }
 
 impl Trait<u32> for () {
-    fn foo(&self) -> u32 { unimplemented!() }
+    fn foo(&self) -> u32 { todo!() }
 
 }
 "#####,
@@ -607,6 +607,21 @@ impl Walrus {
 }
 
 #[test]
+fn doctest_reorder_fields() {
+    check(
+        "reorder_fields",
+        r#####"
+struct Foo {foo: i32, bar: i32};
+const test: Foo = <|>Foo {bar: 0, foo: 1}
+"#####,
+        r#####"
+struct Foo {foo: i32, bar: i32};
+const test: Foo = Foo {foo: 1, bar: 0}
+"#####,
+    )
+}
+
+#[test]
 fn doctest_replace_if_let_with_match() {
     check(
         "replace_if_let_with_match",
diff --git a/crates/ra_assists/src/handlers/add_impl.rs b/crates/ra_assists/src/handlers/add_impl.rs
index 72a201b6d..6622eadb2 100644
--- a/crates/ra_assists/src/handlers/add_impl.rs
+++ b/crates/ra_assists/src/handlers/add_impl.rs
@@ -1,5 +1,5 @@
 use ra_syntax::{
-    ast::{self, AstNode, AstToken, NameOwner, TypeParamsOwner},
+    ast::{self, AstNode, NameOwner, TypeParamsOwner},
     TextUnit,
 };
 use stdx::{format_to, SepBy};
@@ -42,7 +42,7 @@ pub(crate) fn add_impl(ctx: AssistCtx) -> Option<Assist> {
         if let Some(type_params) = type_params {
             let lifetime_params = type_params
                 .lifetime_params()
-                .filter_map(|it| it.lifetime())
+                .filter_map(|it| it.lifetime_token())
                 .map(|it| it.text().clone());
             let type_params =
                 type_params.type_params().filter_map(|it| it.name()).map(|it| it.text().clone());
diff --git a/crates/ra_assists/src/handlers/add_missing_impl_members.rs b/crates/ra_assists/src/handlers/add_missing_impl_members.rs
index 722f207e2..2d6d44980 100644
--- a/crates/ra_assists/src/handlers/add_missing_impl_members.rs
+++ b/crates/ra_assists/src/handlers/add_missing_impl_members.rs
@@ -40,7 +40,7 @@ enum AddMissingImplMembersMode {
 // }
 //
 // impl Trait<u32> for () {
-//     fn foo(&self) -> u32 { unimplemented!() }
+//     fn foo(&self) -> u32 { todo!() }
 //
 // }
 // ```
@@ -165,7 +165,7 @@ fn add_missing_impl_members_inner(
 
 fn add_body(fn_def: ast::FnDef) -> ast::FnDef {
     if fn_def.body().is_none() {
-        fn_def.with_body(make::block_from_expr(make::expr_unimplemented()))
+        fn_def.with_body(make::block_from_expr(make::expr_todo()))
     } else {
         fn_def
     }
@@ -215,8 +215,8 @@ impl Foo for S {
     fn bar(&self) {}
     <|>type Output;
     const CONST: usize = 42;
-    fn foo(&self) { unimplemented!() }
-    fn baz(&self) { unimplemented!() }
+    fn foo(&self) { todo!() }
+    fn baz(&self) { todo!() }
 
 }",
         );
@@ -250,7 +250,7 @@ struct S;
 
 impl Foo for S {
     fn bar(&self) {}
-    <|>fn foo(&self) { unimplemented!() }
+    <|>fn foo(&self) { todo!() }
 
 }",
         );
@@ -268,7 +268,7 @@ impl Foo for S { <|> }",
 trait Foo { fn foo(&self); }
 struct S;
 impl Foo for S {
-    <|>fn foo(&self) { unimplemented!() }
+    <|>fn foo(&self) { todo!() }
 }",
         );
     }
@@ -285,7 +285,7 @@ impl Foo<u32> for S { <|> }",
 trait Foo<T> { fn foo(&self, t: T) -> &T; }
 struct S;
 impl Foo<u32> for S {
-    <|>fn foo(&self, t: u32) -> &u32 { unimplemented!() }
+    <|>fn foo(&self, t: u32) -> &u32 { todo!() }
 }",
         );
     }
@@ -302,7 +302,7 @@ impl<U> Foo<U> for S { <|> }",
 trait Foo<T> { fn foo(&self, t: T) -> &T; }
 struct S;
 impl<U> Foo<U> for S {
-    <|>fn foo(&self, t: U) -> &U { unimplemented!() }
+    <|>fn foo(&self, t: U) -> &U { todo!() }
 }",
         );
     }
@@ -319,7 +319,7 @@ impl Foo for S {}<|>",
 trait Foo { fn foo(&self); }
 struct S;
 impl Foo for S {
-    <|>fn foo(&self) { unimplemented!() }
+    <|>fn foo(&self) { todo!() }
 }",
         )
     }
@@ -342,7 +342,7 @@ mod foo {
 }
 struct S;
 impl foo::Foo for S {
-    <|>fn foo(&self, bar: foo::Bar) { unimplemented!() }
+    <|>fn foo(&self, bar: foo::Bar) { todo!() }
 }",
         );
     }
@@ -365,7 +365,7 @@ mod foo {
 }
 struct S;
 impl foo::Foo for S {
-    <|>fn foo(&self, bar: foo::Bar<u32>) { unimplemented!() }
+    <|>fn foo(&self, bar: foo::Bar<u32>) { todo!() }
 }",
         );
     }
@@ -388,7 +388,7 @@ mod foo {
 }
 struct S;
 impl foo::Foo<u32> for S {
-    <|>fn foo(&self, bar: foo::Bar<u32>) { unimplemented!() }
+    <|>fn foo(&self, bar: foo::Bar<u32>) { todo!() }
 }",
         );
     }
@@ -414,7 +414,7 @@ mod foo {
 struct Param;
 struct S;
 impl foo::Foo<Param> for S {
-    <|>fn foo(&self, bar: Param) { unimplemented!() }
+    <|>fn foo(&self, bar: Param) { todo!() }
 }",
         );
     }
@@ -439,7 +439,7 @@ mod foo {
 }
 struct S;
 impl foo::Foo for S {
-    <|>fn foo(&self, bar: foo::Bar<u32>::Assoc) { unimplemented!() }
+    <|>fn foo(&self, bar: foo::Bar<u32>::Assoc) { todo!() }
 }",
         );
     }
@@ -464,7 +464,7 @@ mod foo {
 }
 struct S;
 impl foo::Foo for S {
-    <|>fn foo(&self, bar: foo::Bar<foo::Baz>) { unimplemented!() }
+    <|>fn foo(&self, bar: foo::Bar<foo::Baz>) { todo!() }
 }",
         );
     }
@@ -487,7 +487,7 @@ mod foo {
 }
 struct S;
 impl foo::Foo for S {
-    <|>fn foo(&self, bar: dyn Fn(u32) -> i32) { unimplemented!() }
+    <|>fn foo(&self, bar: dyn Fn(u32) -> i32) { todo!() }
 }",
         );
     }
@@ -544,7 +544,7 @@ trait Foo {
 struct S;
 impl Foo for S {
     <|>type Output;
-    fn foo(&self) { unimplemented!() }
+    fn foo(&self) { todo!() }
 }"#,
         )
     }
diff --git a/crates/ra_assists/src/handlers/add_new.rs b/crates/ra_assists/src/handlers/add_new.rs
index c10397249..240b19fa3 100644
--- a/crates/ra_assists/src/handlers/add_new.rs
+++ b/crates/ra_assists/src/handlers/add_new.rs
@@ -1,8 +1,7 @@
 use hir::Adt;
 use ra_syntax::{
     ast::{
-        self, AstNode, AstToken, NameOwner, StructKind, TypeAscriptionOwner, TypeParamsOwner,
-        VisibilityOwner,
+        self, AstNode, NameOwner, StructKind, TypeAscriptionOwner, TypeParamsOwner, VisibilityOwner,
     },
     TextUnit, T,
 };
@@ -106,7 +105,7 @@ fn generate_impl_text(strukt: &ast::StructDef, code: &str) -> String {
     if let Some(type_params) = type_params {
         let lifetime_params = type_params
             .lifetime_params()
-            .filter_map(|it| it.lifetime())
+            .filter_map(|it| it.lifetime_token())
             .map(|it| it.text().clone());
         let type_params =
             type_params.type_params().filter_map(|it| it.name()).map(|it| it.text().clone());
diff --git a/crates/ra_assists/src/handlers/inline_local_variable.rs b/crates/ra_assists/src/handlers/inline_local_variable.rs
index 3bfcba8ff..c4fb425b0 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 @@ pub(crate) fn inline_local_variable(ctx: AssistCtx) -> Option<Assist> {
         ast::Pat::BindPat(pat) => pat,
         _ => return None,
     };
-    if bind_pat.is_mutable() {
+    if bind_pat.mut_token().is_some() {
         tested_by!(test_not_inline_mut_variable);
         return None;
     }
diff --git a/crates/ra_assists/src/handlers/introduce_variable.rs b/crates/ra_assists/src/handlers/introduce_variable.rs
index 8a02f1a32..8d0f7e922 100644
--- a/crates/ra_assists/src/handlers/introduce_variable.rs
+++ b/crates/ra_assists/src/handlers/introduce_variable.rs
@@ -61,7 +61,7 @@ pub(crate) fn introduce_variable(ctx: AssistCtx) -> Option<Assist> {
         };
         if is_full_stmt {
             tested_by!(test_introduce_var_expr_stmt);
-            if !full_stmt.unwrap().has_semi() {
+            if full_stmt.unwrap().semicolon_token().is_none() {
                 buf.push_str(";");
             }
             edit.replace(expr.syntax().text_range(), buf);
diff --git a/crates/ra_assists/src/handlers/merge_imports.rs b/crates/ra_assists/src/handlers/merge_imports.rs
index f8b3ddb4e..0958f52f1 100644
--- a/crates/ra_assists/src/handlers/merge_imports.rs
+++ b/crates/ra_assists/src/handlers/merge_imports.rs
@@ -3,7 +3,7 @@ use std::iter::successors;
 use ra_syntax::{
     algo::{neighbor, SyntaxRewriter},
     ast::{self, edit::AstNodeEdit, make},
-    AstNode, AstToken, Direction, InsertPosition, SyntaxElement, T,
+    AstNode, Direction, InsertPosition, SyntaxElement, T,
 };
 
 use crate::{Assist, AssistCtx, AssistId};
@@ -82,7 +82,7 @@ fn try_merge_trees(old: &ast::UseTree, new: &ast::UseTree) -> Option<ast::UseTre
             .filter(|it| it.kind() != T!['{'] && it.kind() != T!['}']),
     );
     let use_tree_list = lhs.use_tree_list()?;
-    let pos = InsertPosition::Before(use_tree_list.r_curly()?.syntax().clone().into());
+    let pos = InsertPosition::Before(use_tree_list.r_curly_token()?.into());
     let use_tree_list = use_tree_list.insert_children(pos, to_insert);
     Some(lhs.with_use_tree_list(use_tree_list))
 }
diff --git a/crates/ra_assists/src/handlers/move_bounds.rs b/crates/ra_assists/src/handlers/move_bounds.rs
index 93f26f51a..0f26884dc 100644
--- a/crates/ra_assists/src/handlers/move_bounds.rs
+++ b/crates/ra_assists/src/handlers/move_bounds.rs
@@ -2,6 +2,7 @@ use ra_syntax::{
     ast::{self, edit::AstNodeEdit, make, AstNode, NameOwner, TypeBoundsOwner},
     match_ast,
     SyntaxKind::*,
+    T,
 };
 
 use crate::{Assist, AssistCtx, AssistId};
@@ -42,7 +43,7 @@ pub(crate) fn move_bounds_to_where_clause(ctx: AssistCtx) -> Option<Assist> {
             ast::EnumDef(it) => it.variant_list()?.syntax().clone().into(),
             ast::StructDef(it) => {
                 it.syntax().children_with_tokens()
-                    .find(|it| it.kind() == RECORD_FIELD_DEF_LIST || it.kind() == SEMI)?
+                    .find(|it| it.kind() == RECORD_FIELD_DEF_LIST || it.kind() == T![;])?
             },
             _ => return None
         }
diff --git a/crates/ra_assists/src/handlers/reorder_fields.rs b/crates/ra_assists/src/handlers/reorder_fields.rs
new file mode 100644
index 000000000..692dd1315
--- /dev/null
+++ b/crates/ra_assists/src/handlers/reorder_fields.rs
@@ -0,0 +1,230 @@
+use std::collections::HashMap;
+
+use itertools::Itertools;
+
+use hir::{Adt, ModuleDef, PathResolution, Semantics, Struct};
+use ra_ide_db::RootDatabase;
+use ra_syntax::{
+    algo, ast,
+    ast::{Name, Path, RecordLit, RecordPat},
+    AstNode, SyntaxKind, SyntaxNode,
+};
+
+use crate::{
+    assist_ctx::{Assist, AssistCtx},
+    AssistId,
+};
+use ra_syntax::ast::{Expr, NameRef};
+
+// Assist: reorder_fields
+//
+// Reorder the fields of record literals and record patterns in the same order as in
+// the definition.
+//
+// ```
+// struct Foo {foo: i32, bar: i32};
+// const test: Foo = <|>Foo {bar: 0, foo: 1}
+// ```
+// ->
+// ```
+// struct Foo {foo: i32, bar: i32};
+// const test: Foo = Foo {foo: 1, bar: 0}
+// ```
+//
+pub(crate) fn reorder_fields(ctx: AssistCtx) -> Option<Assist> {
+    reorder::<RecordLit>(ctx.clone()).or_else(|| reorder::<RecordPat>(ctx))
+}
+
+fn reorder<R: AstNode>(ctx: AssistCtx) -> Option<Assist> {
+    let record = ctx.find_node_at_offset::<R>()?;
+    let path = record.syntax().children().find_map(Path::cast)?;
+
+    let ranks = compute_fields_ranks(&path, &ctx)?;
+
+    let fields = get_fields(&record.syntax());
+    let sorted_fields = sorted_by_rank(&fields, |node| {
+        *ranks.get(&get_field_name(node)).unwrap_or(&usize::max_value())
+    });
+
+    if sorted_fields == fields {
+        return None;
+    }
+
+    ctx.add_assist(AssistId("reorder_fields"), "Reorder record fields", |edit| {
+        for (old, new) in fields.iter().zip(&sorted_fields) {
+            algo::diff(old, new).into_text_edit(edit.text_edit_builder());
+        }
+        edit.target(record.syntax().text_range())
+    })
+}
+
+fn get_fields_kind(node: &SyntaxNode) -> Vec<SyntaxKind> {
+    use SyntaxKind::*;
+    match node.kind() {
+        RECORD_LIT => vec![RECORD_FIELD],
+        RECORD_PAT => vec![RECORD_FIELD_PAT, BIND_PAT],
+        _ => vec![],
+    }
+}
+
+fn get_field_name(node: &SyntaxNode) -> String {
+    use SyntaxKind::*;
+    match node.kind() {
+        RECORD_FIELD => {
+            if let Some(name) = node.children().find_map(NameRef::cast) {
+                return name.to_string();
+            }
+            node.children().find_map(Expr::cast).map(|expr| expr.to_string()).unwrap_or_default()
+        }
+        BIND_PAT | RECORD_FIELD_PAT => {
+            node.children().find_map(Name::cast).map(|n| n.to_string()).unwrap_or_default()
+        }
+        _ => String::new(),
+    }
+}
+
+fn get_fields(record: &SyntaxNode) -> Vec<SyntaxNode> {
+    let kinds = get_fields_kind(record);
+    record.children().flat_map(|n| n.children()).filter(|n| kinds.contains(&n.kind())).collect()
+}
+
+fn sorted_by_rank(
+    fields: &[SyntaxNode],
+    get_rank: impl Fn(&SyntaxNode) -> usize,
+) -> Vec<SyntaxNode> {
+    fields.iter().cloned().sorted_by_key(get_rank).collect()
+}
+
+fn struct_definition(path: &ast::Path, sema: &Semantics<RootDatabase>) -> Option<Struct> {
+    match sema.resolve_path(path) {
+        Some(PathResolution::Def(ModuleDef::Adt(Adt::Struct(s)))) => Some(s),
+        _ => None,
+    }
+}
+
+fn compute_fields_ranks(path: &Path, ctx: &AssistCtx) -> Option<HashMap<String, usize>> {
+    Some(
+        struct_definition(path, ctx.sema)?
+            .fields(ctx.db)
+            .iter()
+            .enumerate()
+            .map(|(idx, field)| (field.name(ctx.db).to_string(), idx))
+            .collect(),
+    )
+}
+
+#[cfg(test)]
+mod tests {
+    use crate::helpers::{check_assist, check_assist_not_applicable};
+
+    use super::*;
+
+    #[test]
+    fn not_applicable_if_sorted() {
+        check_assist_not_applicable(
+            reorder_fields,
+            r#"
+        struct Foo {
+            foo: i32,
+            bar: i32,
+        }
+
+        const test: Foo = <|>Foo { foo: 0, bar: 0 };
+        "#,
+        )
+    }
+
+    #[test]
+    fn trivial_empty_fields() {
+        check_assist_not_applicable(
+            reorder_fields,
+            r#"
+        struct Foo {};
+        const test: Foo = <|>Foo {}
+        "#,
+        )
+    }
+
+    #[test]
+    fn reorder_struct_fields() {
+        check_assist(
+            reorder_fields,
+            r#"
+        struct Foo {foo: i32, bar: i32};
+        const test: Foo = <|>Foo {bar: 0, foo: 1}
+        "#,
+            r#"
+        struct Foo {foo: i32, bar: i32};
+        const test: Foo = <|>Foo {foo: 1, bar: 0}
+        "#,
+        )
+    }
+
+    #[test]
+    fn reorder_struct_pattern() {
+        check_assist(
+            reorder_fields,
+            r#"
+        struct Foo { foo: i64, bar: i64, baz: i64 }
+
+        fn f(f: Foo) -> {
+            match f {
+                <|>Foo { baz: 0, ref mut bar, .. } => (),
+                _ => ()
+            }
+        }
+        "#,
+            r#"
+        struct Foo { foo: i64, bar: i64, baz: i64 }
+
+        fn f(f: Foo) -> {
+            match f {
+                <|>Foo { ref mut bar, baz: 0, .. } => (),
+                _ => ()
+            }
+        }
+        "#,
+        )
+    }
+
+    #[test]
+    fn reorder_with_extra_field() {
+        check_assist(
+            reorder_fields,
+            r#"
+            struct Foo {
+                foo: String,
+                bar: String,
+            }
+
+            impl Foo {
+                fn new() -> Foo {
+                    let foo = String::new();
+                    <|>Foo {
+                        bar: foo.clone(),
+                        extra: "Extra field",
+                        foo,
+                    }
+                }
+            }
+            "#,
+            r#"
+            struct Foo {
+                foo: String,
+                bar: String,
+            }
+
+            impl Foo {
+                fn new() -> Foo {
+                    let foo = String::new();
+                    <|>Foo {
+                        foo,
+                        bar: foo.clone(),
+                        extra: "Extra field",
+                    }
+                }
+            }
+            "#,
+        )
+    }
+}
diff --git a/crates/ra_assists/src/lib.rs b/crates/ra_assists/src/lib.rs
index 5ba5254fd..a00136da1 100644
--- a/crates/ra_assists/src/lib.rs
+++ b/crates/ra_assists/src/lib.rs
@@ -129,6 +129,7 @@ mod handlers {
     mod replace_unwrap_with_match;
     mod split_import;
     mod add_from_impl_for_enum;
+    mod reorder_fields;
 
     pub(crate) fn all() -> &'static [AssistHandler] {
         &[
@@ -170,6 +171,7 @@ mod handlers {
             // These are manually sorted for better priorities
             add_missing_impl_members::add_missing_impl_members,
             add_missing_impl_members::add_missing_default_members,
+            reorder_fields::reorder_fields,
         ]
     }
 }
diff --git a/crates/ra_hir/src/source_analyzer.rs b/crates/ra_hir/src/source_analyzer.rs
index 45631f8fd..58ae6ce41 100644
--- a/crates/ra_hir/src/source_analyzer.rs
+++ b/crates/ra_hir/src/source_analyzer.rs
@@ -139,7 +139,7 @@ impl SourceAnalyzer {
         &self,
         db: &dyn HirDatabase,
         field: &ast::FieldExpr,
-    ) -> Option<crate::StructField> {
+    ) -> Option<StructField> {
         let expr_id = self.expr_id(db, &field.clone().into())?;
         self.infer.as_ref()?.field_resolution(expr_id).map(|it| it.into())
     }
@@ -148,21 +148,19 @@ impl SourceAnalyzer {
         &self,
         db: &dyn HirDatabase,
         field: &ast::RecordField,
-    ) -> Option<(crate::StructField, Option<Local>)> {
-        let (expr_id, local) = match field.expr() {
-            Some(it) => (self.expr_id(db, &it)?, None),
-            None => {
-                let src = InFile { file_id: self.file_id, value: field };
-                let expr_id = self.body_source_map.as_ref()?.field_init_shorthand_expr(src)?;
-                let local_name = field.name_ref()?.as_name();
-                let path = ModPath::from_segments(PathKind::Plain, once(local_name));
-                let local = match self.resolver.resolve_path_in_value_ns_fully(db.upcast(), &path) {
-                    Some(ValueNs::LocalBinding(pat_id)) => {
-                        Some(Local { pat_id, parent: self.resolver.body_owner()? })
-                    }
-                    _ => None,
-                };
-                (expr_id, local)
+    ) -> Option<(StructField, Option<Local>)> {
+        let expr = field.expr()?;
+        let expr_id = self.expr_id(db, &expr)?;
+        let local = if field.name_ref().is_some() {
+            None
+        } else {
+            let local_name = field.field_name()?.as_name();
+            let path = ModPath::from_segments(PathKind::Plain, once(local_name));
+            match self.resolver.resolve_path_in_value_ns_fully(db.upcast(), &path) {
+                Some(ValueNs::LocalBinding(pat_id)) => {
+                    Some(Local { pat_id, parent: self.resolver.body_owner()? })
+                }
+                _ => None,
             }
         };
         let struct_field = self.infer.as_ref()?.record_field_resolution(expr_id)?;
@@ -255,7 +253,7 @@ impl SourceAnalyzer {
             _ => return None,
         };
 
-        let (variant, missing_fields) =
+        let (variant, missing_fields, _exhaustive) =
             record_pattern_missing_fields(db, infer, pat_id, &body[pat_id])?;
         let res = self.missing_fields(db, krate, substs, variant, missing_fields);
         Some(res)
@@ -319,8 +317,7 @@ fn scope_for_offset(
             if source.file_id != offset.file_id {
                 return None;
             }
-            let syntax_node_ptr =
-                source.value.either(|it| it.syntax_node_ptr(), |it| it.syntax_node_ptr());
+            let syntax_node_ptr = source.value.syntax_node_ptr();
             Some((syntax_node_ptr, scope))
         })
         // find containing scope
@@ -399,8 +396,7 @@ fn adjust(
             if source.file_id != file_id {
                 return None;
             }
-            let syntax_node_ptr =
-                source.value.either(|it| it.syntax_node_ptr(), |it| it.syntax_node_ptr());
+            let syntax_node_ptr = source.value.syntax_node_ptr();
             Some((syntax_node_ptr, scope))
         })
         .map(|(ptr, scope)| (ptr.range(), scope))
diff --git a/crates/ra_hir_def/src/adt.rs b/crates/ra_hir_def/src/adt.rs
index be4b0accb..7c0d93691 100644
--- a/crates/ra_hir_def/src/adt.rs
+++ b/crates/ra_hir_def/src/adt.rs
@@ -4,7 +4,6 @@ use std::sync::Arc;
 
 use either::Either;
 use hir_expand::{
-    hygiene::Hygiene,
     name::{AsName, Name},
     InFile,
 };
@@ -13,7 +12,7 @@ use ra_prof::profile;
 use ra_syntax::ast::{self, NameOwner, TypeAscriptionOwner, VisibilityOwner};
 
 use crate::{
-    attr::Attrs, db::DefDatabase, src::HasChildSource, src::HasSource, trace::Trace,
+    body::CfgExpander, db::DefDatabase, src::HasChildSource, src::HasSource, trace::Trace,
     type_ref::TypeRef, visibility::RawVisibility, EnumId, HasModule, LocalEnumVariantId,
     LocalStructFieldId, Lookup, ModuleId, StructId, UnionId, VariantId,
 };
@@ -125,8 +124,9 @@ fn lower_enum(
 
 impl VariantData {
     fn new(db: &dyn DefDatabase, flavor: InFile<ast::StructKind>, module_id: ModuleId) -> Self {
+        let mut expander = CfgExpander::new(db, flavor.file_id, module_id.krate);
         let mut trace = Trace::new_for_arena();
-        match lower_struct(db, &mut trace, &flavor, module_id) {
+        match lower_struct(db, &mut expander, &mut trace, &flavor) {
             StructKind::Tuple => VariantData::Tuple(trace.into_arena()),
             StructKind::Record => VariantData::Record(trace.into_arena()),
             StructKind::Unit => VariantData::Unit,
@@ -178,8 +178,9 @@ impl HasChildSource for VariantId {
                 it.lookup(db).container.module(db),
             ),
         };
+        let mut expander = CfgExpander::new(db, src.file_id, module_id.krate);
         let mut trace = Trace::new_for_map();
-        lower_struct(db, &mut trace, &src, module_id);
+        lower_struct(db, &mut expander, &mut trace, &src);
         src.with_value(trace.into_map())
     }
 }
@@ -193,16 +194,15 @@ pub enum StructKind {
 
 fn lower_struct(
     db: &dyn DefDatabase,
+    expander: &mut CfgExpander,
     trace: &mut Trace<StructFieldData, Either<ast::TupleFieldDef, ast::RecordFieldDef>>,
     ast: &InFile<ast::StructKind>,
-    module_id: ModuleId,
 ) -> StructKind {
-    let crate_graph = db.crate_graph();
     match &ast.value {
         ast::StructKind::Tuple(fl) => {
             for (i, fd) in fl.fields().enumerate() {
-                let attrs = Attrs::new(&fd, &Hygiene::new(db.upcast(), ast.file_id));
-                if !attrs.is_cfg_enabled(&crate_graph[module_id.krate].cfg_options) {
+                let attrs = expander.parse_attrs(&fd);
+                if !expander.is_cfg_enabled(&attrs) {
                     continue;
                 }
 
@@ -219,8 +219,8 @@ fn lower_struct(
         }
         ast::StructKind::Record(fl) => {
             for fd in fl.fields() {
-                let attrs = Attrs::new(&fd, &Hygiene::new(db.upcast(), ast.file_id));
-                if !attrs.is_cfg_enabled(&crate_graph[module_id.krate].cfg_options) {
+                let attrs = expander.parse_attrs(&fd);
+                if !expander.is_cfg_enabled(&attrs) {
                     continue;
                 }
 
diff --git a/crates/ra_hir_def/src/attr.rs b/crates/ra_hir_def/src/attr.rs
index 7b0c506b1..2f2e3e5ba 100644
--- a/crates/ra_hir_def/src/attr.rs
+++ b/crates/ra_hir_def/src/attr.rs
@@ -93,6 +93,7 @@ impl Attrs {
     }
 
     pub(crate) fn is_cfg_enabled(&self, cfg_options: &CfgOptions) -> bool {
+        // FIXME: handle cfg_attr :-)
         self.by_key("cfg").tt_values().all(|tt| cfg_options.is_cfg_enabled(tt) != Some(false))
     }
 }
diff --git a/crates/ra_hir_def/src/body.rs b/crates/ra_hir_def/src/body.rs
index 5f9d53ecb..eafaf48c1 100644
--- a/crates/ra_hir_def/src/body.rs
+++ b/crates/ra_hir_def/src/body.rs
@@ -9,11 +9,14 @@ use drop_bomb::DropBomb;
 use either::Either;
 use hir_expand::{ast_id_map::AstIdMap, hygiene::Hygiene, AstId, HirFileId, InFile, MacroDefId};
 use ra_arena::{map::ArenaMap, Arena};
+use ra_cfg::CfgOptions;
+use ra_db::CrateId;
 use ra_prof::profile;
 use ra_syntax::{ast, AstNode, AstPtr};
 use rustc_hash::FxHashMap;
 
 use crate::{
+    attr::Attrs,
     db::DefDatabase,
     expr::{Expr, ExprId, Pat, PatId},
     item_scope::BuiltinShadowMode,
@@ -24,25 +27,59 @@ use crate::{
     AsMacroCall, DefWithBodyId, HasModule, Lookup, ModuleId,
 };
 
+/// A subser of Exander that only deals with cfg attributes. We only need it to
+/// avoid cyclic queries in crate def map during enum processing.
+pub(crate) struct CfgExpander {
+    cfg_options: CfgOptions,
+    hygiene: Hygiene,
+}
+
 pub(crate) struct Expander {
+    cfg_expander: CfgExpander,
     crate_def_map: Arc<CrateDefMap>,
     current_file_id: HirFileId,
-    hygiene: Hygiene,
     ast_id_map: Arc<AstIdMap>,
     module: ModuleId,
     recursive_limit: usize,
 }
 
+impl CfgExpander {
+    pub(crate) fn new(
+        db: &dyn DefDatabase,
+        current_file_id: HirFileId,
+        krate: CrateId,
+    ) -> CfgExpander {
+        let hygiene = Hygiene::new(db.upcast(), current_file_id);
+        let cfg_options = db.crate_graph()[krate].cfg_options.clone();
+        CfgExpander { cfg_options, hygiene }
+    }
+
+    pub(crate) fn parse_attrs(&self, owner: &dyn ast::AttrsOwner) -> Attrs {
+        Attrs::new(owner, &self.hygiene)
+    }
+
+    pub(crate) fn is_cfg_enabled(&self, attrs: &Attrs) -> bool {
+        attrs.is_cfg_enabled(&self.cfg_options)
+    }
+}
+
 impl Expander {
     pub(crate) fn new(
         db: &dyn DefDatabase,
         current_file_id: HirFileId,
         module: ModuleId,
     ) -> Expander {
+        let cfg_expander = CfgExpander::new(db, current_file_id, module.krate);
         let crate_def_map = db.crate_def_map(module.krate);
-        let hygiene = Hygiene::new(db.upcast(), current_file_id);
         let ast_id_map = db.ast_id_map(current_file_id);
-        Expander { crate_def_map, current_file_id, hygiene, ast_id_map, module, recursive_limit: 0 }
+        Expander {
+            cfg_expander,
+            crate_def_map,
+            current_file_id,
+            ast_id_map,
+            module,
+            recursive_limit: 0,
+        }
     }
 
     pub(crate) fn enter_expand<T: ast::AstNode>(
@@ -75,7 +112,7 @@ impl Expander {
                         ast_id_map: mem::take(&mut self.ast_id_map),
                         bomb: DropBomb::new("expansion mark dropped"),
                     };
-                    self.hygiene = Hygiene::new(db.upcast(), file_id);
+                    self.cfg_expander.hygiene = Hygiene::new(db.upcast(), file_id);
                     self.current_file_id = file_id;
                     self.ast_id_map = db.ast_id_map(file_id);
                     self.recursive_limit += 1;
@@ -91,7 +128,7 @@ impl Expander {
     }
 
     pub(crate) fn exit(&mut self, db: &dyn DefDatabase, mut mark: Mark) {
-        self.hygiene = Hygiene::new(db.upcast(), mark.file_id);
+        self.cfg_expander.hygiene = Hygiene::new(db.upcast(), mark.file_id);
         self.current_file_id = mark.file_id;
         self.ast_id_map = mem::take(&mut mark.ast_id_map);
         self.recursive_limit -= 1;
@@ -102,8 +139,16 @@ impl Expander {
         InFile { file_id: self.current_file_id, value }
     }
 
+    pub(crate) fn parse_attrs(&self, owner: &dyn ast::AttrsOwner) -> Attrs {
+        self.cfg_expander.parse_attrs(owner)
+    }
+
+    pub(crate) fn is_cfg_enabled(&self, attrs: &Attrs) -> bool {
+        self.cfg_expander.is_cfg_enabled(attrs)
+    }
+
     fn parse_path(&mut self, path: ast::Path) -> Option<Path> {
-        Path::from_src(path, &self.hygiene)
+        Path::from_src(path, &self.cfg_expander.hygiene)
     }
 
     fn resolve_path_as_macro(&self, db: &dyn DefDatabase, path: &ModPath) -> Option<MacroDefId> {
@@ -142,7 +187,7 @@ pub struct Body {
     pub item_scope: ItemScope,
 }
 
-pub type ExprPtr = Either<AstPtr<ast::Expr>, AstPtr<ast::RecordField>>;
+pub type ExprPtr = AstPtr<ast::Expr>;
 pub type ExprSource = InFile<ExprPtr>;
 
 pub type PatPtr = Either<AstPtr<ast::Pat>, AstPtr<ast::SelfParam>>;
@@ -236,11 +281,11 @@ impl Index<PatId> for Body {
 
 impl BodySourceMap {
     pub fn expr_syntax(&self, expr: ExprId) -> Result<ExprSource, SyntheticSyntax> {
-        self.expr_map_back[expr]
+        self.expr_map_back[expr].clone()
     }
 
     pub fn node_expr(&self, node: InFile<&ast::Expr>) -> Option<ExprId> {
-        let src = node.map(|it| Either::Left(AstPtr::new(it)));
+        let src = node.map(|it| AstPtr::new(it));
         self.expr_map.get(&src).cloned()
     }
 
@@ -249,13 +294,8 @@ impl BodySourceMap {
         self.expansions.get(&src).cloned()
     }
 
-    pub fn field_init_shorthand_expr(&self, node: InFile<&ast::RecordField>) -> Option<ExprId> {
-        let src = node.map(|it| Either::Right(AstPtr::new(it)));
-        self.expr_map.get(&src).cloned()
-    }
-
     pub fn pat_syntax(&self, pat: PatId) -> Result<PatSource, SyntheticSyntax> {
-        self.pat_map_back[pat]
+        self.pat_map_back[pat].clone()
     }
 
     pub fn node_pat(&self, node: InFile<&ast::Pat>) -> Option<PatId> {
@@ -264,6 +304,6 @@ impl BodySourceMap {
     }
 
     pub fn field_syntax(&self, expr: ExprId, field: usize) -> AstPtr<ast::RecordField> {
-        self.field_map[&(expr, field)]
+        self.field_map[&(expr, field)].clone()
     }
 }
diff --git a/crates/ra_hir_def/src/body/lower.rs b/crates/ra_hir_def/src/body/lower.rs
index 032037c8c..c057dc8f2 100644
--- a/crates/ra_hir_def/src/body/lower.rs
+++ b/crates/ra_hir_def/src/body/lower.rs
@@ -2,9 +2,7 @@
 //! representation.
 
 use either::Either;
-
 use hir_expand::{
-    hygiene::Hygiene,
     name::{name, AsName, Name},
     MacroDefId, MacroDefKind,
 };
@@ -18,10 +16,8 @@ use ra_syntax::{
 };
 use test_utils::tested_by;
 
-use super::{ExprSource, PatSource};
 use crate::{
     adt::StructKind,
-    attr::Attrs,
     body::{Body, BodySourceMap, Expander, PatPtr, SyntheticSyntax},
     builtin_type::{BuiltinFloat, BuiltinInt},
     db::DefDatabase,
@@ -31,12 +27,13 @@ use crate::{
     },
     item_scope::BuiltinShadowMode,
     path::GenericArgs,
-    path::Path,
     type_ref::{Mutability, TypeRef},
-    AdtId, ConstLoc, ContainerId, DefWithBodyId, EnumLoc, FunctionLoc, HasModule, Intern,
-    ModuleDefId, StaticLoc, StructLoc, TraitLoc, TypeAliasLoc, UnionLoc,
+    AdtId, ConstLoc, ContainerId, DefWithBodyId, EnumLoc, FunctionLoc, Intern, ModuleDefId,
+    StaticLoc, StructLoc, TraitLoc, TypeAliasLoc, UnionLoc,
 };
 
+use super::{ExprSource, PatSource};
+
 pub(super) fn lower(
     db: &dyn DefDatabase,
     def: DefWithBodyId,
@@ -104,9 +101,8 @@ impl ExprCollector<'_> {
     }
 
     fn alloc_expr(&mut self, expr: Expr, ptr: AstPtr<ast::Expr>) -> ExprId {
-        let ptr = Either::Left(ptr);
         let src = self.expander.to_source(ptr);
-        let id = self.make_expr(expr, Ok(src));
+        let id = self.make_expr(expr, Ok(src.clone()));
         self.source_map.expr_map.insert(src, id);
         id
     }
@@ -115,13 +111,6 @@ impl ExprCollector<'_> {
     fn alloc_expr_desugared(&mut self, expr: Expr) -> ExprId {
         self.make_expr(expr, Err(SyntheticSyntax))
     }
-    fn alloc_expr_field_shorthand(&mut self, expr: Expr, ptr: AstPtr<ast::RecordField>) -> ExprId {
-        let ptr = Either::Right(ptr);
-        let src = self.expander.to_source(ptr);
-        let id = self.make_expr(expr, Ok(src));
-        self.source_map.expr_map.insert(src, id);
-        id
-    }
     fn empty_block(&mut self) -> ExprId {
         self.alloc_expr_desugared(Expr::Block { statements: Vec::new(), tail: None })
     }
@@ -136,7 +125,7 @@ impl ExprCollector<'_> {
 
     fn alloc_pat(&mut self, pat: Pat, ptr: PatPtr) -> PatId {
         let src = self.expander.to_source(ptr);
-        let id = self.make_pat(pat, Ok(src));
+        let id = self.make_pat(pat, Ok(src.clone()));
         self.source_map.pat_map.insert(src, id);
         id
     }
@@ -291,7 +280,7 @@ impl ExprCollector<'_> {
             ast::Expr::ParenExpr(e) => {
                 let inner = self.collect_expr_opt(e.expr());
                 // make the paren expr point to the inner expression as well
-                let src = self.expander.to_source(Either::Left(syntax_ptr));
+                let src = self.expander.to_source(syntax_ptr);
                 self.source_map.expr_map.insert(src, inner);
                 inner
             }
@@ -300,7 +289,6 @@ impl ExprCollector<'_> {
                 self.alloc_expr(Expr::Return { expr }, syntax_ptr)
             }
             ast::Expr::RecordLit(e) => {
-                let crate_graph = self.db.crate_graph();
                 let path = e.path().and_then(|path| self.expander.parse_path(path));
                 let mut field_ptrs = Vec::new();
                 let record_lit = if let Some(nfl) = e.record_field_list() {
@@ -308,31 +296,17 @@ impl ExprCollector<'_> {
                         .fields()
                         .inspect(|field| field_ptrs.push(AstPtr::new(field)))
                         .filter_map(|field| {
-                            let module_id = ContainerId::DefWithBodyId(self.def).module(self.db);
-                            let attrs = Attrs::new(
-                                &field,
-                                &Hygiene::new(self.db.upcast(), self.expander.current_file_id),
-                            );
-
-                            if !attrs.is_cfg_enabled(&crate_graph[module_id.krate].cfg_options) {
+                            let attrs = self.expander.parse_attrs(&field);
+                            if !self.expander.is_cfg_enabled(&attrs) {
                                 return None;
                             }
+                            let name = field.field_name()?.as_name();
 
                             Some(RecordLitField {
-                                name: field
-                                    .name_ref()
-                                    .map(|nr| nr.as_name())
-                                    .unwrap_or_else(Name::missing),
-                                expr: if let Some(e) = field.expr() {
-                                    self.collect_expr(e)
-                                } else if let Some(nr) = field.name_ref() {
-                                    // field shorthand
-                                    self.alloc_expr_field_shorthand(
-                                        Expr::Path(Path::from_name_ref(&nr)),
-                                        AstPtr::new(&field),
-                                    )
-                                } else {
-                                    self.missing_expr()
+                                name,
+                                expr: match field.expr() {
+                                    Some(e) => self.collect_expr(e),
+                                    None => self.missing_expr(),
                                 },
                             })
                         })
@@ -372,7 +346,7 @@ impl ExprCollector<'_> {
             }
             ast::Expr::RefExpr(e) => {
                 let expr = self.collect_expr_opt(e.expr());
-                let mutability = Mutability::from_mutable(e.is_mut());
+                let mutability = Mutability::from_mutable(e.mut_token().is_some());
                 self.alloc_expr(Expr::Ref { expr, mutability }, syntax_ptr)
             }
             ast::Expr::PrefixExpr(e) => {
@@ -587,7 +561,8 @@ impl ExprCollector<'_> {
         let pattern = match &pat {
             ast::Pat::BindPat(bp) => {
                 let name = bp.name().map(|nr| nr.as_name()).unwrap_or_else(Name::missing);
-                let annotation = BindingAnnotation::new(bp.is_mutable(), bp.is_ref());
+                let annotation =
+                    BindingAnnotation::new(bp.mut_token().is_some(), bp.ref_token().is_some());
                 let subpat = bp.pat().map(|subpat| self.collect_pat(subpat));
                 if annotation == BindingAnnotation::Unannotated && subpat.is_none() {
                     // This could also be a single-segment path pattern. To
@@ -628,7 +603,7 @@ impl ExprCollector<'_> {
             }
             ast::Pat::RefPat(p) => {
                 let pat = self.collect_pat_opt(p.pat());
-                let mutability = Mutability::from_mutable(p.is_mut());
+                let mutability = Mutability::from_mutable(p.mut_token().is_some());
                 Pat::Ref { pat, mutability }
             }
             ast::Pat::PathPat(p) => {
@@ -667,7 +642,9 @@ impl ExprCollector<'_> {
                 });
                 fields.extend(iter);
 
-                Pat::Record { path, args: fields }
+                let ellipsis = record_field_pat_list.dotdot_token().is_some();
+
+                Pat::Record { path, args: fields, ellipsis }
             }
             ast::Pat::SlicePat(p) => {
                 let SlicePatComponents { prefix, slice, suffix } = p.components();
@@ -688,7 +665,6 @@ impl ExprCollector<'_> {
                     Pat::Missing
                 }
             }
-
             // FIXME: implement
             ast::Pat::BoxPat(_) | ast::Pat::RangePat(_) | ast::Pat::MacroPat(_) => Pat::Missing,
         };
diff --git a/crates/ra_hir_def/src/data.rs b/crates/ra_hir_def/src/data.rs
index e793ad874..56a20c5bd 100644
--- a/crates/ra_hir_def/src/data.rs
+++ b/crates/ra_hir_def/src/data.rs
@@ -20,7 +20,7 @@ use crate::{
     type_ref::{Mutability, TypeBound, TypeRef},
     visibility::RawVisibility,
     AssocContainerId, AssocItemId, ConstId, ConstLoc, Expander, FunctionId, FunctionLoc, HasModule,
-    ImplId, Intern, Lookup, ModuleId, StaticId, TraitId, TypeAliasId, TypeAliasLoc,
+    ImplId, Intern, Lookup, StaticId, TraitId, TypeAliasId, TypeAliasLoc,
 };
 
 #[derive(Debug, Clone, PartialEq, Eq)]
@@ -74,7 +74,7 @@ impl FunctionData {
             TypeRef::unit()
         };
 
-        let ret_type = if src.value.is_async() {
+        let ret_type = if src.value.async_token().is_some() {
             let future_impl = desugar_future_path(ret_type);
             let ty_bound = TypeBound::Path(future_impl);
             TypeRef::ImplTrait(vec![ty_bound])
@@ -135,7 +135,7 @@ impl TraitData {
     pub(crate) fn trait_data_query(db: &dyn DefDatabase, tr: TraitId) -> Arc<TraitData> {
         let src = tr.lookup(db).source(db);
         let name = src.value.name().map_or_else(Name::missing, |n| n.as_name());
-        let auto = src.value.is_auto();
+        let auto = src.value.auto_token().is_some();
         let ast_id_map = db.ast_id_map(src.file_id);
 
         let container = AssocContainerId::TraitId(tr);
@@ -212,16 +212,23 @@ impl ImplData {
 
         let target_trait = src.value.target_trait().map(TypeRef::from_ast);
         let target_type = TypeRef::from_ast_opt(src.value.target_type());
-        let is_negative = src.value.is_negative();
+        let is_negative = src.value.excl_token().is_some();
         let module_id = impl_loc.container.module(db);
 
         let mut items = Vec::new();
 
         if let Some(item_list) = src.value.item_list() {
-            items.extend(collect_impl_items(db, item_list.impl_items(), src.file_id, id));
+            let mut expander = Expander::new(db, impl_loc.ast_id.file_id, module_id);
+            items.extend(collect_impl_items(
+                db,
+                &mut expander,
+                item_list.impl_items(),
+                src.file_id,
+                id,
+            ));
             items.extend(collect_impl_items_in_macros(
                 db,
-                module_id,
+                &mut expander,
                 &src.with_value(item_list),
                 id,
             ));
@@ -268,18 +275,17 @@ impl ConstData {
 
 fn collect_impl_items_in_macros(
     db: &dyn DefDatabase,
-    module_id: ModuleId,
+    expander: &mut Expander,
     impl_def: &InFile<ast::ItemList>,
     id: ImplId,
 ) -> Vec<AssocItemId> {
-    let mut expander = Expander::new(db, impl_def.file_id, module_id);
     let mut res = Vec::new();
 
     // We set a limit to protect against infinite recursion
     let limit = 100;
 
     for m in impl_def.value.syntax().children().filter_map(ast::MacroCall::cast) {
-        res.extend(collect_impl_items_in_macro(db, &mut expander, m, id, limit))
+        res.extend(collect_impl_items_in_macro(db, expander, m, id, limit))
     }
 
     res
@@ -300,6 +306,7 @@ fn collect_impl_items_in_macro(
         let items: InFile<ast::MacroItems> = expander.to_source(items);
         let mut res = collect_impl_items(
             db,
+            expander,
             items.value.items().filter_map(|it| ImplItem::cast(it.syntax().clone())),
             items.file_id,
             id,
@@ -319,32 +326,26 @@ fn collect_impl_items_in_macro(
 
 fn collect_impl_items(
     db: &dyn DefDatabase,
+    expander: &mut Expander,
     impl_items: impl Iterator<Item = ImplItem>,
     file_id: crate::HirFileId,
     id: ImplId,
 ) -> Vec<AssocItemId> {
     let items = db.ast_id_map(file_id);
-    let crate_graph = db.crate_graph();
-    let module_id = id.lookup(db).container.module(db);
 
     impl_items
         .filter_map(|item_node| match item_node {
             ast::ImplItem::FnDef(it) => {
+                let attrs = expander.parse_attrs(&it);
+                if !expander.is_cfg_enabled(&attrs) {
+                    return None;
+                }
                 let def = FunctionLoc {
                     container: AssocContainerId::ImplId(id),
                     ast_id: AstId::new(file_id, items.ast_id(&it)),
                 }
                 .intern(db);
-
-                if !db
-                    .function_data(def)
-                    .attrs
-                    .is_cfg_enabled(&crate_graph[module_id.krate].cfg_options)
-                {
-                    None
-                } else {
-                    Some(def.into())
-                }
+                Some(def.into())
             }
             ast::ImplItem::ConstDef(it) => {
                 let def = ConstLoc {
diff --git a/crates/ra_hir_def/src/diagnostics.rs b/crates/ra_hir_def/src/diagnostics.rs
index 095498429..cfa0f2f76 100644
--- a/crates/ra_hir_def/src/diagnostics.rs
+++ b/crates/ra_hir_def/src/diagnostics.rs
@@ -20,7 +20,7 @@ impl Diagnostic for UnresolvedModule {
         "unresolved module".to_string()
     }
     fn source(&self) -> InFile<SyntaxNodePtr> {
-        InFile { file_id: self.file, value: self.decl.into() }
+        InFile { file_id: self.file, value: self.decl.clone().into() }
     }
     fn as_any(&self) -> &(dyn Any + Send + 'static) {
         self
diff --git a/crates/ra_hir_def/src/expr.rs b/crates/ra_hir_def/src/expr.rs
index 197bbe9bd..e11bdf3ec 100644
--- a/crates/ra_hir_def/src/expr.rs
+++ b/crates/ra_hir_def/src/expr.rs
@@ -376,35 +376,14 @@ pub enum Pat {
     Wild,
     Tuple(Vec<PatId>),
     Or(Vec<PatId>),
-    Record {
-        path: Option<Path>,
-        args: Vec<RecordFieldPat>,
-        // FIXME: 'ellipsis' option
-    },
-    Range {
-        start: ExprId,
-        end: ExprId,
-    },
-    Slice {
-        prefix: Vec<PatId>,
-        slice: Option<PatId>,
-        suffix: Vec<PatId>,
-    },
+    Record { path: Option<Path>, args: Vec<RecordFieldPat>, ellipsis: bool },
+    Range { start: ExprId, end: ExprId },
+    Slice { prefix: Vec<PatId>, slice: Option<PatId>, suffix: Vec<PatId> },
     Path(Path),
     Lit(ExprId),
-    Bind {
-        mode: BindingAnnotation,
-        name: Name,
-        subpat: Option<PatId>,
-    },
-    TupleStruct {
-        path: Option<Path>,
-        args: Vec<PatId>,
-    },
-    Ref {
-        pat: PatId,
-        mutability: Mutability,
-    },
+    Bind { mode: BindingAnnotation, name: Name, subpat: Option<PatId> },
+    TupleStruct { path: Option<Path>, args: Vec<PatId> },
+    Ref { pat: PatId, mutability: Mutability },
 }
 
 impl Pat {
diff --git a/crates/ra_hir_def/src/generics.rs b/crates/ra_hir_def/src/generics.rs
index b687ce2b2..d850244c4 100644
--- a/crates/ra_hir_def/src/generics.rs
+++ b/crates/ra_hir_def/src/generics.rs
@@ -194,7 +194,7 @@ impl GenericParams {
     }
 
     fn add_where_predicate_from_bound(&mut self, bound: ast::TypeBound, type_ref: TypeRef) {
-        if bound.has_question_mark() {
+        if bound.question_token().is_some() {
             // FIXME: remove this bound
             return;
         }
diff --git a/crates/ra_hir_def/src/lang_item.rs b/crates/ra_hir_def/src/lang_item.rs
index 01b367278..d96ac8c0a 100644
--- a/crates/ra_hir_def/src/lang_item.rs
+++ b/crates/ra_hir_def/src/lang_item.rs
@@ -4,6 +4,7 @@
 //! features, such as Fn family of traits.
 use std::sync::Arc;
 
+use ra_prof::profile;
 use ra_syntax::SmolStr;
 use rustc_hash::FxHashMap;
 
@@ -78,6 +79,8 @@ impl LangItems {
 
     /// Salsa query. This will look for lang items in a specific crate.
     pub(crate) fn crate_lang_items_query(db: &dyn DefDatabase, krate: CrateId) -> Arc<LangItems> {
+        let _p = profile("crate_lang_items_query");
+
         let mut lang_items = LangItems::default();
 
         let crate_def_map = db.crate_def_map(krate);
@@ -95,6 +98,7 @@ impl LangItems {
         db: &dyn DefDatabase,
         module: ModuleId,
     ) -> Option<Arc<LangItems>> {
+        let _p = profile("module_lang_items_query");
         let mut lang_items = LangItems::default();
         lang_items.collect_lang_items(db, module);
         if lang_items.items.is_empty() {
@@ -111,6 +115,7 @@ impl LangItems {
         start_crate: CrateId,
         item: SmolStr,
     ) -> Option<LangItemTarget> {
+        let _p = profile("lang_item_query");
         let lang_items = db.crate_lang_items(start_crate);
         let start_crate_target = lang_items.items.get(&item);
         if let Some(target) = start_crate_target {
diff --git a/crates/ra_hir_def/src/nameres/collector.rs b/crates/ra_hir_def/src/nameres/collector.rs
index 8fe3f8617..98c74fe25 100644
--- a/crates/ra_hir_def/src/nameres/collector.rs
+++ b/crates/ra_hir_def/src/nameres/collector.rs
@@ -462,6 +462,14 @@ impl DefCollector<'_> {
                 Some(ModuleDefId::AdtId(AdtId::EnumId(e))) => {
                     tested_by!(glob_enum);
                     // glob import from enum => just import all the variants
+
+                    // XXX: urgh, so this works by accident! Here, we look at
+                    // the enum data, and, in theory, this might require us to
+                    // look back at the crate_def_map, creating a cycle. For
+                    // example, `enum E { crate::some_macro!(); }`. Luckely, the
+                    // only kind of macro that is allowed inside enum is a
+                    // `cfg_macro`, and we don't need to run name resolution for
+                    // it, but this is sheer luck!
                     let enum_data = self.db.enum_data(e);
                     let resolutions = enum_data
                         .variants
@@ -977,11 +985,7 @@ impl ModCollector<'_, '_> {
     }
 
     fn is_cfg_enabled(&self, attrs: &Attrs) -> bool {
-        // FIXME: handle cfg_attr :-)
-        attrs
-            .by_key("cfg")
-            .tt_values()
-            .all(|tt| self.def_collector.cfg_options.is_cfg_enabled(tt) != Some(false))
+        attrs.is_cfg_enabled(self.def_collector.cfg_options)
     }
 }
 
diff --git a/crates/ra_hir_def/src/nameres/raw.rs b/crates/ra_hir_def/src/nameres/raw.rs
index a9dff3a5d..afd538e4a 100644
--- a/crates/ra_hir_def/src/nameres/raw.rs
+++ b/crates/ra_hir_def/src/nameres/raw.rs
@@ -287,7 +287,7 @@ impl RawItemsCollector {
         let visibility = RawVisibility::from_ast_with_hygiene(module.visibility(), &self.hygiene);
 
         let ast_id = self.source_ast_id_map.ast_id(&module);
-        if module.has_semi() {
+        if module.semicolon_token().is_some() {
             let item =
                 self.raw_items.modules.alloc(ModuleData::Declaration { name, visibility, ast_id });
             self.push_item(current_module, attrs, RawItemKind::Module(item));
diff --git a/crates/ra_hir_def/src/nameres/tests/incremental.rs b/crates/ra_hir_def/src/nameres/tests/incremental.rs
index 496fc6b08..87165ac33 100644
--- a/crates/ra_hir_def/src/nameres/tests/incremental.rs
+++ b/crates/ra_hir_def/src/nameres/tests/incremental.rs
@@ -32,6 +32,9 @@ fn typing_inside_a_function_should_not_invalidate_def_map() {
 
         use crate::foo::bar::Baz;
 
+        enum E { A, B }
+        use E::*;
+
         fn foo() -> i32 {
             1 + 1
         }
@@ -46,6 +49,9 @@ fn typing_inside_a_function_should_not_invalidate_def_map() {
 
         use crate::foo::bar::Baz;
 
+        enum E { A, B }
+        use E::*;
+
         fn foo() -> i32 { 92 }
         ",
     );
diff --git a/crates/ra_hir_def/src/path.rs b/crates/ra_hir_def/src/path.rs
index 904080341..91c7b3e09 100644
--- a/crates/ra_hir_def/src/path.rs
+++ b/crates/ra_hir_def/src/path.rs
@@ -134,11 +134,6 @@ impl Path {
         lower::lower_path(path, hygiene)
     }
 
-    /// Converts an `ast::NameRef` into a single-identifier `Path`.
-    pub(crate) fn from_name_ref(name_ref: &ast::NameRef) -> Path {
-        Path { type_anchor: None, mod_path: name_ref.as_name().into(), generic_args: vec![None] }
-    }
-
     /// Converts a known mod path to `Path`.
     pub(crate) fn from_known_path(
         path: ModPath,
diff --git a/crates/ra_hir_def/src/path/lower.rs b/crates/ra_hir_def/src/path/lower.rs
index 3c13cb2c7..0f806d6fb 100644
--- a/crates/ra_hir_def/src/path/lower.rs
+++ b/crates/ra_hir_def/src/path/lower.rs
@@ -28,7 +28,7 @@ pub(super) fn lower_path(mut path: ast::Path, hygiene: &Hygiene) -> Option<Path>
     loop {
         let segment = path.segment()?;
 
-        if segment.coloncolon().is_some() {
+        if segment.coloncolon_token().is_some() {
             kind = PathKind::Abs;
         }
 
diff --git a/crates/ra_hir_def/src/path/lower/lower_use.rs b/crates/ra_hir_def/src/path/lower/lower_use.rs
index 6ec944228..5b6854b0f 100644
--- a/crates/ra_hir_def/src/path/lower/lower_use.rs
+++ b/crates/ra_hir_def/src/path/lower/lower_use.rs
@@ -34,7 +34,7 @@ pub(crate) fn lower_use_tree(
         let alias = tree.alias().map(|a| {
             a.name().map(|it| it.as_name()).map_or(ImportAlias::Underscore, ImportAlias::Alias)
         });
-        let is_glob = tree.star().is_some();
+        let is_glob = tree.star_token().is_some();
         if let Some(ast_path) = tree.path() {
             // Handle self in a path.
             // E.g. `use something::{self, <...>}`
diff --git a/crates/ra_hir_def/src/type_ref.rs b/crates/ra_hir_def/src/type_ref.rs
index 01cc392db..ea29c4176 100644
--- a/crates/ra_hir_def/src/type_ref.rs
+++ b/crates/ra_hir_def/src/type_ref.rs
@@ -77,7 +77,7 @@ impl TypeRef {
             }
             ast::TypeRef::PointerType(inner) => {
                 let inner_ty = TypeRef::from_ast_opt(inner.type_ref());
-                let mutability = Mutability::from_mutable(inner.is_mut());
+                let mutability = Mutability::from_mutable(inner.mut_token().is_some());
                 TypeRef::RawPtr(Box::new(inner_ty), mutability)
             }
             ast::TypeRef::ArrayType(inner) => {
@@ -88,7 +88,7 @@ impl TypeRef {
             }
             ast::TypeRef::ReferenceType(inner) => {
                 let inner_ty = TypeRef::from_ast_opt(inner.type_ref());
-                let mutability = Mutability::from_mutable(inner.is_mut());
+                let mutability = Mutability::from_mutable(inner.mut_token().is_some());
                 TypeRef::Reference(Box::new(inner_ty), mutability)
             }
             ast::TypeRef::PlaceholderType(_inner) => TypeRef::Placeholder,
diff --git a/crates/ra_hir_expand/src/ast_id_map.rs b/crates/ra_hir_expand/src/ast_id_map.rs
index 5643ecdce..a3ca302c2 100644
--- a/crates/ra_hir_expand/src/ast_id_map.rs
+++ b/crates/ra_hir_expand/src/ast_id_map.rs
@@ -90,7 +90,7 @@ impl AstIdMap {
     }
 
     pub(crate) fn get<N: AstNode>(&self, id: FileAstId<N>) -> AstPtr<N> {
-        self.arena[id.raw].cast::<N>().unwrap()
+        self.arena[id.raw].clone().cast::<N>().unwrap()
     }
 
     fn alloc(&mut self, item: &SyntaxNode) -> ErasedFileAstId {
diff --git a/crates/ra_hir_expand/src/quote.rs b/crates/ra_hir_expand/src/quote.rs
index 3fd4233da..219bc2097 100644
--- a/crates/ra_hir_expand/src/quote.rs
+++ b/crates/ra_hir_expand/src/quote.rs
@@ -232,7 +232,7 @@ mod tests {
         let quoted = quote!(#a);
         assert_eq!(quoted.to_string(), "hello");
         let t = format!("{:?}", quoted);
-        assert_eq!(t, "Subtree { delimiter: None, token_trees: [Leaf(Ident(Ident { text: \"hello\", id: TokenId(4294967295) }))] }");
+        assert_eq!(t, "SUBTREE $\n  IDENT   hello 4294967295");
     }
 
     #[test]
diff --git a/crates/ra_hir_ty/Cargo.toml b/crates/ra_hir_ty/Cargo.toml
index 9a4a7aa6f..59efc1c31 100644
--- a/crates/ra_hir_ty/Cargo.toml
+++ b/crates/ra_hir_ty/Cargo.toml
@@ -24,6 +24,8 @@ ra_prof = { path = "../ra_prof" }
 ra_syntax = { path = "../ra_syntax" }
 test_utils = { path = "../test_utils" }
 
+scoped-tls = "1"
+
 chalk-solve =   { git = "https://github.com/rust-lang/chalk.git", rev = "039fc904a05f8cb3d0c682c9a57a63dda7a35356" }
 chalk-rust-ir = { git = "https://github.com/rust-lang/chalk.git", rev = "039fc904a05f8cb3d0c682c9a57a63dda7a35356" }
 chalk-ir =      { git = "https://github.com/rust-lang/chalk.git", rev = "039fc904a05f8cb3d0c682c9a57a63dda7a35356" }
diff --git a/crates/ra_hir_ty/src/db.rs b/crates/ra_hir_ty/src/db.rs
index 1462b053f..33da16b48 100644
--- a/crates/ra_hir_ty/src/db.rs
+++ b/crates/ra_hir_ty/src/db.rs
@@ -11,7 +11,7 @@ use ra_db::{impl_intern_key, salsa, CrateId, Upcast};
 use ra_prof::profile;
 
 use crate::{
-    method_resolution::CrateImplDefs,
+    method_resolution::{CrateImplDefs, TyFingerprint},
     traits::{chalk, AssocTyValue, Impl},
     Binders, CallableDef, GenericPredicate, InferenceResult, PolyFnSig, Substs, TraitRef, Ty,
     TyDefId, TypeCtor, ValueTyDefId,
@@ -65,7 +65,12 @@ pub trait HirDatabase: DefDatabase + Upcast<dyn DefDatabase> {
     fn impls_in_crate(&self, krate: CrateId) -> Arc<CrateImplDefs>;
 
     #[salsa::invoke(crate::traits::impls_for_trait_query)]
-    fn impls_for_trait(&self, krate: CrateId, trait_: TraitId) -> Arc<[ImplId]>;
+    fn impls_for_trait(
+        &self,
+        krate: CrateId,
+        trait_: TraitId,
+        self_ty_fp: Option<TyFingerprint>,
+    ) -> Arc<[ImplId]>;
 
     // Interned IDs for Chalk integration
     #[salsa::interned]
diff --git a/crates/ra_hir_ty/src/diagnostics.rs b/crates/ra_hir_ty/src/diagnostics.rs
index 8cbce1168..927896d6f 100644
--- a/crates/ra_hir_ty/src/diagnostics.rs
+++ b/crates/ra_hir_ty/src/diagnostics.rs
@@ -21,7 +21,7 @@ impl Diagnostic for NoSuchField {
     }
 
     fn source(&self) -> InFile<SyntaxNodePtr> {
-        InFile { file_id: self.file, value: self.field.into() }
+        InFile { file_id: self.file, value: self.field.clone().into() }
     }
 
     fn as_any(&self) -> &(dyn Any + Send + 'static) {
@@ -45,7 +45,7 @@ impl Diagnostic for MissingFields {
         buf
     }
     fn source(&self) -> InFile<SyntaxNodePtr> {
-        InFile { file_id: self.file, value: self.field_list.into() }
+        InFile { file_id: self.file, value: self.field_list.clone().into() }
     }
     fn as_any(&self) -> &(dyn Any + Send + 'static) {
         self
@@ -63,6 +63,29 @@ impl AstDiagnostic for MissingFields {
 }
 
 #[derive(Debug)]
+pub struct MissingPatFields {
+    pub file: HirFileId,
+    pub field_list: AstPtr<ast::RecordFieldPatList>,
+    pub missed_fields: Vec<Name>,
+}
+
+impl Diagnostic for MissingPatFields {
+    fn message(&self) -> String {
+        let mut buf = String::from("Missing structure fields:\n");
+        for field in &self.missed_fields {
+            format_to!(buf, "- {}", field);
+        }
+        buf
+    }
+    fn source(&self) -> InFile<SyntaxNodePtr> {
+        InFile { file_id: self.file, value: self.field_list.clone().into() }
+    }
+    fn as_any(&self) -> &(dyn Any + Send + 'static) {
+        self
+    }
+}
+
+#[derive(Debug)]
 pub struct MissingMatchArms {
     pub file: HirFileId,
     pub match_expr: AstPtr<ast::Expr>,
@@ -74,7 +97,7 @@ impl Diagnostic for MissingMatchArms {
         String::from("Missing match arm")
     }
     fn source(&self) -> InFile<SyntaxNodePtr> {
-        InFile { file_id: self.file, value: self.match_expr.into() }
+        InFile { file_id: self.file, value: self.match_expr.clone().into() }
     }
     fn as_any(&self) -> &(dyn Any + Send + 'static) {
         self
@@ -92,7 +115,7 @@ impl Diagnostic for MissingOkInTailExpr {
         "wrap return expression in Ok".to_string()
     }
     fn source(&self) -> InFile<SyntaxNodePtr> {
-        InFile { file_id: self.file, value: self.expr.into() }
+        InFile { file_id: self.file, value: self.expr.clone().into() }
     }
     fn as_any(&self) -> &(dyn Any + Send + 'static) {
         self
diff --git a/crates/ra_hir_ty/src/display.rs b/crates/ra_hir_ty/src/display.rs
index 0e9313aa1..d03bbd5a7 100644
--- a/crates/ra_hir_ty/src/display.rs
+++ b/crates/ra_hir_ty/src/display.rs
@@ -247,19 +247,21 @@ impl HirDisplay for ApplicationTy {
                 }
             }
             TypeCtor::Closure { .. } => {
-                let sig = self.parameters[0]
-                    .callable_sig(f.db)
-                    .expect("first closure parameter should contain signature");
-                if sig.params().is_empty() {
-                    write!(f, "||")?;
-                } else if f.omit_verbose_types() {
-                    write!(f, "|{}|", TYPE_HINT_TRUNCATION)?;
+                let sig = self.parameters[0].callable_sig(f.db);
+                if let Some(sig) = sig {
+                    if sig.params().is_empty() {
+                        write!(f, "||")?;
+                    } else if f.omit_verbose_types() {
+                        write!(f, "|{}|", TYPE_HINT_TRUNCATION)?;
+                    } else {
+                        write!(f, "|")?;
+                        f.write_joined(sig.params(), ", ")?;
+                        write!(f, "|")?;
+                    };
+                    write!(f, " -> {}", sig.ret().display(f.db))?;
                 } else {
-                    write!(f, "|")?;
-                    f.write_joined(sig.params(), ", ")?;
-                    write!(f, "|")?;
-                };
-                write!(f, " -> {}", sig.ret().display(f.db))?;
+                    write!(f, "{{closure}}")?;
+                }
             }
         }
         Ok(())
diff --git a/crates/ra_hir_ty/src/expr.rs b/crates/ra_hir_ty/src/expr.rs
index e45e9ea14..69b527f74 100644
--- a/crates/ra_hir_ty/src/expr.rs
+++ b/crates/ra_hir_ty/src/expr.rs
@@ -9,7 +9,7 @@ use rustc_hash::FxHashSet;
 
 use crate::{
     db::HirDatabase,
-    diagnostics::{MissingFields, MissingMatchArms, MissingOkInTailExpr},
+    diagnostics::{MissingFields, MissingMatchArms, MissingOkInTailExpr, MissingPatFields},
     utils::variant_data,
     ApplicationTy, InferenceResult, Ty, TypeCtor,
     _match::{is_useful, MatchCheckCtx, Matrix, PatStack, Usefulness},
@@ -49,39 +49,95 @@ impl<'a, 'b> ExprValidator<'a, 'b> {
             if let Some((variant_def, missed_fields, true)) =
                 record_literal_missing_fields(db, &self.infer, id, expr)
             {
-                // XXX: only look at source_map if we do have missing fields
-                let (_, source_map) = db.body_with_source_map(self.func.into());
-
-                if let Ok(source_ptr) = source_map.expr_syntax(id) {
-                    if let Some(expr) = source_ptr.value.left() {
-                        let root = source_ptr.file_syntax(db.upcast());
-                        if let ast::Expr::RecordLit(record_lit) = expr.to_node(&root) {
-                            if let Some(field_list) = record_lit.record_field_list() {
-                                let variant_data = variant_data(db.upcast(), variant_def);
-                                let missed_fields = missed_fields
-                                    .into_iter()
-                                    .map(|idx| variant_data.fields()[idx].name.clone())
-                                    .collect();
-                                self.sink.push(MissingFields {
-                                    file: source_ptr.file_id,
-                                    field_list: AstPtr::new(&field_list),
-                                    missed_fields,
-                                })
-                            }
-                        }
-                    }
-                }
+                self.create_record_literal_missing_fields_diagnostic(
+                    id,
+                    db,
+                    variant_def,
+                    missed_fields,
+                );
             }
             if let Expr::Match { expr, arms } = expr {
                 self.validate_match(id, *expr, arms, db, self.infer.clone());
             }
         }
+        for (id, pat) in body.pats.iter() {
+            if let Some((variant_def, missed_fields, true)) =
+                record_pattern_missing_fields(db, &self.infer, id, pat)
+            {
+                self.create_record_pattern_missing_fields_diagnostic(
+                    id,
+                    db,
+                    variant_def,
+                    missed_fields,
+                );
+            }
+        }
         let body_expr = &body[body.body_expr];
         if let Expr::Block { tail: Some(t), .. } = body_expr {
             self.validate_results_in_tail_expr(body.body_expr, *t, db);
         }
     }
 
+    fn create_record_literal_missing_fields_diagnostic(
+        &mut self,
+        id: ExprId,
+        db: &dyn HirDatabase,
+        variant_def: VariantId,
+        missed_fields: Vec<LocalStructFieldId>,
+    ) {
+        // XXX: only look at source_map if we do have missing fields
+        let (_, source_map) = db.body_with_source_map(self.func.into());
+
+        if let Ok(source_ptr) = source_map.expr_syntax(id) {
+            let root = source_ptr.file_syntax(db.upcast());
+            if let ast::Expr::RecordLit(record_lit) = &source_ptr.value.to_node(&root) {
+                if let Some(field_list) = record_lit.record_field_list() {
+                    let variant_data = variant_data(db.upcast(), variant_def);
+                    let missed_fields = missed_fields
+                        .into_iter()
+                        .map(|idx| variant_data.fields()[idx].name.clone())
+                        .collect();
+                    self.sink.push(MissingFields {
+                        file: source_ptr.file_id,
+                        field_list: AstPtr::new(&field_list),
+                        missed_fields,
+                    })
+                }
+            }
+        }
+    }
+
+    fn create_record_pattern_missing_fields_diagnostic(
+        &mut self,
+        id: PatId,
+        db: &dyn HirDatabase,
+        variant_def: VariantId,
+        missed_fields: Vec<LocalStructFieldId>,
+    ) {
+        // XXX: only look at source_map if we do have missing fields
+        let (_, source_map) = db.body_with_source_map(self.func.into());
+
+        if let Ok(source_ptr) = source_map.pat_syntax(id) {
+            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() {
+                        let variant_data = variant_data(db.upcast(), variant_def);
+                        let missed_fields = missed_fields
+                            .into_iter()
+                            .map(|idx| variant_data.fields()[idx].name.clone())
+                            .collect();
+                        self.sink.push(MissingPatFields {
+                            file: source_ptr.file_id,
+                            field_list: AstPtr::new(&field_list),
+                            missed_fields,
+                        })
+                    }
+                }
+            }
+        }
+    }
+
     fn validate_match(
         &mut self,
         id: ExprId,
@@ -147,18 +203,16 @@ impl<'a, 'b> ExprValidator<'a, 'b> {
         }
 
         if let Ok(source_ptr) = source_map.expr_syntax(id) {
-            if let Some(expr) = source_ptr.value.left() {
-                let root = source_ptr.file_syntax(db.upcast());
-                if let ast::Expr::MatchExpr(match_expr) = expr.to_node(&root) {
-                    if let (Some(match_expr), Some(arms)) =
-                        (match_expr.expr(), match_expr.match_arm_list())
-                    {
-                        self.sink.push(MissingMatchArms {
-                            file: source_ptr.file_id,
-                            match_expr: AstPtr::new(&match_expr),
-                            arms: AstPtr::new(&arms),
-                        })
-                    }
+            let root = source_ptr.file_syntax(db.upcast());
+            if let ast::Expr::MatchExpr(match_expr) = &source_ptr.value.to_node(&root) {
+                if let (Some(match_expr), Some(arms)) =
+                    (match_expr.expr(), match_expr.match_arm_list())
+                {
+                    self.sink.push(MissingMatchArms {
+                        file: source_ptr.file_id,
+                        match_expr: AstPtr::new(&match_expr),
+                        arms: AstPtr::new(&arms),
+                    })
                 }
             }
         }
@@ -189,9 +243,8 @@ impl<'a, 'b> ExprValidator<'a, 'b> {
             let (_, source_map) = db.body_with_source_map(self.func.into());
 
             if let Ok(source_ptr) = source_map.expr_syntax(id) {
-                if let Some(expr) = source_ptr.value.left() {
-                    self.sink.push(MissingOkInTailExpr { file: source_ptr.file_id, expr });
-                }
+                self.sink
+                    .push(MissingOkInTailExpr { file: source_ptr.file_id, expr: source_ptr.value });
             }
         }
     }
@@ -232,9 +285,9 @@ pub fn record_pattern_missing_fields(
     infer: &InferenceResult,
     id: PatId,
     pat: &Pat,
-) -> Option<(VariantId, Vec<LocalStructFieldId>)> {
-    let fields = match pat {
-        Pat::Record { path: _, args } => args,
+) -> Option<(VariantId, Vec<LocalStructFieldId>, /*exhaustive*/ bool)> {
+    let (fields, exhaustive) = match pat {
+        Pat::Record { path: _, args, ellipsis } => (args, !ellipsis),
         _ => return None,
     };
 
@@ -254,5 +307,5 @@ pub fn record_pattern_missing_fields(
     if missed_fields.is_empty() {
         return None;
     }
-    Some((variant_def, missed_fields))
+    Some((variant_def, missed_fields, exhaustive))
 }
diff --git a/crates/ra_hir_ty/src/infer/pat.rs b/crates/ra_hir_ty/src/infer/pat.rs
index 69bbb4307..078476f76 100644
--- a/crates/ra_hir_ty/src/infer/pat.rs
+++ b/crates/ra_hir_ty/src/infer/pat.rs
@@ -158,7 +158,7 @@ impl<'a> InferenceContext<'a> {
             Pat::TupleStruct { path: p, args: subpats } => {
                 self.infer_tuple_struct_pat(p.as_ref(), subpats, expected, default_bm, pat)
             }
-            Pat::Record { path: p, args: fields } => {
+            Pat::Record { path: p, args: fields, ellipsis: _ } => {
                 self.infer_record_pat(p.as_ref(), fields, expected, default_bm, pat)
             }
             Pat::Path(path) => {
diff --git a/crates/ra_hir_ty/src/method_resolution.rs b/crates/ra_hir_ty/src/method_resolution.rs
index 74a0bc7db..657284fd0 100644
--- a/crates/ra_hir_ty/src/method_resolution.rs
+++ b/crates/ra_hir_ty/src/method_resolution.rs
@@ -34,7 +34,7 @@ impl TyFingerprint {
     /// Creates a TyFingerprint for looking up an impl. Only certain types can
     /// have impls: if we have some `struct S`, we can have an `impl S`, but not
     /// `impl &S`. Hence, this will return `None` for reference types and such.
-    fn for_impl(ty: &Ty) -> Option<TyFingerprint> {
+    pub(crate) fn for_impl(ty: &Ty) -> Option<TyFingerprint> {
         match ty {
             Ty::Apply(a_ty) => Some(TyFingerprint::Apply(a_ty.ctor)),
             _ => None,
@@ -45,7 +45,7 @@ impl TyFingerprint {
 #[derive(Debug, PartialEq, Eq)]
 pub struct CrateImplDefs {
     impls: FxHashMap<TyFingerprint, Vec<ImplId>>,
-    impls_by_trait: FxHashMap<TraitId, Vec<ImplId>>,
+    impls_by_trait: FxHashMap<TraitId, FxHashMap<Option<TyFingerprint>, Vec<ImplId>>>,
 }
 
 impl CrateImplDefs {
@@ -59,7 +59,14 @@ impl CrateImplDefs {
             for impl_id in module_data.scope.impls() {
                 match db.impl_trait(impl_id) {
                     Some(tr) => {
-                        res.impls_by_trait.entry(tr.value.trait_).or_default().push(impl_id);
+                        let self_ty = db.impl_self_ty(impl_id);
+                        let self_ty_fp = TyFingerprint::for_impl(&self_ty.value);
+                        res.impls_by_trait
+                            .entry(tr.value.trait_)
+                            .or_default()
+                            .entry(self_ty_fp)
+                            .or_default()
+                            .push(impl_id);
                     }
                     None => {
                         let self_ty = db.impl_self_ty(impl_id);
@@ -79,11 +86,39 @@ impl CrateImplDefs {
     }
 
     pub fn lookup_impl_defs_for_trait(&self, tr: TraitId) -> impl Iterator<Item = ImplId> + '_ {
-        self.impls_by_trait.get(&tr).into_iter().flatten().copied()
+        self.impls_by_trait
+            .get(&tr)
+            .into_iter()
+            .flat_map(|m| m.values().flat_map(|v| v.iter().copied()))
+    }
+
+    pub fn lookup_impl_defs_for_trait_and_ty(
+        &self,
+        tr: TraitId,
+        fp: TyFingerprint,
+    ) -> impl Iterator<Item = ImplId> + '_ {
+        self.impls_by_trait
+            .get(&tr)
+            .and_then(|m| m.get(&Some(fp)))
+            .into_iter()
+            .flatten()
+            .copied()
+            .chain(
+                self.impls_by_trait
+                    .get(&tr)
+                    .and_then(|m| m.get(&None))
+                    .into_iter()
+                    .flatten()
+                    .copied(),
+            )
     }
 
     pub fn all_impls<'a>(&'a self) -> impl Iterator<Item = ImplId> + 'a {
-        self.impls.values().chain(self.impls_by_trait.values()).flatten().copied()
+        self.impls
+            .values()
+            .chain(self.impls_by_trait.values().flat_map(|m| m.values()))
+            .flatten()
+            .copied()
     }
 }
 
diff --git a/crates/ra_hir_ty/src/tests.rs b/crates/ra_hir_ty/src/tests.rs
index 08723068f..81fc0f63a 100644
--- a/crates/ra_hir_ty/src/tests.rs
+++ b/crates/ra_hir_ty/src/tests.rs
@@ -23,7 +23,7 @@ use insta::assert_snapshot;
 use ra_db::{fixture::WithFixture, salsa::Database, FilePosition, SourceDatabase};
 use ra_syntax::{
     algo,
-    ast::{self, AstNode, AstToken},
+    ast::{self, AstNode},
 };
 use stdx::format_to;
 
@@ -82,12 +82,10 @@ fn infer_with_mismatches(content: &str, include_mismatches: bool) -> String {
 
         for (expr, ty) in inference_result.type_of_expr.iter() {
             let syntax_ptr = match body_source_map.expr_syntax(expr) {
-                Ok(sp) => {
-                    sp.map(|ast| ast.either(|it| it.syntax_node_ptr(), |it| it.syntax_node_ptr()))
-                }
+                Ok(sp) => sp.map(|ast| ast.syntax_node_ptr()),
                 Err(SyntheticSyntax) => continue,
             };
-            types.push((syntax_ptr, ty));
+            types.push((syntax_ptr.clone(), ty));
             if let Some(mismatch) = inference_result.type_mismatch_for_expr(expr) {
                 mismatches.push((syntax_ptr, mismatch));
             }
@@ -101,7 +99,7 @@ fn infer_with_mismatches(content: &str, include_mismatches: bool) -> String {
             let node = src_ptr.value.to_node(&src_ptr.file_syntax(&db));
 
             let (range, text) = if let Some(self_param) = ast::SelfParam::cast(node.clone()) {
-                (self_param.self_kw().unwrap().syntax().text_range(), "self".to_string())
+                (self_param.self_token().unwrap().text_range(), "self".to_string())
             } else {
                 (src_ptr.value.range(), node.text().to_string().replace("\n", " "))
             };
@@ -409,3 +407,43 @@ fn no_such_field_with_feature_flag_diagnostics_on_struct_fields() {
 
     assert_snapshot!(diagnostics, @r###""###);
 }
+
+#[test]
+fn missing_record_pat_field_diagnostic() {
+    let diagnostics = TestDB::with_files(
+        r"
+        //- /lib.rs
+        struct S { foo: i32, bar: () }
+        fn baz(s: S) {
+            let S { foo: _ } = s;
+        }
+        ",
+    )
+    .diagnostics()
+    .0;
+
+    assert_snapshot!(diagnostics, @r###"
+    "{ foo: _ }": Missing structure fields:
+    - bar
+    "###
+    );
+}
+
+#[test]
+fn missing_record_pat_field_no_diagnostic_if_not_exhaustive() {
+    let diagnostics = TestDB::with_files(
+        r"
+        //- /lib.rs
+        struct S { foo: i32, bar: () }
+        fn baz(s: S) -> i32 {
+            match s {
+                S { foo, .. } => foo,
+            }
+        }
+        ",
+    )
+    .diagnostics()
+    .0;
+
+    assert_snapshot!(diagnostics, @"");
+}
diff --git a/crates/ra_hir_ty/src/tests/macros.rs b/crates/ra_hir_ty/src/tests/macros.rs
index ff4599b71..f2a9b1c40 100644
--- a/crates/ra_hir_ty/src/tests/macros.rs
+++ b/crates/ra_hir_ty/src/tests/macros.rs
@@ -1,10 +1,13 @@
+use std::fs;
+
 use insta::assert_snapshot;
 use ra_db::fixture::WithFixture;
-
-use super::{infer, type_at, type_at_pos};
+use test_utils::project_dir;
 
 use crate::test_db::TestDB;
 
+use super::{infer, type_at, type_at_pos};
+
 #[test]
 fn cfg_impl_def() {
     let (db, pos) = TestDB::with_position(
@@ -482,6 +485,30 @@ fn bar() -> u32 {0}
 }
 
 #[test]
+#[ignore]
+fn include_accidentally_quadratic() {
+    let file = project_dir().join("crates/ra_syntax/test_data/accidentally_quadratic");
+    let big_file = fs::read_to_string(file).unwrap();
+    let big_file = vec![big_file; 10].join("\n");
+
+    let fixture = r#"
+//- /main.rs
+#[rustc_builtin_macro]
+macro_rules! include {() => {}}
+
+include!("foo.rs");
+
+fn main() {
+    RegisterBlock { }<|>;
+}
+    "#;
+    let fixture = format!("{}\n//- /foo.rs\n{}", fixture, big_file);
+
+    let (db, pos) = TestDB::with_position(&fixture);
+    assert_eq!("RegisterBlock", type_at_pos(&db, pos));
+}
+
+#[test]
 fn infer_builtin_macros_include_concat() {
     let (db, pos) = TestDB::with_position(
         r#"
diff --git a/crates/ra_hir_ty/src/traits.rs b/crates/ra_hir_ty/src/traits.rs
index 5a1e12ce9..43d8d1e80 100644
--- a/crates/ra_hir_ty/src/traits.rs
+++ b/crates/ra_hir_ty/src/traits.rs
@@ -7,7 +7,7 @@ use ra_db::{impl_intern_key, salsa, CrateId};
 use ra_prof::profile;
 use rustc_hash::FxHashSet;
 
-use crate::{db::HirDatabase, DebruijnIndex};
+use crate::{db::HirDatabase, method_resolution::TyFingerprint, DebruijnIndex};
 
 use super::{Canonical, GenericPredicate, HirDisplay, ProjectionTy, TraitRef, Ty, TypeWalk};
 
@@ -40,7 +40,12 @@ pub(crate) fn impls_for_trait_query(
     db: &dyn HirDatabase,
     krate: CrateId,
     trait_: TraitId,
+    self_ty_fp: Option<TyFingerprint>,
 ) -> Arc<[ImplId]> {
+    // FIXME: We could be a lot smarter here - because of the orphan rules and
+    // the fact that the trait and the self type need to be in the dependency
+    // tree of a crate somewhere for an impl to exist, we could skip looking in
+    // a lot of crates completely
     let mut impls = FxHashSet::default();
     // We call the query recursively here. On the one hand, this means we can
     // reuse results from queries for different crates; on the other hand, this
@@ -48,10 +53,13 @@ pub(crate) fn impls_for_trait_query(
     // ones the user is editing), so this may actually be a waste of memory. I'm
     // doing it like this mainly for simplicity for now.
     for dep in &db.crate_graph()[krate].dependencies {
-        impls.extend(db.impls_for_trait(dep.crate_id, trait_).iter());
+        impls.extend(db.impls_for_trait(dep.crate_id, trait_, self_ty_fp).iter());
     }
     let crate_impl_defs = db.impls_in_crate(krate);
-    impls.extend(crate_impl_defs.lookup_impl_defs_for_trait(trait_));
+    match self_ty_fp {
+        Some(fp) => impls.extend(crate_impl_defs.lookup_impl_defs_for_trait_and_ty(trait_, fp)),
+        None => impls.extend(crate_impl_defs.lookup_impl_defs_for_trait(trait_)),
+    }
     impls.into_iter().collect()
 }
 
@@ -177,7 +185,7 @@ fn solve(
 
     let fuel = std::cell::Cell::new(CHALK_SOLVER_FUEL);
 
-    let solution = solver.solve_limited(&context, goal, || {
+    let should_continue = || {
         context.db.check_canceled();
         let remaining = fuel.get();
         fuel.set(remaining - 1);
@@ -185,12 +193,21 @@ fn solve(
             log::debug!("fuel exhausted");
         }
         remaining > 0
-    });
+    };
+    let mut solve = || solver.solve_limited(&context, goal, should_continue);
+    // don't set the TLS for Chalk unless Chalk debugging is active, to make
+    // extra sure we only use it for debugging
+    let solution =
+        if is_chalk_debug() { chalk::tls::set_current_program(db, solve) } else { solve() };
 
     log::debug!("solve({:?}) => {:?}", goal, solution);
     solution
 }
 
+fn is_chalk_debug() -> bool {
+    std::env::var("CHALK_DEBUG").is_ok()
+}
+
 fn solution_from_chalk(
     db: &dyn HirDatabase,
     solution: chalk_solve::Solution<Interner>,
diff --git a/crates/ra_hir_ty/src/traits/chalk.rs b/crates/ra_hir_ty/src/traits/chalk.rs
index 1bc0f0713..e05fea843 100644
--- a/crates/ra_hir_ty/src/traits/chalk.rs
+++ b/crates/ra_hir_ty/src/traits/chalk.rs
@@ -16,10 +16,12 @@ use ra_db::{
 
 use super::{builtin, AssocTyValue, Canonical, ChalkContext, Impl, Obligation};
 use crate::{
-    db::HirDatabase, display::HirDisplay, utils::generics, ApplicationTy, GenericPredicate,
-    ProjectionTy, Substs, TraitRef, Ty, TypeCtor,
+    db::HirDatabase, display::HirDisplay, method_resolution::TyFingerprint, utils::generics,
+    ApplicationTy, GenericPredicate, ProjectionTy, Substs, TraitRef, Ty, TypeCtor,
 };
 
+pub(super) mod tls;
+
 #[derive(Debug, Copy, Clone, Hash, PartialOrd, Ord, PartialEq, Eq)]
 pub struct Interner;
 
@@ -33,90 +35,85 @@ impl chalk_ir::interner::Interner for Interner {
     type Identifier = TypeAliasId;
     type DefId = InternId;
 
-    // FIXME: implement these
     fn debug_struct_id(
-        _type_kind_id: chalk_ir::StructId<Self>,
-        _fmt: &mut fmt::Formatter<'_>,
+        type_kind_id: StructId,
+        fmt: &mut fmt::Formatter<'_>,
     ) -> Option<fmt::Result> {
-        None
+        tls::with_current_program(|prog| Some(prog?.debug_struct_id(type_kind_id, fmt)))
     }
 
-    fn debug_trait_id(
-        _type_kind_id: chalk_ir::TraitId<Self>,
-        _fmt: &mut fmt::Formatter<'_>,
-    ) -> Option<fmt::Result> {
-        None
+    fn debug_trait_id(type_kind_id: TraitId, fmt: &mut fmt::Formatter<'_>) -> Option<fmt::Result> {
+        tls::with_current_program(|prog| Some(prog?.debug_trait_id(type_kind_id, fmt)))
     }
 
-    fn debug_assoc_type_id(
-        _id: chalk_ir::AssocTypeId<Self>,
-        _fmt: &mut fmt::Formatter<'_>,
-    ) -> Option<fmt::Result> {
-        None
+    fn debug_assoc_type_id(id: AssocTypeId, fmt: &mut fmt::Formatter<'_>) -> Option<fmt::Result> {
+        tls::with_current_program(|prog| Some(prog?.debug_assoc_type_id(id, fmt)))
     }
 
     fn debug_alias(
-        _projection: &chalk_ir::AliasTy<Self>,
-        _fmt: &mut fmt::Formatter<'_>,
+        alias: &chalk_ir::AliasTy<Interner>,
+        fmt: &mut fmt::Formatter<'_>,
     ) -> Option<fmt::Result> {
-        None
+        tls::with_current_program(|prog| Some(prog?.debug_alias(alias, fmt)))
     }
 
-    fn debug_ty(_ty: &chalk_ir::Ty<Self>, _fmt: &mut fmt::Formatter<'_>) -> Option<fmt::Result> {
-        None
+    fn debug_ty(ty: &chalk_ir::Ty<Interner>, fmt: &mut fmt::Formatter<'_>) -> Option<fmt::Result> {
+        tls::with_current_program(|prog| Some(prog?.debug_ty(ty, fmt)))
     }
 
     fn debug_lifetime(
-        _lifetime: &chalk_ir::Lifetime<Self>,
-        _fmt: &mut fmt::Formatter<'_>,
+        lifetime: &chalk_ir::Lifetime<Interner>,
+        fmt: &mut fmt::Formatter<'_>,
     ) -> Option<fmt::Result> {
-        None
+        tls::with_current_program(|prog| Some(prog?.debug_lifetime(lifetime, fmt)))
     }
 
     fn debug_parameter(
-        _parameter: &Parameter<Self>,
-        _fmt: &mut fmt::Formatter<'_>,
+        parameter: &Parameter<Interner>,
+        fmt: &mut fmt::Formatter<'_>,
     ) -> Option<fmt::Result> {
-        None
+        tls::with_current_program(|prog| Some(prog?.debug_parameter(parameter, fmt)))
     }
 
-    fn debug_goal(_goal: &Goal<Self>, _fmt: &mut fmt::Formatter<'_>) -> Option<fmt::Result> {
-        None
+    fn debug_goal(goal: &Goal<Interner>, fmt: &mut fmt::Formatter<'_>) -> Option<fmt::Result> {
+        tls::with_current_program(|prog| Some(prog?.debug_goal(goal, fmt)))
     }
 
     fn debug_goals(
-        _goals: &chalk_ir::Goals<Self>,
-        _fmt: &mut fmt::Formatter<'_>,
+        goals: &chalk_ir::Goals<Interner>,
+        fmt: &mut fmt::Formatter<'_>,
     ) -> Option<fmt::Result> {
-        None
+        tls::with_current_program(|prog| Some(prog?.debug_goals(goals, fmt)))
     }
 
     fn debug_program_clause_implication(
-        _pci: &chalk_ir::ProgramClauseImplication<Self>,
-        _fmt: &mut fmt::Formatter<'_>,
+        pci: &chalk_ir::ProgramClauseImplication<Interner>,
+        fmt: &mut fmt::Formatter<'_>,
     ) -> Option<fmt::Result> {
-        None
+        tls::with_current_program(|prog| Some(prog?.debug_program_clause_implication(pci, fmt)))
     }
 
     fn debug_application_ty(
-        _application_ty: &chalk_ir::ApplicationTy<Self>,
-        _fmt: &mut fmt::Formatter<'_>,
+        application_ty: &chalk_ir::ApplicationTy<Interner>,
+        fmt: &mut fmt::Formatter<'_>,
     ) -> Option<fmt::Result> {
-        None
+        tls::with_current_program(|prog| Some(prog?.debug_application_ty(application_ty, fmt)))
     }
 
     fn debug_substitution(
-        _substitution: &chalk_ir::Substitution<Self>,
-        _fmt: &mut fmt::Formatter<'_>,
+        substitution: &chalk_ir::Substitution<Interner>,
+        fmt: &mut fmt::Formatter<'_>,
     ) -> Option<fmt::Result> {
-        None
+        tls::with_current_program(|prog| Some(prog?.debug_substitution(substitution, fmt)))
     }
 
     fn debug_separator_trait_ref(
-        _separator_trait_ref: &chalk_ir::SeparatorTraitRef<Self>,
-        _fmt: &mut fmt::Formatter<'_>,
+        separator_trait_ref: &chalk_ir::SeparatorTraitRef<Interner>,
+        fmt: &mut fmt::Formatter<'_>,
     ) -> Option<fmt::Result> {
-        None
+        tls::with_current_program(|prog| {
+            Some(prog?.debug_separator_trait_ref(separator_trait_ref, fmt))
+        })
     }
 
     fn intern_ty(&self, ty: chalk_ir::TyData<Self>) -> Box<chalk_ir::TyData<Self>> {
@@ -650,19 +647,22 @@ impl<'a> chalk_solve::RustIrDatabase<Interner> for ChalkContext<'a> {
         debug!("impls_for_trait {:?}", trait_id);
         let trait_: hir_def::TraitId = from_chalk(self.db, trait_id);
 
+        let ty: Ty = from_chalk(self.db, parameters[0].assert_ty_ref(&Interner).clone());
+
+        let self_ty_fp = TyFingerprint::for_impl(&ty);
+
         // Note: Since we're using impls_for_trait, only impls where the trait
         // can be resolved should ever reach Chalk. `impl_datum` relies on that
         // and will panic if the trait can't be resolved.
         let mut result: Vec<_> = self
             .db
-            .impls_for_trait(self.krate, trait_)
+            .impls_for_trait(self.krate, trait_, self_ty_fp)
             .iter()
             .copied()
             .map(Impl::ImplDef)
             .map(|impl_| impl_.to_chalk(self.db))
             .collect();
 
-        let ty: Ty = from_chalk(self.db, parameters[0].assert_ty_ref(&Interner).clone());
         let arg: Option<Ty> =
             parameters.get(1).map(|p| from_chalk(self.db, p.assert_ty_ref(&Interner).clone()));
 
diff --git a/crates/ra_hir_ty/src/traits/chalk/tls.rs b/crates/ra_hir_ty/src/traits/chalk/tls.rs
new file mode 100644
index 000000000..d9bbb54a5
--- /dev/null
+++ b/crates/ra_hir_ty/src/traits/chalk/tls.rs
@@ -0,0 +1,231 @@
+//! Implementation of Chalk debug helper functions using TLS.
+use std::fmt;
+
+use chalk_ir::{AliasTy, Goal, Goals, Lifetime, Parameter, ProgramClauseImplication, TypeName};
+
+use super::{from_chalk, Interner};
+use crate::{db::HirDatabase, CallableDef, TypeCtor};
+use hir_def::{AdtId, AssocContainerId, Lookup, TypeAliasId};
+
+pub use unsafe_tls::{set_current_program, with_current_program};
+
+pub struct DebugContext<'a>(&'a (dyn HirDatabase + 'a));
+
+impl DebugContext<'_> {
+    pub fn debug_struct_id(
+        &self,
+        id: super::StructId,
+        f: &mut fmt::Formatter<'_>,
+    ) -> Result<(), fmt::Error> {
+        let type_ctor: TypeCtor = from_chalk(self.0, TypeName::Struct(id));
+        match type_ctor {
+            TypeCtor::Bool => write!(f, "bool")?,
+            TypeCtor::Char => write!(f, "char")?,
+            TypeCtor::Int(t) => write!(f, "{}", t)?,
+            TypeCtor::Float(t) => write!(f, "{}", t)?,
+            TypeCtor::Str => write!(f, "str")?,
+            TypeCtor::Slice => write!(f, "slice")?,
+            TypeCtor::Array => write!(f, "array")?,
+            TypeCtor::RawPtr(m) => write!(f, "*{}", m.as_keyword_for_ptr())?,
+            TypeCtor::Ref(m) => write!(f, "&{}", m.as_keyword_for_ref())?,
+            TypeCtor::Never => write!(f, "!")?,
+            TypeCtor::Tuple { .. } => {
+                write!(f, "()")?;
+            }
+            TypeCtor::FnPtr { .. } => {
+                write!(f, "fn")?;
+            }
+            TypeCtor::FnDef(def) => {
+                let name = match def {
+                    CallableDef::FunctionId(ff) => self.0.function_data(ff).name.clone(),
+                    CallableDef::StructId(s) => self.0.struct_data(s).name.clone(),
+                    CallableDef::EnumVariantId(e) => {
+                        let enum_data = self.0.enum_data(e.parent);
+                        enum_data.variants[e.local_id].name.clone()
+                    }
+                };
+                match def {
+                    CallableDef::FunctionId(_) => write!(f, "{{fn {}}}", name)?,
+                    CallableDef::StructId(_) | CallableDef::EnumVariantId(_) => {
+                        write!(f, "{{ctor {}}}", name)?
+                    }
+                }
+            }
+            TypeCtor::Adt(def_id) => {
+                let name = match def_id {
+                    AdtId::StructId(it) => self.0.struct_data(it).name.clone(),
+                    AdtId::UnionId(it) => self.0.union_data(it).name.clone(),
+                    AdtId::EnumId(it) => self.0.enum_data(it).name.clone(),
+                };
+                write!(f, "{}", name)?;
+            }
+            TypeCtor::AssociatedType(type_alias) => {
+                let trait_ = match type_alias.lookup(self.0.upcast()).container {
+                    AssocContainerId::TraitId(it) => it,
+                    _ => panic!("not an associated type"),
+                };
+                let trait_name = self.0.trait_data(trait_).name.clone();
+                let name = self.0.type_alias_data(type_alias).name.clone();
+                write!(f, "{}::{}", trait_name, name)?;
+            }
+            TypeCtor::Closure { def, expr } => {
+                write!(f, "{{closure {:?} in {:?}}}", expr.into_raw(), def)?;
+            }
+        }
+        Ok(())
+    }
+
+    pub fn debug_trait_id(
+        &self,
+        id: super::TraitId,
+        fmt: &mut fmt::Formatter<'_>,
+    ) -> Result<(), fmt::Error> {
+        let trait_: hir_def::TraitId = from_chalk(self.0, id);
+        let trait_data = self.0.trait_data(trait_);
+        write!(fmt, "{}", trait_data.name)
+    }
+
+    pub fn debug_assoc_type_id(
+        &self,
+        id: super::AssocTypeId,
+        fmt: &mut fmt::Formatter<'_>,
+    ) -> Result<(), fmt::Error> {
+        let type_alias: TypeAliasId = from_chalk(self.0, id);
+        let type_alias_data = self.0.type_alias_data(type_alias);
+        let trait_ = match type_alias.lookup(self.0.upcast()).container {
+            AssocContainerId::TraitId(t) => t,
+            _ => panic!("associated type not in trait"),
+        };
+        let trait_data = self.0.trait_data(trait_);
+        write!(fmt, "{}::{}", trait_data.name, type_alias_data.name)
+    }
+
+    pub fn debug_alias(
+        &self,
+        alias: &AliasTy<Interner>,
+        fmt: &mut fmt::Formatter<'_>,
+    ) -> Result<(), fmt::Error> {
+        let type_alias: TypeAliasId = from_chalk(self.0, alias.associated_ty_id);
+        let type_alias_data = self.0.type_alias_data(type_alias);
+        let trait_ = match type_alias.lookup(self.0.upcast()).container {
+            AssocContainerId::TraitId(t) => t,
+            _ => panic!("associated type not in trait"),
+        };
+        let trait_data = self.0.trait_data(trait_);
+        let params = alias.substitution.parameters(&Interner);
+        write!(
+            fmt,
+            "<{:?} as {}<{:?}>>::{}",
+            &params[0],
+            trait_data.name,
+            &params[1..],
+            type_alias_data.name
+        )
+    }
+
+    pub fn debug_ty(
+        &self,
+        ty: &chalk_ir::Ty<Interner>,
+        fmt: &mut fmt::Formatter<'_>,
+    ) -> Result<(), fmt::Error> {
+        write!(fmt, "{:?}", ty.data(&Interner))
+    }
+
+    pub fn debug_lifetime(
+        &self,
+        lifetime: &Lifetime<Interner>,
+        fmt: &mut fmt::Formatter<'_>,
+    ) -> Result<(), fmt::Error> {
+        write!(fmt, "{:?}", lifetime.data(&Interner))
+    }
+
+    pub fn debug_parameter(
+        &self,
+        parameter: &Parameter<Interner>,
+        fmt: &mut fmt::Formatter<'_>,
+    ) -> Result<(), fmt::Error> {
+        write!(fmt, "{:?}", parameter.data(&Interner).inner_debug())
+    }
+
+    pub fn debug_goal(
+        &self,
+        goal: &Goal<Interner>,
+        fmt: &mut fmt::Formatter<'_>,
+    ) -> Result<(), fmt::Error> {
+        let goal_data = goal.data(&Interner);
+        write!(fmt, "{:?}", goal_data)
+    }
+
+    pub fn debug_goals(
+        &self,
+        goals: &Goals<Interner>,
+        fmt: &mut fmt::Formatter<'_>,
+    ) -> Result<(), fmt::Error> {
+        write!(fmt, "{:?}", goals.debug(&Interner))
+    }
+
+    pub fn debug_program_clause_implication(
+        &self,
+        pci: &ProgramClauseImplication<Interner>,
+        fmt: &mut fmt::Formatter<'_>,
+    ) -> Result<(), fmt::Error> {
+        write!(fmt, "{:?}", pci.debug(&Interner))
+    }
+
+    pub fn debug_application_ty(
+        &self,
+        application_ty: &chalk_ir::ApplicationTy<Interner>,
+        fmt: &mut fmt::Formatter<'_>,
+    ) -> Result<(), fmt::Error> {
+        write!(fmt, "{:?}", application_ty.debug(&Interner))
+    }
+
+    pub fn debug_substitution(
+        &self,
+        substitution: &chalk_ir::Substitution<Interner>,
+        fmt: &mut fmt::Formatter<'_>,
+    ) -> Result<(), fmt::Error> {
+        write!(fmt, "{:?}", substitution.debug(&Interner))
+    }
+
+    pub fn debug_separator_trait_ref(
+        &self,
+        separator_trait_ref: &chalk_ir::SeparatorTraitRef<Interner>,
+        fmt: &mut fmt::Formatter<'_>,
+    ) -> Result<(), fmt::Error> {
+        write!(fmt, "{:?}", separator_trait_ref.debug(&Interner))
+    }
+}
+
+mod unsafe_tls {
+    use super::DebugContext;
+    use crate::db::HirDatabase;
+    use scoped_tls::scoped_thread_local;
+
+    scoped_thread_local!(static PROGRAM: DebugContext);
+
+    pub fn with_current_program<R>(
+        op: impl for<'a> FnOnce(Option<&'a DebugContext<'a>>) -> R,
+    ) -> R {
+        if PROGRAM.is_set() {
+            PROGRAM.with(|prog| op(Some(prog)))
+        } else {
+            op(None)
+        }
+    }
+
+    pub fn set_current_program<OP, R>(p: &dyn HirDatabase, op: OP) -> R
+    where
+        OP: FnOnce() -> R,
+    {
+        let ctx = DebugContext(p);
+        // we're transmuting the lifetime in the DebugContext to static. This is
+        // fine because we only keep the reference for the lifetime of this
+        // function, *and* the only way to access the context is through
+        // `with_current_program`, which hides the lifetime through the `for`
+        // type.
+        let static_p: &DebugContext<'static> =
+            unsafe { std::mem::transmute::<&DebugContext, &DebugContext<'static>>(&ctx) };
+        PROGRAM.set(static_p, || op())
+    }
+}
diff --git a/crates/ra_ide/src/completion/complete_dot.rs b/crates/ra_ide/src/completion/complete_dot.rs
index 358b041aa..b5448af5c 100644
--- a/crates/ra_ide/src/completion/complete_dot.rs
+++ b/crates/ra_ide/src/completion/complete_dot.rs
@@ -72,7 +72,6 @@ fn complete_fields(acc: &mut Completions, ctx: &CompletionContext, receiver: &Ty
         }
         for (i, ty) in receiver.tuple_fields(ctx.db).into_iter().enumerate() {
             // FIXME: Handle visibility
-            // TODO: add the same behavior with type ?
             acc.add_tuple_field(ctx, i, &ty);
         }
     }
diff --git a/crates/ra_ide/src/completion/complete_fn_param.rs b/crates/ra_ide/src/completion/complete_fn_param.rs
index 62ae5ccb4..f84b559fc 100644
--- a/crates/ra_ide/src/completion/complete_fn_param.rs
+++ b/crates/ra_ide/src/completion/complete_fn_param.rs
@@ -1,6 +1,9 @@
 //! FIXME: write short doc here
 
-use ra_syntax::{ast, match_ast, AstNode};
+use ra_syntax::{
+    ast::{self, ModuleItemOwner},
+    match_ast, AstNode,
+};
 use rustc_hash::FxHashMap;
 
 use crate::completion::{CompletionContext, CompletionItem, CompletionKind, Completions};
@@ -16,11 +19,19 @@ pub(super) fn complete_fn_param(acc: &mut Completions, ctx: &CompletionContext)
 
     let mut params = FxHashMap::default();
     for node in ctx.token.parent().ancestors() {
-        match_ast! {
+        let items = match_ast! {
             match node {
-                ast::SourceFile(it) => process(it, &mut params),
-                ast::ItemList(it) => process(it, &mut params),
-                _ => (),
+                ast::SourceFile(it) => it.items(),
+                ast::ItemList(it) => it.items(),
+                _ => continue,
+            }
+        };
+        for item in items {
+            if let ast::ModuleItem::FnDef(func) = item {
+                func.param_list().into_iter().flat_map(|it| it.params()).for_each(|param| {
+                    let text = param.syntax().text().to_string();
+                    params.entry(text).or_insert((0, param)).0 += 1;
+                })
             }
         }
     }
@@ -39,15 +50,6 @@ pub(super) fn complete_fn_param(acc: &mut Completions, ctx: &CompletionContext)
                 .lookup_by(lookup)
                 .add_to(acc)
         });
-
-    fn process<N: ast::FnDefOwner>(node: N, params: &mut FxHashMap<String, (u32, ast::Param)>) {
-        node.functions().filter_map(|it| it.param_list()).flat_map(|it| it.params()).for_each(
-            |param| {
-                let text = param.syntax().text().to_string();
-                params.entry(text).or_insert((0, param)).0 += 1;
-            },
-        )
-    }
 }
 
 #[cfg(test)]
diff --git a/crates/ra_ide/src/completion/complete_trait_impl.rs b/crates/ra_ide/src/completion/complete_trait_impl.rs
index ded1ff3bc..fab02945c 100644
--- a/crates/ra_ide/src/completion/complete_trait_impl.rs
+++ b/crates/ra_ide/src/completion/complete_trait_impl.rs
@@ -35,7 +35,7 @@ use hir::{self, Docs, HasSource};
 use ra_assists::utils::get_missing_impl_items;
 use ra_syntax::{
     ast::{self, edit, ImplDef},
-    AstNode, SyntaxKind, SyntaxNode, TextRange,
+    AstNode, SyntaxKind, SyntaxNode, TextRange, T,
 };
 use ra_text_edit::TextEdit;
 
@@ -204,7 +204,7 @@ fn make_const_compl_syntax(const_: &ast::ConstDef) -> String {
     let end = const_
         .syntax()
         .children_with_tokens()
-        .find(|s| s.kind() == SyntaxKind::SEMI || s.kind() == SyntaxKind::EQ)
+        .find(|s| s.kind() == T![;] || s.kind() == T![=])
         .map_or(const_end, |f| f.text_range().start());
 
     let len = end - start;
diff --git a/crates/ra_ide/src/completion/complete_unqualified_path.rs b/crates/ra_ide/src/completion/complete_unqualified_path.rs
index efde9bf73..0b0da6ee4 100644
--- a/crates/ra_ide/src/completion/complete_unqualified_path.rs
+++ b/crates/ra_ide/src/completion/complete_unqualified_path.rs
@@ -3,7 +3,7 @@
 use crate::completion::{CompletionContext, Completions};
 
 pub(super) fn complete_unqualified_path(acc: &mut Completions, ctx: &CompletionContext) {
-    if !(ctx.is_trivial_path && !ctx.is_pat_binding_or_const) {
+    if !(ctx.is_trivial_path && !ctx.is_pat_binding_or_const && !ctx.record_lit_syntax.is_some()) {
         return;
     }
 
diff --git a/crates/ra_ide/src/completion/completion_context.rs b/crates/ra_ide/src/completion/completion_context.rs
index fddaf21e4..eb8016dd1 100644
--- a/crates/ra_ide/src/completion/completion_context.rs
+++ b/crates/ra_ide/src/completion/completion_context.rs
@@ -1,13 +1,11 @@
 //! FIXME: write short doc here
 
-use hir::{db::HirDatabase, Semantics, SemanticsScope};
+use hir::{Semantics, SemanticsScope};
 use ra_db::SourceDatabase;
 use ra_ide_db::RootDatabase;
 use ra_syntax::{
     algo::{find_covering_element, find_node_at_offset},
-    ast,
-    ast::ArgListOwner,
-    AstNode,
+    ast, AstNode,
     SyntaxKind::*,
     SyntaxNode, SyntaxToken, TextRange, TextUnit,
 };
@@ -196,7 +194,10 @@ impl<'a> CompletionContext<'a> {
         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) {
                 self.is_pat_binding_or_const = true;
-                if bind_pat.has_at() || bind_pat.is_ref() || bind_pat.is_mutable() {
+                if bind_pat.at_token().is_some()
+                    || bind_pat.ref_token().is_some()
+                    || bind_pat.mut_token().is_some()
+                {
                     self.is_pat_binding_or_const = false;
                 }
                 if bind_pat.syntax().parent().and_then(ast::RecordFieldPatList::cast).is_some() {
@@ -230,7 +231,7 @@ impl<'a> CompletionContext<'a> {
         self.name_ref_syntax =
             find_node_at_offset(&original_file, name_ref.syntax().text_range().start());
         let name_range = name_ref.syntax().text_range();
-        if name_ref.syntax().parent().and_then(ast::RecordField::cast).is_some() {
+        if ast::RecordField::for_field_name(&name_ref).is_some() {
             self.record_lit_syntax =
                 self.sema.find_node_at_offset_with_macros(&original_file, offset);
         }
diff --git a/crates/ra_ide/src/display/function_signature.rs b/crates/ra_ide/src/display/function_signature.rs
index e58a78271..2d175882b 100644
--- a/crates/ra_ide/src/display/function_signature.rs
+++ b/crates/ra_ide/src/display/function_signature.rs
@@ -69,7 +69,13 @@ impl FunctionSignature {
         for field in st.fields(db).into_iter() {
             let ty = field.signature_ty(db);
             let raw_param = format!("{}", ty.display(db));
-            parameter_types.push(raw_param.split(':').nth(1).unwrap()[1..].to_string());
+
+            if let Some(param_type) = raw_param.split(':').nth(1) {
+                parameter_types.push(param_type[1..].to_string());
+            } else {
+                // The unwrap_or_else is useful when you have tuple struct
+                parameter_types.push(raw_param.clone());
+            }
             params.push(raw_param);
         }
 
@@ -107,8 +113,15 @@ impl FunctionSignature {
         for field in variant.fields(db).into_iter() {
             let ty = field.signature_ty(db);
             let raw_param = format!("{}", ty.display(db));
-            parameter_types.push(raw_param.split(':').nth(1).unwrap()[1..].to_string());
-            params.push(raw_param);
+            if let Some(param_type) = raw_param.split(':').nth(1) {
+                parameter_types.push(param_type[1..].to_string());
+            } else {
+                // The unwrap_or_else is useful when you have tuple
+                parameter_types.push(raw_param);
+            }
+            let name = field.name(db);
+
+            params.push(format!("{}: {}", name, ty.display(db)));
         }
 
         Some(
@@ -164,7 +177,7 @@ impl From<&'_ ast::FnDef> for FunctionSignature {
                     has_self_param = true;
                     let raw_param = self_param.syntax().text().to_string();
 
-                    // TODO: better solution ?
+                    // FIXME: better solution ?
                     res_types.push(
                         raw_param.split(':').nth(1).unwrap_or_else(|| " Self")[1..].to_string(),
                     );
diff --git a/crates/ra_ide/src/inlay_hints.rs b/crates/ra_ide/src/inlay_hints.rs
index 4b133b19b..45b9f7802 100644
--- a/crates/ra_ide/src/inlay_hints.rs
+++ b/crates/ra_ide/src/inlay_hints.rs
@@ -1,4 +1,4 @@
-//! FIXME: write short doc here
+//! This module defines multiple types of inlay hints and their visibility
 
 use hir::{Adt, HirDisplay, Semantics, Type};
 use ra_ide_db::RootDatabase;
@@ -235,8 +235,10 @@ fn should_show_param_hint(
     param_name: &str,
     argument: &ast::Expr,
 ) -> bool {
-    let argument_string = argument.syntax().to_string();
-    if param_name.is_empty() || argument_string.ends_with(param_name) {
+    if param_name.is_empty()
+        || is_argument_similar_to_param(argument, param_name)
+        || Some(param_name) == fn_signature.name.as_ref().map(String::as_str)
+    {
         return false;
     }
 
@@ -245,12 +247,32 @@ fn should_show_param_hint(
     } else {
         fn_signature.parameters.len()
     };
+
     // avoid displaying hints for common functions like map, filter, etc.
-    if parameters_len == 1 && (param_name.len() == 1 || param_name == "predicate") {
-        return false;
+    // or other obvious words used in std
+    parameters_len != 1 || !is_obvious_param(param_name)
+}
+
+fn is_argument_similar_to_param(argument: &ast::Expr, param_name: &str) -> bool {
+    let argument_string = remove_ref(argument.clone()).syntax().to_string();
+    argument_string.starts_with(&param_name) || argument_string.ends_with(&param_name)
+}
+
+fn remove_ref(expr: ast::Expr) -> ast::Expr {
+    if let ast::Expr::RefExpr(ref_expr) = &expr {
+        if let Some(inner) = ref_expr.expr() {
+            return inner;
+        }
     }
+    expr
+}
 
-    true
+fn is_obvious_param(param_name: &str) -> bool {
+    let is_obvious_param_name = match param_name {
+        "predicate" | "value" | "pat" | "rhs" | "other" => true,
+        _ => false,
+    };
+    param_name.len() == 1 || is_obvious_param_name
 }
 
 fn get_fn_signature(sema: &Semantics<RootDatabase>, expr: &ast::Expr) -> Option<FunctionSignature> {
@@ -1059,9 +1081,22 @@ impl Test {
         self
     }
 
+    fn field(self, value: i32) -> Self {
+        self
+    }
+
     fn no_hints_expected(&self, _: i32, test_var: i32) {}
+
+    fn frob(&self, frob: bool) {}
 }
 
+struct Param {}
+
+fn different_order(param: &Param) {}
+fn different_order_mut(param: &mut Param) {}
+
+fn twiddle(twiddle: bool) {}
+
 fn main() {
     let container: TestVarContainer = TestVarContainer { test_var: 42 };
     let test: Test = Test {};
@@ -1069,11 +1104,23 @@ fn main() {
     map(22);
     filter(33);
 
-    let test_processed: Test = test.map(1).filter(2);
+    let test_processed: Test = test.map(1).filter(2).field(3);
 
     let test_var: i32 = 55;
     test_processed.no_hints_expected(22, test_var);
     test_processed.no_hints_expected(33, container.test_var);
+    test_processed.frob(false);
+
+    twiddle(true);
+
+    let param_begin: Param = Param {};
+    different_order(&param_begin);
+    different_order(&mut param_begin);
+
+    let a: f64 = 7.0;
+    let b: f64 = 4.0;
+    let _: f64 = a.div_euclid(b);
+    let _: f64 = a.abs_sub(b);
 }"#,
         );
 
diff --git a/crates/ra_ide/src/references.rs b/crates/ra_ide/src/references.rs
index 746cc86ba..7d0544ff4 100644
--- a/crates/ra_ide/src/references.rs
+++ b/crates/ra_ide/src/references.rs
@@ -152,7 +152,7 @@ fn decl_access(def: &Definition, syntax: &SyntaxNode, range: TextRange) -> Optio
     if stmt.initializer().is_some() {
         let pat = stmt.pat()?;
         if let ast::Pat::BindPat(it) = pat {
-            if it.is_mutable() {
+            if it.mut_token().is_some() {
                 return Some(ReferenceAccess::Write);
             }
         }
diff --git a/crates/ra_ide/src/syntax_tree.rs b/crates/ra_ide/src/syntax_tree.rs
index f58e436d1..5842ae2e8 100644
--- a/crates/ra_ide/src/syntax_tree.rs
+++ b/crates/ra_ide/src/syntax_tree.rs
@@ -165,7 +165,7 @@ SOURCE_FILE@[0; 60)
               PATH_SEGMENT@[16; 22)
                 NAME_REF@[16; 22)
                   IDENT@[16; 22) "assert"
-            EXCL@[22; 23) "!"
+            BANG@[22; 23) "!"
             TOKEN_TREE@[23; 57)
               L_PAREN@[23; 24) "("
               STRING@[24; 52) "\"\n    fn foo() {\n     ..."
@@ -173,7 +173,7 @@ SOURCE_FILE@[0; 60)
               WHITESPACE@[53; 54) " "
               STRING@[54; 56) "\"\""
               R_PAREN@[56; 57) ")"
-          SEMI@[57; 58) ";"
+          SEMICOLON@[57; 58) ";"
         WHITESPACE@[58; 59) "\n"
         R_CURLY@[59; 60) "}"
 "#
@@ -226,7 +226,7 @@ EXPR_STMT@[16; 58)
       PATH_SEGMENT@[16; 22)
         NAME_REF@[16; 22)
           IDENT@[16; 22) "assert"
-    EXCL@[22; 23) "!"
+    BANG@[22; 23) "!"
     TOKEN_TREE@[23; 57)
       L_PAREN@[23; 24) "("
       STRING@[24; 52) "\"\n    fn foo() {\n     ..."
@@ -234,7 +234,7 @@ EXPR_STMT@[16; 58)
       WHITESPACE@[53; 54) " "
       STRING@[54; 56) "\"\""
       R_PAREN@[56; 57) ")"
-  SEMI@[57; 58) ";"
+  SEMICOLON@[57; 58) ";"
 "#
             .trim()
         );
diff --git a/crates/ra_ide/src/typing.rs b/crates/ra_ide/src/typing.rs
index cb2cd2479..f55cd3bf5 100644
--- a/crates/ra_ide/src/typing.rs
+++ b/crates/ra_ide/src/typing.rs
@@ -63,7 +63,7 @@ fn on_char_typed_inner(
 fn on_eq_typed(file: &SourceFile, offset: TextUnit) -> Option<SingleFileChange> {
     assert_eq!(file.syntax().text().char_at(offset), Some('='));
     let let_stmt: ast::LetStmt = find_node_at_offset(file.syntax(), offset)?;
-    if let_stmt.has_semi() {
+    if let_stmt.semicolon_token().is_some() {
         return None;
     }
     if let Some(expr) = let_stmt.initializer() {
diff --git a/crates/ra_ide_db/src/defs.rs b/crates/ra_ide_db/src/defs.rs
index e9934844e..49a8c74fb 100644
--- a/crates/ra_ide_db/src/defs.rs
+++ b/crates/ra_ide_db/src/defs.rs
@@ -216,7 +216,7 @@ pub fn classify_name_ref(
         }
     }
 
-    if let Some(record_field) = ast::RecordField::cast(parent.clone()) {
+    if let Some(record_field) = ast::RecordField::for_field_name(name_ref) {
         tested_by!(goto_def_for_record_fields; force);
         tested_by!(goto_def_for_field_init_shorthand; force);
         if let Some((field, local)) = sema.resolve_record_field(&record_field) {
diff --git a/crates/ra_mbe/src/syntax_bridge.rs b/crates/ra_mbe/src/syntax_bridge.rs
index 8e8ae2b29..9fb5cb058 100644
--- a/crates/ra_mbe/src/syntax_bridge.rs
+++ b/crates/ra_mbe/src/syntax_bridge.rs
@@ -137,21 +137,23 @@ impl TokenMap {
         token_id: tt::TokenId,
         open_relative_range: TextRange,
         close_relative_range: TextRange,
-    ) {
+    ) -> usize {
+        let res = self.entries.len();
         self.entries
             .push((token_id, TokenTextRange::Delimiter(open_relative_range, close_relative_range)));
+        res
     }
 
-    fn update_close_delim(&mut self, token_id: tt::TokenId, close_relative_range: TextRange) {
-        if let Some(entry) = self.entries.iter_mut().find(|(tid, _)| *tid == token_id) {
-            if let TokenTextRange::Delimiter(dim, _) = entry.1 {
-                entry.1 = TokenTextRange::Delimiter(dim, close_relative_range);
-            }
+    fn update_close_delim(&mut self, idx: usize, close_relative_range: TextRange) {
+        let (_, token_text_range) = &mut self.entries[idx];
+        if let TokenTextRange::Delimiter(dim, _) = token_text_range {
+            *token_text_range = TokenTextRange::Delimiter(*dim, close_relative_range);
         }
     }
 
-    fn remove_delim(&mut self, token_id: tt::TokenId) {
-        self.entries.retain(|(tid, _)| *tid != token_id);
+    fn remove_delim(&mut self, idx: usize) {
+        // FIXME: This could be accidently quadratic
+        self.entries.remove(idx);
     }
 }
 
@@ -238,24 +240,24 @@ impl TokenIdAlloc {
         token_id
     }
 
-    fn open_delim(&mut self, open_abs_range: TextRange) -> tt::TokenId {
+    fn open_delim(&mut self, open_abs_range: TextRange) -> (tt::TokenId, usize) {
         let token_id = tt::TokenId(self.next_id);
         self.next_id += 1;
-        self.map.insert_delim(
+        let idx = self.map.insert_delim(
             token_id,
             open_abs_range - self.global_offset,
             open_abs_range - self.global_offset,
         );
-        token_id
+        (token_id, idx)
     }
 
-    fn close_delim(&mut self, id: tt::TokenId, close_abs_range: Option<TextRange>) {
+    fn close_delim(&mut self, idx: usize, close_abs_range: Option<TextRange>) {
         match close_abs_range {
             None => {
-                self.map.remove_delim(id);
+                self.map.remove_delim(idx);
             }
             Some(close) => {
-                self.map.update_close_delim(id, close - self.global_offset);
+                self.map.update_close_delim(idx, close - self.global_offset);
             }
         }
     }
@@ -322,7 +324,7 @@ trait TokenConvertor {
 
             if let Some((kind, closed)) = delim {
                 let mut subtree = tt::Subtree::default();
-                let id = self.id_alloc().open_delim(range);
+                let (id, idx) = self.id_alloc().open_delim(range);
                 subtree.delimiter = Some(tt::Delimiter { kind, id });
 
                 while self.peek().map(|it| it.kind() != closed).unwrap_or(false) {
@@ -331,7 +333,7 @@ trait TokenConvertor {
                 let last_range = match self.bump() {
                     None => {
                         // For error resilience, we insert an char punct for the opening delim here
-                        self.id_alloc().close_delim(id, None);
+                        self.id_alloc().close_delim(idx, None);
                         let leaf: tt::Leaf = tt::Punct {
                             id: self.id_alloc().alloc(range),
                             char: token.to_char().unwrap(),
@@ -344,7 +346,7 @@ trait TokenConvertor {
                     }
                     Some(it) => it.1,
                 };
-                self.id_alloc().close_delim(id, Some(last_range));
+                self.id_alloc().close_delim(idx, Some(last_range));
                 subtree.into()
             } else {
                 let spacing = match self.peek() {
diff --git a/crates/ra_mbe/src/tests.rs b/crates/ra_mbe/src/tests.rs
index 254318e23..5d1274d21 100644
--- a/crates/ra_mbe/src/tests.rs
+++ b/crates/ra_mbe/src/tests.rs
@@ -142,6 +142,79 @@ macro_rules! impl_froms {
 }
 
 #[test]
+fn test_convert_tt2() {
+    parse_macro(
+        r#"
+macro_rules! impl_froms {
+    ($e:ident: $($v:ident),*) => {
+        $(
+            impl From<$v> for $e {
+                fn from(it: $v) -> $e {
+                    $e::$v(it)
+                }
+            }
+        )*
+    }
+}
+"#,
+    )
+    .assert_expand(
+        "impl_froms!(TokenTree: Leaf, Subtree);",
+        r#"
+SUBTREE $
+  IDENT   impl 20
+  IDENT   From 21
+  PUNCH   < [joint] 22
+  IDENT   Leaf 53
+  PUNCH   > [alone] 25
+  IDENT   for 26
+  IDENT   TokenTree 51
+  SUBTREE {} 29
+    IDENT   fn 30
+    IDENT   from 31
+    SUBTREE () 32
+      IDENT   it 33
+      PUNCH   : [alone] 34
+      IDENT   Leaf 53
+    PUNCH   - [joint] 37
+    PUNCH   > [alone] 38
+    IDENT   TokenTree 51
+    SUBTREE {} 41
+      IDENT   TokenTree 51
+      PUNCH   : [joint] 44
+      PUNCH   : [joint] 45
+      IDENT   Leaf 53
+      SUBTREE () 48
+        IDENT   it 49
+  IDENT   impl 20
+  IDENT   From 21
+  PUNCH   < [joint] 22
+  IDENT   Subtree 55
+  PUNCH   > [alone] 25
+  IDENT   for 26
+  IDENT   TokenTree 51
+  SUBTREE {} 29
+    IDENT   fn 30
+    IDENT   from 31
+    SUBTREE () 32
+      IDENT   it 33
+      PUNCH   : [alone] 34
+      IDENT   Subtree 55
+    PUNCH   - [joint] 37
+    PUNCH   > [alone] 38
+    IDENT   TokenTree 51
+    SUBTREE {} 41
+      IDENT   TokenTree 51
+      PUNCH   : [joint] 44
+      PUNCH   : [joint] 45
+      IDENT   Subtree 55
+      SUBTREE () 48
+        IDENT   it 49
+"#,
+    );
+}
+
+#[test]
 fn test_expr_order() {
     let expanded = parse_macro(
         r#"
@@ -179,7 +252,7 @@ fn test_expr_order() {
             STAR@[11; 12) "*"
             LITERAL@[12; 13)
               INT_NUMBER@[12; 13) "2"
-          SEMI@[13; 14) ";"
+          SEMICOLON@[13; 14) ";"
         R_CURLY@[14; 15) "}""#,
     );
 }
@@ -532,7 +605,7 @@ fn test_tt_to_stmts() {
     EQ@[4; 5) "="
     LITERAL@[5; 6)
       INT_NUMBER@[5; 6) "0"
-    SEMI@[6; 7) ";"
+    SEMICOLON@[6; 7) ";"
   EXPR_STMT@[7; 14)
     BIN_EXPR@[7; 13)
       PATH_EXPR@[7; 8)
@@ -547,7 +620,7 @@ fn test_tt_to_stmts() {
         PLUS@[11; 12) "+"
         LITERAL@[12; 13)
           INT_NUMBER@[12; 13) "1"
-    SEMI@[13; 14) ";"
+    SEMICOLON@[13; 14) ";"
   EXPR_STMT@[14; 15)
     PATH_EXPR@[14; 15)
       PATH@[14; 15)
@@ -880,7 +953,7 @@ fn test_tt_composite2() {
       PATH_SEGMENT@[0; 3)
         NAME_REF@[0; 3)
           IDENT@[0; 3) "abs"
-    EXCL@[3; 4) "!"
+    BANG@[3; 4) "!"
     TOKEN_TREE@[4; 10)
       L_PAREN@[4; 5) "("
       EQ@[5; 6) "="
@@ -1000,14 +1073,14 @@ fn test_vec() {
               PATH_SEGMENT@[9; 12)
                 NAME_REF@[9; 12)
                   IDENT@[9; 12) "Vec"
-            COLONCOLON@[12; 14) "::"
+            COLON2@[12; 14) "::"
             PATH_SEGMENT@[14; 17)
               NAME_REF@[14; 17)
                 IDENT@[14; 17) "new"
         ARG_LIST@[17; 19)
           L_PAREN@[17; 18) "("
           R_PAREN@[18; 19) ")"
-      SEMI@[19; 20) ";"
+      SEMICOLON@[19; 20) ";"
     EXPR_STMT@[20; 33)
       METHOD_CALL_EXPR@[20; 32)
         PATH_EXPR@[20; 21)
@@ -1023,7 +1096,7 @@ fn test_vec() {
           LITERAL@[27; 31)
             INT_NUMBER@[27; 31) "1u32"
           R_PAREN@[31; 32) ")"
-      SEMI@[32; 33) ";"
+      SEMICOLON@[32; 33) ";"
     EXPR_STMT@[33; 43)
       METHOD_CALL_EXPR@[33; 42)
         PATH_EXPR@[33; 34)
@@ -1039,7 +1112,7 @@ fn test_vec() {
           LITERAL@[40; 41)
             INT_NUMBER@[40; 41) "2"
           R_PAREN@[41; 42) ")"
-      SEMI@[42; 43) ";"
+      SEMICOLON@[42; 43) ";"
     PATH_EXPR@[43; 44)
       PATH@[43; 44)
         PATH_SEGMENT@[43; 44)
@@ -1479,6 +1552,12 @@ impl MacroFixture {
         assert_eq!(expansion.to_string(), expected);
     }
 
+    fn assert_expand(&self, invocation: &str, expected: &str) {
+        let expansion = self.expand_tt(invocation);
+        let actual = format!("{:?}", expansion);
+        test_utils::assert_eq_text!(&actual.trim(), &expected.trim());
+    }
+
     fn assert_expand_items(&self, invocation: &str, expected: &str) -> &MacroFixture {
         self.assert_expansion(FragmentKind::Items, invocation, expected);
         self
@@ -1681,7 +1760,7 @@ fn test_no_space_after_semi_colon() {
     MOD_KW@[21; 24) "mod"
     NAME@[24; 25)
       IDENT@[24; 25) "m"
-    SEMI@[25; 26) ";"
+    SEMICOLON@[25; 26) ";"
   MODULE@[26; 52)
     ATTR@[26; 47)
       POUND@[26; 27) "#"
@@ -1700,7 +1779,7 @@ fn test_no_space_after_semi_colon() {
     MOD_KW@[47; 50) "mod"
     NAME@[50; 51)
       IDENT@[50; 51) "f"
-    SEMI@[51; 52) ";""###,
+    SEMICOLON@[51; 52) ";""###,
     );
 }
 
diff --git a/crates/ra_parser/src/grammar/expressions.rs b/crates/ra_parser/src/grammar/expressions.rs
index c486c0211..cb30b25a8 100644
--- a/crates/ra_parser/src/grammar/expressions.rs
+++ b/crates/ra_parser/src/grammar/expressions.rs
@@ -339,7 +339,8 @@ fn expr_bp(p: &mut Parser, mut r: Restrictions, bp: u8) -> (Option<CompletedMark
     (Some(lhs), BlockLike::NotBlock)
 }
 
-const LHS_FIRST: TokenSet = atom::ATOM_EXPR_FIRST.union(token_set![AMP, STAR, EXCL, DOT, MINUS]);
+const LHS_FIRST: TokenSet =
+    atom::ATOM_EXPR_FIRST.union(token_set![T![&], T![*], T![!], T![.], T![-]]);
 
 fn lhs(p: &mut Parser, r: Restrictions) -> Option<(CompletedMarker, BlockLike)> {
     let m;
@@ -618,26 +619,39 @@ pub(crate) fn record_field_list(p: &mut Parser) {
     let m = p.start();
     p.bump(T!['{']);
     while !p.at(EOF) && !p.at(T!['}']) {
+        let m = p.start();
+        // test record_literal_field_with_attr
+        // fn main() {
+        //     S { #[cfg(test)] field: 1 }
+        // }
+        attributes::outer_attributes(p);
+
         match p.current() {
-            // test record_literal_field_with_attr
-            // fn main() {
-            //     S { #[cfg(test)] field: 1 }
-            // }
-            IDENT | INT_NUMBER | T![#] => {
-                let m = p.start();
-                attributes::outer_attributes(p);
-                name_ref_or_index(p);
-                if p.eat(T![:]) {
-                    expr(p);
+            IDENT | INT_NUMBER => {
+                // test_err record_literal_before_ellipsis_recovery
+                // fn main() {
+                //     S { field ..S::default() }
+                // }
+                if p.nth_at(1, T![:]) || p.nth_at(1, T![..]) {
+                    name_ref_or_index(p);
+                    p.expect(T![:]);
                 }
+                expr(p);
                 m.complete(p, RECORD_FIELD);
             }
             T![.] if p.at(T![..]) => {
+                m.abandon(p);
                 p.bump(T![..]);
                 expr(p);
             }
-            T!['{'] => error_block(p, "expected a field"),
-            _ => p.err_and_bump("expected identifier"),
+            T!['{'] => {
+                error_block(p, "expected a field");
+                m.abandon(p);
+            }
+            _ => {
+                p.err_and_bump("expected identifier");
+                m.abandon(p);
+            }
         }
         if !p.at(T!['}']) {
             p.expect(T![,]);
diff --git a/crates/ra_parser/src/grammar/types.rs b/crates/ra_parser/src/grammar/types.rs
index 386969d2d..fe1a039cb 100644
--- a/crates/ra_parser/src/grammar/types.rs
+++ b/crates/ra_parser/src/grammar/types.rs
@@ -3,8 +3,19 @@
 use super::*;
 
 pub(super) const TYPE_FIRST: TokenSet = paths::PATH_FIRST.union(token_set![
-    L_PAREN, EXCL, STAR, L_BRACK, AMP, UNDERSCORE, FN_KW, UNSAFE_KW, EXTERN_KW, FOR_KW, IMPL_KW,
-    DYN_KW, L_ANGLE,
+    T!['('],
+    T!['['],
+    T![<],
+    T![!],
+    T![*],
+    T![&],
+    T![_],
+    T![fn],
+    T![unsafe],
+    T![extern],
+    T![for],
+    T![impl],
+    T![dyn],
 ]);
 
 const TYPE_RECOVERY_SET: TokenSet = token_set![R_PAREN, COMMA, L_DOLLAR];
diff --git a/crates/ra_parser/src/syntax_kind/generated.rs b/crates/ra_parser/src/syntax_kind/generated.rs
index 004f4e564..524e7d784 100644
--- a/crates/ra_parser/src/syntax_kind/generated.rs
+++ b/crates/ra_parser/src/syntax_kind/generated.rs
@@ -9,7 +9,7 @@ pub enum SyntaxKind {
     TOMBSTONE,
     #[doc(hidden)]
     EOF,
-    SEMI,
+    SEMICOLON,
     COMMA,
     L_PAREN,
     R_PAREN,
@@ -33,15 +33,15 @@ pub enum SyntaxKind {
     PERCENT,
     UNDERSCORE,
     DOT,
-    DOTDOT,
-    DOTDOTDOT,
-    DOTDOTEQ,
+    DOT2,
+    DOT3,
+    DOT2EQ,
     COLON,
-    COLONCOLON,
+    COLON2,
     EQ,
-    EQEQ,
+    EQ2,
     FAT_ARROW,
-    EXCL,
+    BANG,
     NEQ,
     MINUS,
     THIN_ARROW,
@@ -55,8 +55,8 @@ pub enum SyntaxKind {
     SLASHEQ,
     STAREQ,
     PERCENTEQ,
-    AMPAMP,
-    PIPEPIPE,
+    AMP2,
+    PIPE2,
     SHL,
     SHR,
     SHLEQ,
@@ -265,12 +265,12 @@ impl SyntaxKind {
     }
     pub fn is_punct(self) -> bool {
         match self {
-            SEMI | COMMA | L_PAREN | R_PAREN | L_CURLY | R_CURLY | L_BRACK | R_BRACK | L_ANGLE
-            | R_ANGLE | AT | POUND | TILDE | QUESTION | DOLLAR | AMP | PIPE | PLUS | STAR
-            | SLASH | CARET | PERCENT | UNDERSCORE | DOT | DOTDOT | DOTDOTDOT | DOTDOTEQ
-            | COLON | COLONCOLON | EQ | EQEQ | FAT_ARROW | EXCL | NEQ | MINUS | THIN_ARROW
-            | LTEQ | GTEQ | PLUSEQ | MINUSEQ | PIPEEQ | AMPEQ | CARETEQ | SLASHEQ | STAREQ
-            | PERCENTEQ | AMPAMP | PIPEPIPE | SHL | SHR | SHLEQ | SHREQ => true,
+            SEMICOLON | COMMA | L_PAREN | R_PAREN | L_CURLY | R_CURLY | L_BRACK | R_BRACK
+            | L_ANGLE | R_ANGLE | AT | POUND | TILDE | QUESTION | DOLLAR | AMP | PIPE | PLUS
+            | STAR | SLASH | CARET | PERCENT | UNDERSCORE | DOT | DOT2 | DOT3 | DOT2EQ | COLON
+            | COLON2 | EQ | EQ2 | FAT_ARROW | BANG | NEQ | MINUS | THIN_ARROW | LTEQ | GTEQ
+            | PLUSEQ | MINUSEQ | PIPEEQ | AMPEQ | CARETEQ | SLASHEQ | STAREQ | PERCENTEQ | AMP2
+            | PIPE2 | SHL | SHR | SHLEQ | SHREQ => true,
             _ => false,
         }
     }
@@ -329,7 +329,7 @@ impl SyntaxKind {
     }
     pub fn from_char(c: char) -> Option<SyntaxKind> {
         let tok = match c {
-            ';' => SEMI,
+            ';' => SEMICOLON,
             ',' => COMMA,
             '(' => L_PAREN,
             ')' => R_PAREN,
@@ -355,7 +355,7 @@ impl SyntaxKind {
             '.' => DOT,
             ':' => COLON,
             '=' => EQ,
-            '!' => EXCL,
+            '!' => BANG,
             '-' => MINUS,
             _ => return None,
         };
@@ -363,296 +363,4 @@ impl SyntaxKind {
     }
 }
 #[macro_export]
-macro_rules! T {
-    ( ; ) => {
-        $crate::SyntaxKind::SEMI
-    };
-    ( , ) => {
-        $crate::SyntaxKind::COMMA
-    };
-    ( '(' ) => {
-        $crate::SyntaxKind::L_PAREN
-    };
-    ( ')' ) => {
-        $crate::SyntaxKind::R_PAREN
-    };
-    ( '{' ) => {
-        $crate::SyntaxKind::L_CURLY
-    };
-    ( '}' ) => {
-        $crate::SyntaxKind::R_CURLY
-    };
-    ( '[' ) => {
-        $crate::SyntaxKind::L_BRACK
-    };
-    ( ']' ) => {
-        $crate::SyntaxKind::R_BRACK
-    };
-    ( < ) => {
-        $crate::SyntaxKind::L_ANGLE
-    };
-    ( > ) => {
-        $crate::SyntaxKind::R_ANGLE
-    };
-    ( @ ) => {
-        $crate::SyntaxKind::AT
-    };
-    ( # ) => {
-        $crate::SyntaxKind::POUND
-    };
-    ( ~ ) => {
-        $crate::SyntaxKind::TILDE
-    };
-    ( ? ) => {
-        $crate::SyntaxKind::QUESTION
-    };
-    ( $ ) => {
-        $crate::SyntaxKind::DOLLAR
-    };
-    ( & ) => {
-        $crate::SyntaxKind::AMP
-    };
-    ( | ) => {
-        $crate::SyntaxKind::PIPE
-    };
-    ( + ) => {
-        $crate::SyntaxKind::PLUS
-    };
-    ( * ) => {
-        $crate::SyntaxKind::STAR
-    };
-    ( / ) => {
-        $crate::SyntaxKind::SLASH
-    };
-    ( ^ ) => {
-        $crate::SyntaxKind::CARET
-    };
-    ( % ) => {
-        $crate::SyntaxKind::PERCENT
-    };
-    ( _ ) => {
-        $crate::SyntaxKind::UNDERSCORE
-    };
-    ( . ) => {
-        $crate::SyntaxKind::DOT
-    };
-    ( .. ) => {
-        $crate::SyntaxKind::DOTDOT
-    };
-    ( ... ) => {
-        $crate::SyntaxKind::DOTDOTDOT
-    };
-    ( ..= ) => {
-        $crate::SyntaxKind::DOTDOTEQ
-    };
-    ( : ) => {
-        $crate::SyntaxKind::COLON
-    };
-    ( :: ) => {
-        $crate::SyntaxKind::COLONCOLON
-    };
-    ( = ) => {
-        $crate::SyntaxKind::EQ
-    };
-    ( == ) => {
-        $crate::SyntaxKind::EQEQ
-    };
-    ( => ) => {
-        $crate::SyntaxKind::FAT_ARROW
-    };
-    ( ! ) => {
-        $crate::SyntaxKind::EXCL
-    };
-    ( != ) => {
-        $crate::SyntaxKind::NEQ
-    };
-    ( - ) => {
-        $crate::SyntaxKind::MINUS
-    };
-    ( -> ) => {
-        $crate::SyntaxKind::THIN_ARROW
-    };
-    ( <= ) => {
-        $crate::SyntaxKind::LTEQ
-    };
-    ( >= ) => {
-        $crate::SyntaxKind::GTEQ
-    };
-    ( += ) => {
-        $crate::SyntaxKind::PLUSEQ
-    };
-    ( -= ) => {
-        $crate::SyntaxKind::MINUSEQ
-    };
-    ( |= ) => {
-        $crate::SyntaxKind::PIPEEQ
-    };
-    ( &= ) => {
-        $crate::SyntaxKind::AMPEQ
-    };
-    ( ^= ) => {
-        $crate::SyntaxKind::CARETEQ
-    };
-    ( /= ) => {
-        $crate::SyntaxKind::SLASHEQ
-    };
-    ( *= ) => {
-        $crate::SyntaxKind::STAREQ
-    };
-    ( %= ) => {
-        $crate::SyntaxKind::PERCENTEQ
-    };
-    ( && ) => {
-        $crate::SyntaxKind::AMPAMP
-    };
-    ( || ) => {
-        $crate::SyntaxKind::PIPEPIPE
-    };
-    ( << ) => {
-        $crate::SyntaxKind::SHL
-    };
-    ( >> ) => {
-        $crate::SyntaxKind::SHR
-    };
-    ( <<= ) => {
-        $crate::SyntaxKind::SHLEQ
-    };
-    ( >>= ) => {
-        $crate::SyntaxKind::SHREQ
-    };
-    ( as ) => {
-        $crate::SyntaxKind::AS_KW
-    };
-    ( async ) => {
-        $crate::SyntaxKind::ASYNC_KW
-    };
-    ( await ) => {
-        $crate::SyntaxKind::AWAIT_KW
-    };
-    ( box ) => {
-        $crate::SyntaxKind::BOX_KW
-    };
-    ( break ) => {
-        $crate::SyntaxKind::BREAK_KW
-    };
-    ( const ) => {
-        $crate::SyntaxKind::CONST_KW
-    };
-    ( continue ) => {
-        $crate::SyntaxKind::CONTINUE_KW
-    };
-    ( crate ) => {
-        $crate::SyntaxKind::CRATE_KW
-    };
-    ( dyn ) => {
-        $crate::SyntaxKind::DYN_KW
-    };
-    ( else ) => {
-        $crate::SyntaxKind::ELSE_KW
-    };
-    ( enum ) => {
-        $crate::SyntaxKind::ENUM_KW
-    };
-    ( extern ) => {
-        $crate::SyntaxKind::EXTERN_KW
-    };
-    ( false ) => {
-        $crate::SyntaxKind::FALSE_KW
-    };
-    ( fn ) => {
-        $crate::SyntaxKind::FN_KW
-    };
-    ( for ) => {
-        $crate::SyntaxKind::FOR_KW
-    };
-    ( if ) => {
-        $crate::SyntaxKind::IF_KW
-    };
-    ( impl ) => {
-        $crate::SyntaxKind::IMPL_KW
-    };
-    ( in ) => {
-        $crate::SyntaxKind::IN_KW
-    };
-    ( let ) => {
-        $crate::SyntaxKind::LET_KW
-    };
-    ( loop ) => {
-        $crate::SyntaxKind::LOOP_KW
-    };
-    ( macro ) => {
-        $crate::SyntaxKind::MACRO_KW
-    };
-    ( match ) => {
-        $crate::SyntaxKind::MATCH_KW
-    };
-    ( mod ) => {
-        $crate::SyntaxKind::MOD_KW
-    };
-    ( move ) => {
-        $crate::SyntaxKind::MOVE_KW
-    };
-    ( mut ) => {
-        $crate::SyntaxKind::MUT_KW
-    };
-    ( pub ) => {
-        $crate::SyntaxKind::PUB_KW
-    };
-    ( ref ) => {
-        $crate::SyntaxKind::REF_KW
-    };
-    ( return ) => {
-        $crate::SyntaxKind::RETURN_KW
-    };
-    ( self ) => {
-        $crate::SyntaxKind::SELF_KW
-    };
-    ( static ) => {
-        $crate::SyntaxKind::STATIC_KW
-    };
-    ( struct ) => {
-        $crate::SyntaxKind::STRUCT_KW
-    };
-    ( super ) => {
-        $crate::SyntaxKind::SUPER_KW
-    };
-    ( trait ) => {
-        $crate::SyntaxKind::TRAIT_KW
-    };
-    ( true ) => {
-        $crate::SyntaxKind::TRUE_KW
-    };
-    ( try ) => {
-        $crate::SyntaxKind::TRY_KW
-    };
-    ( type ) => {
-        $crate::SyntaxKind::TYPE_KW
-    };
-    ( unsafe ) => {
-        $crate::SyntaxKind::UNSAFE_KW
-    };
-    ( use ) => {
-        $crate::SyntaxKind::USE_KW
-    };
-    ( where ) => {
-        $crate::SyntaxKind::WHERE_KW
-    };
-    ( while ) => {
-        $crate::SyntaxKind::WHILE_KW
-    };
-    ( auto ) => {
-        $crate::SyntaxKind::AUTO_KW
-    };
-    ( default ) => {
-        $crate::SyntaxKind::DEFAULT_KW
-    };
-    ( existential ) => {
-        $crate::SyntaxKind::EXISTENTIAL_KW
-    };
-    ( union ) => {
-        $crate::SyntaxKind::UNION_KW
-    };
-    ( raw ) => {
-        $crate::SyntaxKind::RAW_KW
-    };
-}
+macro_rules ! T { [ ; ] => { $ crate :: SyntaxKind :: SEMICOLON } ; [ , ] => { $ crate :: SyntaxKind :: COMMA } ; [ '(' ] => { $ crate :: SyntaxKind :: L_PAREN } ; [ ')' ] => { $ crate :: SyntaxKind :: R_PAREN } ; [ '{' ] => { $ crate :: SyntaxKind :: L_CURLY } ; [ '}' ] => { $ crate :: SyntaxKind :: R_CURLY } ; [ '[' ] => { $ crate :: SyntaxKind :: L_BRACK } ; [ ']' ] => { $ crate :: SyntaxKind :: R_BRACK } ; [ < ] => { $ crate :: SyntaxKind :: L_ANGLE } ; [ > ] => { $ crate :: SyntaxKind :: R_ANGLE } ; [ @ ] => { $ crate :: SyntaxKind :: AT } ; [ # ] => { $ crate :: SyntaxKind :: POUND } ; [ ~ ] => { $ crate :: SyntaxKind :: TILDE } ; [ ? ] => { $ crate :: SyntaxKind :: QUESTION } ; [ $ ] => { $ crate :: SyntaxKind :: DOLLAR } ; [ & ] => { $ crate :: SyntaxKind :: AMP } ; [ | ] => { $ crate :: SyntaxKind :: PIPE } ; [ + ] => { $ crate :: SyntaxKind :: PLUS } ; [ * ] => { $ crate :: SyntaxKind :: STAR } ; [ / ] => { $ crate :: SyntaxKind :: SLASH } ; [ ^ ] => { $ crate :: SyntaxKind :: CARET } ; [ % ] => { $ crate :: SyntaxKind :: PERCENT } ; [ _ ] => { $ crate :: SyntaxKind :: UNDERSCORE } ; [ . ] => { $ crate :: SyntaxKind :: DOT } ; [ .. ] => { $ crate :: SyntaxKind :: DOT2 } ; [ ... ] => { $ crate :: SyntaxKind :: DOT3 } ; [ ..= ] => { $ crate :: SyntaxKind :: DOT2EQ } ; [ : ] => { $ crate :: SyntaxKind :: COLON } ; [ :: ] => { $ crate :: SyntaxKind :: COLON2 } ; [ = ] => { $ crate :: SyntaxKind :: EQ } ; [ == ] => { $ crate :: SyntaxKind :: EQ2 } ; [ => ] => { $ crate :: SyntaxKind :: FAT_ARROW } ; [ ! ] => { $ crate :: SyntaxKind :: BANG } ; [ != ] => { $ crate :: SyntaxKind :: NEQ } ; [ - ] => { $ crate :: SyntaxKind :: MINUS } ; [ -> ] => { $ crate :: SyntaxKind :: THIN_ARROW } ; [ <= ] => { $ crate :: SyntaxKind :: LTEQ } ; [ >= ] => { $ crate :: SyntaxKind :: GTEQ } ; [ += ] => { $ crate :: SyntaxKind :: PLUSEQ } ; [ -= ] => { $ crate :: SyntaxKind :: MINUSEQ } ; [ |= ] => { $ crate :: SyntaxKind :: PIPEEQ } ; [ &= ] => { $ crate :: SyntaxKind :: AMPEQ } ; [ ^= ] => { $ crate :: SyntaxKind :: CARETEQ } ; [ /= ] => { $ crate :: SyntaxKind :: SLASHEQ } ; [ *= ] => { $ crate :: SyntaxKind :: STAREQ } ; [ %= ] => { $ crate :: SyntaxKind :: PERCENTEQ } ; [ && ] => { $ crate :: SyntaxKind :: AMP2 } ; [ || ] => { $ crate :: SyntaxKind :: PIPE2 } ; [ << ] => { $ crate :: SyntaxKind :: SHL } ; [ >> ] => { $ crate :: SyntaxKind :: SHR } ; [ <<= ] => { $ crate :: SyntaxKind :: SHLEQ } ; [ >>= ] => { $ crate :: SyntaxKind :: SHREQ } ; [ as ] => { $ crate :: SyntaxKind :: AS_KW } ; [ async ] => { $ crate :: SyntaxKind :: ASYNC_KW } ; [ await ] => { $ crate :: SyntaxKind :: AWAIT_KW } ; [ box ] => { $ crate :: SyntaxKind :: BOX_KW } ; [ break ] => { $ crate :: SyntaxKind :: BREAK_KW } ; [ const ] => { $ crate :: SyntaxKind :: CONST_KW } ; [ continue ] => { $ crate :: SyntaxKind :: CONTINUE_KW } ; [ crate ] => { $ crate :: SyntaxKind :: CRATE_KW } ; [ dyn ] => { $ crate :: SyntaxKind :: DYN_KW } ; [ else ] => { $ crate :: SyntaxKind :: ELSE_KW } ; [ enum ] => { $ crate :: SyntaxKind :: ENUM_KW } ; [ extern ] => { $ crate :: SyntaxKind :: EXTERN_KW } ; [ false ] => { $ crate :: SyntaxKind :: FALSE_KW } ; [ fn ] => { $ crate :: SyntaxKind :: FN_KW } ; [ for ] => { $ crate :: SyntaxKind :: FOR_KW } ; [ if ] => { $ crate :: SyntaxKind :: IF_KW } ; [ impl ] => { $ crate :: SyntaxKind :: IMPL_KW } ; [ in ] => { $ crate :: SyntaxKind :: IN_KW } ; [ let ] => { $ crate :: SyntaxKind :: LET_KW } ; [ loop ] => { $ crate :: SyntaxKind :: LOOP_KW } ; [ macro ] => { $ crate :: SyntaxKind :: MACRO_KW } ; [ match ] => { $ crate :: SyntaxKind :: MATCH_KW } ; [ mod ] => { $ crate :: SyntaxKind :: MOD_KW } ; [ move ] => { $ crate :: SyntaxKind :: MOVE_KW } ; [ mut ] => { $ crate :: SyntaxKind :: MUT_KW } ; [ pub ] => { $ crate :: SyntaxKind :: PUB_KW } ; [ ref ] => { $ crate :: SyntaxKind :: REF_KW } ; [ return ] => { $ crate :: SyntaxKind :: RETURN_KW } ; [ self ] => { $ crate :: SyntaxKind :: SELF_KW } ; [ static ] => { $ crate :: SyntaxKind :: STATIC_KW } ; [ struct ] => { $ crate :: SyntaxKind :: STRUCT_KW } ; [ super ] => { $ crate :: SyntaxKind :: SUPER_KW } ; [ trait ] => { $ crate :: SyntaxKind :: TRAIT_KW } ; [ true ] => { $ crate :: SyntaxKind :: TRUE_KW } ; [ try ] => { $ crate :: SyntaxKind :: TRY_KW } ; [ type ] => { $ crate :: SyntaxKind :: TYPE_KW } ; [ unsafe ] => { $ crate :: SyntaxKind :: UNSAFE_KW } ; [ use ] => { $ crate :: SyntaxKind :: USE_KW } ; [ where ] => { $ crate :: SyntaxKind :: WHERE_KW } ; [ while ] => { $ crate :: SyntaxKind :: WHILE_KW } ; [ auto ] => { $ crate :: SyntaxKind :: AUTO_KW } ; [ default ] => { $ crate :: SyntaxKind :: DEFAULT_KW } ; [ existential ] => { $ crate :: SyntaxKind :: EXISTENTIAL_KW } ; [ union ] => { $ crate :: SyntaxKind :: UNION_KW } ; [ raw ] => { $ crate :: SyntaxKind :: RAW_KW } ; [ lifetime ] => { $ crate :: SyntaxKind :: LIFETIME } ; [ ident ] => { $ crate :: SyntaxKind :: IDENT } ; }
diff --git a/crates/ra_proc_macro_srv/Cargo.toml b/crates/ra_proc_macro_srv/Cargo.toml
index f08de5fc7..1e0f50339 100644
--- a/crates/ra_proc_macro_srv/Cargo.toml
+++ b/crates/ra_proc_macro_srv/Cargo.toml
@@ -12,9 +12,12 @@ doctest = false
 ra_tt = { path = "../ra_tt" }
 ra_mbe = { path = "../ra_mbe" }
 ra_proc_macro = { path = "../ra_proc_macro" }
+goblin = "0.2.1"
+libloading = "0.6.0"
+test_utils = { path = "../test_utils" }
 
 [dev-dependencies]
 cargo_metadata = "0.9.1"
 difference = "2.0.0"
 # used as proc macro test target
-serde_derive = "=1.0.104"
\ No newline at end of file
+serde_derive = "=1.0.104"
diff --git a/crates/ra_proc_macro_srv/src/dylib.rs b/crates/ra_proc_macro_srv/src/dylib.rs
new file mode 100644
index 000000000..ec63d587b
--- /dev/null
+++ b/crates/ra_proc_macro_srv/src/dylib.rs
@@ -0,0 +1,211 @@
+//! Handles dynamic library loading for proc macro
+
+use crate::{proc_macro::bridge, rustc_server::TokenStream};
+use std::path::Path;
+
+use goblin::{mach::Mach, Object};
+use libloading::Library;
+use ra_proc_macro::ProcMacroKind;
+
+use std::io::Error as IoError;
+use std::io::ErrorKind as IoErrorKind;
+
+const NEW_REGISTRAR_SYMBOL: &str = "_rustc_proc_macro_decls_";
+
+fn invalid_data_err(e: impl Into<Box<dyn std::error::Error + Send + Sync>>) -> IoError {
+    IoError::new(IoErrorKind::InvalidData, e)
+}
+
+fn get_symbols_from_lib(file: &Path) -> Result<Vec<String>, IoError> {
+    let buffer = std::fs::read(file)?;
+    let object = Object::parse(&buffer).map_err(invalid_data_err)?;
+
+    match object {
+        Object::Elf(elf) => {
+            let symbols = elf.dynstrtab.to_vec().map_err(invalid_data_err)?;
+            let names = symbols.iter().map(|s| s.to_string()).collect();
+            Ok(names)
+        }
+        Object::PE(pe) => {
+            let symbol_names =
+                pe.exports.iter().flat_map(|s| s.name).map(|n| n.to_string()).collect();
+            Ok(symbol_names)
+        }
+        Object::Mach(mach) => match mach {
+            Mach::Binary(binary) => {
+                let exports = binary.exports().map_err(invalid_data_err)?;
+                let names = exports
+                    .into_iter()
+                    .map(|s| {
+                        // In macos doc:
+                        // https://developer.apple.com/library/archive/documentation/System/Conceptual/ManPages_iPhoneOS/man3/dlsym.3.html
+                        // Unlike other dyld API's, the symbol name passed to dlsym() must NOT be
+                        // prepended with an underscore.
+                        if s.name.starts_with("_") {
+                            s.name[1..].to_string()
+                        } else {
+                            s.name
+                        }
+                    })
+                    .collect();
+                Ok(names)
+            }
+            Mach::Fat(_) => Ok(vec![]),
+        },
+        Object::Archive(_) | Object::Unknown(_) => Ok(vec![]),
+    }
+}
+
+fn is_derive_registrar_symbol(symbol: &str) -> bool {
+    symbol.contains(NEW_REGISTRAR_SYMBOL)
+}
+
+fn find_registrar_symbol(file: &Path) -> Result<Option<String>, IoError> {
+    let symbols = get_symbols_from_lib(file)?;
+    Ok(symbols.into_iter().find(|s| is_derive_registrar_symbol(s)))
+}
+
+/// Loads dynamic library in platform dependent manner.
+///
+/// For unix, you have to use RTLD_DEEPBIND flag to escape problems described
+/// [here](https://github.com/fedochet/rust-proc-macro-panic-inside-panic-expample)
+/// and [here](https://github.com/rust-lang/rust/issues/60593).
+///
+/// Usage of RTLD_DEEPBIND
+/// [here](https://github.com/fedochet/rust-proc-macro-panic-inside-panic-expample/issues/1)
+///
+/// It seems that on Windows that behaviour is default, so we do nothing in that case.
+#[cfg(windows)]
+fn load_library(file: &Path) -> Result<Library, libloading::Error> {
+    Library::new(file)
+}
+
+#[cfg(unix)]
+fn load_library(file: &Path) -> Result<Library, libloading::Error> {
+    use libloading::os::unix::Library as UnixLibrary;
+    use std::os::raw::c_int;
+
+    const RTLD_NOW: c_int = 0x00002;
+    const RTLD_DEEPBIND: c_int = 0x00008;
+
+    UnixLibrary::open(Some(file), RTLD_NOW | RTLD_DEEPBIND).map(|lib| lib.into())
+}
+
+struct ProcMacroLibraryLibloading {
+    // Hold the dylib to prevent it for unloadeding
+    _lib: Library,
+    exported_macros: Vec<bridge::client::ProcMacro>,
+}
+
+impl ProcMacroLibraryLibloading {
+    fn open(file: &Path) -> Result<Self, IoError> {
+        let symbol_name = find_registrar_symbol(file)?
+            .ok_or(invalid_data_err(format!("Cannot find registrar symbol in file {:?}", file)))?;
+
+        let lib = load_library(file).map_err(invalid_data_err)?;
+        let exported_macros = {
+            let macros: libloading::Symbol<&&[bridge::client::ProcMacro]> =
+                unsafe { lib.get(symbol_name.as_bytes()) }.map_err(invalid_data_err)?;
+            macros.to_vec()
+        };
+
+        Ok(ProcMacroLibraryLibloading { _lib: lib, exported_macros })
+    }
+}
+
+type ProcMacroLibraryImpl = ProcMacroLibraryLibloading;
+
+pub struct Expander {
+    libs: Vec<ProcMacroLibraryImpl>,
+}
+
+impl Expander {
+    pub fn new<P: AsRef<Path>>(lib: &P) -> Result<Expander, String> {
+        let mut libs = vec![];
+        /* Some libraries for dynamic loading require canonicalized path (even when it is
+        already absolute
+        */
+        let lib =
+            lib.as_ref().canonicalize().expect(&format!("Cannot canonicalize {:?}", lib.as_ref()));
+
+        let library = ProcMacroLibraryImpl::open(&lib).map_err(|e| e.to_string())?;
+        libs.push(library);
+
+        Ok(Expander { libs })
+    }
+
+    pub fn expand(
+        &self,
+        macro_name: &str,
+        macro_body: &ra_tt::Subtree,
+        attributes: Option<&ra_tt::Subtree>,
+    ) -> Result<ra_tt::Subtree, bridge::PanicMessage> {
+        let parsed_body = TokenStream::with_subtree(macro_body.clone());
+
+        let parsed_attributes = attributes
+            .map_or(crate::rustc_server::TokenStream::new(), |attr| {
+                TokenStream::with_subtree(attr.clone())
+            });
+
+        for lib in &self.libs {
+            for proc_macro in &lib.exported_macros {
+                match proc_macro {
+                    bridge::client::ProcMacro::CustomDerive { trait_name, client, .. }
+                        if *trait_name == macro_name =>
+                    {
+                        let res = client.run(
+                            &crate::proc_macro::bridge::server::SameThread,
+                            crate::rustc_server::Rustc::default(),
+                            parsed_body,
+                        );
+                        return res.map(|it| it.subtree);
+                    }
+                    bridge::client::ProcMacro::Bang { name, client } if *name == macro_name => {
+                        let res = client.run(
+                            &crate::proc_macro::bridge::server::SameThread,
+                            crate::rustc_server::Rustc::default(),
+                            parsed_body,
+                        );
+                        return res.map(|it| it.subtree);
+                    }
+                    bridge::client::ProcMacro::Attr { name, client } if *name == macro_name => {
+                        let res = client.run(
+                            &crate::proc_macro::bridge::server::SameThread,
+                            crate::rustc_server::Rustc::default(),
+                            parsed_attributes,
+                            parsed_body,
+                        );
+
+                        return res.map(|it| it.subtree);
+                    }
+                    _ => continue,
+                }
+            }
+        }
+
+        Err(bridge::PanicMessage::String("Nothing to expand".to_string()))
+    }
+
+    pub fn list_macros(&self) -> Result<Vec<(String, ProcMacroKind)>, bridge::PanicMessage> {
+        let mut result = vec![];
+
+        for lib in &self.libs {
+            for proc_macro in &lib.exported_macros {
+                let res = match proc_macro {
+                    bridge::client::ProcMacro::CustomDerive { trait_name, .. } => {
+                        (trait_name.to_string(), ProcMacroKind::CustomDerive)
+                    }
+                    bridge::client::ProcMacro::Bang { name, .. } => {
+                        (name.to_string(), ProcMacroKind::FuncLike)
+                    }
+                    bridge::client::ProcMacro::Attr { name, .. } => {
+                        (name.to_string(), ProcMacroKind::Attr)
+                    }
+                };
+                result.push(res);
+            }
+        }
+
+        Ok(result)
+    }
+}
diff --git a/crates/ra_proc_macro_srv/src/lib.rs b/crates/ra_proc_macro_srv/src/lib.rs
index f376df236..59716cbb3 100644
--- a/crates/ra_proc_macro_srv/src/lib.rs
+++ b/crates/ra_proc_macro_srv/src/lib.rs
@@ -17,13 +17,41 @@ mod proc_macro;
 #[doc(hidden)]
 mod rustc_server;
 
+mod dylib;
+
 use proc_macro::bridge::client::TokenStream;
 use ra_proc_macro::{ExpansionResult, ExpansionTask, ListMacrosResult, ListMacrosTask};
 
-pub fn expand_task(_task: &ExpansionTask) -> Result<ExpansionResult, String> {
-    unimplemented!()
+pub fn expand_task(task: &ExpansionTask) -> Result<ExpansionResult, String> {
+    let expander = dylib::Expander::new(&task.lib)
+        .expect(&format!("Cannot expand with provided libraries: ${:?}", &task.lib));
+
+    match expander.expand(&task.macro_name, &task.macro_body, task.attributes.as_ref()) {
+        Ok(expansion) => Ok(ExpansionResult { expansion }),
+        Err(msg) => {
+            let reason = format!(
+                "Cannot perform expansion for {}: error {:?}!",
+                &task.macro_name,
+                msg.as_str()
+            );
+            Err(reason)
+        }
+    }
 }
 
-pub fn list_macros(_task: &ListMacrosTask) -> Result<ListMacrosResult, String> {
-    unimplemented!()
+pub fn list_macros(task: &ListMacrosTask) -> Result<ListMacrosResult, String> {
+    let expander = dylib::Expander::new(&task.lib)
+        .expect(&format!("Cannot expand with provided libraries: ${:?}", &task.lib));
+
+    match expander.list_macros() {
+        Ok(macros) => Ok(ListMacrosResult { macros }),
+        Err(msg) => {
+            let reason =
+                format!("Cannot perform expansion for {:?}: error {:?}!", &task.lib, msg.as_str());
+            Err(reason)
+        }
+    }
 }
+
+#[cfg(test)]
+mod tests;
diff --git a/crates/ra_proc_macro_srv/src/rustc_server.rs b/crates/ra_proc_macro_srv/src/rustc_server.rs
index 92d1fd989..ec0d35692 100644
--- a/crates/ra_proc_macro_srv/src/rustc_server.rs
+++ b/crates/ra_proc_macro_srv/src/rustc_server.rs
@@ -34,6 +34,10 @@ impl TokenStream {
         TokenStream { subtree: Default::default() }
     }
 
+    pub fn with_subtree(subtree: tt::Subtree) -> Self {
+        TokenStream { subtree }
+    }
+
     pub fn is_empty(&self) -> bool {
         self.subtree.token_trees.is_empty()
     }
diff --git a/crates/ra_proc_macro_srv/src/tests/fixtures/test_serialize_proc_macro.txt b/crates/ra_proc_macro_srv/src/tests/fixtures/test_serialize_proc_macro.txt
new file mode 100644
index 000000000..24507d98d
--- /dev/null
+++ b/crates/ra_proc_macro_srv/src/tests/fixtures/test_serialize_proc_macro.txt
@@ -0,0 +1,188 @@
+SUBTREE $
+  PUNCH   # [alone] 4294967295
+  SUBTREE [] 4294967295
+    IDENT   allow 4294967295
+    SUBTREE () 4294967295
+      IDENT   non_upper_case_globals 4294967295
+      PUNCH   , [alone] 4294967295
+      IDENT   unused_attributes 4294967295
+      PUNCH   , [alone] 4294967295
+      IDENT   unused_qualifications 4294967295
+  IDENT   const 4294967295
+  IDENT   _IMPL_SERIALIZE_FOR_Foo 4294967295
+  PUNCH   : [alone] 4294967295
+  SUBTREE () 4294967295
+  PUNCH   = [alone] 4294967295
+  SUBTREE {} 4294967295
+    PUNCH   # [alone] 4294967295
+    SUBTREE [] 4294967295
+      IDENT   allow 4294967295
+      SUBTREE () 4294967295
+        IDENT   unknown_lints 4294967295
+    PUNCH   # [alone] 4294967295
+    SUBTREE [] 4294967295
+      IDENT   cfg_attr 4294967295
+      SUBTREE () 4294967295
+        IDENT   feature 4294967295
+        PUNCH   = [alone] 4294967295
+        SUBTREE $
+          LITERAL "cargo-clippy" 0
+        PUNCH   , [alone] 4294967295
+        IDENT   allow 4294967295
+        SUBTREE () 4294967295
+          IDENT   useless_attribute 4294967295
+    PUNCH   # [alone] 4294967295
+    SUBTREE [] 4294967295
+      IDENT   allow 4294967295
+      SUBTREE () 4294967295
+        IDENT   rust_2018_idioms 4294967295
+    IDENT   extern 4294967295
+    IDENT   crate 4294967295
+    IDENT   serde 4294967295
+    IDENT   as 4294967295
+    IDENT   _serde 4294967295
+    PUNCH   ; [alone] 4294967295
+    PUNCH   # [alone] 4294967295
+    SUBTREE [] 4294967295
+      IDENT   allow 4294967295
+      SUBTREE () 4294967295
+        IDENT   unused_macros 4294967295
+    IDENT   macro_rules 4294967295
+    PUNCH   ! [alone] 4294967295
+    IDENT   try 4294967295
+    SUBTREE {} 4294967295
+      SUBTREE () 4294967295
+        PUNCH   $ [alone] 4294967295
+        IDENT   __expr 4294967295
+        PUNCH   : [alone] 4294967295
+        IDENT   expr 4294967295
+      PUNCH   = [joint] 4294967295
+      PUNCH   > [alone] 4294967295
+      SUBTREE {} 4294967295
+        IDENT   match 4294967295
+        PUNCH   $ [alone] 4294967295
+        IDENT   __expr 4294967295
+        SUBTREE {} 4294967295
+          IDENT   _serde 4294967295
+          PUNCH   : [joint] 4294967295
+          PUNCH   : [alone] 4294967295
+          IDENT   export 4294967295
+          PUNCH   : [joint] 4294967295
+          PUNCH   : [alone] 4294967295
+          IDENT   Ok 4294967295
+          SUBTREE () 4294967295
+            IDENT   __val 4294967295
+          PUNCH   = [joint] 4294967295
+          PUNCH   > [alone] 4294967295
+          IDENT   __val 4294967295
+          PUNCH   , [alone] 4294967295
+          IDENT   _serde 4294967295
+          PUNCH   : [joint] 4294967295
+          PUNCH   : [alone] 4294967295
+          IDENT   export 4294967295
+          PUNCH   : [joint] 4294967295
+          PUNCH   : [alone] 4294967295
+          IDENT   Err 4294967295
+          SUBTREE () 4294967295
+            IDENT   __err 4294967295
+          PUNCH   = [joint] 4294967295
+          PUNCH   > [alone] 4294967295
+          SUBTREE {} 4294967295
+            IDENT   return 4294967295
+            IDENT   _serde 4294967295
+            PUNCH   : [joint] 4294967295
+            PUNCH   : [alone] 4294967295
+            IDENT   export 4294967295
+            PUNCH   : [joint] 4294967295
+            PUNCH   : [alone] 4294967295
+            IDENT   Err 4294967295
+            SUBTREE () 4294967295
+              IDENT   __err 4294967295
+            PUNCH   ; [alone] 4294967295
+    PUNCH   # [alone] 4294967295
+    SUBTREE [] 4294967295
+      IDENT   automatically_derived 4294967295
+    IDENT   impl 4294967295
+    IDENT   _serde 4294967295
+    PUNCH   : [joint] 4294967295
+    PUNCH   : [alone] 4294967295
+    IDENT   Serialize 4294967295
+    IDENT   for 4294967295
+    IDENT   Foo 1
+    SUBTREE {} 4294967295
+      IDENT   fn 4294967295
+      IDENT   serialize 4294967295
+      PUNCH   < [alone] 4294967295
+      IDENT   __S 4294967295
+      PUNCH   > [alone] 4294967295
+      SUBTREE () 4294967295
+        PUNCH   & [alone] 4294967295
+        IDENT   self 4294967295
+        PUNCH   , [alone] 4294967295
+        IDENT   __serializer 4294967295
+        PUNCH   : [alone] 4294967295
+        IDENT   __S 4294967295
+      PUNCH   - [joint] 4294967295
+      PUNCH   > [alone] 4294967295
+      IDENT   _serde 4294967295
+      PUNCH   : [joint] 4294967295
+      PUNCH   : [alone] 4294967295
+      IDENT   export 4294967295
+      PUNCH   : [joint] 4294967295
+      PUNCH   : [alone] 4294967295
+      IDENT   Result 4294967295
+      PUNCH   < [alone] 4294967295
+      IDENT   __S 4294967295
+      PUNCH   : [joint] 4294967295
+      PUNCH   : [alone] 4294967295
+      IDENT   Ok 4294967295
+      PUNCH   , [alone] 4294967295
+      IDENT   __S 4294967295
+      PUNCH   : [joint] 4294967295
+      PUNCH   : [alone] 4294967295
+      IDENT   Error 4294967295
+      PUNCH   > [alone] 4294967295
+      IDENT   where 4294967295
+      IDENT   __S 4294967295
+      PUNCH   : [alone] 4294967295
+      IDENT   _serde 4294967295
+      PUNCH   : [joint] 4294967295
+      PUNCH   : [alone] 4294967295
+      IDENT   Serializer 4294967295
+      PUNCH   , [alone] 4294967295
+      SUBTREE {} 4294967295
+        IDENT   let 4294967295
+        IDENT   __serde_state 4294967295
+        PUNCH   = [alone] 4294967295
+        IDENT   try 4294967295
+        PUNCH   ! [alone] 4294967295
+        SUBTREE () 4294967295
+          IDENT   _serde 4294967295
+          PUNCH   : [joint] 4294967295
+          PUNCH   : [alone] 4294967295
+          IDENT   Serializer 4294967295
+          PUNCH   : [joint] 4294967295
+          PUNCH   : [alone] 4294967295
+          IDENT   serialize_struct 4294967295
+          SUBTREE () 4294967295
+            IDENT   __serializer 4294967295
+            PUNCH   , [alone] 4294967295
+            LITERAL "Foo" 4294967295
+            PUNCH   , [alone] 4294967295
+            IDENT   false 4294967295
+            IDENT   as 4294967295
+            IDENT   usize 4294967295
+        PUNCH   ; [alone] 4294967295
+        IDENT   _serde 4294967295
+        PUNCH   : [joint] 4294967295
+        PUNCH   : [alone] 4294967295
+        IDENT   ser 4294967295
+        PUNCH   : [joint] 4294967295
+        PUNCH   : [alone] 4294967295
+        IDENT   SerializeStruct 4294967295
+        PUNCH   : [joint] 4294967295
+        PUNCH   : [alone] 4294967295
+        IDENT   end 4294967295
+        SUBTREE () 4294967295
+          IDENT   __serde_state 4294967295
+  PUNCH   ; [alone] 4294967295
\ No newline at end of file
diff --git a/crates/ra_proc_macro_srv/src/tests/mod.rs b/crates/ra_proc_macro_srv/src/tests/mod.rs
new file mode 100644
index 000000000..03f79bc5d
--- /dev/null
+++ b/crates/ra_proc_macro_srv/src/tests/mod.rs
@@ -0,0 +1,47 @@
+//! proc-macro tests
+
+#[macro_use]
+mod utils;
+use test_utils::assert_eq_text;
+use utils::*;
+
+#[test]
+fn test_derive_serialize_proc_macro() {
+    assert_expand(
+        "serde_derive",
+        "Serialize",
+        "1.0.104",
+        r##"struct Foo {}"##,
+        include_str!("fixtures/test_serialize_proc_macro.txt"),
+    );
+}
+
+#[test]
+fn test_derive_serialize_proc_macro_failed() {
+    assert_expand(
+        "serde_derive",
+        "Serialize",
+        "1.0.104",
+        r##"
+    struct {}
+"##,
+        r##"
+SUBTREE $
+  IDENT   compile_error 4294967295
+  PUNCH   ! [alone] 4294967295
+  SUBTREE {} 4294967295
+    LITERAL "expected identifier" 4294967295
+"##,
+    );
+}
+
+#[test]
+fn test_derive_proc_macro_list() {
+    let res = list("serde_derive", "1.0.104").join("\n");
+
+    assert_eq_text!(
+        &res,
+        r#"Serialize [CustomDerive]
+Deserialize [CustomDerive]"#
+    );
+}
diff --git a/crates/ra_proc_macro_srv/src/tests/utils.rs b/crates/ra_proc_macro_srv/src/tests/utils.rs
new file mode 100644
index 000000000..1ee409449
--- /dev/null
+++ b/crates/ra_proc_macro_srv/src/tests/utils.rs
@@ -0,0 +1,65 @@
+//! utils used in proc-macro tests
+
+use crate::dylib;
+use crate::list_macros;
+pub use difference::Changeset as __Changeset;
+use ra_proc_macro::ListMacrosTask;
+use std::str::FromStr;
+use test_utils::assert_eq_text;
+
+mod fixtures {
+    use cargo_metadata::{parse_messages, Message};
+    use std::process::Command;
+
+    // Use current project metadata to get the proc-macro dylib path
+    pub fn dylib_path(crate_name: &str, version: &str) -> std::path::PathBuf {
+        let command = Command::new("cargo")
+            .args(&["check", "--message-format", "json"])
+            .output()
+            .unwrap()
+            .stdout;
+
+        for message in parse_messages(command.as_slice()) {
+            match message.unwrap() {
+                Message::CompilerArtifact(artifact) => {
+                    if artifact.target.kind.contains(&"proc-macro".to_string()) {
+                        let repr = format!("{} {}", crate_name, version);
+                        if artifact.package_id.repr.starts_with(&repr) {
+                            return artifact.filenames[0].clone();
+                        }
+                    }
+                }
+                _ => (), // Unknown message
+            }
+        }
+
+        panic!("No proc-macro dylib for {} found!", crate_name);
+    }
+}
+
+fn parse_string(code: &str) -> Option<crate::rustc_server::TokenStream> {
+    Some(crate::rustc_server::TokenStream::from_str(code).unwrap())
+}
+
+pub fn assert_expand(
+    crate_name: &str,
+    macro_name: &str,
+    version: &str,
+    fixture: &str,
+    expect: &str,
+) {
+    let path = fixtures::dylib_path(crate_name, version);
+    let expander = dylib::Expander::new(&path).unwrap();
+    let fixture = parse_string(fixture).unwrap();
+
+    let res = expander.expand(macro_name, &fixture.subtree, None).unwrap();
+    assert_eq_text!(&format!("{:?}", res), &expect.trim());
+}
+
+pub fn list(crate_name: &str, version: &str) -> Vec<String> {
+    let path = fixtures::dylib_path(crate_name, version);
+    let task = ListMacrosTask { lib: path };
+
+    let res = list_macros(&task).unwrap();
+    res.macros.into_iter().map(|(name, kind)| format!("{} [{:?}]", name, kind)).collect()
+}
diff --git a/crates/ra_prof/src/lib.rs b/crates/ra_prof/src/lib.rs
index 00ea3a9b0..2d4f68f5e 100644
--- a/crates/ra_prof/src/lib.rs
+++ b/crates/ra_prof/src/lib.rs
@@ -113,21 +113,6 @@ pub fn profile(label: Label) -> Profiler {
     })
 }
 
-pub fn print_time(label: Label) -> impl Drop {
-    struct Guard {
-        label: Label,
-        start: Instant,
-    }
-
-    impl Drop for Guard {
-        fn drop(&mut self) {
-            eprintln!("{}: {:?}", self.label, self.start.elapsed())
-        }
-    }
-
-    Guard { label, start: Instant::now() }
-}
-
 pub struct Profiler {
     label: Option<Label>,
     detail: Option<String>,
diff --git a/crates/ra_syntax/src/ast.rs b/crates/ra_syntax/src/ast.rs
index a42eec91a..99c6b7219 100644
--- a/crates/ra_syntax/src/ast.rs
+++ b/crates/ra_syntax/src/ast.rs
@@ -42,11 +42,6 @@ pub trait AstNode {
     fn syntax(&self) -> &SyntaxNode;
 }
 
-#[test]
-fn assert_ast_is_object_safe() {
-    fn _f(_: &dyn AstNode, _: &dyn NameOwner) {}
-}
-
 /// Like `AstNode`, but wraps tokens rather than interior nodes.
 pub trait AstToken {
     fn can_cast(token: SyntaxKind) -> bool
@@ -64,22 +59,6 @@ pub trait AstToken {
     }
 }
 
-mod support {
-    use super::{AstChildren, AstNode, AstToken, SyntaxNode};
-
-    pub(super) fn child<N: AstNode>(parent: &SyntaxNode) -> Option<N> {
-        parent.children().find_map(N::cast)
-    }
-
-    pub(super) fn children<N: AstNode>(parent: &SyntaxNode) -> AstChildren<N> {
-        AstChildren::new(parent)
-    }
-
-    pub(super) fn token<T: AstToken>(parent: &SyntaxNode) -> Option<T> {
-        parent.children_with_tokens().filter_map(|it| it.into_token()).find_map(T::cast)
-    }
-}
-
 /// An iterator over `SyntaxNode` children of a particular AST type.
 #[derive(Debug, Clone)]
 pub struct AstChildren<N> {
@@ -100,12 +79,25 @@ impl<N: AstNode> Iterator for AstChildren<N> {
     }
 }
 
-fn child_opt<P: AstNode + ?Sized, C: AstNode>(parent: &P) -> Option<C> {
-    children(parent).next()
+mod support {
+    use super::{AstChildren, AstNode, SyntaxKind, SyntaxNode, SyntaxToken};
+
+    pub(super) fn child<N: AstNode>(parent: &SyntaxNode) -> Option<N> {
+        parent.children().find_map(N::cast)
+    }
+
+    pub(super) fn children<N: AstNode>(parent: &SyntaxNode) -> AstChildren<N> {
+        AstChildren::new(parent)
+    }
+
+    pub(super) fn token(parent: &SyntaxNode, kind: SyntaxKind) -> Option<SyntaxToken> {
+        parent.children_with_tokens().filter_map(|it| it.into_token()).find(|it| it.kind() == kind)
+    }
 }
 
-fn children<P: AstNode + ?Sized, C: AstNode>(parent: &P) -> AstChildren<C> {
-    AstChildren::new(parent.syntax())
+#[test]
+fn assert_ast_is_object_safe() {
+    fn _f(_: &dyn AstNode, _: &dyn NameOwner) {}
 }
 
 #[test]
@@ -287,7 +279,7 @@ where
     let pred = predicates.next().unwrap();
     let mut bounds = pred.type_bound_list().unwrap().bounds();
 
-    assert_eq!("'a", pred.lifetime().unwrap().text());
+    assert_eq!("'a", pred.lifetime_token().unwrap().text());
 
     assert_bound("'b", bounds.next());
     assert_bound("'c", bounds.next());
diff --git a/crates/ra_syntax/src/ast/edit.rs b/crates/ra_syntax/src/ast/edit.rs
index d79310995..9e5411ee5 100644
--- a/crates/ra_syntax/src/ast/edit.rs
+++ b/crates/ra_syntax/src/ast/edit.rs
@@ -6,7 +6,7 @@ use std::{iter, ops::RangeInclusive};
 use arrayvec::ArrayVec;
 
 use crate::{
-    algo,
+    algo::{self, neighbor, SyntaxRewriter},
     ast::{
         self,
         make::{self, tokens},
@@ -16,7 +16,6 @@ use crate::{
     SyntaxKind::{ATTR, COMMENT, WHITESPACE},
     SyntaxNode, SyntaxToken, T,
 };
-use algo::{neighbor, SyntaxRewriter};
 
 impl ast::BinExpr {
     #[must_use]
@@ -96,10 +95,10 @@ impl ast::ItemList {
                 leading_indent(it.syntax()).unwrap_or_default().to_string(),
                 InsertPosition::After(it.syntax().clone().into()),
             ),
-            None => match self.l_curly() {
+            None => match self.l_curly_token() {
                 Some(it) => (
                     "    ".to_string() + &leading_indent(self.syntax()).unwrap_or_default(),
-                    InsertPosition::After(it.syntax().clone().into()),
+                    InsertPosition::After(it.into()),
                 ),
                 None => return self.clone(),
             },
@@ -142,8 +141,8 @@ impl ast::RecordFieldList {
 
         macro_rules! after_l_curly {
             () => {{
-                let anchor = match self.l_curly() {
-                    Some(it) => it.syntax().clone().into(),
+                let anchor = match self.l_curly_token() {
+                    Some(it) => it.into(),
                     None => return self.clone(),
                 };
                 InsertPosition::After(anchor)
@@ -190,15 +189,15 @@ impl ast::RecordFieldList {
 impl ast::TypeParam {
     #[must_use]
     pub fn remove_bounds(&self) -> ast::TypeParam {
-        let colon = match self.colon() {
+        let colon = match self.colon_token() {
             Some(it) => it,
             None => return self.clone(),
         };
         let end = match self.type_bound_list() {
             Some(it) => it.syntax().clone().into(),
-            None => colon.syntax().clone().into(),
+            None => colon.clone().into(),
         };
-        self.replace_children(colon.syntax().clone().into()..=end, iter::empty())
+        self.replace_children(colon.into()..=end, iter::empty())
     }
 }
 
@@ -301,7 +300,7 @@ impl ast::UseTree {
             suffix.clone(),
             self.use_tree_list(),
             self.alias(),
-            self.star().is_some(),
+            self.star_token().is_some(),
         );
         let nested = make::use_tree_list(iter::once(use_tree));
         return make::use_tree(prefix.clone(), Some(nested), None, false);
diff --git a/crates/ra_syntax/src/ast/expr_extensions.rs b/crates/ra_syntax/src/ast/expr_extensions.rs
index 40c8fca3b..93aa3d45f 100644
--- a/crates/ra_syntax/src/ast/expr_extensions.rs
+++ b/crates/ra_syntax/src/ast/expr_extensions.rs
@@ -1,7 +1,7 @@
 //! Various extension methods to ast Expr Nodes, which are hard to code-generate.
 
 use crate::{
-    ast::{self, child_opt, children, AstChildren, AstNode},
+    ast::{self, support, AstChildren, AstNode},
     SmolStr,
     SyntaxKind::*,
     SyntaxToken, T,
@@ -36,7 +36,7 @@ impl ast::IfExpr {
         let res = match self.blocks().nth(1) {
             Some(block) => ElseBranch::Block(block),
             None => {
-                let elif: ast::IfExpr = child_opt(self)?;
+                let elif: ast::IfExpr = support::child(self.syntax())?;
                 ElseBranch::IfExpr(elif)
             }
         };
@@ -44,17 +44,7 @@ impl ast::IfExpr {
     }
 
     fn blocks(&self) -> AstChildren<ast::BlockExpr> {
-        children(self)
-    }
-}
-
-impl ast::RefExpr {
-    pub fn is_mut(&self) -> bool {
-        self.syntax().children_with_tokens().any(|n| n.kind() == T![mut])
-    }
-
-    pub fn raw_token(&self) -> Option<SyntaxToken> {
-        None // FIXME: implement &raw
+        support::children(self.syntax())
     }
 }
 
@@ -212,15 +202,15 @@ impl ast::BinExpr {
     }
 
     pub fn lhs(&self) -> Option<ast::Expr> {
-        children(self).next()
+        support::children(self.syntax()).next()
     }
 
     pub fn rhs(&self) -> Option<ast::Expr> {
-        children(self).nth(1)
+        support::children(self.syntax()).nth(1)
     }
 
     pub fn sub_exprs(&self) -> (Option<ast::Expr>, Option<ast::Expr>) {
-        let mut children = children(self);
+        let mut children = support::children(self.syntax());
         let first = children.next();
         let second = children.next();
         (first, second)
@@ -275,10 +265,10 @@ impl ast::RangeExpr {
 
 impl ast::IndexExpr {
     pub fn base(&self) -> Option<ast::Expr> {
-        children(self).next()
+        support::children(self.syntax()).next()
     }
     pub fn index(&self) -> Option<ast::Expr> {
-        children(self).nth(1)
+        support::children(self.syntax()).nth(1)
     }
 }
 
@@ -291,11 +281,11 @@ impl ast::ArrayExpr {
     pub fn kind(&self) -> ArrayExprKind {
         if self.is_repeat() {
             ArrayExprKind::Repeat {
-                initializer: children(self).next(),
-                repeat: children(self).nth(1),
+                initializer: support::children(self.syntax()).next(),
+                repeat: support::children(self.syntax()).nth(1),
             }
         } else {
-            ArrayExprKind::ElementList(children(self))
+            ArrayExprKind::ElementList(support::children(self.syntax()))
         }
     }
 
diff --git a/crates/ra_syntax/src/ast/extensions.rs b/crates/ra_syntax/src/ast/extensions.rs
index 33fe60762..63e272fbf 100644
--- a/crates/ra_syntax/src/ast/extensions.rs
+++ b/crates/ra_syntax/src/ast/extensions.rs
@@ -2,16 +2,12 @@
 //! Extensions for various expressions live in a sibling `expr_extensions` module.
 
 use itertools::Itertools;
+use ra_parser::SyntaxKind;
 
 use crate::{
-    ast::{
-        self, child_opt, children, support, AstNode, AstToken, AttrInput, NameOwner, SyntaxNode,
-    },
-    SmolStr, SyntaxElement,
-    SyntaxKind::*,
-    SyntaxToken, T,
+    ast::{self, support, AstNode, AttrInput, NameOwner, SyntaxNode},
+    SmolStr, SyntaxElement, SyntaxToken, T,
 };
-use ra_parser::SyntaxKind;
 
 impl ast::Name {
     pub fn text(&self) -> &SmolStr {
@@ -25,13 +21,7 @@ impl ast::NameRef {
     }
 
     pub fn as_tuple_field(&self) -> Option<usize> {
-        self.syntax().children_with_tokens().find_map(|c| {
-            if c.kind() == SyntaxKind::INT_NUMBER {
-                c.as_token().and_then(|tok| tok.text().as_str().parse().ok())
-            } else {
-                None
-            }
-        })
+        self.text().parse().ok()
     }
 }
 
@@ -87,7 +77,7 @@ impl ast::Attr {
             first_token.and_then(|token| token.next_token()).as_ref().map(SyntaxToken::kind);
 
         match (first_token_kind, second_token_kind) {
-            (Some(SyntaxKind::POUND), Some(SyntaxKind::EXCL)) => AttrKind::Inner,
+            (Some(SyntaxKind::POUND), Some(T![!])) => AttrKind::Inner,
             _ => AttrKind::Outer,
         }
     }
@@ -140,15 +130,6 @@ impl ast::Path {
     }
 }
 
-impl ast::Module {
-    pub fn has_semi(&self) -> bool {
-        match self.syntax().last_child_or_token() {
-            None => false,
-            Some(node) => node.kind() == T![;],
-        }
-    }
-}
-
 impl ast::UseTreeList {
     pub fn parent_use_tree(&self) -> ast::UseTree {
         self.syntax()
@@ -174,15 +155,11 @@ impl ast::ImplDef {
     }
 
     fn target(&self) -> (Option<ast::TypeRef>, Option<ast::TypeRef>) {
-        let mut types = children(self);
+        let mut types = support::children(self.syntax());
         let first = types.next();
         let second = types.next();
         (first, second)
     }
-
-    pub fn is_negative(&self) -> bool {
-        self.syntax().children_with_tokens().any(|t| t.kind() == T![!])
-    }
 }
 
 #[derive(Debug, Clone, PartialEq, Eq)]
@@ -194,9 +171,9 @@ pub enum StructKind {
 
 impl StructKind {
     fn from_node<N: AstNode>(node: &N) -> StructKind {
-        if let Some(nfdl) = child_opt::<_, ast::RecordFieldDefList>(node) {
+        if let Some(nfdl) = support::child::<ast::RecordFieldDefList>(node.syntax()) {
             StructKind::Record(nfdl)
-        } else if let Some(pfl) = child_opt::<_, ast::TupleFieldDefList>(node) {
+        } else if let Some(pfl) = support::child::<ast::TupleFieldDefList>(node.syntax()) {
             StructKind::Tuple(pfl)
         } else {
             StructKind::Unit
@@ -210,6 +187,36 @@ impl ast::StructDef {
     }
 }
 
+impl ast::RecordField {
+    pub fn for_field_name(field_name: &ast::NameRef) -> Option<ast::RecordField> {
+        let candidate =
+            field_name.syntax().parent().and_then(ast::RecordField::cast).or_else(|| {
+                field_name.syntax().ancestors().nth(4).and_then(ast::RecordField::cast)
+            })?;
+        if candidate.field_name().as_ref() == Some(field_name) {
+            Some(candidate)
+        } else {
+            None
+        }
+    }
+
+    /// Deals with field init shorthand
+    pub fn field_name(&self) -> Option<ast::NameRef> {
+        if let Some(name_ref) = self.name_ref() {
+            return Some(name_ref);
+        }
+        if let Some(ast::Expr::PathExpr(expr)) = self.expr() {
+            let path = expr.path()?;
+            let segment = path.segment()?;
+            let name_ref = segment.name_ref()?;
+            if path.qualifier().is_none() {
+                return Some(name_ref);
+            }
+        }
+        None
+    }
+}
+
 impl ast::EnumVariant {
     pub fn parent_enum(&self) -> ast::EnumDef {
         self.syntax()
@@ -223,41 +230,6 @@ impl ast::EnumVariant {
     }
 }
 
-impl ast::FnDef {
-    pub fn semicolon_token(&self) -> Option<SyntaxToken> {
-        self.syntax()
-            .last_child_or_token()
-            .and_then(|it| it.into_token())
-            .filter(|it| it.kind() == T![;])
-    }
-
-    pub fn is_async(&self) -> bool {
-        self.syntax().children_with_tokens().any(|it| it.kind() == T![async])
-    }
-}
-
-impl ast::LetStmt {
-    pub fn has_semi(&self) -> bool {
-        match self.syntax().last_child_or_token() {
-            None => false,
-            Some(node) => node.kind() == T![;],
-        }
-    }
-
-    pub fn eq_token(&self) -> Option<SyntaxToken> {
-        self.syntax().children_with_tokens().find(|t| t.kind() == EQ).and_then(|it| it.into_token())
-    }
-}
-
-impl ast::ExprStmt {
-    pub fn has_semi(&self) -> bool {
-        match self.syntax().last_child_or_token() {
-            None => false,
-            Some(node) => node.kind() == T![;],
-        }
-    }
-}
-
 #[derive(Debug, Clone, PartialEq, Eq)]
 pub enum FieldKind {
     Name(ast::NameRef),
@@ -286,25 +258,6 @@ impl ast::FieldExpr {
     }
 }
 
-impl ast::RefPat {
-    pub fn is_mut(&self) -> bool {
-        self.syntax().children_with_tokens().any(|n| n.kind() == T![mut])
-    }
-}
-
-impl ast::BindPat {
-    pub fn is_mutable(&self) -> bool {
-        self.syntax().children_with_tokens().any(|n| n.kind() == T![mut])
-    }
-
-    pub fn is_ref(&self) -> bool {
-        self.syntax().children_with_tokens().any(|n| n.kind() == T![ref])
-    }
-    pub fn has_at(&self) -> bool {
-        self.syntax().children_with_tokens().any(|it| it.kind() == T![@])
-    }
-}
-
 pub struct SlicePatComponents {
     pub prefix: Vec<ast::Pat>,
     pub slice: Option<ast::Pat>,
@@ -339,18 +292,6 @@ impl ast::SlicePat {
     }
 }
 
-impl ast::PointerType {
-    pub fn is_mut(&self) -> bool {
-        self.syntax().children_with_tokens().any(|n| n.kind() == T![mut])
-    }
-}
-
-impl ast::ReferenceType {
-    pub fn is_mut(&self) -> bool {
-        self.syntax().children_with_tokens().any(|n| n.kind() == T![mut])
-    }
-}
-
 #[derive(Copy, Clone, Debug, PartialEq, Eq, Hash)]
 pub enum SelfParamKind {
     /// self
@@ -363,8 +304,8 @@ pub enum SelfParamKind {
 
 impl ast::SelfParam {
     pub fn kind(&self) -> SelfParamKind {
-        if self.amp().is_some() {
-            if self.amp_mut_kw().is_some() {
+        if self.amp_token().is_some() {
+            if self.mut_token().is_some() {
                 SelfParamKind::MutRef
             } else {
                 SelfParamKind::Ref
@@ -373,24 +314,6 @@ impl ast::SelfParam {
             SelfParamKind::Owned
         }
     }
-
-    /// the "mut" in "mut self", not the one in "&mut self"
-    pub fn mut_kw(&self) -> Option<ast::MutKw> {
-        self.syntax()
-            .children_with_tokens()
-            .filter_map(|it| it.into_token())
-            .take_while(|it| it.kind() != T![&])
-            .find_map(ast::MutKw::cast)
-    }
-
-    /// the "mut" in "&mut self", not the one in "mut self"
-    pub fn amp_mut_kw(&self) -> Option<ast::MutKw> {
-        self.syntax()
-            .children_with_tokens()
-            .filter_map(|it| it.into_token())
-            .skip_while(|it| it.kind() != T![&])
-            .find_map(ast::MutKw::cast)
-    }
 }
 
 #[derive(Clone, Debug, PartialEq, Eq, Hash)]
@@ -400,53 +323,43 @@ pub enum TypeBoundKind {
     /// for<'a> ...
     ForType(ast::ForType),
     /// 'a
-    Lifetime(ast::Lifetime),
+    Lifetime(SyntaxToken),
 }
 
 impl ast::TypeBound {
     pub fn kind(&self) -> TypeBoundKind {
-        if let Some(path_type) = children(self).next() {
+        if let Some(path_type) = support::children(self.syntax()).next() {
             TypeBoundKind::PathType(path_type)
-        } else if let Some(for_type) = children(self).next() {
+        } else if let Some(for_type) = support::children(self.syntax()).next() {
             TypeBoundKind::ForType(for_type)
-        } else if let Some(lifetime) = self.lifetime() {
+        } else if let Some(lifetime) = self.lifetime_token() {
             TypeBoundKind::Lifetime(lifetime)
         } else {
             unreachable!()
         }
     }
 
-    pub fn has_question_mark(&self) -> bool {
-        self.question().is_some()
-    }
-
-    pub fn const_question(&self) -> Option<ast::Question> {
+    pub fn const_question_token(&self) -> Option<SyntaxToken> {
         self.syntax()
             .children_with_tokens()
             .filter_map(|it| it.into_token())
             .take_while(|it| it.kind() != T![const])
-            .find_map(ast::Question::cast)
+            .find(|it| it.kind() == T![?])
     }
 
-    pub fn question(&self) -> Option<ast::Question> {
-        if self.const_kw().is_some() {
+    pub fn question_token(&self) -> Option<SyntaxToken> {
+        if self.const_token().is_some() {
             self.syntax()
                 .children_with_tokens()
                 .filter_map(|it| it.into_token())
                 .skip_while(|it| it.kind() != T![const])
-                .find_map(ast::Question::cast)
+                .find(|it| it.kind() == T![?])
         } else {
-            support::token(&self.syntax)
+            support::token(&self.syntax, T![?])
         }
     }
 }
 
-impl ast::TraitDef {
-    pub fn is_auto(&self) -> bool {
-        self.syntax().children_with_tokens().any(|t| t.kind() == T![auto])
-    }
-}
-
 pub enum VisibilityKind {
     In(ast::Path),
     PubCrate,
@@ -457,30 +370,18 @@ pub enum VisibilityKind {
 
 impl ast::Visibility {
     pub fn kind(&self) -> VisibilityKind {
-        if let Some(path) = children(self).next() {
+        if let Some(path) = support::children(self.syntax()).next() {
             VisibilityKind::In(path)
-        } else if self.is_pub_crate() {
+        } else if self.crate_token().is_some() {
             VisibilityKind::PubCrate
-        } else if self.is_pub_super() {
+        } else if self.super_token().is_some() {
             VisibilityKind::PubSuper
-        } else if self.is_pub_self() {
+        } else if self.self_token().is_some() {
             VisibilityKind::PubSuper
         } else {
             VisibilityKind::Pub
         }
     }
-
-    fn is_pub_crate(&self) -> bool {
-        self.syntax().children_with_tokens().any(|it| it.kind() == T![crate])
-    }
-
-    fn is_pub_super(&self) -> bool {
-        self.syntax().children_with_tokens().any(|it| it.kind() == T![super])
-    }
-
-    fn is_pub_self(&self) -> bool {
-        self.syntax().children_with_tokens().any(|it| it.kind() == T![self])
-    }
 }
 
 impl ast::MacroCall {
@@ -495,12 +396,12 @@ impl ast::MacroCall {
 }
 
 impl ast::LifetimeParam {
-    pub fn lifetime_bounds(&self) -> impl Iterator<Item = ast::Lifetime> {
+    pub fn lifetime_bounds(&self) -> impl Iterator<Item = SyntaxToken> {
         self.syntax()
             .children_with_tokens()
             .filter_map(|it| it.into_token())
             .skip_while(|x| x.kind() != T![:])
-            .filter_map(ast::Lifetime::cast)
+            .filter(|it| it.kind() == T![lifetime])
     }
 }
 
@@ -508,7 +409,7 @@ impl ast::RangePat {
     pub fn start(&self) -> Option<ast::Pat> {
         self.syntax()
             .children_with_tokens()
-            .take_while(|it| !ast::RangeSeparator::can_cast(it.kind()))
+            .take_while(|it| !(it.kind() == T![..] || it.kind() == T![..=]))
             .filter_map(|it| it.into_node())
             .find_map(ast::Pat::cast)
     }
@@ -516,18 +417,24 @@ impl ast::RangePat {
     pub fn end(&self) -> Option<ast::Pat> {
         self.syntax()
             .children_with_tokens()
-            .skip_while(|it| !ast::RangeSeparator::can_cast(it.kind()))
+            .skip_while(|it| !(it.kind() == T![..] || it.kind() == T![..=]))
             .filter_map(|it| it.into_node())
             .find_map(ast::Pat::cast)
     }
 }
 
 impl ast::TokenTree {
-    pub fn left_delimiter(&self) -> Option<ast::LeftDelimiter> {
-        self.syntax().first_child_or_token()?.into_token().and_then(ast::LeftDelimiter::cast)
+    pub fn left_delimiter_token(&self) -> Option<SyntaxToken> {
+        self.syntax().first_child_or_token()?.into_token().filter(|it| match it.kind() {
+            T!['{'] | T!['('] | T!['['] => true,
+            _ => false,
+        })
     }
 
-    pub fn right_delimiter(&self) -> Option<ast::RightDelimiter> {
-        self.syntax().last_child_or_token()?.into_token().and_then(ast::RightDelimiter::cast)
+    pub fn right_delimiter_token(&self) -> Option<SyntaxToken> {
+        self.syntax().last_child_or_token()?.into_token().filter(|it| match it.kind() {
+            T!['{'] | T!['('] | T!['['] => true,
+            _ => false,
+        })
     }
 }
diff --git a/crates/ra_syntax/src/ast/generated/nodes.rs b/crates/ra_syntax/src/ast/generated/nodes.rs
index 8b348ad6e..f1098755b 100644
--- a/crates/ra_syntax/src/ast/generated/nodes.rs
+++ b/crates/ra_syntax/src/ast/generated/nodes.rs
@@ -1,11 +1,11 @@
 //! Generated file, do not edit by hand, see `xtask/src/codegen`
 
-use super::tokens::*;
 use crate::{
     ast::{self, support, AstChildren, AstNode},
     SyntaxKind::{self, *},
-    SyntaxNode,
+    SyntaxNode, SyntaxToken, T,
 };
+
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub struct SourceFile {
     pub(crate) syntax: SyntaxNode,
@@ -22,11 +22,11 @@ impl AstNode for SourceFile {
     fn syntax(&self) -> &SyntaxNode { &self.syntax }
 }
 impl ast::ModuleItemOwner for SourceFile {}
-impl ast::FnDefOwner for SourceFile {}
 impl ast::AttrsOwner for SourceFile {}
 impl SourceFile {
     pub fn modules(&self) -> AstChildren<Module> { support::children(&self.syntax) }
 }
+
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub struct FnDef {
     pub(crate) syntax: SyntaxNode,
@@ -49,16 +49,17 @@ impl ast::DocCommentsOwner for FnDef {}
 impl ast::AttrsOwner for FnDef {}
 impl FnDef {
     pub fn abi(&self) -> Option<Abi> { support::child(&self.syntax) }
-    pub fn const_kw(&self) -> Option<ConstKw> { support::token(&self.syntax) }
-    pub fn default_kw(&self) -> Option<DefaultKw> { support::token(&self.syntax) }
-    pub fn async_kw(&self) -> Option<AsyncKw> { support::token(&self.syntax) }
-    pub fn unsafe_kw(&self) -> Option<UnsafeKw> { support::token(&self.syntax) }
-    pub fn fn_kw(&self) -> Option<FnKw> { support::token(&self.syntax) }
+    pub fn const_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![const]) }
+    pub fn default_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![default]) }
+    pub fn async_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![async]) }
+    pub fn unsafe_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![unsafe]) }
+    pub fn fn_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![fn]) }
     pub fn param_list(&self) -> Option<ParamList> { support::child(&self.syntax) }
     pub fn ret_type(&self) -> Option<RetType> { support::child(&self.syntax) }
     pub fn body(&self) -> Option<BlockExpr> { support::child(&self.syntax) }
-    pub fn semi(&self) -> Option<Semi> { support::token(&self.syntax) }
+    pub fn semicolon_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![;]) }
 }
+
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub struct RetType {
     pub(crate) syntax: SyntaxNode,
@@ -75,9 +76,10 @@ impl AstNode for RetType {
     fn syntax(&self) -> &SyntaxNode { &self.syntax }
 }
 impl RetType {
-    pub fn thin_arrow(&self) -> Option<ThinArrow> { support::token(&self.syntax) }
+    pub fn thin_arrow_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![->]) }
     pub fn type_ref(&self) -> Option<TypeRef> { support::child(&self.syntax) }
 }
+
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub struct StructDef {
     pub(crate) syntax: SyntaxNode,
@@ -99,10 +101,11 @@ impl ast::TypeParamsOwner for StructDef {}
 impl ast::AttrsOwner for StructDef {}
 impl ast::DocCommentsOwner for StructDef {}
 impl StructDef {
-    pub fn struct_kw(&self) -> Option<StructKw> { support::token(&self.syntax) }
+    pub fn struct_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![struct]) }
     pub fn field_def_list(&self) -> Option<FieldDefList> { support::child(&self.syntax) }
-    pub fn semi(&self) -> Option<Semi> { support::token(&self.syntax) }
+    pub fn semicolon_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![;]) }
 }
+
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub struct UnionDef {
     pub(crate) syntax: SyntaxNode,
@@ -124,11 +127,12 @@ impl ast::TypeParamsOwner for UnionDef {}
 impl ast::AttrsOwner for UnionDef {}
 impl ast::DocCommentsOwner for UnionDef {}
 impl UnionDef {
-    pub fn union_kw(&self) -> Option<UnionKw> { support::token(&self.syntax) }
+    pub fn union_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![union]) }
     pub fn record_field_def_list(&self) -> Option<RecordFieldDefList> {
         support::child(&self.syntax)
     }
 }
+
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub struct RecordFieldDefList {
     pub(crate) syntax: SyntaxNode,
@@ -145,10 +149,11 @@ impl AstNode for RecordFieldDefList {
     fn syntax(&self) -> &SyntaxNode { &self.syntax }
 }
 impl RecordFieldDefList {
-    pub fn l_curly(&self) -> Option<LCurly> { support::token(&self.syntax) }
+    pub fn l_curly_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T!['{']) }
     pub fn fields(&self) -> AstChildren<RecordFieldDef> { support::children(&self.syntax) }
-    pub fn r_curly(&self) -> Option<RCurly> { support::token(&self.syntax) }
+    pub fn r_curly_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T!['}']) }
 }
+
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub struct RecordFieldDef {
     pub(crate) syntax: SyntaxNode,
@@ -170,6 +175,7 @@ impl ast::AttrsOwner for RecordFieldDef {}
 impl ast::DocCommentsOwner for RecordFieldDef {}
 impl ast::TypeAscriptionOwner for RecordFieldDef {}
 impl RecordFieldDef {}
+
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub struct TupleFieldDefList {
     pub(crate) syntax: SyntaxNode,
@@ -186,10 +192,11 @@ impl AstNode for TupleFieldDefList {
     fn syntax(&self) -> &SyntaxNode { &self.syntax }
 }
 impl TupleFieldDefList {
-    pub fn l_paren(&self) -> Option<LParen> { support::token(&self.syntax) }
+    pub fn l_paren_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T!['(']) }
     pub fn fields(&self) -> AstChildren<TupleFieldDef> { support::children(&self.syntax) }
-    pub fn r_paren(&self) -> Option<RParen> { support::token(&self.syntax) }
+    pub fn r_paren_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![')']) }
 }
+
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub struct TupleFieldDef {
     pub(crate) syntax: SyntaxNode,
@@ -210,6 +217,7 @@ impl ast::AttrsOwner for TupleFieldDef {}
 impl TupleFieldDef {
     pub fn type_ref(&self) -> Option<TypeRef> { support::child(&self.syntax) }
 }
+
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub struct EnumDef {
     pub(crate) syntax: SyntaxNode,
@@ -231,9 +239,10 @@ impl ast::TypeParamsOwner for EnumDef {}
 impl ast::AttrsOwner for EnumDef {}
 impl ast::DocCommentsOwner for EnumDef {}
 impl EnumDef {
-    pub fn enum_kw(&self) -> Option<EnumKw> { support::token(&self.syntax) }
+    pub fn enum_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![enum]) }
     pub fn variant_list(&self) -> Option<EnumVariantList> { support::child(&self.syntax) }
 }
+
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub struct EnumVariantList {
     pub(crate) syntax: SyntaxNode,
@@ -250,10 +259,11 @@ impl AstNode for EnumVariantList {
     fn syntax(&self) -> &SyntaxNode { &self.syntax }
 }
 impl EnumVariantList {
-    pub fn l_curly(&self) -> Option<LCurly> { support::token(&self.syntax) }
+    pub fn l_curly_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T!['{']) }
     pub fn variants(&self) -> AstChildren<EnumVariant> { support::children(&self.syntax) }
-    pub fn r_curly(&self) -> Option<RCurly> { support::token(&self.syntax) }
+    pub fn r_curly_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T!['}']) }
 }
+
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub struct EnumVariant {
     pub(crate) syntax: SyntaxNode,
@@ -275,9 +285,10 @@ impl ast::DocCommentsOwner for EnumVariant {}
 impl ast::AttrsOwner for EnumVariant {}
 impl EnumVariant {
     pub fn field_def_list(&self) -> Option<FieldDefList> { support::child(&self.syntax) }
-    pub fn eq(&self) -> Option<Eq> { support::token(&self.syntax) }
+    pub fn eq_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![=]) }
     pub fn expr(&self) -> Option<Expr> { support::child(&self.syntax) }
 }
+
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub struct TraitDef {
     pub(crate) syntax: SyntaxNode,
@@ -300,11 +311,12 @@ impl ast::DocCommentsOwner for TraitDef {}
 impl ast::TypeParamsOwner for TraitDef {}
 impl ast::TypeBoundsOwner for TraitDef {}
 impl TraitDef {
-    pub fn unsafe_kw(&self) -> Option<UnsafeKw> { support::token(&self.syntax) }
-    pub fn auto_kw(&self) -> Option<AutoKw> { support::token(&self.syntax) }
-    pub fn trait_kw(&self) -> Option<TraitKw> { support::token(&self.syntax) }
+    pub fn unsafe_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![unsafe]) }
+    pub fn auto_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![auto]) }
+    pub fn trait_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![trait]) }
     pub fn item_list(&self) -> Option<ItemList> { support::child(&self.syntax) }
 }
+
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub struct Module {
     pub(crate) syntax: SyntaxNode,
@@ -325,10 +337,11 @@ impl ast::NameOwner for Module {}
 impl ast::AttrsOwner for Module {}
 impl ast::DocCommentsOwner for Module {}
 impl Module {
-    pub fn mod_kw(&self) -> Option<ModKw> { support::token(&self.syntax) }
+    pub fn mod_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![mod]) }
     pub fn item_list(&self) -> Option<ItemList> { support::child(&self.syntax) }
-    pub fn semi(&self) -> Option<Semi> { support::token(&self.syntax) }
+    pub fn semicolon_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![;]) }
 }
+
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub struct ItemList {
     pub(crate) syntax: SyntaxNode,
@@ -344,13 +357,13 @@ impl AstNode for ItemList {
     }
     fn syntax(&self) -> &SyntaxNode { &self.syntax }
 }
-impl ast::FnDefOwner for ItemList {}
 impl ast::ModuleItemOwner for ItemList {}
 impl ItemList {
-    pub fn l_curly(&self) -> Option<LCurly> { support::token(&self.syntax) }
+    pub fn l_curly_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T!['{']) }
     pub fn impl_items(&self) -> AstChildren<ImplItem> { support::children(&self.syntax) }
-    pub fn r_curly(&self) -> Option<RCurly> { support::token(&self.syntax) }
+    pub fn r_curly_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T!['}']) }
 }
+
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub struct ConstDef {
     pub(crate) syntax: SyntaxNode,
@@ -373,12 +386,13 @@ impl ast::AttrsOwner for ConstDef {}
 impl ast::DocCommentsOwner for ConstDef {}
 impl ast::TypeAscriptionOwner for ConstDef {}
 impl ConstDef {
-    pub fn default_kw(&self) -> Option<DefaultKw> { support::token(&self.syntax) }
-    pub fn const_kw(&self) -> Option<ConstKw> { support::token(&self.syntax) }
-    pub fn eq(&self) -> Option<Eq> { support::token(&self.syntax) }
+    pub fn default_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![default]) }
+    pub fn const_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![const]) }
+    pub fn eq_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![=]) }
     pub fn body(&self) -> Option<Expr> { support::child(&self.syntax) }
-    pub fn semi(&self) -> Option<Semi> { support::token(&self.syntax) }
+    pub fn semicolon_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![;]) }
 }
+
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub struct StaticDef {
     pub(crate) syntax: SyntaxNode,
@@ -401,12 +415,13 @@ impl ast::AttrsOwner for StaticDef {}
 impl ast::DocCommentsOwner for StaticDef {}
 impl ast::TypeAscriptionOwner for StaticDef {}
 impl StaticDef {
-    pub fn static_kw(&self) -> Option<StaticKw> { support::token(&self.syntax) }
-    pub fn mut_kw(&self) -> Option<MutKw> { support::token(&self.syntax) }
-    pub fn eq(&self) -> Option<Eq> { support::token(&self.syntax) }
+    pub fn static_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![static]) }
+    pub fn mut_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![mut]) }
+    pub fn eq_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![=]) }
     pub fn body(&self) -> Option<Expr> { support::child(&self.syntax) }
-    pub fn semi(&self) -> Option<Semi> { support::token(&self.syntax) }
+    pub fn semicolon_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![;]) }
 }
+
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub struct TypeAliasDef {
     pub(crate) syntax: SyntaxNode,
@@ -429,12 +444,13 @@ impl ast::AttrsOwner for TypeAliasDef {}
 impl ast::DocCommentsOwner for TypeAliasDef {}
 impl ast::TypeBoundsOwner for TypeAliasDef {}
 impl TypeAliasDef {
-    pub fn default_kw(&self) -> Option<DefaultKw> { support::token(&self.syntax) }
-    pub fn type_kw(&self) -> Option<TypeKw> { support::token(&self.syntax) }
-    pub fn eq(&self) -> Option<Eq> { support::token(&self.syntax) }
+    pub fn default_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![default]) }
+    pub fn type_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![type]) }
+    pub fn eq_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![=]) }
     pub fn type_ref(&self) -> Option<TypeRef> { support::child(&self.syntax) }
-    pub fn semi(&self) -> Option<Semi> { support::token(&self.syntax) }
+    pub fn semicolon_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![;]) }
 }
+
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub struct ImplDef {
     pub(crate) syntax: SyntaxNode,
@@ -453,14 +469,15 @@ impl AstNode for ImplDef {
 impl ast::TypeParamsOwner for ImplDef {}
 impl ast::AttrsOwner for ImplDef {}
 impl ImplDef {
-    pub fn default_kw(&self) -> Option<DefaultKw> { support::token(&self.syntax) }
-    pub fn const_kw(&self) -> Option<ConstKw> { support::token(&self.syntax) }
-    pub fn unsafe_kw(&self) -> Option<UnsafeKw> { support::token(&self.syntax) }
-    pub fn impl_kw(&self) -> Option<ImplKw> { support::token(&self.syntax) }
-    pub fn excl(&self) -> Option<Excl> { support::token(&self.syntax) }
-    pub fn for_kw(&self) -> Option<ForKw> { support::token(&self.syntax) }
+    pub fn default_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![default]) }
+    pub fn const_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![const]) }
+    pub fn unsafe_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![unsafe]) }
+    pub fn impl_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![impl]) }
+    pub fn excl_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![!]) }
+    pub fn for_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![for]) }
     pub fn item_list(&self) -> Option<ItemList> { support::child(&self.syntax) }
 }
+
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub struct ParenType {
     pub(crate) syntax: SyntaxNode,
@@ -477,10 +494,11 @@ impl AstNode for ParenType {
     fn syntax(&self) -> &SyntaxNode { &self.syntax }
 }
 impl ParenType {
-    pub fn l_paren(&self) -> Option<LParen> { support::token(&self.syntax) }
+    pub fn l_paren_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T!['(']) }
     pub fn type_ref(&self) -> Option<TypeRef> { support::child(&self.syntax) }
-    pub fn r_paren(&self) -> Option<RParen> { support::token(&self.syntax) }
+    pub fn r_paren_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![')']) }
 }
+
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub struct TupleType {
     pub(crate) syntax: SyntaxNode,
@@ -497,10 +515,11 @@ impl AstNode for TupleType {
     fn syntax(&self) -> &SyntaxNode { &self.syntax }
 }
 impl TupleType {
-    pub fn l_paren(&self) -> Option<LParen> { support::token(&self.syntax) }
+    pub fn l_paren_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T!['(']) }
     pub fn fields(&self) -> AstChildren<TypeRef> { support::children(&self.syntax) }
-    pub fn r_paren(&self) -> Option<RParen> { support::token(&self.syntax) }
+    pub fn r_paren_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![')']) }
 }
+
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub struct NeverType {
     pub(crate) syntax: SyntaxNode,
@@ -517,8 +536,9 @@ impl AstNode for NeverType {
     fn syntax(&self) -> &SyntaxNode { &self.syntax }
 }
 impl NeverType {
-    pub fn excl(&self) -> Option<Excl> { support::token(&self.syntax) }
+    pub fn excl_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![!]) }
 }
+
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub struct PathType {
     pub(crate) syntax: SyntaxNode,
@@ -537,6 +557,7 @@ impl AstNode for PathType {
 impl PathType {
     pub fn path(&self) -> Option<Path> { support::child(&self.syntax) }
 }
+
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub struct PointerType {
     pub(crate) syntax: SyntaxNode,
@@ -553,10 +574,12 @@ impl AstNode for PointerType {
     fn syntax(&self) -> &SyntaxNode { &self.syntax }
 }
 impl PointerType {
-    pub fn star(&self) -> Option<Star> { support::token(&self.syntax) }
-    pub fn const_kw(&self) -> Option<ConstKw> { support::token(&self.syntax) }
+    pub fn star_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![*]) }
+    pub fn const_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![const]) }
+    pub fn mut_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![mut]) }
     pub fn type_ref(&self) -> Option<TypeRef> { support::child(&self.syntax) }
 }
+
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub struct ArrayType {
     pub(crate) syntax: SyntaxNode,
@@ -573,12 +596,13 @@ impl AstNode for ArrayType {
     fn syntax(&self) -> &SyntaxNode { &self.syntax }
 }
 impl ArrayType {
-    pub fn l_brack(&self) -> Option<LBrack> { support::token(&self.syntax) }
+    pub fn l_brack_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T!['[']) }
     pub fn type_ref(&self) -> Option<TypeRef> { support::child(&self.syntax) }
-    pub fn semi(&self) -> Option<Semi> { support::token(&self.syntax) }
+    pub fn semicolon_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![;]) }
     pub fn expr(&self) -> Option<Expr> { support::child(&self.syntax) }
-    pub fn r_brack(&self) -> Option<RBrack> { support::token(&self.syntax) }
+    pub fn r_brack_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![']']) }
 }
+
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub struct SliceType {
     pub(crate) syntax: SyntaxNode,
@@ -595,10 +619,11 @@ impl AstNode for SliceType {
     fn syntax(&self) -> &SyntaxNode { &self.syntax }
 }
 impl SliceType {
-    pub fn l_brack(&self) -> Option<LBrack> { support::token(&self.syntax) }
+    pub fn l_brack_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T!['[']) }
     pub fn type_ref(&self) -> Option<TypeRef> { support::child(&self.syntax) }
-    pub fn r_brack(&self) -> Option<RBrack> { support::token(&self.syntax) }
+    pub fn r_brack_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![']']) }
 }
+
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub struct ReferenceType {
     pub(crate) syntax: SyntaxNode,
@@ -615,11 +640,14 @@ impl AstNode for ReferenceType {
     fn syntax(&self) -> &SyntaxNode { &self.syntax }
 }
 impl ReferenceType {
-    pub fn amp(&self) -> Option<Amp> { support::token(&self.syntax) }
-    pub fn lifetime(&self) -> Option<Lifetime> { support::token(&self.syntax) }
-    pub fn mut_kw(&self) -> Option<MutKw> { support::token(&self.syntax) }
+    pub fn amp_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![&]) }
+    pub fn lifetime_token(&self) -> Option<SyntaxToken> {
+        support::token(&self.syntax, T![lifetime])
+    }
+    pub fn mut_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![mut]) }
     pub fn type_ref(&self) -> Option<TypeRef> { support::child(&self.syntax) }
 }
+
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub struct PlaceholderType {
     pub(crate) syntax: SyntaxNode,
@@ -636,8 +664,9 @@ impl AstNode for PlaceholderType {
     fn syntax(&self) -> &SyntaxNode { &self.syntax }
 }
 impl PlaceholderType {
-    pub fn underscore(&self) -> Option<Underscore> { support::token(&self.syntax) }
+    pub fn underscore_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![_]) }
 }
+
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub struct FnPointerType {
     pub(crate) syntax: SyntaxNode,
@@ -655,11 +684,12 @@ impl AstNode for FnPointerType {
 }
 impl FnPointerType {
     pub fn abi(&self) -> Option<Abi> { support::child(&self.syntax) }
-    pub fn unsafe_kw(&self) -> Option<UnsafeKw> { support::token(&self.syntax) }
-    pub fn fn_kw(&self) -> Option<FnKw> { support::token(&self.syntax) }
+    pub fn unsafe_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![unsafe]) }
+    pub fn fn_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![fn]) }
     pub fn param_list(&self) -> Option<ParamList> { support::child(&self.syntax) }
     pub fn ret_type(&self) -> Option<RetType> { support::child(&self.syntax) }
 }
+
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub struct ForType {
     pub(crate) syntax: SyntaxNode,
@@ -676,10 +706,11 @@ impl AstNode for ForType {
     fn syntax(&self) -> &SyntaxNode { &self.syntax }
 }
 impl ForType {
-    pub fn for_kw(&self) -> Option<ForKw> { support::token(&self.syntax) }
+    pub fn for_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![for]) }
     pub fn type_param_list(&self) -> Option<TypeParamList> { support::child(&self.syntax) }
     pub fn type_ref(&self) -> Option<TypeRef> { support::child(&self.syntax) }
 }
+
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub struct ImplTraitType {
     pub(crate) syntax: SyntaxNode,
@@ -697,8 +728,9 @@ impl AstNode for ImplTraitType {
 }
 impl ast::TypeBoundsOwner for ImplTraitType {}
 impl ImplTraitType {
-    pub fn impl_kw(&self) -> Option<ImplKw> { support::token(&self.syntax) }
+    pub fn impl_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![impl]) }
 }
+
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub struct DynTraitType {
     pub(crate) syntax: SyntaxNode,
@@ -716,8 +748,9 @@ impl AstNode for DynTraitType {
 }
 impl ast::TypeBoundsOwner for DynTraitType {}
 impl DynTraitType {
-    pub fn dyn_kw(&self) -> Option<DynKw> { support::token(&self.syntax) }
+    pub fn dyn_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![dyn]) }
 }
+
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub struct TupleExpr {
     pub(crate) syntax: SyntaxNode,
@@ -735,10 +768,11 @@ impl AstNode for TupleExpr {
 }
 impl ast::AttrsOwner for TupleExpr {}
 impl TupleExpr {
-    pub fn l_paren(&self) -> Option<LParen> { support::token(&self.syntax) }
+    pub fn l_paren_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T!['(']) }
     pub fn exprs(&self) -> AstChildren<Expr> { support::children(&self.syntax) }
-    pub fn r_paren(&self) -> Option<RParen> { support::token(&self.syntax) }
+    pub fn r_paren_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![')']) }
 }
+
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub struct ArrayExpr {
     pub(crate) syntax: SyntaxNode,
@@ -756,11 +790,12 @@ impl AstNode for ArrayExpr {
 }
 impl ast::AttrsOwner for ArrayExpr {}
 impl ArrayExpr {
-    pub fn l_brack(&self) -> Option<LBrack> { support::token(&self.syntax) }
+    pub fn l_brack_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T!['[']) }
     pub fn exprs(&self) -> AstChildren<Expr> { support::children(&self.syntax) }
-    pub fn semi(&self) -> Option<Semi> { support::token(&self.syntax) }
-    pub fn r_brack(&self) -> Option<RBrack> { support::token(&self.syntax) }
+    pub fn semicolon_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 ParenExpr {
     pub(crate) syntax: SyntaxNode,
@@ -778,10 +813,11 @@ impl AstNode for ParenExpr {
 }
 impl ast::AttrsOwner for ParenExpr {}
 impl ParenExpr {
-    pub fn l_paren(&self) -> Option<LParen> { support::token(&self.syntax) }
+    pub fn l_paren_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T!['(']) }
     pub fn expr(&self) -> Option<Expr> { support::child(&self.syntax) }
-    pub fn r_paren(&self) -> Option<RParen> { support::token(&self.syntax) }
+    pub fn r_paren_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![')']) }
 }
+
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub struct PathExpr {
     pub(crate) syntax: SyntaxNode,
@@ -800,6 +836,7 @@ impl AstNode for PathExpr {
 impl PathExpr {
     pub fn path(&self) -> Option<Path> { support::child(&self.syntax) }
 }
+
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub struct LambdaExpr {
     pub(crate) syntax: SyntaxNode,
@@ -817,13 +854,14 @@ impl AstNode for LambdaExpr {
 }
 impl ast::AttrsOwner for LambdaExpr {}
 impl LambdaExpr {
-    pub fn static_kw(&self) -> Option<StaticKw> { support::token(&self.syntax) }
-    pub fn async_kw(&self) -> Option<AsyncKw> { support::token(&self.syntax) }
-    pub fn move_kw(&self) -> Option<MoveKw> { support::token(&self.syntax) }
+    pub fn static_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![static]) }
+    pub fn async_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![async]) }
+    pub fn move_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![move]) }
     pub fn param_list(&self) -> Option<ParamList> { support::child(&self.syntax) }
     pub fn ret_type(&self) -> Option<RetType> { support::child(&self.syntax) }
     pub fn body(&self) -> Option<Expr> { support::child(&self.syntax) }
 }
+
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub struct IfExpr {
     pub(crate) syntax: SyntaxNode,
@@ -841,9 +879,10 @@ impl AstNode for IfExpr {
 }
 impl ast::AttrsOwner for IfExpr {}
 impl IfExpr {
-    pub fn if_kw(&self) -> Option<IfKw> { support::token(&self.syntax) }
+    pub fn if_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![if]) }
     pub fn condition(&self) -> Option<Condition> { support::child(&self.syntax) }
 }
+
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub struct LoopExpr {
     pub(crate) syntax: SyntaxNode,
@@ -862,8 +901,9 @@ impl AstNode for LoopExpr {
 impl ast::AttrsOwner for LoopExpr {}
 impl ast::LoopBodyOwner for LoopExpr {}
 impl LoopExpr {
-    pub fn loop_kw(&self) -> Option<LoopKw> { support::token(&self.syntax) }
+    pub fn loop_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![loop]) }
 }
+
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub struct TryBlockExpr {
     pub(crate) syntax: SyntaxNode,
@@ -881,9 +921,10 @@ impl AstNode for TryBlockExpr {
 }
 impl ast::AttrsOwner for TryBlockExpr {}
 impl TryBlockExpr {
-    pub fn try_kw(&self) -> Option<TryKw> { support::token(&self.syntax) }
+    pub fn try_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![try]) }
     pub fn body(&self) -> Option<BlockExpr> { support::child(&self.syntax) }
 }
+
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub struct ForExpr {
     pub(crate) syntax: SyntaxNode,
@@ -902,11 +943,12 @@ impl AstNode for ForExpr {
 impl ast::AttrsOwner for ForExpr {}
 impl ast::LoopBodyOwner for ForExpr {}
 impl ForExpr {
-    pub fn for_kw(&self) -> Option<ForKw> { support::token(&self.syntax) }
+    pub fn for_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![for]) }
     pub fn pat(&self) -> Option<Pat> { support::child(&self.syntax) }
-    pub fn in_kw(&self) -> Option<InKw> { support::token(&self.syntax) }
+    pub fn in_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![in]) }
     pub fn iterable(&self) -> Option<Expr> { support::child(&self.syntax) }
 }
+
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub struct WhileExpr {
     pub(crate) syntax: SyntaxNode,
@@ -925,9 +967,10 @@ impl AstNode for WhileExpr {
 impl ast::AttrsOwner for WhileExpr {}
 impl ast::LoopBodyOwner for WhileExpr {}
 impl WhileExpr {
-    pub fn while_kw(&self) -> Option<WhileKw> { support::token(&self.syntax) }
+    pub fn while_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![while]) }
     pub fn condition(&self) -> Option<Condition> { support::child(&self.syntax) }
 }
+
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub struct ContinueExpr {
     pub(crate) syntax: SyntaxNode,
@@ -945,9 +988,14 @@ impl AstNode for ContinueExpr {
 }
 impl ast::AttrsOwner for ContinueExpr {}
 impl ContinueExpr {
-    pub fn continue_kw(&self) -> Option<ContinueKw> { support::token(&self.syntax) }
-    pub fn lifetime(&self) -> Option<Lifetime> { support::token(&self.syntax) }
+    pub fn continue_token(&self) -> Option<SyntaxToken> {
+        support::token(&self.syntax, T![continue])
+    }
+    pub fn lifetime_token(&self) -> Option<SyntaxToken> {
+        support::token(&self.syntax, T![lifetime])
+    }
 }
+
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub struct BreakExpr {
     pub(crate) syntax: SyntaxNode,
@@ -965,10 +1013,13 @@ impl AstNode for BreakExpr {
 }
 impl ast::AttrsOwner for BreakExpr {}
 impl BreakExpr {
-    pub fn break_kw(&self) -> Option<BreakKw> { support::token(&self.syntax) }
-    pub fn lifetime(&self) -> Option<Lifetime> { support::token(&self.syntax) }
+    pub fn break_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![break]) }
+    pub fn lifetime_token(&self) -> Option<SyntaxToken> {
+        support::token(&self.syntax, T![lifetime])
+    }
     pub fn expr(&self) -> Option<Expr> { support::child(&self.syntax) }
 }
+
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub struct Label {
     pub(crate) syntax: SyntaxNode,
@@ -985,8 +1036,11 @@ impl AstNode for Label {
     fn syntax(&self) -> &SyntaxNode { &self.syntax }
 }
 impl Label {
-    pub fn lifetime(&self) -> Option<Lifetime> { support::token(&self.syntax) }
+    pub fn lifetime_token(&self) -> Option<SyntaxToken> {
+        support::token(&self.syntax, T![lifetime])
+    }
 }
+
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub struct BlockExpr {
     pub(crate) syntax: SyntaxNode,
@@ -1005,9 +1059,10 @@ impl AstNode for BlockExpr {
 impl ast::AttrsOwner for BlockExpr {}
 impl BlockExpr {
     pub fn label(&self) -> Option<Label> { support::child(&self.syntax) }
-    pub fn unsafe_kw(&self) -> Option<UnsafeKw> { support::token(&self.syntax) }
+    pub fn unsafe_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![unsafe]) }
     pub fn block(&self) -> Option<Block> { support::child(&self.syntax) }
 }
+
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub struct ReturnExpr {
     pub(crate) syntax: SyntaxNode,
@@ -1027,6 +1082,7 @@ impl ast::AttrsOwner for ReturnExpr {}
 impl ReturnExpr {
     pub fn expr(&self) -> Option<Expr> { support::child(&self.syntax) }
 }
+
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub struct CallExpr {
     pub(crate) syntax: SyntaxNode,
@@ -1046,6 +1102,7 @@ impl ast::ArgListOwner for CallExpr {}
 impl CallExpr {
     pub fn expr(&self) -> Option<Expr> { support::child(&self.syntax) }
 }
+
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub struct MethodCallExpr {
     pub(crate) syntax: SyntaxNode,
@@ -1065,10 +1122,11 @@ impl ast::AttrsOwner for MethodCallExpr {}
 impl ast::ArgListOwner for MethodCallExpr {}
 impl MethodCallExpr {
     pub fn expr(&self) -> Option<Expr> { support::child(&self.syntax) }
-    pub fn dot(&self) -> Option<Dot> { support::token(&self.syntax) }
+    pub fn dot_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![.]) }
     pub fn name_ref(&self) -> Option<NameRef> { support::child(&self.syntax) }
     pub fn type_arg_list(&self) -> Option<TypeArgList> { support::child(&self.syntax) }
 }
+
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub struct IndexExpr {
     pub(crate) syntax: SyntaxNode,
@@ -1086,9 +1144,10 @@ impl AstNode for IndexExpr {
 }
 impl ast::AttrsOwner for IndexExpr {}
 impl IndexExpr {
-    pub fn l_brack(&self) -> Option<LBrack> { support::token(&self.syntax) }
-    pub fn r_brack(&self) -> Option<RBrack> { support::token(&self.syntax) }
+    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 FieldExpr {
     pub(crate) syntax: SyntaxNode,
@@ -1107,9 +1166,10 @@ impl AstNode for FieldExpr {
 impl ast::AttrsOwner for FieldExpr {}
 impl FieldExpr {
     pub fn expr(&self) -> Option<Expr> { support::child(&self.syntax) }
-    pub fn dot(&self) -> Option<Dot> { support::token(&self.syntax) }
+    pub fn dot_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![.]) }
     pub fn name_ref(&self) -> Option<NameRef> { support::child(&self.syntax) }
 }
+
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub struct AwaitExpr {
     pub(crate) syntax: SyntaxNode,
@@ -1128,9 +1188,10 @@ impl AstNode for AwaitExpr {
 impl ast::AttrsOwner for AwaitExpr {}
 impl AwaitExpr {
     pub fn expr(&self) -> Option<Expr> { support::child(&self.syntax) }
-    pub fn dot(&self) -> Option<Dot> { support::token(&self.syntax) }
-    pub fn await_kw(&self) -> Option<AwaitKw> { support::token(&self.syntax) }
+    pub fn dot_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![.]) }
+    pub fn await_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![await]) }
 }
+
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub struct TryExpr {
     pub(crate) syntax: SyntaxNode,
@@ -1148,9 +1209,10 @@ impl AstNode for TryExpr {
 }
 impl ast::AttrsOwner for TryExpr {}
 impl TryExpr {
-    pub fn try_kw(&self) -> Option<TryKw> { support::token(&self.syntax) }
+    pub fn try_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![try]) }
     pub fn expr(&self) -> Option<Expr> { support::child(&self.syntax) }
 }
+
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub struct CastExpr {
     pub(crate) syntax: SyntaxNode,
@@ -1169,9 +1231,10 @@ impl AstNode for CastExpr {
 impl ast::AttrsOwner for CastExpr {}
 impl CastExpr {
     pub fn expr(&self) -> Option<Expr> { support::child(&self.syntax) }
-    pub fn as_kw(&self) -> Option<AsKw> { support::token(&self.syntax) }
+    pub fn as_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![as]) }
     pub fn type_ref(&self) -> Option<TypeRef> { support::child(&self.syntax) }
 }
+
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub struct RefExpr {
     pub(crate) syntax: SyntaxNode,
@@ -1189,11 +1252,12 @@ impl AstNode for RefExpr {
 }
 impl ast::AttrsOwner for RefExpr {}
 impl RefExpr {
-    pub fn amp(&self) -> Option<Amp> { support::token(&self.syntax) }
-    pub fn raw_kw(&self) -> Option<RawKw> { support::token(&self.syntax) }
-    pub fn mut_kw(&self) -> Option<MutKw> { support::token(&self.syntax) }
+    pub fn amp_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![&]) }
+    pub fn raw_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![raw]) }
+    pub fn mut_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![mut]) }
     pub fn expr(&self) -> Option<Expr> { support::child(&self.syntax) }
 }
+
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub struct PrefixExpr {
     pub(crate) syntax: SyntaxNode,
@@ -1211,9 +1275,9 @@ impl AstNode for PrefixExpr {
 }
 impl ast::AttrsOwner for PrefixExpr {}
 impl PrefixExpr {
-    pub fn prefix_op(&self) -> Option<PrefixOp> { support::token(&self.syntax) }
     pub fn expr(&self) -> Option<Expr> { support::child(&self.syntax) }
 }
+
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub struct BoxExpr {
     pub(crate) syntax: SyntaxNode,
@@ -1231,9 +1295,10 @@ impl AstNode for BoxExpr {
 }
 impl ast::AttrsOwner for BoxExpr {}
 impl BoxExpr {
-    pub fn box_kw(&self) -> Option<BoxKw> { support::token(&self.syntax) }
+    pub fn box_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![box]) }
     pub fn expr(&self) -> Option<Expr> { support::child(&self.syntax) }
 }
+
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub struct RangeExpr {
     pub(crate) syntax: SyntaxNode,
@@ -1250,9 +1315,8 @@ impl AstNode for RangeExpr {
     fn syntax(&self) -> &SyntaxNode { &self.syntax }
 }
 impl ast::AttrsOwner for RangeExpr {}
-impl RangeExpr {
-    pub fn range_op(&self) -> Option<RangeOp> { support::token(&self.syntax) }
-}
+impl RangeExpr {}
+
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub struct BinExpr {
     pub(crate) syntax: SyntaxNode,
@@ -1269,9 +1333,8 @@ impl AstNode for BinExpr {
     fn syntax(&self) -> &SyntaxNode { &self.syntax }
 }
 impl ast::AttrsOwner for BinExpr {}
-impl BinExpr {
-    pub fn bin_op(&self) -> Option<BinOp> { support::token(&self.syntax) }
-}
+impl BinExpr {}
+
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub struct Literal {
     pub(crate) syntax: SyntaxNode,
@@ -1287,9 +1350,8 @@ impl AstNode for Literal {
     }
     fn syntax(&self) -> &SyntaxNode { &self.syntax }
 }
-impl Literal {
-    pub fn literal_token(&self) -> Option<LiteralToken> { support::token(&self.syntax) }
-}
+impl Literal {}
+
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub struct MatchExpr {
     pub(crate) syntax: SyntaxNode,
@@ -1307,10 +1369,11 @@ impl AstNode for MatchExpr {
 }
 impl ast::AttrsOwner for MatchExpr {}
 impl MatchExpr {
-    pub fn match_kw(&self) -> Option<MatchKw> { support::token(&self.syntax) }
+    pub fn match_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![match]) }
     pub fn expr(&self) -> Option<Expr> { support::child(&self.syntax) }
     pub fn match_arm_list(&self) -> Option<MatchArmList> { support::child(&self.syntax) }
 }
+
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub struct MatchArmList {
     pub(crate) syntax: SyntaxNode,
@@ -1328,10 +1391,11 @@ impl AstNode for MatchArmList {
 }
 impl ast::AttrsOwner for MatchArmList {}
 impl MatchArmList {
-    pub fn l_curly(&self) -> Option<LCurly> { support::token(&self.syntax) }
+    pub fn l_curly_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T!['{']) }
     pub fn arms(&self) -> AstChildren<MatchArm> { support::children(&self.syntax) }
-    pub fn r_curly(&self) -> Option<RCurly> { support::token(&self.syntax) }
+    pub fn r_curly_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T!['}']) }
 }
+
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub struct MatchArm {
     pub(crate) syntax: SyntaxNode,
@@ -1351,9 +1415,10 @@ impl ast::AttrsOwner for MatchArm {}
 impl MatchArm {
     pub fn pat(&self) -> Option<Pat> { support::child(&self.syntax) }
     pub fn guard(&self) -> Option<MatchGuard> { support::child(&self.syntax) }
-    pub fn fat_arrow(&self) -> Option<FatArrow> { support::token(&self.syntax) }
+    pub fn fat_arrow_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![=>]) }
     pub fn expr(&self) -> Option<Expr> { support::child(&self.syntax) }
 }
+
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub struct MatchGuard {
     pub(crate) syntax: SyntaxNode,
@@ -1370,9 +1435,10 @@ impl AstNode for MatchGuard {
     fn syntax(&self) -> &SyntaxNode { &self.syntax }
 }
 impl MatchGuard {
-    pub fn if_kw(&self) -> Option<IfKw> { support::token(&self.syntax) }
+    pub fn if_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![if]) }
     pub fn expr(&self) -> Option<Expr> { support::child(&self.syntax) }
 }
+
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub struct RecordLit {
     pub(crate) syntax: SyntaxNode,
@@ -1392,6 +1458,7 @@ impl RecordLit {
     pub fn path(&self) -> Option<Path> { support::child(&self.syntax) }
     pub fn record_field_list(&self) -> Option<RecordFieldList> { support::child(&self.syntax) }
 }
+
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub struct RecordFieldList {
     pub(crate) syntax: SyntaxNode,
@@ -1408,12 +1475,13 @@ impl AstNode for RecordFieldList {
     fn syntax(&self) -> &SyntaxNode { &self.syntax }
 }
 impl RecordFieldList {
-    pub fn l_curly(&self) -> Option<LCurly> { support::token(&self.syntax) }
+    pub fn l_curly_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T!['{']) }
     pub fn fields(&self) -> AstChildren<RecordField> { support::children(&self.syntax) }
-    pub fn dotdot(&self) -> Option<Dotdot> { support::token(&self.syntax) }
+    pub fn dotdot_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![..]) }
     pub fn spread(&self) -> Option<Expr> { support::child(&self.syntax) }
-    pub fn r_curly(&self) -> Option<RCurly> { support::token(&self.syntax) }
+    pub fn r_curly_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T!['}']) }
 }
+
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub struct RecordField {
     pub(crate) syntax: SyntaxNode,
@@ -1432,9 +1500,10 @@ impl AstNode for RecordField {
 impl ast::AttrsOwner for RecordField {}
 impl RecordField {
     pub fn name_ref(&self) -> Option<NameRef> { support::child(&self.syntax) }
-    pub fn colon(&self) -> Option<Colon> { support::token(&self.syntax) }
+    pub fn colon_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![:]) }
     pub fn expr(&self) -> Option<Expr> { support::child(&self.syntax) }
 }
+
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub struct OrPat {
     pub(crate) syntax: SyntaxNode,
@@ -1453,6 +1522,7 @@ impl AstNode for OrPat {
 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,
@@ -1469,10 +1539,11 @@ impl AstNode for ParenPat {
     fn syntax(&self) -> &SyntaxNode { &self.syntax }
 }
 impl ParenPat {
-    pub fn l_paren(&self) -> Option<LParen> { support::token(&self.syntax) }
+    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(&self) -> Option<RParen> { support::token(&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(crate) syntax: SyntaxNode,
@@ -1489,10 +1560,11 @@ impl AstNode for RefPat {
     fn syntax(&self) -> &SyntaxNode { &self.syntax }
 }
 impl RefPat {
-    pub fn amp(&self) -> Option<Amp> { support::token(&self.syntax) }
-    pub fn mut_kw(&self) -> Option<MutKw> { support::token(&self.syntax) }
+    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 BoxPat {
     pub(crate) syntax: SyntaxNode,
@@ -1509,9 +1581,10 @@ impl AstNode for BoxPat {
     fn syntax(&self) -> &SyntaxNode { &self.syntax }
 }
 impl BoxPat {
-    pub fn box_kw(&self) -> Option<BoxKw> { support::token(&self.syntax) }
+    pub fn box_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![box]) }
     pub fn pat(&self) -> Option<Pat> { support::child(&self.syntax) }
 }
+
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub struct BindPat {
     pub(crate) syntax: SyntaxNode,
@@ -1530,10 +1603,12 @@ impl AstNode for BindPat {
 impl ast::AttrsOwner for BindPat {}
 impl ast::NameOwner for BindPat {}
 impl BindPat {
-    pub fn ref_kw(&self) -> Option<RefKw> { support::token(&self.syntax) }
-    pub fn mut_kw(&self) -> Option<MutKw> { support::token(&self.syntax) }
+    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)]
 pub struct PlaceholderPat {
     pub(crate) syntax: SyntaxNode,
@@ -1550,8 +1625,9 @@ impl AstNode for PlaceholderPat {
     fn syntax(&self) -> &SyntaxNode { &self.syntax }
 }
 impl PlaceholderPat {
-    pub fn underscore(&self) -> Option<Underscore> { support::token(&self.syntax) }
+    pub fn underscore_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![_]) }
 }
+
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub struct DotDotPat {
     pub(crate) syntax: SyntaxNode,
@@ -1568,8 +1644,9 @@ impl AstNode for DotDotPat {
     fn syntax(&self) -> &SyntaxNode { &self.syntax }
 }
 impl DotDotPat {
-    pub fn dotdot(&self) -> Option<Dotdot> { support::token(&self.syntax) }
+    pub fn dotdot_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![..]) }
 }
+
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub struct PathPat {
     pub(crate) syntax: SyntaxNode,
@@ -1588,6 +1665,7 @@ impl AstNode for PathPat {
 impl PathPat {
     pub fn path(&self) -> Option<Path> { support::child(&self.syntax) }
 }
+
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub struct SlicePat {
     pub(crate) syntax: SyntaxNode,
@@ -1604,10 +1682,11 @@ impl AstNode for SlicePat {
     fn syntax(&self) -> &SyntaxNode { &self.syntax }
 }
 impl SlicePat {
-    pub fn l_brack(&self) -> Option<LBrack> { support::token(&self.syntax) }
+    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(&self) -> Option<RBrack> { support::token(&self.syntax) }
+    pub fn r_brack_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![']']) }
 }
+
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub struct RangePat {
     pub(crate) syntax: SyntaxNode,
@@ -1623,9 +1702,8 @@ impl AstNode for RangePat {
     }
     fn syntax(&self) -> &SyntaxNode { &self.syntax }
 }
-impl RangePat {
-    pub fn range_separator(&self) -> Option<RangeSeparator> { support::token(&self.syntax) }
-}
+impl RangePat {}
+
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub struct LiteralPat {
     pub(crate) syntax: SyntaxNode,
@@ -1644,6 +1722,7 @@ impl AstNode for LiteralPat {
 impl LiteralPat {
     pub fn literal(&self) -> Option<Literal> { support::child(&self.syntax) }
 }
+
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub struct MacroPat {
     pub(crate) syntax: SyntaxNode,
@@ -1662,6 +1741,7 @@ impl AstNode for MacroPat {
 impl MacroPat {
     pub fn macro_call(&self) -> Option<MacroCall> { support::child(&self.syntax) }
 }
+
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub struct RecordPat {
     pub(crate) syntax: SyntaxNode,
@@ -1683,6 +1763,7 @@ impl RecordPat {
     }
     pub fn path(&self) -> Option<Path> { support::child(&self.syntax) }
 }
+
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub struct RecordFieldPatList {
     pub(crate) syntax: SyntaxNode,
@@ -1699,15 +1780,16 @@ impl AstNode for RecordFieldPatList {
     fn syntax(&self) -> &SyntaxNode { &self.syntax }
 }
 impl RecordFieldPatList {
-    pub fn l_curly(&self) -> Option<LCurly> { support::token(&self.syntax) }
+    pub fn l_curly_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T!['{']) }
     pub fn pats(&self) -> AstChildren<RecordInnerPat> { support::children(&self.syntax) }
     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(&self) -> Option<Dotdot> { support::token(&self.syntax) }
-    pub fn r_curly(&self) -> Option<RCurly> { support::token(&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 RecordFieldPat {
     pub(crate) syntax: SyntaxNode,
@@ -1726,9 +1808,10 @@ impl AstNode for RecordFieldPat {
 impl ast::AttrsOwner for RecordFieldPat {}
 impl ast::NameOwner for RecordFieldPat {}
 impl RecordFieldPat {
-    pub fn colon(&self) -> Option<Colon> { support::token(&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 struct TupleStructPat {
     pub(crate) syntax: SyntaxNode,
@@ -1746,10 +1829,11 @@ impl AstNode for TupleStructPat {
 }
 impl TupleStructPat {
     pub fn path(&self) -> Option<Path> { support::child(&self.syntax) }
-    pub fn l_paren(&self) -> Option<LParen> { support::token(&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(&self) -> Option<RParen> { support::token(&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(crate) syntax: SyntaxNode,
@@ -1766,10 +1850,11 @@ impl AstNode for TuplePat {
     fn syntax(&self) -> &SyntaxNode { &self.syntax }
 }
 impl TuplePat {
-    pub fn l_paren(&self) -> Option<LParen> { support::token(&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(&self) -> Option<RParen> { support::token(&self.syntax) }
+    pub fn r_paren_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![')']) }
 }
+
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub struct Visibility {
     pub(crate) syntax: SyntaxNode,
@@ -1786,11 +1871,12 @@ impl AstNode for Visibility {
     fn syntax(&self) -> &SyntaxNode { &self.syntax }
 }
 impl Visibility {
-    pub fn pub_kw(&self) -> Option<PubKw> { support::token(&self.syntax) }
-    pub fn super_kw(&self) -> Option<SuperKw> { support::token(&self.syntax) }
-    pub fn self_kw(&self) -> Option<SelfKw> { support::token(&self.syntax) }
-    pub fn crate_kw(&self) -> Option<CrateKw> { support::token(&self.syntax) }
+    pub fn pub_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![pub]) }
+    pub fn super_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![super]) }
+    pub fn self_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![self]) }
+    pub fn crate_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![crate]) }
 }
+
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub struct Name {
     pub(crate) syntax: SyntaxNode,
@@ -1807,8 +1893,9 @@ impl AstNode for Name {
     fn syntax(&self) -> &SyntaxNode { &self.syntax }
 }
 impl Name {
-    pub fn ident(&self) -> Option<Ident> { support::token(&self.syntax) }
+    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,
@@ -1824,9 +1911,8 @@ impl AstNode for NameRef {
     }
     fn syntax(&self) -> &SyntaxNode { &self.syntax }
 }
-impl NameRef {
-    pub fn name_ref_token(&self) -> Option<NameRefToken> { support::token(&self.syntax) }
-}
+impl NameRef {}
+
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub struct MacroCall {
     pub(crate) syntax: SyntaxNode,
@@ -1847,10 +1933,11 @@ impl ast::AttrsOwner for MacroCall {}
 impl ast::DocCommentsOwner for MacroCall {}
 impl MacroCall {
     pub fn path(&self) -> Option<Path> { support::child(&self.syntax) }
-    pub fn excl(&self) -> Option<Excl> { support::token(&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 semi(&self) -> Option<Semi> { support::token(&self.syntax) }
+    pub fn semicolon_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![;]) }
 }
+
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub struct Attr {
     pub(crate) syntax: SyntaxNode,
@@ -1867,14 +1954,15 @@ impl AstNode for Attr {
     fn syntax(&self) -> &SyntaxNode { &self.syntax }
 }
 impl Attr {
-    pub fn pound(&self) -> Option<Pound> { support::token(&self.syntax) }
-    pub fn excl(&self) -> Option<Excl> { support::token(&self.syntax) }
-    pub fn l_brack(&self) -> Option<LBrack> { support::token(&self.syntax) }
+    pub fn pound_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![#]) }
+    pub fn excl_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![!]) }
+    pub fn l_brack_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T!['[']) }
     pub fn path(&self) -> Option<Path> { support::child(&self.syntax) }
-    pub fn eq(&self) -> Option<Eq> { support::token(&self.syntax) }
+    pub fn eq_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![=]) }
     pub fn input(&self) -> Option<AttrInput> { support::child(&self.syntax) }
-    pub fn r_brack(&self) -> Option<RBrack> { support::token(&self.syntax) }
+    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,
@@ -1891,6 +1979,7 @@ impl AstNode for TokenTree {
     fn syntax(&self) -> &SyntaxNode { &self.syntax }
 }
 impl TokenTree {}
+
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub struct TypeParamList {
     pub(crate) syntax: SyntaxNode,
@@ -1907,13 +1996,14 @@ impl AstNode for TypeParamList {
     fn syntax(&self) -> &SyntaxNode { &self.syntax }
 }
 impl TypeParamList {
-    pub fn l_angle(&self) -> Option<LAngle> { support::token(&self.syntax) }
+    pub fn l_angle_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![<]) }
     pub fn generic_params(&self) -> AstChildren<GenericParam> { support::children(&self.syntax) }
     pub fn type_params(&self) -> AstChildren<TypeParam> { support::children(&self.syntax) }
     pub fn lifetime_params(&self) -> AstChildren<LifetimeParam> { support::children(&self.syntax) }
     pub fn const_params(&self) -> AstChildren<ConstParam> { support::children(&self.syntax) }
-    pub fn r_angle(&self) -> Option<RAngle> { support::token(&self.syntax) }
+    pub fn r_angle_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![>]) }
 }
+
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub struct TypeParam {
     pub(crate) syntax: SyntaxNode,
@@ -1933,9 +2023,10 @@ impl ast::NameOwner for TypeParam {}
 impl ast::AttrsOwner for TypeParam {}
 impl ast::TypeBoundsOwner for TypeParam {}
 impl TypeParam {
-    pub fn eq(&self) -> Option<Eq> { support::token(&self.syntax) }
+    pub fn eq_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![=]) }
     pub fn default_type(&self) -> Option<TypeRef> { support::child(&self.syntax) }
 }
+
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub struct ConstParam {
     pub(crate) syntax: SyntaxNode,
@@ -1955,9 +2046,10 @@ impl ast::NameOwner for ConstParam {}
 impl ast::AttrsOwner for ConstParam {}
 impl ast::TypeAscriptionOwner for ConstParam {}
 impl ConstParam {
-    pub fn eq(&self) -> Option<Eq> { support::token(&self.syntax) }
+    pub fn eq_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![=]) }
     pub fn default_val(&self) -> Option<Expr> { support::child(&self.syntax) }
 }
+
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub struct LifetimeParam {
     pub(crate) syntax: SyntaxNode,
@@ -1975,8 +2067,11 @@ impl AstNode for LifetimeParam {
 }
 impl ast::AttrsOwner for LifetimeParam {}
 impl LifetimeParam {
-    pub fn lifetime(&self) -> Option<Lifetime> { support::token(&self.syntax) }
+    pub fn lifetime_token(&self) -> Option<SyntaxToken> {
+        support::token(&self.syntax, T![lifetime])
+    }
 }
+
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub struct TypeBound {
     pub(crate) syntax: SyntaxNode,
@@ -1993,10 +2088,13 @@ impl AstNode for TypeBound {
     fn syntax(&self) -> &SyntaxNode { &self.syntax }
 }
 impl TypeBound {
-    pub fn lifetime(&self) -> Option<Lifetime> { support::token(&self.syntax) }
-    pub fn const_kw(&self) -> Option<ConstKw> { support::token(&self.syntax) }
+    pub fn lifetime_token(&self) -> Option<SyntaxToken> {
+        support::token(&self.syntax, T![lifetime])
+    }
+    pub fn const_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![const]) }
     pub fn type_ref(&self) -> Option<TypeRef> { support::child(&self.syntax) }
 }
+
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub struct TypeBoundList {
     pub(crate) syntax: SyntaxNode,
@@ -2015,6 +2113,7 @@ impl AstNode for TypeBoundList {
 impl TypeBoundList {
     pub fn bounds(&self) -> AstChildren<TypeBound> { support::children(&self.syntax) }
 }
+
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub struct WherePred {
     pub(crate) syntax: SyntaxNode,
@@ -2032,9 +2131,12 @@ impl AstNode for WherePred {
 }
 impl ast::TypeBoundsOwner for WherePred {}
 impl WherePred {
-    pub fn lifetime(&self) -> Option<Lifetime> { support::token(&self.syntax) }
+    pub fn lifetime_token(&self) -> Option<SyntaxToken> {
+        support::token(&self.syntax, T![lifetime])
+    }
     pub fn type_ref(&self) -> Option<TypeRef> { support::child(&self.syntax) }
 }
+
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub struct WhereClause {
     pub(crate) syntax: SyntaxNode,
@@ -2051,9 +2153,10 @@ impl AstNode for WhereClause {
     fn syntax(&self) -> &SyntaxNode { &self.syntax }
 }
 impl WhereClause {
-    pub fn where_kw(&self) -> Option<WhereKw> { support::token(&self.syntax) }
+    pub fn where_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![where]) }
     pub fn predicates(&self) -> AstChildren<WherePred> { support::children(&self.syntax) }
 }
+
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub struct Abi {
     pub(crate) syntax: SyntaxNode,
@@ -2069,9 +2172,8 @@ impl AstNode for Abi {
     }
     fn syntax(&self) -> &SyntaxNode { &self.syntax }
 }
-impl Abi {
-    pub fn string(&self) -> Option<String> { support::token(&self.syntax) }
-}
+impl Abi {}
+
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub struct ExprStmt {
     pub(crate) syntax: SyntaxNode,
@@ -2090,8 +2192,9 @@ impl AstNode for ExprStmt {
 impl ast::AttrsOwner for ExprStmt {}
 impl ExprStmt {
     pub fn expr(&self) -> Option<Expr> { support::child(&self.syntax) }
-    pub fn semi(&self) -> Option<Semi> { support::token(&self.syntax) }
+    pub fn semicolon_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![;]) }
 }
+
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub struct LetStmt {
     pub(crate) syntax: SyntaxNode,
@@ -2110,11 +2213,13 @@ impl AstNode for LetStmt {
 impl ast::AttrsOwner for LetStmt {}
 impl ast::TypeAscriptionOwner for LetStmt {}
 impl LetStmt {
-    pub fn let_kw(&self) -> Option<LetKw> { support::token(&self.syntax) }
+    pub fn let_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![let]) }
     pub fn pat(&self) -> Option<Pat> { support::child(&self.syntax) }
-    pub fn eq(&self) -> Option<Eq> { support::token(&self.syntax) }
+    pub fn eq_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![=]) }
     pub fn initializer(&self) -> Option<Expr> { support::child(&self.syntax) }
+    pub fn semicolon_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![;]) }
 }
+
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub struct Condition {
     pub(crate) syntax: SyntaxNode,
@@ -2131,11 +2236,12 @@ impl AstNode for Condition {
     fn syntax(&self) -> &SyntaxNode { &self.syntax }
 }
 impl Condition {
-    pub fn let_kw(&self) -> Option<LetKw> { support::token(&self.syntax) }
+    pub fn let_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![let]) }
     pub fn pat(&self) -> Option<Pat> { support::child(&self.syntax) }
-    pub fn eq(&self) -> Option<Eq> { support::token(&self.syntax) }
+    pub fn eq_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![=]) }
     pub fn expr(&self) -> Option<Expr> { support::child(&self.syntax) }
 }
+
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub struct Block {
     pub(crate) syntax: SyntaxNode,
@@ -2154,11 +2260,12 @@ impl AstNode for Block {
 impl ast::AttrsOwner for Block {}
 impl ast::ModuleItemOwner for Block {}
 impl Block {
-    pub fn l_curly(&self) -> Option<LCurly> { support::token(&self.syntax) }
+    pub fn l_curly_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T!['{']) }
     pub fn statements(&self) -> AstChildren<Stmt> { support::children(&self.syntax) }
     pub fn expr(&self) -> Option<Expr> { support::child(&self.syntax) }
-    pub fn r_curly(&self) -> Option<RCurly> { support::token(&self.syntax) }
+    pub fn r_curly_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T!['}']) }
 }
+
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub struct ParamList {
     pub(crate) syntax: SyntaxNode,
@@ -2175,11 +2282,12 @@ impl AstNode for ParamList {
     fn syntax(&self) -> &SyntaxNode { &self.syntax }
 }
 impl ParamList {
-    pub fn l_paren(&self) -> Option<LParen> { support::token(&self.syntax) }
+    pub fn l_paren_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T!['(']) }
     pub fn self_param(&self) -> Option<SelfParam> { support::child(&self.syntax) }
     pub fn params(&self) -> AstChildren<Param> { support::children(&self.syntax) }
-    pub fn r_paren(&self) -> Option<RParen> { support::token(&self.syntax) }
+    pub fn r_paren_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![')']) }
 }
+
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub struct SelfParam {
     pub(crate) syntax: SyntaxNode,
@@ -2198,10 +2306,14 @@ impl AstNode for SelfParam {
 impl ast::TypeAscriptionOwner for SelfParam {}
 impl ast::AttrsOwner for SelfParam {}
 impl SelfParam {
-    pub fn amp(&self) -> Option<Amp> { support::token(&self.syntax) }
-    pub fn lifetime(&self) -> Option<Lifetime> { support::token(&self.syntax) }
-    pub fn self_kw(&self) -> Option<SelfKw> { support::token(&self.syntax) }
+    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 lifetime_token(&self) -> Option<SyntaxToken> {
+        support::token(&self.syntax, T![lifetime])
+    }
+    pub fn self_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![self]) }
 }
+
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub struct Param {
     pub(crate) syntax: SyntaxNode,
@@ -2221,8 +2333,9 @@ impl ast::TypeAscriptionOwner for Param {}
 impl ast::AttrsOwner for Param {}
 impl Param {
     pub fn pat(&self) -> Option<Pat> { support::child(&self.syntax) }
-    pub fn dotdotdot(&self) -> Option<Dotdotdot> { support::token(&self.syntax) }
+    pub fn dotdotdot_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![...]) }
 }
+
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub struct UseItem {
     pub(crate) syntax: SyntaxNode,
@@ -2241,9 +2354,10 @@ impl AstNode for UseItem {
 impl ast::AttrsOwner for UseItem {}
 impl ast::VisibilityOwner for UseItem {}
 impl UseItem {
-    pub fn use_kw(&self) -> Option<UseKw> { support::token(&self.syntax) }
+    pub fn use_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![use]) }
     pub fn use_tree(&self) -> Option<UseTree> { support::child(&self.syntax) }
 }
+
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub struct UseTree {
     pub(crate) syntax: SyntaxNode,
@@ -2261,10 +2375,11 @@ impl AstNode for UseTree {
 }
 impl UseTree {
     pub fn path(&self) -> Option<Path> { support::child(&self.syntax) }
-    pub fn star(&self) -> Option<Star> { support::token(&self.syntax) }
+    pub fn star_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![*]) }
     pub fn use_tree_list(&self) -> Option<UseTreeList> { support::child(&self.syntax) }
     pub fn alias(&self) -> Option<Alias> { support::child(&self.syntax) }
 }
+
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub struct Alias {
     pub(crate) syntax: SyntaxNode,
@@ -2282,8 +2397,9 @@ impl AstNode for Alias {
 }
 impl ast::NameOwner for Alias {}
 impl Alias {
-    pub fn as_kw(&self) -> Option<AsKw> { support::token(&self.syntax) }
+    pub fn as_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![as]) }
 }
+
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub struct UseTreeList {
     pub(crate) syntax: SyntaxNode,
@@ -2300,10 +2416,11 @@ impl AstNode for UseTreeList {
     fn syntax(&self) -> &SyntaxNode { &self.syntax }
 }
 impl UseTreeList {
-    pub fn l_curly(&self) -> Option<LCurly> { support::token(&self.syntax) }
+    pub fn l_curly_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T!['{']) }
     pub fn use_trees(&self) -> AstChildren<UseTree> { support::children(&self.syntax) }
-    pub fn r_curly(&self) -> Option<RCurly> { support::token(&self.syntax) }
+    pub fn r_curly_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T!['}']) }
 }
+
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub struct ExternCrateItem {
     pub(crate) syntax: SyntaxNode,
@@ -2322,11 +2439,12 @@ impl AstNode for ExternCrateItem {
 impl ast::AttrsOwner for ExternCrateItem {}
 impl ast::VisibilityOwner for ExternCrateItem {}
 impl ExternCrateItem {
-    pub fn extern_kw(&self) -> Option<ExternKw> { support::token(&self.syntax) }
-    pub fn crate_kw(&self) -> Option<CrateKw> { support::token(&self.syntax) }
+    pub fn extern_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![extern]) }
+    pub fn crate_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![crate]) }
     pub fn name_ref(&self) -> Option<NameRef> { support::child(&self.syntax) }
     pub fn alias(&self) -> Option<Alias> { support::child(&self.syntax) }
 }
+
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub struct ArgList {
     pub(crate) syntax: SyntaxNode,
@@ -2343,10 +2461,11 @@ impl AstNode for ArgList {
     fn syntax(&self) -> &SyntaxNode { &self.syntax }
 }
 impl ArgList {
-    pub fn l_paren(&self) -> Option<LParen> { support::token(&self.syntax) }
+    pub fn l_paren_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T!['(']) }
     pub fn args(&self) -> AstChildren<Expr> { support::children(&self.syntax) }
-    pub fn r_paren(&self) -> Option<RParen> { support::token(&self.syntax) }
+    pub fn r_paren_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![')']) }
 }
+
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub struct Path {
     pub(crate) syntax: SyntaxNode,
@@ -2366,6 +2485,7 @@ impl Path {
     pub fn segment(&self) -> Option<PathSegment> { support::child(&self.syntax) }
     pub fn qualifier(&self) -> Option<Path> { support::child(&self.syntax) }
 }
+
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub struct PathSegment {
     pub(crate) syntax: SyntaxNode,
@@ -2382,15 +2502,16 @@ impl AstNode for PathSegment {
     fn syntax(&self) -> &SyntaxNode { &self.syntax }
 }
 impl PathSegment {
-    pub fn coloncolon(&self) -> Option<Coloncolon> { support::token(&self.syntax) }
-    pub fn l_angle(&self) -> Option<LAngle> { support::token(&self.syntax) }
+    pub fn coloncolon_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![::]) }
+    pub fn l_angle_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![<]) }
     pub fn name_ref(&self) -> Option<NameRef> { support::child(&self.syntax) }
     pub fn type_arg_list(&self) -> Option<TypeArgList> { support::child(&self.syntax) }
     pub fn param_list(&self) -> Option<ParamList> { support::child(&self.syntax) }
     pub fn ret_type(&self) -> Option<RetType> { support::child(&self.syntax) }
     pub fn path_type(&self) -> Option<PathType> { support::child(&self.syntax) }
-    pub fn r_angle(&self) -> Option<RAngle> { support::token(&self.syntax) }
+    pub fn r_angle_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![>]) }
 }
+
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub struct TypeArgList {
     pub(crate) syntax: SyntaxNode,
@@ -2407,15 +2528,16 @@ impl AstNode for TypeArgList {
     fn syntax(&self) -> &SyntaxNode { &self.syntax }
 }
 impl TypeArgList {
-    pub fn coloncolon(&self) -> Option<Coloncolon> { support::token(&self.syntax) }
-    pub fn l_angle(&self) -> Option<LAngle> { support::token(&self.syntax) }
+    pub fn coloncolon_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![::]) }
+    pub fn l_angle_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![<]) }
     pub fn generic_args(&self) -> AstChildren<GenericArg> { support::children(&self.syntax) }
     pub fn type_args(&self) -> AstChildren<TypeArg> { support::children(&self.syntax) }
     pub fn lifetime_args(&self) -> AstChildren<LifetimeArg> { support::children(&self.syntax) }
     pub fn assoc_type_args(&self) -> AstChildren<AssocTypeArg> { support::children(&self.syntax) }
     pub fn const_args(&self) -> AstChildren<ConstArg> { support::children(&self.syntax) }
-    pub fn r_angle(&self) -> Option<RAngle> { support::token(&self.syntax) }
+    pub fn r_angle_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![>]) }
 }
+
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub struct TypeArg {
     pub(crate) syntax: SyntaxNode,
@@ -2434,6 +2556,7 @@ impl AstNode for TypeArg {
 impl TypeArg {
     pub fn type_ref(&self) -> Option<TypeRef> { support::child(&self.syntax) }
 }
+
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub struct AssocTypeArg {
     pub(crate) syntax: SyntaxNode,
@@ -2452,9 +2575,10 @@ impl AstNode for AssocTypeArg {
 impl ast::TypeBoundsOwner for AssocTypeArg {}
 impl AssocTypeArg {
     pub fn name_ref(&self) -> Option<NameRef> { support::child(&self.syntax) }
-    pub fn eq(&self) -> Option<Eq> { support::token(&self.syntax) }
+    pub fn eq_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![=]) }
     pub fn type_ref(&self) -> Option<TypeRef> { support::child(&self.syntax) }
 }
+
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub struct LifetimeArg {
     pub(crate) syntax: SyntaxNode,
@@ -2471,8 +2595,11 @@ impl AstNode for LifetimeArg {
     fn syntax(&self) -> &SyntaxNode { &self.syntax }
 }
 impl LifetimeArg {
-    pub fn lifetime(&self) -> Option<Lifetime> { support::token(&self.syntax) }
+    pub fn lifetime_token(&self) -> Option<SyntaxToken> {
+        support::token(&self.syntax, T![lifetime])
+    }
 }
+
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub struct ConstArg {
     pub(crate) syntax: SyntaxNode,
@@ -2490,9 +2617,10 @@ impl AstNode for ConstArg {
 }
 impl ConstArg {
     pub fn literal(&self) -> Option<Literal> { support::child(&self.syntax) }
-    pub fn eq(&self) -> Option<Eq> { support::token(&self.syntax) }
+    pub fn eq_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![=]) }
     pub fn block_expr(&self) -> Option<BlockExpr> { support::child(&self.syntax) }
 }
+
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub struct MacroItems {
     pub(crate) syntax: SyntaxNode,
@@ -2509,8 +2637,8 @@ impl AstNode for MacroItems {
     fn syntax(&self) -> &SyntaxNode { &self.syntax }
 }
 impl ast::ModuleItemOwner for MacroItems {}
-impl ast::FnDefOwner for MacroItems {}
 impl MacroItems {}
+
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub struct MacroStmts {
     pub(crate) syntax: SyntaxNode,
@@ -2530,6 +2658,7 @@ 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 ExternItemList {
     pub(crate) syntax: SyntaxNode,
@@ -2545,13 +2674,13 @@ impl AstNode for ExternItemList {
     }
     fn syntax(&self) -> &SyntaxNode { &self.syntax }
 }
-impl ast::FnDefOwner for ExternItemList {}
 impl ast::ModuleItemOwner for ExternItemList {}
 impl ExternItemList {
-    pub fn l_curly(&self) -> Option<LCurly> { support::token(&self.syntax) }
+    pub fn l_curly_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T!['{']) }
     pub fn extern_items(&self) -> AstChildren<ExternItem> { support::children(&self.syntax) }
-    pub fn r_curly(&self) -> Option<RCurly> { support::token(&self.syntax) }
+    pub fn r_curly_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T!['}']) }
 }
+
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub struct ExternBlock {
     pub(crate) syntax: SyntaxNode,
@@ -2571,6 +2700,7 @@ impl ExternBlock {
     pub fn abi(&self) -> Option<Abi> { support::child(&self.syntax) }
     pub fn extern_item_list(&self) -> Option<ExternItemList> { support::child(&self.syntax) }
 }
+
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub struct MetaItem {
     pub(crate) syntax: SyntaxNode,
@@ -2588,10 +2718,11 @@ impl AstNode for MetaItem {
 }
 impl MetaItem {
     pub fn path(&self) -> Option<Path> { support::child(&self.syntax) }
-    pub fn eq(&self) -> Option<Eq> { support::token(&self.syntax) }
+    pub fn eq_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![=]) }
     pub fn attr_input(&self) -> Option<AttrInput> { support::child(&self.syntax) }
     pub fn nested_meta_items(&self) -> AstChildren<MetaItem> { support::children(&self.syntax) }
 }
+
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub struct MacroDef {
     pub(crate) syntax: SyntaxNode,
@@ -2611,6 +2742,7 @@ impl MacroDef {
     pub fn name(&self) -> Option<Name> { support::child(&self.syntax) }
     pub fn token_tree(&self) -> Option<TokenTree> { support::child(&self.syntax) }
 }
+
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub enum NominalDef {
     StructDef(StructDef),
@@ -2653,6 +2785,7 @@ impl AstNode for NominalDef {
 impl ast::NameOwner for NominalDef {}
 impl ast::TypeParamsOwner for NominalDef {}
 impl ast::AttrsOwner for NominalDef {}
+
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub enum GenericParam {
     LifetimeParam(LifetimeParam),
@@ -2692,6 +2825,7 @@ impl AstNode for GenericParam {
         }
     }
 }
+
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub enum GenericArg {
     LifetimeArg(LifetimeArg),
@@ -2737,6 +2871,7 @@ impl AstNode for GenericArg {
         }
     }
 }
+
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub enum TypeRef {
     ParenType(ParenType),
@@ -2838,6 +2973,7 @@ impl AstNode for TypeRef {
         }
     }
 }
+
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub enum ModuleItem {
     StructDef(StructDef),
@@ -2948,6 +3084,7 @@ impl AstNode for ModuleItem {
 impl ast::NameOwner for ModuleItem {}
 impl ast::AttrsOwner for ModuleItem {}
 impl ast::VisibilityOwner for ModuleItem {}
+
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub enum ImplItem {
     FnDef(FnDef),
@@ -2989,6 +3126,7 @@ impl AstNode for ImplItem {
 }
 impl ast::NameOwner for ImplItem {}
 impl ast::AttrsOwner for ImplItem {}
+
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub enum ExternItem {
     FnDef(FnDef),
@@ -3025,6 +3163,7 @@ impl AstNode for ExternItem {
 impl ast::NameOwner for ExternItem {}
 impl ast::AttrsOwner for ExternItem {}
 impl ast::VisibilityOwner for ExternItem {}
+
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub enum Expr {
     TupleExpr(TupleExpr),
@@ -3238,6 +3377,7 @@ impl AstNode for Expr {
     }
 }
 impl ast::AttrsOwner for Expr {}
+
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub enum Pat {
     OrPat(OrPat),
@@ -3351,6 +3491,7 @@ impl AstNode for Pat {
         }
     }
 }
+
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub enum RecordInnerPat {
     RecordFieldPat(RecordFieldPat),
@@ -3384,6 +3525,7 @@ impl AstNode for RecordInnerPat {
         }
     }
 }
+
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub enum AttrInput {
     Literal(Literal),
@@ -3417,6 +3559,7 @@ impl AstNode for AttrInput {
         }
     }
 }
+
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub enum Stmt {
     LetStmt(LetStmt),
@@ -3450,6 +3593,7 @@ impl AstNode for Stmt {
         }
     }
 }
+
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub enum FieldDefList {
     RecordFieldDefList(RecordFieldDefList),
diff --git a/crates/ra_syntax/src/ast/generated/tokens.rs b/crates/ra_syntax/src/ast/generated/tokens.rs
index e64b8bce6..f91befaac 100644
--- a/crates/ra_syntax/src/ast/generated/tokens.rs
+++ b/crates/ra_syntax/src/ast/generated/tokens.rs
@@ -5,2146 +5,7 @@ use crate::{
     SyntaxKind::{self, *},
     SyntaxToken,
 };
-#[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct Semi {
-    pub(crate) syntax: SyntaxToken,
-}
-impl std::fmt::Display for Semi {
-    fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
-        std::fmt::Display::fmt(&self.syntax, f)
-    }
-}
-impl AstToken for Semi {
-    fn can_cast(kind: SyntaxKind) -> bool { kind == SEMI }
-    fn cast(syntax: SyntaxToken) -> Option<Self> {
-        if Self::can_cast(syntax.kind()) {
-            Some(Self { syntax })
-        } else {
-            None
-        }
-    }
-    fn syntax(&self) -> &SyntaxToken { &self.syntax }
-}
-#[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct Comma {
-    pub(crate) syntax: SyntaxToken,
-}
-impl std::fmt::Display for Comma {
-    fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
-        std::fmt::Display::fmt(&self.syntax, f)
-    }
-}
-impl AstToken for Comma {
-    fn can_cast(kind: SyntaxKind) -> bool { kind == COMMA }
-    fn cast(syntax: SyntaxToken) -> Option<Self> {
-        if Self::can_cast(syntax.kind()) {
-            Some(Self { syntax })
-        } else {
-            None
-        }
-    }
-    fn syntax(&self) -> &SyntaxToken { &self.syntax }
-}
-#[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct LParen {
-    pub(crate) syntax: SyntaxToken,
-}
-impl std::fmt::Display for LParen {
-    fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
-        std::fmt::Display::fmt(&self.syntax, f)
-    }
-}
-impl AstToken for LParen {
-    fn can_cast(kind: SyntaxKind) -> bool { kind == L_PAREN }
-    fn cast(syntax: SyntaxToken) -> Option<Self> {
-        if Self::can_cast(syntax.kind()) {
-            Some(Self { syntax })
-        } else {
-            None
-        }
-    }
-    fn syntax(&self) -> &SyntaxToken { &self.syntax }
-}
-#[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct RParen {
-    pub(crate) syntax: SyntaxToken,
-}
-impl std::fmt::Display for RParen {
-    fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
-        std::fmt::Display::fmt(&self.syntax, f)
-    }
-}
-impl AstToken for RParen {
-    fn can_cast(kind: SyntaxKind) -> bool { kind == R_PAREN }
-    fn cast(syntax: SyntaxToken) -> Option<Self> {
-        if Self::can_cast(syntax.kind()) {
-            Some(Self { syntax })
-        } else {
-            None
-        }
-    }
-    fn syntax(&self) -> &SyntaxToken { &self.syntax }
-}
-#[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct LCurly {
-    pub(crate) syntax: SyntaxToken,
-}
-impl std::fmt::Display for LCurly {
-    fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
-        std::fmt::Display::fmt(&self.syntax, f)
-    }
-}
-impl AstToken for LCurly {
-    fn can_cast(kind: SyntaxKind) -> bool { kind == L_CURLY }
-    fn cast(syntax: SyntaxToken) -> Option<Self> {
-        if Self::can_cast(syntax.kind()) {
-            Some(Self { syntax })
-        } else {
-            None
-        }
-    }
-    fn syntax(&self) -> &SyntaxToken { &self.syntax }
-}
-#[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct RCurly {
-    pub(crate) syntax: SyntaxToken,
-}
-impl std::fmt::Display for RCurly {
-    fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
-        std::fmt::Display::fmt(&self.syntax, f)
-    }
-}
-impl AstToken for RCurly {
-    fn can_cast(kind: SyntaxKind) -> bool { kind == R_CURLY }
-    fn cast(syntax: SyntaxToken) -> Option<Self> {
-        if Self::can_cast(syntax.kind()) {
-            Some(Self { syntax })
-        } else {
-            None
-        }
-    }
-    fn syntax(&self) -> &SyntaxToken { &self.syntax }
-}
-#[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct LBrack {
-    pub(crate) syntax: SyntaxToken,
-}
-impl std::fmt::Display for LBrack {
-    fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
-        std::fmt::Display::fmt(&self.syntax, f)
-    }
-}
-impl AstToken for LBrack {
-    fn can_cast(kind: SyntaxKind) -> bool { kind == L_BRACK }
-    fn cast(syntax: SyntaxToken) -> Option<Self> {
-        if Self::can_cast(syntax.kind()) {
-            Some(Self { syntax })
-        } else {
-            None
-        }
-    }
-    fn syntax(&self) -> &SyntaxToken { &self.syntax }
-}
-#[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct RBrack {
-    pub(crate) syntax: SyntaxToken,
-}
-impl std::fmt::Display for RBrack {
-    fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
-        std::fmt::Display::fmt(&self.syntax, f)
-    }
-}
-impl AstToken for RBrack {
-    fn can_cast(kind: SyntaxKind) -> bool { kind == R_BRACK }
-    fn cast(syntax: SyntaxToken) -> Option<Self> {
-        if Self::can_cast(syntax.kind()) {
-            Some(Self { syntax })
-        } else {
-            None
-        }
-    }
-    fn syntax(&self) -> &SyntaxToken { &self.syntax }
-}
-#[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct LAngle {
-    pub(crate) syntax: SyntaxToken,
-}
-impl std::fmt::Display for LAngle {
-    fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
-        std::fmt::Display::fmt(&self.syntax, f)
-    }
-}
-impl AstToken for LAngle {
-    fn can_cast(kind: SyntaxKind) -> bool { kind == L_ANGLE }
-    fn cast(syntax: SyntaxToken) -> Option<Self> {
-        if Self::can_cast(syntax.kind()) {
-            Some(Self { syntax })
-        } else {
-            None
-        }
-    }
-    fn syntax(&self) -> &SyntaxToken { &self.syntax }
-}
-#[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct RAngle {
-    pub(crate) syntax: SyntaxToken,
-}
-impl std::fmt::Display for RAngle {
-    fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
-        std::fmt::Display::fmt(&self.syntax, f)
-    }
-}
-impl AstToken for RAngle {
-    fn can_cast(kind: SyntaxKind) -> bool { kind == R_ANGLE }
-    fn cast(syntax: SyntaxToken) -> Option<Self> {
-        if Self::can_cast(syntax.kind()) {
-            Some(Self { syntax })
-        } else {
-            None
-        }
-    }
-    fn syntax(&self) -> &SyntaxToken { &self.syntax }
-}
-#[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct At {
-    pub(crate) syntax: SyntaxToken,
-}
-impl std::fmt::Display for At {
-    fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
-        std::fmt::Display::fmt(&self.syntax, f)
-    }
-}
-impl AstToken for At {
-    fn can_cast(kind: SyntaxKind) -> bool { kind == AT }
-    fn cast(syntax: SyntaxToken) -> Option<Self> {
-        if Self::can_cast(syntax.kind()) {
-            Some(Self { syntax })
-        } else {
-            None
-        }
-    }
-    fn syntax(&self) -> &SyntaxToken { &self.syntax }
-}
-#[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct Pound {
-    pub(crate) syntax: SyntaxToken,
-}
-impl std::fmt::Display for Pound {
-    fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
-        std::fmt::Display::fmt(&self.syntax, f)
-    }
-}
-impl AstToken for Pound {
-    fn can_cast(kind: SyntaxKind) -> bool { kind == POUND }
-    fn cast(syntax: SyntaxToken) -> Option<Self> {
-        if Self::can_cast(syntax.kind()) {
-            Some(Self { syntax })
-        } else {
-            None
-        }
-    }
-    fn syntax(&self) -> &SyntaxToken { &self.syntax }
-}
-#[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct Tilde {
-    pub(crate) syntax: SyntaxToken,
-}
-impl std::fmt::Display for Tilde {
-    fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
-        std::fmt::Display::fmt(&self.syntax, f)
-    }
-}
-impl AstToken for Tilde {
-    fn can_cast(kind: SyntaxKind) -> bool { kind == TILDE }
-    fn cast(syntax: SyntaxToken) -> Option<Self> {
-        if Self::can_cast(syntax.kind()) {
-            Some(Self { syntax })
-        } else {
-            None
-        }
-    }
-    fn syntax(&self) -> &SyntaxToken { &self.syntax }
-}
-#[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct Question {
-    pub(crate) syntax: SyntaxToken,
-}
-impl std::fmt::Display for Question {
-    fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
-        std::fmt::Display::fmt(&self.syntax, f)
-    }
-}
-impl AstToken for Question {
-    fn can_cast(kind: SyntaxKind) -> bool { kind == QUESTION }
-    fn cast(syntax: SyntaxToken) -> Option<Self> {
-        if Self::can_cast(syntax.kind()) {
-            Some(Self { syntax })
-        } else {
-            None
-        }
-    }
-    fn syntax(&self) -> &SyntaxToken { &self.syntax }
-}
-#[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct Dollar {
-    pub(crate) syntax: SyntaxToken,
-}
-impl std::fmt::Display for Dollar {
-    fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
-        std::fmt::Display::fmt(&self.syntax, f)
-    }
-}
-impl AstToken for Dollar {
-    fn can_cast(kind: SyntaxKind) -> bool { kind == DOLLAR }
-    fn cast(syntax: SyntaxToken) -> Option<Self> {
-        if Self::can_cast(syntax.kind()) {
-            Some(Self { syntax })
-        } else {
-            None
-        }
-    }
-    fn syntax(&self) -> &SyntaxToken { &self.syntax }
-}
-#[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct Amp {
-    pub(crate) syntax: SyntaxToken,
-}
-impl std::fmt::Display for Amp {
-    fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
-        std::fmt::Display::fmt(&self.syntax, f)
-    }
-}
-impl AstToken for Amp {
-    fn can_cast(kind: SyntaxKind) -> bool { kind == AMP }
-    fn cast(syntax: SyntaxToken) -> Option<Self> {
-        if Self::can_cast(syntax.kind()) {
-            Some(Self { syntax })
-        } else {
-            None
-        }
-    }
-    fn syntax(&self) -> &SyntaxToken { &self.syntax }
-}
-#[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct Pipe {
-    pub(crate) syntax: SyntaxToken,
-}
-impl std::fmt::Display for Pipe {
-    fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
-        std::fmt::Display::fmt(&self.syntax, f)
-    }
-}
-impl AstToken for Pipe {
-    fn can_cast(kind: SyntaxKind) -> bool { kind == PIPE }
-    fn cast(syntax: SyntaxToken) -> Option<Self> {
-        if Self::can_cast(syntax.kind()) {
-            Some(Self { syntax })
-        } else {
-            None
-        }
-    }
-    fn syntax(&self) -> &SyntaxToken { &self.syntax }
-}
-#[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct Plus {
-    pub(crate) syntax: SyntaxToken,
-}
-impl std::fmt::Display for Plus {
-    fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
-        std::fmt::Display::fmt(&self.syntax, f)
-    }
-}
-impl AstToken for Plus {
-    fn can_cast(kind: SyntaxKind) -> bool { kind == PLUS }
-    fn cast(syntax: SyntaxToken) -> Option<Self> {
-        if Self::can_cast(syntax.kind()) {
-            Some(Self { syntax })
-        } else {
-            None
-        }
-    }
-    fn syntax(&self) -> &SyntaxToken { &self.syntax }
-}
-#[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct Star {
-    pub(crate) syntax: SyntaxToken,
-}
-impl std::fmt::Display for Star {
-    fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
-        std::fmt::Display::fmt(&self.syntax, f)
-    }
-}
-impl AstToken for Star {
-    fn can_cast(kind: SyntaxKind) -> bool { kind == STAR }
-    fn cast(syntax: SyntaxToken) -> Option<Self> {
-        if Self::can_cast(syntax.kind()) {
-            Some(Self { syntax })
-        } else {
-            None
-        }
-    }
-    fn syntax(&self) -> &SyntaxToken { &self.syntax }
-}
-#[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct Slash {
-    pub(crate) syntax: SyntaxToken,
-}
-impl std::fmt::Display for Slash {
-    fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
-        std::fmt::Display::fmt(&self.syntax, f)
-    }
-}
-impl AstToken for Slash {
-    fn can_cast(kind: SyntaxKind) -> bool { kind == SLASH }
-    fn cast(syntax: SyntaxToken) -> Option<Self> {
-        if Self::can_cast(syntax.kind()) {
-            Some(Self { syntax })
-        } else {
-            None
-        }
-    }
-    fn syntax(&self) -> &SyntaxToken { &self.syntax }
-}
-#[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct Caret {
-    pub(crate) syntax: SyntaxToken,
-}
-impl std::fmt::Display for Caret {
-    fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
-        std::fmt::Display::fmt(&self.syntax, f)
-    }
-}
-impl AstToken for Caret {
-    fn can_cast(kind: SyntaxKind) -> bool { kind == CARET }
-    fn cast(syntax: SyntaxToken) -> Option<Self> {
-        if Self::can_cast(syntax.kind()) {
-            Some(Self { syntax })
-        } else {
-            None
-        }
-    }
-    fn syntax(&self) -> &SyntaxToken { &self.syntax }
-}
-#[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct Percent {
-    pub(crate) syntax: SyntaxToken,
-}
-impl std::fmt::Display for Percent {
-    fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
-        std::fmt::Display::fmt(&self.syntax, f)
-    }
-}
-impl AstToken for Percent {
-    fn can_cast(kind: SyntaxKind) -> bool { kind == PERCENT }
-    fn cast(syntax: SyntaxToken) -> Option<Self> {
-        if Self::can_cast(syntax.kind()) {
-            Some(Self { syntax })
-        } else {
-            None
-        }
-    }
-    fn syntax(&self) -> &SyntaxToken { &self.syntax }
-}
-#[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct Underscore {
-    pub(crate) syntax: SyntaxToken,
-}
-impl std::fmt::Display for Underscore {
-    fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
-        std::fmt::Display::fmt(&self.syntax, f)
-    }
-}
-impl AstToken for Underscore {
-    fn can_cast(kind: SyntaxKind) -> bool { kind == UNDERSCORE }
-    fn cast(syntax: SyntaxToken) -> Option<Self> {
-        if Self::can_cast(syntax.kind()) {
-            Some(Self { syntax })
-        } else {
-            None
-        }
-    }
-    fn syntax(&self) -> &SyntaxToken { &self.syntax }
-}
-#[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct Dot {
-    pub(crate) syntax: SyntaxToken,
-}
-impl std::fmt::Display for Dot {
-    fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
-        std::fmt::Display::fmt(&self.syntax, f)
-    }
-}
-impl AstToken for Dot {
-    fn can_cast(kind: SyntaxKind) -> bool { kind == DOT }
-    fn cast(syntax: SyntaxToken) -> Option<Self> {
-        if Self::can_cast(syntax.kind()) {
-            Some(Self { syntax })
-        } else {
-            None
-        }
-    }
-    fn syntax(&self) -> &SyntaxToken { &self.syntax }
-}
-#[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct Dotdot {
-    pub(crate) syntax: SyntaxToken,
-}
-impl std::fmt::Display for Dotdot {
-    fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
-        std::fmt::Display::fmt(&self.syntax, f)
-    }
-}
-impl AstToken for Dotdot {
-    fn can_cast(kind: SyntaxKind) -> bool { kind == DOTDOT }
-    fn cast(syntax: SyntaxToken) -> Option<Self> {
-        if Self::can_cast(syntax.kind()) {
-            Some(Self { syntax })
-        } else {
-            None
-        }
-    }
-    fn syntax(&self) -> &SyntaxToken { &self.syntax }
-}
-#[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct Dotdotdot {
-    pub(crate) syntax: SyntaxToken,
-}
-impl std::fmt::Display for Dotdotdot {
-    fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
-        std::fmt::Display::fmt(&self.syntax, f)
-    }
-}
-impl AstToken for Dotdotdot {
-    fn can_cast(kind: SyntaxKind) -> bool { kind == DOTDOTDOT }
-    fn cast(syntax: SyntaxToken) -> Option<Self> {
-        if Self::can_cast(syntax.kind()) {
-            Some(Self { syntax })
-        } else {
-            None
-        }
-    }
-    fn syntax(&self) -> &SyntaxToken { &self.syntax }
-}
-#[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct Dotdoteq {
-    pub(crate) syntax: SyntaxToken,
-}
-impl std::fmt::Display for Dotdoteq {
-    fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
-        std::fmt::Display::fmt(&self.syntax, f)
-    }
-}
-impl AstToken for Dotdoteq {
-    fn can_cast(kind: SyntaxKind) -> bool { kind == DOTDOTEQ }
-    fn cast(syntax: SyntaxToken) -> Option<Self> {
-        if Self::can_cast(syntax.kind()) {
-            Some(Self { syntax })
-        } else {
-            None
-        }
-    }
-    fn syntax(&self) -> &SyntaxToken { &self.syntax }
-}
-#[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct Colon {
-    pub(crate) syntax: SyntaxToken,
-}
-impl std::fmt::Display for Colon {
-    fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
-        std::fmt::Display::fmt(&self.syntax, f)
-    }
-}
-impl AstToken for Colon {
-    fn can_cast(kind: SyntaxKind) -> bool { kind == COLON }
-    fn cast(syntax: SyntaxToken) -> Option<Self> {
-        if Self::can_cast(syntax.kind()) {
-            Some(Self { syntax })
-        } else {
-            None
-        }
-    }
-    fn syntax(&self) -> &SyntaxToken { &self.syntax }
-}
-#[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct Coloncolon {
-    pub(crate) syntax: SyntaxToken,
-}
-impl std::fmt::Display for Coloncolon {
-    fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
-        std::fmt::Display::fmt(&self.syntax, f)
-    }
-}
-impl AstToken for Coloncolon {
-    fn can_cast(kind: SyntaxKind) -> bool { kind == COLONCOLON }
-    fn cast(syntax: SyntaxToken) -> Option<Self> {
-        if Self::can_cast(syntax.kind()) {
-            Some(Self { syntax })
-        } else {
-            None
-        }
-    }
-    fn syntax(&self) -> &SyntaxToken { &self.syntax }
-}
-#[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct Eq {
-    pub(crate) syntax: SyntaxToken,
-}
-impl std::fmt::Display for Eq {
-    fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
-        std::fmt::Display::fmt(&self.syntax, f)
-    }
-}
-impl AstToken for Eq {
-    fn can_cast(kind: SyntaxKind) -> bool { kind == EQ }
-    fn cast(syntax: SyntaxToken) -> Option<Self> {
-        if Self::can_cast(syntax.kind()) {
-            Some(Self { syntax })
-        } else {
-            None
-        }
-    }
-    fn syntax(&self) -> &SyntaxToken { &self.syntax }
-}
-#[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct Eqeq {
-    pub(crate) syntax: SyntaxToken,
-}
-impl std::fmt::Display for Eqeq {
-    fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
-        std::fmt::Display::fmt(&self.syntax, f)
-    }
-}
-impl AstToken for Eqeq {
-    fn can_cast(kind: SyntaxKind) -> bool { kind == EQEQ }
-    fn cast(syntax: SyntaxToken) -> Option<Self> {
-        if Self::can_cast(syntax.kind()) {
-            Some(Self { syntax })
-        } else {
-            None
-        }
-    }
-    fn syntax(&self) -> &SyntaxToken { &self.syntax }
-}
-#[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct FatArrow {
-    pub(crate) syntax: SyntaxToken,
-}
-impl std::fmt::Display for FatArrow {
-    fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
-        std::fmt::Display::fmt(&self.syntax, f)
-    }
-}
-impl AstToken for FatArrow {
-    fn can_cast(kind: SyntaxKind) -> bool { kind == FAT_ARROW }
-    fn cast(syntax: SyntaxToken) -> Option<Self> {
-        if Self::can_cast(syntax.kind()) {
-            Some(Self { syntax })
-        } else {
-            None
-        }
-    }
-    fn syntax(&self) -> &SyntaxToken { &self.syntax }
-}
-#[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct Excl {
-    pub(crate) syntax: SyntaxToken,
-}
-impl std::fmt::Display for Excl {
-    fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
-        std::fmt::Display::fmt(&self.syntax, f)
-    }
-}
-impl AstToken for Excl {
-    fn can_cast(kind: SyntaxKind) -> bool { kind == EXCL }
-    fn cast(syntax: SyntaxToken) -> Option<Self> {
-        if Self::can_cast(syntax.kind()) {
-            Some(Self { syntax })
-        } else {
-            None
-        }
-    }
-    fn syntax(&self) -> &SyntaxToken { &self.syntax }
-}
-#[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct Neq {
-    pub(crate) syntax: SyntaxToken,
-}
-impl std::fmt::Display for Neq {
-    fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
-        std::fmt::Display::fmt(&self.syntax, f)
-    }
-}
-impl AstToken for Neq {
-    fn can_cast(kind: SyntaxKind) -> bool { kind == NEQ }
-    fn cast(syntax: SyntaxToken) -> Option<Self> {
-        if Self::can_cast(syntax.kind()) {
-            Some(Self { syntax })
-        } else {
-            None
-        }
-    }
-    fn syntax(&self) -> &SyntaxToken { &self.syntax }
-}
-#[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct Minus {
-    pub(crate) syntax: SyntaxToken,
-}
-impl std::fmt::Display for Minus {
-    fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
-        std::fmt::Display::fmt(&self.syntax, f)
-    }
-}
-impl AstToken for Minus {
-    fn can_cast(kind: SyntaxKind) -> bool { kind == MINUS }
-    fn cast(syntax: SyntaxToken) -> Option<Self> {
-        if Self::can_cast(syntax.kind()) {
-            Some(Self { syntax })
-        } else {
-            None
-        }
-    }
-    fn syntax(&self) -> &SyntaxToken { &self.syntax }
-}
-#[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct ThinArrow {
-    pub(crate) syntax: SyntaxToken,
-}
-impl std::fmt::Display for ThinArrow {
-    fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
-        std::fmt::Display::fmt(&self.syntax, f)
-    }
-}
-impl AstToken for ThinArrow {
-    fn can_cast(kind: SyntaxKind) -> bool { kind == THIN_ARROW }
-    fn cast(syntax: SyntaxToken) -> Option<Self> {
-        if Self::can_cast(syntax.kind()) {
-            Some(Self { syntax })
-        } else {
-            None
-        }
-    }
-    fn syntax(&self) -> &SyntaxToken { &self.syntax }
-}
-#[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct Lteq {
-    pub(crate) syntax: SyntaxToken,
-}
-impl std::fmt::Display for Lteq {
-    fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
-        std::fmt::Display::fmt(&self.syntax, f)
-    }
-}
-impl AstToken for Lteq {
-    fn can_cast(kind: SyntaxKind) -> bool { kind == LTEQ }
-    fn cast(syntax: SyntaxToken) -> Option<Self> {
-        if Self::can_cast(syntax.kind()) {
-            Some(Self { syntax })
-        } else {
-            None
-        }
-    }
-    fn syntax(&self) -> &SyntaxToken { &self.syntax }
-}
-#[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct Gteq {
-    pub(crate) syntax: SyntaxToken,
-}
-impl std::fmt::Display for Gteq {
-    fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
-        std::fmt::Display::fmt(&self.syntax, f)
-    }
-}
-impl AstToken for Gteq {
-    fn can_cast(kind: SyntaxKind) -> bool { kind == GTEQ }
-    fn cast(syntax: SyntaxToken) -> Option<Self> {
-        if Self::can_cast(syntax.kind()) {
-            Some(Self { syntax })
-        } else {
-            None
-        }
-    }
-    fn syntax(&self) -> &SyntaxToken { &self.syntax }
-}
-#[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct Pluseq {
-    pub(crate) syntax: SyntaxToken,
-}
-impl std::fmt::Display for Pluseq {
-    fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
-        std::fmt::Display::fmt(&self.syntax, f)
-    }
-}
-impl AstToken for Pluseq {
-    fn can_cast(kind: SyntaxKind) -> bool { kind == PLUSEQ }
-    fn cast(syntax: SyntaxToken) -> Option<Self> {
-        if Self::can_cast(syntax.kind()) {
-            Some(Self { syntax })
-        } else {
-            None
-        }
-    }
-    fn syntax(&self) -> &SyntaxToken { &self.syntax }
-}
-#[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct Minuseq {
-    pub(crate) syntax: SyntaxToken,
-}
-impl std::fmt::Display for Minuseq {
-    fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
-        std::fmt::Display::fmt(&self.syntax, f)
-    }
-}
-impl AstToken for Minuseq {
-    fn can_cast(kind: SyntaxKind) -> bool { kind == MINUSEQ }
-    fn cast(syntax: SyntaxToken) -> Option<Self> {
-        if Self::can_cast(syntax.kind()) {
-            Some(Self { syntax })
-        } else {
-            None
-        }
-    }
-    fn syntax(&self) -> &SyntaxToken { &self.syntax }
-}
-#[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct Pipeeq {
-    pub(crate) syntax: SyntaxToken,
-}
-impl std::fmt::Display for Pipeeq {
-    fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
-        std::fmt::Display::fmt(&self.syntax, f)
-    }
-}
-impl AstToken for Pipeeq {
-    fn can_cast(kind: SyntaxKind) -> bool { kind == PIPEEQ }
-    fn cast(syntax: SyntaxToken) -> Option<Self> {
-        if Self::can_cast(syntax.kind()) {
-            Some(Self { syntax })
-        } else {
-            None
-        }
-    }
-    fn syntax(&self) -> &SyntaxToken { &self.syntax }
-}
-#[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct Ampeq {
-    pub(crate) syntax: SyntaxToken,
-}
-impl std::fmt::Display for Ampeq {
-    fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
-        std::fmt::Display::fmt(&self.syntax, f)
-    }
-}
-impl AstToken for Ampeq {
-    fn can_cast(kind: SyntaxKind) -> bool { kind == AMPEQ }
-    fn cast(syntax: SyntaxToken) -> Option<Self> {
-        if Self::can_cast(syntax.kind()) {
-            Some(Self { syntax })
-        } else {
-            None
-        }
-    }
-    fn syntax(&self) -> &SyntaxToken { &self.syntax }
-}
-#[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct Careteq {
-    pub(crate) syntax: SyntaxToken,
-}
-impl std::fmt::Display for Careteq {
-    fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
-        std::fmt::Display::fmt(&self.syntax, f)
-    }
-}
-impl AstToken for Careteq {
-    fn can_cast(kind: SyntaxKind) -> bool { kind == CARETEQ }
-    fn cast(syntax: SyntaxToken) -> Option<Self> {
-        if Self::can_cast(syntax.kind()) {
-            Some(Self { syntax })
-        } else {
-            None
-        }
-    }
-    fn syntax(&self) -> &SyntaxToken { &self.syntax }
-}
-#[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct Slasheq {
-    pub(crate) syntax: SyntaxToken,
-}
-impl std::fmt::Display for Slasheq {
-    fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
-        std::fmt::Display::fmt(&self.syntax, f)
-    }
-}
-impl AstToken for Slasheq {
-    fn can_cast(kind: SyntaxKind) -> bool { kind == SLASHEQ }
-    fn cast(syntax: SyntaxToken) -> Option<Self> {
-        if Self::can_cast(syntax.kind()) {
-            Some(Self { syntax })
-        } else {
-            None
-        }
-    }
-    fn syntax(&self) -> &SyntaxToken { &self.syntax }
-}
-#[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct Stareq {
-    pub(crate) syntax: SyntaxToken,
-}
-impl std::fmt::Display for Stareq {
-    fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
-        std::fmt::Display::fmt(&self.syntax, f)
-    }
-}
-impl AstToken for Stareq {
-    fn can_cast(kind: SyntaxKind) -> bool { kind == STAREQ }
-    fn cast(syntax: SyntaxToken) -> Option<Self> {
-        if Self::can_cast(syntax.kind()) {
-            Some(Self { syntax })
-        } else {
-            None
-        }
-    }
-    fn syntax(&self) -> &SyntaxToken { &self.syntax }
-}
-#[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct Percenteq {
-    pub(crate) syntax: SyntaxToken,
-}
-impl std::fmt::Display for Percenteq {
-    fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
-        std::fmt::Display::fmt(&self.syntax, f)
-    }
-}
-impl AstToken for Percenteq {
-    fn can_cast(kind: SyntaxKind) -> bool { kind == PERCENTEQ }
-    fn cast(syntax: SyntaxToken) -> Option<Self> {
-        if Self::can_cast(syntax.kind()) {
-            Some(Self { syntax })
-        } else {
-            None
-        }
-    }
-    fn syntax(&self) -> &SyntaxToken { &self.syntax }
-}
-#[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct Ampamp {
-    pub(crate) syntax: SyntaxToken,
-}
-impl std::fmt::Display for Ampamp {
-    fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
-        std::fmt::Display::fmt(&self.syntax, f)
-    }
-}
-impl AstToken for Ampamp {
-    fn can_cast(kind: SyntaxKind) -> bool { kind == AMPAMP }
-    fn cast(syntax: SyntaxToken) -> Option<Self> {
-        if Self::can_cast(syntax.kind()) {
-            Some(Self { syntax })
-        } else {
-            None
-        }
-    }
-    fn syntax(&self) -> &SyntaxToken { &self.syntax }
-}
-#[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct Pipepipe {
-    pub(crate) syntax: SyntaxToken,
-}
-impl std::fmt::Display for Pipepipe {
-    fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
-        std::fmt::Display::fmt(&self.syntax, f)
-    }
-}
-impl AstToken for Pipepipe {
-    fn can_cast(kind: SyntaxKind) -> bool { kind == PIPEPIPE }
-    fn cast(syntax: SyntaxToken) -> Option<Self> {
-        if Self::can_cast(syntax.kind()) {
-            Some(Self { syntax })
-        } else {
-            None
-        }
-    }
-    fn syntax(&self) -> &SyntaxToken { &self.syntax }
-}
-#[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct Shl {
-    pub(crate) syntax: SyntaxToken,
-}
-impl std::fmt::Display for Shl {
-    fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
-        std::fmt::Display::fmt(&self.syntax, f)
-    }
-}
-impl AstToken for Shl {
-    fn can_cast(kind: SyntaxKind) -> bool { kind == SHL }
-    fn cast(syntax: SyntaxToken) -> Option<Self> {
-        if Self::can_cast(syntax.kind()) {
-            Some(Self { syntax })
-        } else {
-            None
-        }
-    }
-    fn syntax(&self) -> &SyntaxToken { &self.syntax }
-}
-#[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct Shr {
-    pub(crate) syntax: SyntaxToken,
-}
-impl std::fmt::Display for Shr {
-    fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
-        std::fmt::Display::fmt(&self.syntax, f)
-    }
-}
-impl AstToken for Shr {
-    fn can_cast(kind: SyntaxKind) -> bool { kind == SHR }
-    fn cast(syntax: SyntaxToken) -> Option<Self> {
-        if Self::can_cast(syntax.kind()) {
-            Some(Self { syntax })
-        } else {
-            None
-        }
-    }
-    fn syntax(&self) -> &SyntaxToken { &self.syntax }
-}
-#[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct Shleq {
-    pub(crate) syntax: SyntaxToken,
-}
-impl std::fmt::Display for Shleq {
-    fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
-        std::fmt::Display::fmt(&self.syntax, f)
-    }
-}
-impl AstToken for Shleq {
-    fn can_cast(kind: SyntaxKind) -> bool { kind == SHLEQ }
-    fn cast(syntax: SyntaxToken) -> Option<Self> {
-        if Self::can_cast(syntax.kind()) {
-            Some(Self { syntax })
-        } else {
-            None
-        }
-    }
-    fn syntax(&self) -> &SyntaxToken { &self.syntax }
-}
-#[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct Shreq {
-    pub(crate) syntax: SyntaxToken,
-}
-impl std::fmt::Display for Shreq {
-    fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
-        std::fmt::Display::fmt(&self.syntax, f)
-    }
-}
-impl AstToken for Shreq {
-    fn can_cast(kind: SyntaxKind) -> bool { kind == SHREQ }
-    fn cast(syntax: SyntaxToken) -> Option<Self> {
-        if Self::can_cast(syntax.kind()) {
-            Some(Self { syntax })
-        } else {
-            None
-        }
-    }
-    fn syntax(&self) -> &SyntaxToken { &self.syntax }
-}
-#[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct AsKw {
-    pub(crate) syntax: SyntaxToken,
-}
-impl std::fmt::Display for AsKw {
-    fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
-        std::fmt::Display::fmt(&self.syntax, f)
-    }
-}
-impl AstToken for AsKw {
-    fn can_cast(kind: SyntaxKind) -> bool { kind == AS_KW }
-    fn cast(syntax: SyntaxToken) -> Option<Self> {
-        if Self::can_cast(syntax.kind()) {
-            Some(Self { syntax })
-        } else {
-            None
-        }
-    }
-    fn syntax(&self) -> &SyntaxToken { &self.syntax }
-}
-#[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct AsyncKw {
-    pub(crate) syntax: SyntaxToken,
-}
-impl std::fmt::Display for AsyncKw {
-    fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
-        std::fmt::Display::fmt(&self.syntax, f)
-    }
-}
-impl AstToken for AsyncKw {
-    fn can_cast(kind: SyntaxKind) -> bool { kind == ASYNC_KW }
-    fn cast(syntax: SyntaxToken) -> Option<Self> {
-        if Self::can_cast(syntax.kind()) {
-            Some(Self { syntax })
-        } else {
-            None
-        }
-    }
-    fn syntax(&self) -> &SyntaxToken { &self.syntax }
-}
-#[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct AwaitKw {
-    pub(crate) syntax: SyntaxToken,
-}
-impl std::fmt::Display for AwaitKw {
-    fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
-        std::fmt::Display::fmt(&self.syntax, f)
-    }
-}
-impl AstToken for AwaitKw {
-    fn can_cast(kind: SyntaxKind) -> bool { kind == AWAIT_KW }
-    fn cast(syntax: SyntaxToken) -> Option<Self> {
-        if Self::can_cast(syntax.kind()) {
-            Some(Self { syntax })
-        } else {
-            None
-        }
-    }
-    fn syntax(&self) -> &SyntaxToken { &self.syntax }
-}
-#[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct BoxKw {
-    pub(crate) syntax: SyntaxToken,
-}
-impl std::fmt::Display for BoxKw {
-    fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
-        std::fmt::Display::fmt(&self.syntax, f)
-    }
-}
-impl AstToken for BoxKw {
-    fn can_cast(kind: SyntaxKind) -> bool { kind == BOX_KW }
-    fn cast(syntax: SyntaxToken) -> Option<Self> {
-        if Self::can_cast(syntax.kind()) {
-            Some(Self { syntax })
-        } else {
-            None
-        }
-    }
-    fn syntax(&self) -> &SyntaxToken { &self.syntax }
-}
-#[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct BreakKw {
-    pub(crate) syntax: SyntaxToken,
-}
-impl std::fmt::Display for BreakKw {
-    fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
-        std::fmt::Display::fmt(&self.syntax, f)
-    }
-}
-impl AstToken for BreakKw {
-    fn can_cast(kind: SyntaxKind) -> bool { kind == BREAK_KW }
-    fn cast(syntax: SyntaxToken) -> Option<Self> {
-        if Self::can_cast(syntax.kind()) {
-            Some(Self { syntax })
-        } else {
-            None
-        }
-    }
-    fn syntax(&self) -> &SyntaxToken { &self.syntax }
-}
-#[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct ConstKw {
-    pub(crate) syntax: SyntaxToken,
-}
-impl std::fmt::Display for ConstKw {
-    fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
-        std::fmt::Display::fmt(&self.syntax, f)
-    }
-}
-impl AstToken for ConstKw {
-    fn can_cast(kind: SyntaxKind) -> bool { kind == CONST_KW }
-    fn cast(syntax: SyntaxToken) -> Option<Self> {
-        if Self::can_cast(syntax.kind()) {
-            Some(Self { syntax })
-        } else {
-            None
-        }
-    }
-    fn syntax(&self) -> &SyntaxToken { &self.syntax }
-}
-#[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct ContinueKw {
-    pub(crate) syntax: SyntaxToken,
-}
-impl std::fmt::Display for ContinueKw {
-    fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
-        std::fmt::Display::fmt(&self.syntax, f)
-    }
-}
-impl AstToken for ContinueKw {
-    fn can_cast(kind: SyntaxKind) -> bool { kind == CONTINUE_KW }
-    fn cast(syntax: SyntaxToken) -> Option<Self> {
-        if Self::can_cast(syntax.kind()) {
-            Some(Self { syntax })
-        } else {
-            None
-        }
-    }
-    fn syntax(&self) -> &SyntaxToken { &self.syntax }
-}
-#[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct CrateKw {
-    pub(crate) syntax: SyntaxToken,
-}
-impl std::fmt::Display for CrateKw {
-    fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
-        std::fmt::Display::fmt(&self.syntax, f)
-    }
-}
-impl AstToken for CrateKw {
-    fn can_cast(kind: SyntaxKind) -> bool { kind == CRATE_KW }
-    fn cast(syntax: SyntaxToken) -> Option<Self> {
-        if Self::can_cast(syntax.kind()) {
-            Some(Self { syntax })
-        } else {
-            None
-        }
-    }
-    fn syntax(&self) -> &SyntaxToken { &self.syntax }
-}
-#[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct DynKw {
-    pub(crate) syntax: SyntaxToken,
-}
-impl std::fmt::Display for DynKw {
-    fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
-        std::fmt::Display::fmt(&self.syntax, f)
-    }
-}
-impl AstToken for DynKw {
-    fn can_cast(kind: SyntaxKind) -> bool { kind == DYN_KW }
-    fn cast(syntax: SyntaxToken) -> Option<Self> {
-        if Self::can_cast(syntax.kind()) {
-            Some(Self { syntax })
-        } else {
-            None
-        }
-    }
-    fn syntax(&self) -> &SyntaxToken { &self.syntax }
-}
-#[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct ElseKw {
-    pub(crate) syntax: SyntaxToken,
-}
-impl std::fmt::Display for ElseKw {
-    fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
-        std::fmt::Display::fmt(&self.syntax, f)
-    }
-}
-impl AstToken for ElseKw {
-    fn can_cast(kind: SyntaxKind) -> bool { kind == ELSE_KW }
-    fn cast(syntax: SyntaxToken) -> Option<Self> {
-        if Self::can_cast(syntax.kind()) {
-            Some(Self { syntax })
-        } else {
-            None
-        }
-    }
-    fn syntax(&self) -> &SyntaxToken { &self.syntax }
-}
-#[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct EnumKw {
-    pub(crate) syntax: SyntaxToken,
-}
-impl std::fmt::Display for EnumKw {
-    fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
-        std::fmt::Display::fmt(&self.syntax, f)
-    }
-}
-impl AstToken for EnumKw {
-    fn can_cast(kind: SyntaxKind) -> bool { kind == ENUM_KW }
-    fn cast(syntax: SyntaxToken) -> Option<Self> {
-        if Self::can_cast(syntax.kind()) {
-            Some(Self { syntax })
-        } else {
-            None
-        }
-    }
-    fn syntax(&self) -> &SyntaxToken { &self.syntax }
-}
-#[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct ExternKw {
-    pub(crate) syntax: SyntaxToken,
-}
-impl std::fmt::Display for ExternKw {
-    fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
-        std::fmt::Display::fmt(&self.syntax, f)
-    }
-}
-impl AstToken for ExternKw {
-    fn can_cast(kind: SyntaxKind) -> bool { kind == EXTERN_KW }
-    fn cast(syntax: SyntaxToken) -> Option<Self> {
-        if Self::can_cast(syntax.kind()) {
-            Some(Self { syntax })
-        } else {
-            None
-        }
-    }
-    fn syntax(&self) -> &SyntaxToken { &self.syntax }
-}
-#[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct FalseKw {
-    pub(crate) syntax: SyntaxToken,
-}
-impl std::fmt::Display for FalseKw {
-    fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
-        std::fmt::Display::fmt(&self.syntax, f)
-    }
-}
-impl AstToken for FalseKw {
-    fn can_cast(kind: SyntaxKind) -> bool { kind == FALSE_KW }
-    fn cast(syntax: SyntaxToken) -> Option<Self> {
-        if Self::can_cast(syntax.kind()) {
-            Some(Self { syntax })
-        } else {
-            None
-        }
-    }
-    fn syntax(&self) -> &SyntaxToken { &self.syntax }
-}
-#[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct FnKw {
-    pub(crate) syntax: SyntaxToken,
-}
-impl std::fmt::Display for FnKw {
-    fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
-        std::fmt::Display::fmt(&self.syntax, f)
-    }
-}
-impl AstToken for FnKw {
-    fn can_cast(kind: SyntaxKind) -> bool { kind == FN_KW }
-    fn cast(syntax: SyntaxToken) -> Option<Self> {
-        if Self::can_cast(syntax.kind()) {
-            Some(Self { syntax })
-        } else {
-            None
-        }
-    }
-    fn syntax(&self) -> &SyntaxToken { &self.syntax }
-}
-#[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct ForKw {
-    pub(crate) syntax: SyntaxToken,
-}
-impl std::fmt::Display for ForKw {
-    fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
-        std::fmt::Display::fmt(&self.syntax, f)
-    }
-}
-impl AstToken for ForKw {
-    fn can_cast(kind: SyntaxKind) -> bool { kind == FOR_KW }
-    fn cast(syntax: SyntaxToken) -> Option<Self> {
-        if Self::can_cast(syntax.kind()) {
-            Some(Self { syntax })
-        } else {
-            None
-        }
-    }
-    fn syntax(&self) -> &SyntaxToken { &self.syntax }
-}
-#[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct IfKw {
-    pub(crate) syntax: SyntaxToken,
-}
-impl std::fmt::Display for IfKw {
-    fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
-        std::fmt::Display::fmt(&self.syntax, f)
-    }
-}
-impl AstToken for IfKw {
-    fn can_cast(kind: SyntaxKind) -> bool { kind == IF_KW }
-    fn cast(syntax: SyntaxToken) -> Option<Self> {
-        if Self::can_cast(syntax.kind()) {
-            Some(Self { syntax })
-        } else {
-            None
-        }
-    }
-    fn syntax(&self) -> &SyntaxToken { &self.syntax }
-}
-#[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct ImplKw {
-    pub(crate) syntax: SyntaxToken,
-}
-impl std::fmt::Display for ImplKw {
-    fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
-        std::fmt::Display::fmt(&self.syntax, f)
-    }
-}
-impl AstToken for ImplKw {
-    fn can_cast(kind: SyntaxKind) -> bool { kind == IMPL_KW }
-    fn cast(syntax: SyntaxToken) -> Option<Self> {
-        if Self::can_cast(syntax.kind()) {
-            Some(Self { syntax })
-        } else {
-            None
-        }
-    }
-    fn syntax(&self) -> &SyntaxToken { &self.syntax }
-}
-#[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct InKw {
-    pub(crate) syntax: SyntaxToken,
-}
-impl std::fmt::Display for InKw {
-    fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
-        std::fmt::Display::fmt(&self.syntax, f)
-    }
-}
-impl AstToken for InKw {
-    fn can_cast(kind: SyntaxKind) -> bool { kind == IN_KW }
-    fn cast(syntax: SyntaxToken) -> Option<Self> {
-        if Self::can_cast(syntax.kind()) {
-            Some(Self { syntax })
-        } else {
-            None
-        }
-    }
-    fn syntax(&self) -> &SyntaxToken { &self.syntax }
-}
-#[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct LetKw {
-    pub(crate) syntax: SyntaxToken,
-}
-impl std::fmt::Display for LetKw {
-    fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
-        std::fmt::Display::fmt(&self.syntax, f)
-    }
-}
-impl AstToken for LetKw {
-    fn can_cast(kind: SyntaxKind) -> bool { kind == LET_KW }
-    fn cast(syntax: SyntaxToken) -> Option<Self> {
-        if Self::can_cast(syntax.kind()) {
-            Some(Self { syntax })
-        } else {
-            None
-        }
-    }
-    fn syntax(&self) -> &SyntaxToken { &self.syntax }
-}
-#[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct LoopKw {
-    pub(crate) syntax: SyntaxToken,
-}
-impl std::fmt::Display for LoopKw {
-    fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
-        std::fmt::Display::fmt(&self.syntax, f)
-    }
-}
-impl AstToken for LoopKw {
-    fn can_cast(kind: SyntaxKind) -> bool { kind == LOOP_KW }
-    fn cast(syntax: SyntaxToken) -> Option<Self> {
-        if Self::can_cast(syntax.kind()) {
-            Some(Self { syntax })
-        } else {
-            None
-        }
-    }
-    fn syntax(&self) -> &SyntaxToken { &self.syntax }
-}
-#[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct MacroKw {
-    pub(crate) syntax: SyntaxToken,
-}
-impl std::fmt::Display for MacroKw {
-    fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
-        std::fmt::Display::fmt(&self.syntax, f)
-    }
-}
-impl AstToken for MacroKw {
-    fn can_cast(kind: SyntaxKind) -> bool { kind == MACRO_KW }
-    fn cast(syntax: SyntaxToken) -> Option<Self> {
-        if Self::can_cast(syntax.kind()) {
-            Some(Self { syntax })
-        } else {
-            None
-        }
-    }
-    fn syntax(&self) -> &SyntaxToken { &self.syntax }
-}
-#[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct MatchKw {
-    pub(crate) syntax: SyntaxToken,
-}
-impl std::fmt::Display for MatchKw {
-    fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
-        std::fmt::Display::fmt(&self.syntax, f)
-    }
-}
-impl AstToken for MatchKw {
-    fn can_cast(kind: SyntaxKind) -> bool { kind == MATCH_KW }
-    fn cast(syntax: SyntaxToken) -> Option<Self> {
-        if Self::can_cast(syntax.kind()) {
-            Some(Self { syntax })
-        } else {
-            None
-        }
-    }
-    fn syntax(&self) -> &SyntaxToken { &self.syntax }
-}
-#[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct ModKw {
-    pub(crate) syntax: SyntaxToken,
-}
-impl std::fmt::Display for ModKw {
-    fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
-        std::fmt::Display::fmt(&self.syntax, f)
-    }
-}
-impl AstToken for ModKw {
-    fn can_cast(kind: SyntaxKind) -> bool { kind == MOD_KW }
-    fn cast(syntax: SyntaxToken) -> Option<Self> {
-        if Self::can_cast(syntax.kind()) {
-            Some(Self { syntax })
-        } else {
-            None
-        }
-    }
-    fn syntax(&self) -> &SyntaxToken { &self.syntax }
-}
-#[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct MoveKw {
-    pub(crate) syntax: SyntaxToken,
-}
-impl std::fmt::Display for MoveKw {
-    fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
-        std::fmt::Display::fmt(&self.syntax, f)
-    }
-}
-impl AstToken for MoveKw {
-    fn can_cast(kind: SyntaxKind) -> bool { kind == MOVE_KW }
-    fn cast(syntax: SyntaxToken) -> Option<Self> {
-        if Self::can_cast(syntax.kind()) {
-            Some(Self { syntax })
-        } else {
-            None
-        }
-    }
-    fn syntax(&self) -> &SyntaxToken { &self.syntax }
-}
-#[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct MutKw {
-    pub(crate) syntax: SyntaxToken,
-}
-impl std::fmt::Display for MutKw {
-    fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
-        std::fmt::Display::fmt(&self.syntax, f)
-    }
-}
-impl AstToken for MutKw {
-    fn can_cast(kind: SyntaxKind) -> bool { kind == MUT_KW }
-    fn cast(syntax: SyntaxToken) -> Option<Self> {
-        if Self::can_cast(syntax.kind()) {
-            Some(Self { syntax })
-        } else {
-            None
-        }
-    }
-    fn syntax(&self) -> &SyntaxToken { &self.syntax }
-}
-#[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct PubKw {
-    pub(crate) syntax: SyntaxToken,
-}
-impl std::fmt::Display for PubKw {
-    fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
-        std::fmt::Display::fmt(&self.syntax, f)
-    }
-}
-impl AstToken for PubKw {
-    fn can_cast(kind: SyntaxKind) -> bool { kind == PUB_KW }
-    fn cast(syntax: SyntaxToken) -> Option<Self> {
-        if Self::can_cast(syntax.kind()) {
-            Some(Self { syntax })
-        } else {
-            None
-        }
-    }
-    fn syntax(&self) -> &SyntaxToken { &self.syntax }
-}
-#[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct RefKw {
-    pub(crate) syntax: SyntaxToken,
-}
-impl std::fmt::Display for RefKw {
-    fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
-        std::fmt::Display::fmt(&self.syntax, f)
-    }
-}
-impl AstToken for RefKw {
-    fn can_cast(kind: SyntaxKind) -> bool { kind == REF_KW }
-    fn cast(syntax: SyntaxToken) -> Option<Self> {
-        if Self::can_cast(syntax.kind()) {
-            Some(Self { syntax })
-        } else {
-            None
-        }
-    }
-    fn syntax(&self) -> &SyntaxToken { &self.syntax }
-}
-#[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct ReturnKw {
-    pub(crate) syntax: SyntaxToken,
-}
-impl std::fmt::Display for ReturnKw {
-    fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
-        std::fmt::Display::fmt(&self.syntax, f)
-    }
-}
-impl AstToken for ReturnKw {
-    fn can_cast(kind: SyntaxKind) -> bool { kind == RETURN_KW }
-    fn cast(syntax: SyntaxToken) -> Option<Self> {
-        if Self::can_cast(syntax.kind()) {
-            Some(Self { syntax })
-        } else {
-            None
-        }
-    }
-    fn syntax(&self) -> &SyntaxToken { &self.syntax }
-}
-#[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct SelfKw {
-    pub(crate) syntax: SyntaxToken,
-}
-impl std::fmt::Display for SelfKw {
-    fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
-        std::fmt::Display::fmt(&self.syntax, f)
-    }
-}
-impl AstToken for SelfKw {
-    fn can_cast(kind: SyntaxKind) -> bool { kind == SELF_KW }
-    fn cast(syntax: SyntaxToken) -> Option<Self> {
-        if Self::can_cast(syntax.kind()) {
-            Some(Self { syntax })
-        } else {
-            None
-        }
-    }
-    fn syntax(&self) -> &SyntaxToken { &self.syntax }
-}
-#[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct StaticKw {
-    pub(crate) syntax: SyntaxToken,
-}
-impl std::fmt::Display for StaticKw {
-    fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
-        std::fmt::Display::fmt(&self.syntax, f)
-    }
-}
-impl AstToken for StaticKw {
-    fn can_cast(kind: SyntaxKind) -> bool { kind == STATIC_KW }
-    fn cast(syntax: SyntaxToken) -> Option<Self> {
-        if Self::can_cast(syntax.kind()) {
-            Some(Self { syntax })
-        } else {
-            None
-        }
-    }
-    fn syntax(&self) -> &SyntaxToken { &self.syntax }
-}
-#[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct StructKw {
-    pub(crate) syntax: SyntaxToken,
-}
-impl std::fmt::Display for StructKw {
-    fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
-        std::fmt::Display::fmt(&self.syntax, f)
-    }
-}
-impl AstToken for StructKw {
-    fn can_cast(kind: SyntaxKind) -> bool { kind == STRUCT_KW }
-    fn cast(syntax: SyntaxToken) -> Option<Self> {
-        if Self::can_cast(syntax.kind()) {
-            Some(Self { syntax })
-        } else {
-            None
-        }
-    }
-    fn syntax(&self) -> &SyntaxToken { &self.syntax }
-}
-#[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct SuperKw {
-    pub(crate) syntax: SyntaxToken,
-}
-impl std::fmt::Display for SuperKw {
-    fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
-        std::fmt::Display::fmt(&self.syntax, f)
-    }
-}
-impl AstToken for SuperKw {
-    fn can_cast(kind: SyntaxKind) -> bool { kind == SUPER_KW }
-    fn cast(syntax: SyntaxToken) -> Option<Self> {
-        if Self::can_cast(syntax.kind()) {
-            Some(Self { syntax })
-        } else {
-            None
-        }
-    }
-    fn syntax(&self) -> &SyntaxToken { &self.syntax }
-}
-#[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct TraitKw {
-    pub(crate) syntax: SyntaxToken,
-}
-impl std::fmt::Display for TraitKw {
-    fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
-        std::fmt::Display::fmt(&self.syntax, f)
-    }
-}
-impl AstToken for TraitKw {
-    fn can_cast(kind: SyntaxKind) -> bool { kind == TRAIT_KW }
-    fn cast(syntax: SyntaxToken) -> Option<Self> {
-        if Self::can_cast(syntax.kind()) {
-            Some(Self { syntax })
-        } else {
-            None
-        }
-    }
-    fn syntax(&self) -> &SyntaxToken { &self.syntax }
-}
-#[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct TrueKw {
-    pub(crate) syntax: SyntaxToken,
-}
-impl std::fmt::Display for TrueKw {
-    fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
-        std::fmt::Display::fmt(&self.syntax, f)
-    }
-}
-impl AstToken for TrueKw {
-    fn can_cast(kind: SyntaxKind) -> bool { kind == TRUE_KW }
-    fn cast(syntax: SyntaxToken) -> Option<Self> {
-        if Self::can_cast(syntax.kind()) {
-            Some(Self { syntax })
-        } else {
-            None
-        }
-    }
-    fn syntax(&self) -> &SyntaxToken { &self.syntax }
-}
-#[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct TryKw {
-    pub(crate) syntax: SyntaxToken,
-}
-impl std::fmt::Display for TryKw {
-    fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
-        std::fmt::Display::fmt(&self.syntax, f)
-    }
-}
-impl AstToken for TryKw {
-    fn can_cast(kind: SyntaxKind) -> bool { kind == TRY_KW }
-    fn cast(syntax: SyntaxToken) -> Option<Self> {
-        if Self::can_cast(syntax.kind()) {
-            Some(Self { syntax })
-        } else {
-            None
-        }
-    }
-    fn syntax(&self) -> &SyntaxToken { &self.syntax }
-}
-#[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct TypeKw {
-    pub(crate) syntax: SyntaxToken,
-}
-impl std::fmt::Display for TypeKw {
-    fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
-        std::fmt::Display::fmt(&self.syntax, f)
-    }
-}
-impl AstToken for TypeKw {
-    fn can_cast(kind: SyntaxKind) -> bool { kind == TYPE_KW }
-    fn cast(syntax: SyntaxToken) -> Option<Self> {
-        if Self::can_cast(syntax.kind()) {
-            Some(Self { syntax })
-        } else {
-            None
-        }
-    }
-    fn syntax(&self) -> &SyntaxToken { &self.syntax }
-}
-#[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct UnsafeKw {
-    pub(crate) syntax: SyntaxToken,
-}
-impl std::fmt::Display for UnsafeKw {
-    fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
-        std::fmt::Display::fmt(&self.syntax, f)
-    }
-}
-impl AstToken for UnsafeKw {
-    fn can_cast(kind: SyntaxKind) -> bool { kind == UNSAFE_KW }
-    fn cast(syntax: SyntaxToken) -> Option<Self> {
-        if Self::can_cast(syntax.kind()) {
-            Some(Self { syntax })
-        } else {
-            None
-        }
-    }
-    fn syntax(&self) -> &SyntaxToken { &self.syntax }
-}
-#[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct UseKw {
-    pub(crate) syntax: SyntaxToken,
-}
-impl std::fmt::Display for UseKw {
-    fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
-        std::fmt::Display::fmt(&self.syntax, f)
-    }
-}
-impl AstToken for UseKw {
-    fn can_cast(kind: SyntaxKind) -> bool { kind == USE_KW }
-    fn cast(syntax: SyntaxToken) -> Option<Self> {
-        if Self::can_cast(syntax.kind()) {
-            Some(Self { syntax })
-        } else {
-            None
-        }
-    }
-    fn syntax(&self) -> &SyntaxToken { &self.syntax }
-}
-#[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct WhereKw {
-    pub(crate) syntax: SyntaxToken,
-}
-impl std::fmt::Display for WhereKw {
-    fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
-        std::fmt::Display::fmt(&self.syntax, f)
-    }
-}
-impl AstToken for WhereKw {
-    fn can_cast(kind: SyntaxKind) -> bool { kind == WHERE_KW }
-    fn cast(syntax: SyntaxToken) -> Option<Self> {
-        if Self::can_cast(syntax.kind()) {
-            Some(Self { syntax })
-        } else {
-            None
-        }
-    }
-    fn syntax(&self) -> &SyntaxToken { &self.syntax }
-}
-#[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct WhileKw {
-    pub(crate) syntax: SyntaxToken,
-}
-impl std::fmt::Display for WhileKw {
-    fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
-        std::fmt::Display::fmt(&self.syntax, f)
-    }
-}
-impl AstToken for WhileKw {
-    fn can_cast(kind: SyntaxKind) -> bool { kind == WHILE_KW }
-    fn cast(syntax: SyntaxToken) -> Option<Self> {
-        if Self::can_cast(syntax.kind()) {
-            Some(Self { syntax })
-        } else {
-            None
-        }
-    }
-    fn syntax(&self) -> &SyntaxToken { &self.syntax }
-}
-#[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct AutoKw {
-    pub(crate) syntax: SyntaxToken,
-}
-impl std::fmt::Display for AutoKw {
-    fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
-        std::fmt::Display::fmt(&self.syntax, f)
-    }
-}
-impl AstToken for AutoKw {
-    fn can_cast(kind: SyntaxKind) -> bool { kind == AUTO_KW }
-    fn cast(syntax: SyntaxToken) -> Option<Self> {
-        if Self::can_cast(syntax.kind()) {
-            Some(Self { syntax })
-        } else {
-            None
-        }
-    }
-    fn syntax(&self) -> &SyntaxToken { &self.syntax }
-}
-#[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct DefaultKw {
-    pub(crate) syntax: SyntaxToken,
-}
-impl std::fmt::Display for DefaultKw {
-    fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
-        std::fmt::Display::fmt(&self.syntax, f)
-    }
-}
-impl AstToken for DefaultKw {
-    fn can_cast(kind: SyntaxKind) -> bool { kind == DEFAULT_KW }
-    fn cast(syntax: SyntaxToken) -> Option<Self> {
-        if Self::can_cast(syntax.kind()) {
-            Some(Self { syntax })
-        } else {
-            None
-        }
-    }
-    fn syntax(&self) -> &SyntaxToken { &self.syntax }
-}
-#[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct ExistentialKw {
-    pub(crate) syntax: SyntaxToken,
-}
-impl std::fmt::Display for ExistentialKw {
-    fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
-        std::fmt::Display::fmt(&self.syntax, f)
-    }
-}
-impl AstToken for ExistentialKw {
-    fn can_cast(kind: SyntaxKind) -> bool { kind == EXISTENTIAL_KW }
-    fn cast(syntax: SyntaxToken) -> Option<Self> {
-        if Self::can_cast(syntax.kind()) {
-            Some(Self { syntax })
-        } else {
-            None
-        }
-    }
-    fn syntax(&self) -> &SyntaxToken { &self.syntax }
-}
-#[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct UnionKw {
-    pub(crate) syntax: SyntaxToken,
-}
-impl std::fmt::Display for UnionKw {
-    fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
-        std::fmt::Display::fmt(&self.syntax, f)
-    }
-}
-impl AstToken for UnionKw {
-    fn can_cast(kind: SyntaxKind) -> bool { kind == UNION_KW }
-    fn cast(syntax: SyntaxToken) -> Option<Self> {
-        if Self::can_cast(syntax.kind()) {
-            Some(Self { syntax })
-        } else {
-            None
-        }
-    }
-    fn syntax(&self) -> &SyntaxToken { &self.syntax }
-}
-#[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct RawKw {
-    pub(crate) syntax: SyntaxToken,
-}
-impl std::fmt::Display for RawKw {
-    fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
-        std::fmt::Display::fmt(&self.syntax, f)
-    }
-}
-impl AstToken for RawKw {
-    fn can_cast(kind: SyntaxKind) -> bool { kind == RAW_KW }
-    fn cast(syntax: SyntaxToken) -> Option<Self> {
-        if Self::can_cast(syntax.kind()) {
-            Some(Self { syntax })
-        } else {
-            None
-        }
-    }
-    fn syntax(&self) -> &SyntaxToken { &self.syntax }
-}
-#[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct IntNumber {
-    pub(crate) syntax: SyntaxToken,
-}
-impl std::fmt::Display for IntNumber {
-    fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
-        std::fmt::Display::fmt(&self.syntax, f)
-    }
-}
-impl AstToken for IntNumber {
-    fn can_cast(kind: SyntaxKind) -> bool { kind == INT_NUMBER }
-    fn cast(syntax: SyntaxToken) -> Option<Self> {
-        if Self::can_cast(syntax.kind()) {
-            Some(Self { syntax })
-        } else {
-            None
-        }
-    }
-    fn syntax(&self) -> &SyntaxToken { &self.syntax }
-}
-#[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct FloatNumber {
-    pub(crate) syntax: SyntaxToken,
-}
-impl std::fmt::Display for FloatNumber {
-    fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
-        std::fmt::Display::fmt(&self.syntax, f)
-    }
-}
-impl AstToken for FloatNumber {
-    fn can_cast(kind: SyntaxKind) -> bool { kind == FLOAT_NUMBER }
-    fn cast(syntax: SyntaxToken) -> Option<Self> {
-        if Self::can_cast(syntax.kind()) {
-            Some(Self { syntax })
-        } else {
-            None
-        }
-    }
-    fn syntax(&self) -> &SyntaxToken { &self.syntax }
-}
-#[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct Char {
-    pub(crate) syntax: SyntaxToken,
-}
-impl std::fmt::Display for Char {
-    fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
-        std::fmt::Display::fmt(&self.syntax, f)
-    }
-}
-impl AstToken for Char {
-    fn can_cast(kind: SyntaxKind) -> bool { kind == CHAR }
-    fn cast(syntax: SyntaxToken) -> Option<Self> {
-        if Self::can_cast(syntax.kind()) {
-            Some(Self { syntax })
-        } else {
-            None
-        }
-    }
-    fn syntax(&self) -> &SyntaxToken { &self.syntax }
-}
-#[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct Byte {
-    pub(crate) syntax: SyntaxToken,
-}
-impl std::fmt::Display for Byte {
-    fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
-        std::fmt::Display::fmt(&self.syntax, f)
-    }
-}
-impl AstToken for Byte {
-    fn can_cast(kind: SyntaxKind) -> bool { kind == BYTE }
-    fn cast(syntax: SyntaxToken) -> Option<Self> {
-        if Self::can_cast(syntax.kind()) {
-            Some(Self { syntax })
-        } else {
-            None
-        }
-    }
-    fn syntax(&self) -> &SyntaxToken { &self.syntax }
-}
-#[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct String {
-    pub(crate) syntax: SyntaxToken,
-}
-impl std::fmt::Display for String {
-    fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
-        std::fmt::Display::fmt(&self.syntax, f)
-    }
-}
-impl AstToken for String {
-    fn can_cast(kind: SyntaxKind) -> bool { kind == STRING }
-    fn cast(syntax: SyntaxToken) -> Option<Self> {
-        if Self::can_cast(syntax.kind()) {
-            Some(Self { syntax })
-        } else {
-            None
-        }
-    }
-    fn syntax(&self) -> &SyntaxToken { &self.syntax }
-}
-#[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct RawString {
-    pub(crate) syntax: SyntaxToken,
-}
-impl std::fmt::Display for RawString {
-    fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
-        std::fmt::Display::fmt(&self.syntax, f)
-    }
-}
-impl AstToken for RawString {
-    fn can_cast(kind: SyntaxKind) -> bool { kind == RAW_STRING }
-    fn cast(syntax: SyntaxToken) -> Option<Self> {
-        if Self::can_cast(syntax.kind()) {
-            Some(Self { syntax })
-        } else {
-            None
-        }
-    }
-    fn syntax(&self) -> &SyntaxToken { &self.syntax }
-}
-#[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct ByteString {
-    pub(crate) syntax: SyntaxToken,
-}
-impl std::fmt::Display for ByteString {
-    fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
-        std::fmt::Display::fmt(&self.syntax, f)
-    }
-}
-impl AstToken for ByteString {
-    fn can_cast(kind: SyntaxKind) -> bool { kind == BYTE_STRING }
-    fn cast(syntax: SyntaxToken) -> Option<Self> {
-        if Self::can_cast(syntax.kind()) {
-            Some(Self { syntax })
-        } else {
-            None
-        }
-    }
-    fn syntax(&self) -> &SyntaxToken { &self.syntax }
-}
-#[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct RawByteString {
-    pub(crate) syntax: SyntaxToken,
-}
-impl std::fmt::Display for RawByteString {
-    fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
-        std::fmt::Display::fmt(&self.syntax, f)
-    }
-}
-impl AstToken for RawByteString {
-    fn can_cast(kind: SyntaxKind) -> bool { kind == RAW_BYTE_STRING }
-    fn cast(syntax: SyntaxToken) -> Option<Self> {
-        if Self::can_cast(syntax.kind()) {
-            Some(Self { syntax })
-        } else {
-            None
-        }
-    }
-    fn syntax(&self) -> &SyntaxToken { &self.syntax }
-}
-#[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct Error {
-    pub(crate) syntax: SyntaxToken,
-}
-impl std::fmt::Display for Error {
-    fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
-        std::fmt::Display::fmt(&self.syntax, f)
-    }
-}
-impl AstToken for Error {
-    fn can_cast(kind: SyntaxKind) -> bool { kind == ERROR }
-    fn cast(syntax: SyntaxToken) -> Option<Self> {
-        if Self::can_cast(syntax.kind()) {
-            Some(Self { syntax })
-        } else {
-            None
-        }
-    }
-    fn syntax(&self) -> &SyntaxToken { &self.syntax }
-}
-#[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct Ident {
-    pub(crate) syntax: SyntaxToken,
-}
-impl std::fmt::Display for Ident {
-    fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
-        std::fmt::Display::fmt(&self.syntax, f)
-    }
-}
-impl AstToken for Ident {
-    fn can_cast(kind: SyntaxKind) -> bool { kind == IDENT }
-    fn cast(syntax: SyntaxToken) -> Option<Self> {
-        if Self::can_cast(syntax.kind()) {
-            Some(Self { syntax })
-        } else {
-            None
-        }
-    }
-    fn syntax(&self) -> &SyntaxToken { &self.syntax }
-}
+
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub struct Whitespace {
     pub(crate) syntax: SyntaxToken,
@@ -2165,26 +26,7 @@ impl AstToken for Whitespace {
     }
     fn syntax(&self) -> &SyntaxToken { &self.syntax }
 }
-#[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct Lifetime {
-    pub(crate) syntax: SyntaxToken,
-}
-impl std::fmt::Display for Lifetime {
-    fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
-        std::fmt::Display::fmt(&self.syntax, f)
-    }
-}
-impl AstToken for Lifetime {
-    fn can_cast(kind: SyntaxKind) -> bool { kind == LIFETIME }
-    fn cast(syntax: SyntaxToken) -> Option<Self> {
-        if Self::can_cast(syntax.kind()) {
-            Some(Self { syntax })
-        } else {
-            None
-        }
-    }
-    fn syntax(&self) -> &SyntaxToken { &self.syntax }
-}
+
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub struct Comment {
     pub(crate) syntax: SyntaxToken,
@@ -2205,37 +47,18 @@ impl AstToken for Comment {
     }
     fn syntax(&self) -> &SyntaxToken { &self.syntax }
 }
+
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct Shebang {
-    pub(crate) syntax: SyntaxToken,
-}
-impl std::fmt::Display for Shebang {
-    fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
-        std::fmt::Display::fmt(&self.syntax, f)
-    }
-}
-impl AstToken for Shebang {
-    fn can_cast(kind: SyntaxKind) -> bool { kind == SHEBANG }
-    fn cast(syntax: SyntaxToken) -> Option<Self> {
-        if Self::can_cast(syntax.kind()) {
-            Some(Self { syntax })
-        } else {
-            None
-        }
-    }
-    fn syntax(&self) -> &SyntaxToken { &self.syntax }
-}
-#[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct LDollar {
+pub struct String {
     pub(crate) syntax: SyntaxToken,
 }
-impl std::fmt::Display for LDollar {
+impl std::fmt::Display for String {
     fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
         std::fmt::Display::fmt(&self.syntax, f)
     }
 }
-impl AstToken for LDollar {
-    fn can_cast(kind: SyntaxKind) -> bool { kind == L_DOLLAR }
+impl AstToken for String {
+    fn can_cast(kind: SyntaxKind) -> bool { kind == STRING }
     fn cast(syntax: SyntaxToken) -> Option<Self> {
         if Self::can_cast(syntax.kind()) {
             Some(Self { syntax })
@@ -2245,17 +68,18 @@ impl AstToken for LDollar {
     }
     fn syntax(&self) -> &SyntaxToken { &self.syntax }
 }
+
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct RDollar {
+pub struct RawString {
     pub(crate) syntax: SyntaxToken,
 }
-impl std::fmt::Display for RDollar {
+impl std::fmt::Display for RawString {
     fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
         std::fmt::Display::fmt(&self.syntax, f)
     }
 }
-impl AstToken for RDollar {
-    fn can_cast(kind: SyntaxKind) -> bool { kind == R_DOLLAR }
+impl AstToken for RawString {
+    fn can_cast(kind: SyntaxKind) -> bool { kind == RAW_STRING }
     fn cast(syntax: SyntaxToken) -> Option<Self> {
         if Self::can_cast(syntax.kind()) {
             Some(Self { syntax })
@@ -2265,544 +89,3 @@ impl AstToken for RDollar {
     }
     fn syntax(&self) -> &SyntaxToken { &self.syntax }
 }
-#[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub enum LeftDelimiter {
-    LParen(LParen),
-    LBrack(LBrack),
-    LCurly(LCurly),
-}
-impl From<LParen> for LeftDelimiter {
-    fn from(node: LParen) -> LeftDelimiter { LeftDelimiter::LParen(node) }
-}
-impl From<LBrack> for LeftDelimiter {
-    fn from(node: LBrack) -> LeftDelimiter { LeftDelimiter::LBrack(node) }
-}
-impl From<LCurly> for LeftDelimiter {
-    fn from(node: LCurly) -> LeftDelimiter { LeftDelimiter::LCurly(node) }
-}
-impl std::fmt::Display for LeftDelimiter {
-    fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
-        std::fmt::Display::fmt(self.syntax(), f)
-    }
-}
-impl AstToken for LeftDelimiter {
-    fn can_cast(kind: SyntaxKind) -> bool {
-        match kind {
-            L_PAREN | L_BRACK | L_CURLY => true,
-            _ => false,
-        }
-    }
-    fn cast(syntax: SyntaxToken) -> Option<Self> {
-        let res = match syntax.kind() {
-            L_PAREN => LeftDelimiter::LParen(LParen { syntax }),
-            L_BRACK => LeftDelimiter::LBrack(LBrack { syntax }),
-            L_CURLY => LeftDelimiter::LCurly(LCurly { syntax }),
-            _ => return None,
-        };
-        Some(res)
-    }
-    fn syntax(&self) -> &SyntaxToken {
-        match self {
-            LeftDelimiter::LParen(it) => &it.syntax,
-            LeftDelimiter::LBrack(it) => &it.syntax,
-            LeftDelimiter::LCurly(it) => &it.syntax,
-        }
-    }
-}
-#[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub enum RightDelimiter {
-    RParen(RParen),
-    RBrack(RBrack),
-    RCurly(RCurly),
-}
-impl From<RParen> for RightDelimiter {
-    fn from(node: RParen) -> RightDelimiter { RightDelimiter::RParen(node) }
-}
-impl From<RBrack> for RightDelimiter {
-    fn from(node: RBrack) -> RightDelimiter { RightDelimiter::RBrack(node) }
-}
-impl From<RCurly> for RightDelimiter {
-    fn from(node: RCurly) -> RightDelimiter { RightDelimiter::RCurly(node) }
-}
-impl std::fmt::Display for RightDelimiter {
-    fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
-        std::fmt::Display::fmt(self.syntax(), f)
-    }
-}
-impl AstToken for RightDelimiter {
-    fn can_cast(kind: SyntaxKind) -> bool {
-        match kind {
-            R_PAREN | R_BRACK | R_CURLY => true,
-            _ => false,
-        }
-    }
-    fn cast(syntax: SyntaxToken) -> Option<Self> {
-        let res = match syntax.kind() {
-            R_PAREN => RightDelimiter::RParen(RParen { syntax }),
-            R_BRACK => RightDelimiter::RBrack(RBrack { syntax }),
-            R_CURLY => RightDelimiter::RCurly(RCurly { syntax }),
-            _ => return None,
-        };
-        Some(res)
-    }
-    fn syntax(&self) -> &SyntaxToken {
-        match self {
-            RightDelimiter::RParen(it) => &it.syntax,
-            RightDelimiter::RBrack(it) => &it.syntax,
-            RightDelimiter::RCurly(it) => &it.syntax,
-        }
-    }
-}
-#[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub enum RangeSeparator {
-    Dotdot(Dotdot),
-    Dotdotdot(Dotdotdot),
-    Dotdoteq(Dotdoteq),
-}
-impl From<Dotdot> for RangeSeparator {
-    fn from(node: Dotdot) -> RangeSeparator { RangeSeparator::Dotdot(node) }
-}
-impl From<Dotdotdot> for RangeSeparator {
-    fn from(node: Dotdotdot) -> RangeSeparator { RangeSeparator::Dotdotdot(node) }
-}
-impl From<Dotdoteq> for RangeSeparator {
-    fn from(node: Dotdoteq) -> RangeSeparator { RangeSeparator::Dotdoteq(node) }
-}
-impl std::fmt::Display for RangeSeparator {
-    fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
-        std::fmt::Display::fmt(self.syntax(), f)
-    }
-}
-impl AstToken for RangeSeparator {
-    fn can_cast(kind: SyntaxKind) -> bool {
-        match kind {
-            DOTDOT | DOTDOTDOT | DOTDOTEQ => true,
-            _ => false,
-        }
-    }
-    fn cast(syntax: SyntaxToken) -> Option<Self> {
-        let res = match syntax.kind() {
-            DOTDOT => RangeSeparator::Dotdot(Dotdot { syntax }),
-            DOTDOTDOT => RangeSeparator::Dotdotdot(Dotdotdot { syntax }),
-            DOTDOTEQ => RangeSeparator::Dotdoteq(Dotdoteq { syntax }),
-            _ => return None,
-        };
-        Some(res)
-    }
-    fn syntax(&self) -> &SyntaxToken {
-        match self {
-            RangeSeparator::Dotdot(it) => &it.syntax,
-            RangeSeparator::Dotdotdot(it) => &it.syntax,
-            RangeSeparator::Dotdoteq(it) => &it.syntax,
-        }
-    }
-}
-#[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub enum BinOp {
-    Pipepipe(Pipepipe),
-    Ampamp(Ampamp),
-    Eqeq(Eqeq),
-    Neq(Neq),
-    Lteq(Lteq),
-    Gteq(Gteq),
-    LAngle(LAngle),
-    RAngle(RAngle),
-    Plus(Plus),
-    Star(Star),
-    Minus(Minus),
-    Slash(Slash),
-    Percent(Percent),
-    Shl(Shl),
-    Shr(Shr),
-    Caret(Caret),
-    Pipe(Pipe),
-    Amp(Amp),
-    Eq(Eq),
-    Pluseq(Pluseq),
-    Slasheq(Slasheq),
-    Stareq(Stareq),
-    Percenteq(Percenteq),
-    Shreq(Shreq),
-    Shleq(Shleq),
-    Minuseq(Minuseq),
-    Pipeeq(Pipeeq),
-    Ampeq(Ampeq),
-    Careteq(Careteq),
-}
-impl From<Pipepipe> for BinOp {
-    fn from(node: Pipepipe) -> BinOp { BinOp::Pipepipe(node) }
-}
-impl From<Ampamp> for BinOp {
-    fn from(node: Ampamp) -> BinOp { BinOp::Ampamp(node) }
-}
-impl From<Eqeq> for BinOp {
-    fn from(node: Eqeq) -> BinOp { BinOp::Eqeq(node) }
-}
-impl From<Neq> for BinOp {
-    fn from(node: Neq) -> BinOp { BinOp::Neq(node) }
-}
-impl From<Lteq> for BinOp {
-    fn from(node: Lteq) -> BinOp { BinOp::Lteq(node) }
-}
-impl From<Gteq> for BinOp {
-    fn from(node: Gteq) -> BinOp { BinOp::Gteq(node) }
-}
-impl From<LAngle> for BinOp {
-    fn from(node: LAngle) -> BinOp { BinOp::LAngle(node) }
-}
-impl From<RAngle> for BinOp {
-    fn from(node: RAngle) -> BinOp { BinOp::RAngle(node) }
-}
-impl From<Plus> for BinOp {
-    fn from(node: Plus) -> BinOp { BinOp::Plus(node) }
-}
-impl From<Star> for BinOp {
-    fn from(node: Star) -> BinOp { BinOp::Star(node) }
-}
-impl From<Minus> for BinOp {
-    fn from(node: Minus) -> BinOp { BinOp::Minus(node) }
-}
-impl From<Slash> for BinOp {
-    fn from(node: Slash) -> BinOp { BinOp::Slash(node) }
-}
-impl From<Percent> for BinOp {
-    fn from(node: Percent) -> BinOp { BinOp::Percent(node) }
-}
-impl From<Shl> for BinOp {
-    fn from(node: Shl) -> BinOp { BinOp::Shl(node) }
-}
-impl From<Shr> for BinOp {
-    fn from(node: Shr) -> BinOp { BinOp::Shr(node) }
-}
-impl From<Caret> for BinOp {
-    fn from(node: Caret) -> BinOp { BinOp::Caret(node) }
-}
-impl From<Pipe> for BinOp {
-    fn from(node: Pipe) -> BinOp { BinOp::Pipe(node) }
-}
-impl From<Amp> for BinOp {
-    fn from(node: Amp) -> BinOp { BinOp::Amp(node) }
-}
-impl From<Eq> for BinOp {
-    fn from(node: Eq) -> BinOp { BinOp::Eq(node) }
-}
-impl From<Pluseq> for BinOp {
-    fn from(node: Pluseq) -> BinOp { BinOp::Pluseq(node) }
-}
-impl From<Slasheq> for BinOp {
-    fn from(node: Slasheq) -> BinOp { BinOp::Slasheq(node) }
-}
-impl From<Stareq> for BinOp {
-    fn from(node: Stareq) -> BinOp { BinOp::Stareq(node) }
-}
-impl From<Percenteq> for BinOp {
-    fn from(node: Percenteq) -> BinOp { BinOp::Percenteq(node) }
-}
-impl From<Shreq> for BinOp {
-    fn from(node: Shreq) -> BinOp { BinOp::Shreq(node) }
-}
-impl From<Shleq> for BinOp {
-    fn from(node: Shleq) -> BinOp { BinOp::Shleq(node) }
-}
-impl From<Minuseq> for BinOp {
-    fn from(node: Minuseq) -> BinOp { BinOp::Minuseq(node) }
-}
-impl From<Pipeeq> for BinOp {
-    fn from(node: Pipeeq) -> BinOp { BinOp::Pipeeq(node) }
-}
-impl From<Ampeq> for BinOp {
-    fn from(node: Ampeq) -> BinOp { BinOp::Ampeq(node) }
-}
-impl From<Careteq> for BinOp {
-    fn from(node: Careteq) -> BinOp { BinOp::Careteq(node) }
-}
-impl std::fmt::Display for BinOp {
-    fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
-        std::fmt::Display::fmt(self.syntax(), f)
-    }
-}
-impl AstToken for BinOp {
-    fn can_cast(kind: SyntaxKind) -> bool {
-        match kind {
-            PIPEPIPE | AMPAMP | EQEQ | NEQ | LTEQ | GTEQ | L_ANGLE | R_ANGLE | PLUS | STAR
-            | MINUS | SLASH | PERCENT | SHL | SHR | CARET | PIPE | AMP | EQ | PLUSEQ | SLASHEQ
-            | STAREQ | PERCENTEQ | SHREQ | SHLEQ | MINUSEQ | PIPEEQ | AMPEQ | CARETEQ => true,
-            _ => false,
-        }
-    }
-    fn cast(syntax: SyntaxToken) -> Option<Self> {
-        let res = match syntax.kind() {
-            PIPEPIPE => BinOp::Pipepipe(Pipepipe { syntax }),
-            AMPAMP => BinOp::Ampamp(Ampamp { syntax }),
-            EQEQ => BinOp::Eqeq(Eqeq { syntax }),
-            NEQ => BinOp::Neq(Neq { syntax }),
-            LTEQ => BinOp::Lteq(Lteq { syntax }),
-            GTEQ => BinOp::Gteq(Gteq { syntax }),
-            L_ANGLE => BinOp::LAngle(LAngle { syntax }),
-            R_ANGLE => BinOp::RAngle(RAngle { syntax }),
-            PLUS => BinOp::Plus(Plus { syntax }),
-            STAR => BinOp::Star(Star { syntax }),
-            MINUS => BinOp::Minus(Minus { syntax }),
-            SLASH => BinOp::Slash(Slash { syntax }),
-            PERCENT => BinOp::Percent(Percent { syntax }),
-            SHL => BinOp::Shl(Shl { syntax }),
-            SHR => BinOp::Shr(Shr { syntax }),
-            CARET => BinOp::Caret(Caret { syntax }),
-            PIPE => BinOp::Pipe(Pipe { syntax }),
-            AMP => BinOp::Amp(Amp { syntax }),
-            EQ => BinOp::Eq(Eq { syntax }),
-            PLUSEQ => BinOp::Pluseq(Pluseq { syntax }),
-            SLASHEQ => BinOp::Slasheq(Slasheq { syntax }),
-            STAREQ => BinOp::Stareq(Stareq { syntax }),
-            PERCENTEQ => BinOp::Percenteq(Percenteq { syntax }),
-            SHREQ => BinOp::Shreq(Shreq { syntax }),
-            SHLEQ => BinOp::Shleq(Shleq { syntax }),
-            MINUSEQ => BinOp::Minuseq(Minuseq { syntax }),
-            PIPEEQ => BinOp::Pipeeq(Pipeeq { syntax }),
-            AMPEQ => BinOp::Ampeq(Ampeq { syntax }),
-            CARETEQ => BinOp::Careteq(Careteq { syntax }),
-            _ => return None,
-        };
-        Some(res)
-    }
-    fn syntax(&self) -> &SyntaxToken {
-        match self {
-            BinOp::Pipepipe(it) => &it.syntax,
-            BinOp::Ampamp(it) => &it.syntax,
-            BinOp::Eqeq(it) => &it.syntax,
-            BinOp::Neq(it) => &it.syntax,
-            BinOp::Lteq(it) => &it.syntax,
-            BinOp::Gteq(it) => &it.syntax,
-            BinOp::LAngle(it) => &it.syntax,
-            BinOp::RAngle(it) => &it.syntax,
-            BinOp::Plus(it) => &it.syntax,
-            BinOp::Star(it) => &it.syntax,
-            BinOp::Minus(it) => &it.syntax,
-            BinOp::Slash(it) => &it.syntax,
-            BinOp::Percent(it) => &it.syntax,
-            BinOp::Shl(it) => &it.syntax,
-            BinOp::Shr(it) => &it.syntax,
-            BinOp::Caret(it) => &it.syntax,
-            BinOp::Pipe(it) => &it.syntax,
-            BinOp::Amp(it) => &it.syntax,
-            BinOp::Eq(it) => &it.syntax,
-            BinOp::Pluseq(it) => &it.syntax,
-            BinOp::Slasheq(it) => &it.syntax,
-            BinOp::Stareq(it) => &it.syntax,
-            BinOp::Percenteq(it) => &it.syntax,
-            BinOp::Shreq(it) => &it.syntax,
-            BinOp::Shleq(it) => &it.syntax,
-            BinOp::Minuseq(it) => &it.syntax,
-            BinOp::Pipeeq(it) => &it.syntax,
-            BinOp::Ampeq(it) => &it.syntax,
-            BinOp::Careteq(it) => &it.syntax,
-        }
-    }
-}
-#[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub enum PrefixOp {
-    Minus(Minus),
-    Excl(Excl),
-    Star(Star),
-}
-impl From<Minus> for PrefixOp {
-    fn from(node: Minus) -> PrefixOp { PrefixOp::Minus(node) }
-}
-impl From<Excl> for PrefixOp {
-    fn from(node: Excl) -> PrefixOp { PrefixOp::Excl(node) }
-}
-impl From<Star> for PrefixOp {
-    fn from(node: Star) -> PrefixOp { PrefixOp::Star(node) }
-}
-impl std::fmt::Display for PrefixOp {
-    fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
-        std::fmt::Display::fmt(self.syntax(), f)
-    }
-}
-impl AstToken for PrefixOp {
-    fn can_cast(kind: SyntaxKind) -> bool {
-        match kind {
-            MINUS | EXCL | STAR => true,
-            _ => false,
-        }
-    }
-    fn cast(syntax: SyntaxToken) -> Option<Self> {
-        let res = match syntax.kind() {
-            MINUS => PrefixOp::Minus(Minus { syntax }),
-            EXCL => PrefixOp::Excl(Excl { syntax }),
-            STAR => PrefixOp::Star(Star { syntax }),
-            _ => return None,
-        };
-        Some(res)
-    }
-    fn syntax(&self) -> &SyntaxToken {
-        match self {
-            PrefixOp::Minus(it) => &it.syntax,
-            PrefixOp::Excl(it) => &it.syntax,
-            PrefixOp::Star(it) => &it.syntax,
-        }
-    }
-}
-#[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub enum RangeOp {
-    Dotdot(Dotdot),
-    Dotdoteq(Dotdoteq),
-}
-impl From<Dotdot> for RangeOp {
-    fn from(node: Dotdot) -> RangeOp { RangeOp::Dotdot(node) }
-}
-impl From<Dotdoteq> for RangeOp {
-    fn from(node: Dotdoteq) -> RangeOp { RangeOp::Dotdoteq(node) }
-}
-impl std::fmt::Display for RangeOp {
-    fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
-        std::fmt::Display::fmt(self.syntax(), f)
-    }
-}
-impl AstToken for RangeOp {
-    fn can_cast(kind: SyntaxKind) -> bool {
-        match kind {
-            DOTDOT | DOTDOTEQ => true,
-            _ => false,
-        }
-    }
-    fn cast(syntax: SyntaxToken) -> Option<Self> {
-        let res = match syntax.kind() {
-            DOTDOT => RangeOp::Dotdot(Dotdot { syntax }),
-            DOTDOTEQ => RangeOp::Dotdoteq(Dotdoteq { syntax }),
-            _ => return None,
-        };
-        Some(res)
-    }
-    fn syntax(&self) -> &SyntaxToken {
-        match self {
-            RangeOp::Dotdot(it) => &it.syntax,
-            RangeOp::Dotdoteq(it) => &it.syntax,
-        }
-    }
-}
-#[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub enum LiteralToken {
-    IntNumber(IntNumber),
-    FloatNumber(FloatNumber),
-    String(String),
-    RawString(RawString),
-    TrueKw(TrueKw),
-    FalseKw(FalseKw),
-    ByteString(ByteString),
-    RawByteString(RawByteString),
-    Char(Char),
-    Byte(Byte),
-}
-impl From<IntNumber> for LiteralToken {
-    fn from(node: IntNumber) -> LiteralToken { LiteralToken::IntNumber(node) }
-}
-impl From<FloatNumber> for LiteralToken {
-    fn from(node: FloatNumber) -> LiteralToken { LiteralToken::FloatNumber(node) }
-}
-impl From<String> for LiteralToken {
-    fn from(node: String) -> LiteralToken { LiteralToken::String(node) }
-}
-impl From<RawString> for LiteralToken {
-    fn from(node: RawString) -> LiteralToken { LiteralToken::RawString(node) }
-}
-impl From<TrueKw> for LiteralToken {
-    fn from(node: TrueKw) -> LiteralToken { LiteralToken::TrueKw(node) }
-}
-impl From<FalseKw> for LiteralToken {
-    fn from(node: FalseKw) -> LiteralToken { LiteralToken::FalseKw(node) }
-}
-impl From<ByteString> for LiteralToken {
-    fn from(node: ByteString) -> LiteralToken { LiteralToken::ByteString(node) }
-}
-impl From<RawByteString> for LiteralToken {
-    fn from(node: RawByteString) -> LiteralToken { LiteralToken::RawByteString(node) }
-}
-impl From<Char> for LiteralToken {
-    fn from(node: Char) -> LiteralToken { LiteralToken::Char(node) }
-}
-impl From<Byte> for LiteralToken {
-    fn from(node: Byte) -> LiteralToken { LiteralToken::Byte(node) }
-}
-impl std::fmt::Display for LiteralToken {
-    fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
-        std::fmt::Display::fmt(self.syntax(), f)
-    }
-}
-impl AstToken for LiteralToken {
-    fn can_cast(kind: SyntaxKind) -> bool {
-        match kind {
-            INT_NUMBER | FLOAT_NUMBER | STRING | RAW_STRING | TRUE_KW | FALSE_KW | BYTE_STRING
-            | RAW_BYTE_STRING | CHAR | BYTE => true,
-            _ => false,
-        }
-    }
-    fn cast(syntax: SyntaxToken) -> Option<Self> {
-        let res = match syntax.kind() {
-            INT_NUMBER => LiteralToken::IntNumber(IntNumber { syntax }),
-            FLOAT_NUMBER => LiteralToken::FloatNumber(FloatNumber { syntax }),
-            STRING => LiteralToken::String(String { syntax }),
-            RAW_STRING => LiteralToken::RawString(RawString { syntax }),
-            TRUE_KW => LiteralToken::TrueKw(TrueKw { syntax }),
-            FALSE_KW => LiteralToken::FalseKw(FalseKw { syntax }),
-            BYTE_STRING => LiteralToken::ByteString(ByteString { syntax }),
-            RAW_BYTE_STRING => LiteralToken::RawByteString(RawByteString { syntax }),
-            CHAR => LiteralToken::Char(Char { syntax }),
-            BYTE => LiteralToken::Byte(Byte { syntax }),
-            _ => return None,
-        };
-        Some(res)
-    }
-    fn syntax(&self) -> &SyntaxToken {
-        match self {
-            LiteralToken::IntNumber(it) => &it.syntax,
-            LiteralToken::FloatNumber(it) => &it.syntax,
-            LiteralToken::String(it) => &it.syntax,
-            LiteralToken::RawString(it) => &it.syntax,
-            LiteralToken::TrueKw(it) => &it.syntax,
-            LiteralToken::FalseKw(it) => &it.syntax,
-            LiteralToken::ByteString(it) => &it.syntax,
-            LiteralToken::RawByteString(it) => &it.syntax,
-            LiteralToken::Char(it) => &it.syntax,
-            LiteralToken::Byte(it) => &it.syntax,
-        }
-    }
-}
-#[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub enum NameRefToken {
-    Ident(Ident),
-    IntNumber(IntNumber),
-}
-impl From<Ident> for NameRefToken {
-    fn from(node: Ident) -> NameRefToken { NameRefToken::Ident(node) }
-}
-impl From<IntNumber> for NameRefToken {
-    fn from(node: IntNumber) -> NameRefToken { NameRefToken::IntNumber(node) }
-}
-impl std::fmt::Display for NameRefToken {
-    fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
-        std::fmt::Display::fmt(self.syntax(), f)
-    }
-}
-impl AstToken for NameRefToken {
-    fn can_cast(kind: SyntaxKind) -> bool {
-        match kind {
-            IDENT | INT_NUMBER => true,
-            _ => false,
-        }
-    }
-    fn cast(syntax: SyntaxToken) -> Option<Self> {
-        let res = match syntax.kind() {
-            IDENT => NameRefToken::Ident(Ident { syntax }),
-            INT_NUMBER => NameRefToken::IntNumber(IntNumber { syntax }),
-            _ => return None,
-        };
-        Some(res)
-    }
-    fn syntax(&self) -> &SyntaxToken {
-        match self {
-            NameRefToken::Ident(it) => &it.syntax,
-            NameRefToken::IntNumber(it) => &it.syntax,
-        }
-    }
-}
diff --git a/crates/ra_syntax/src/ast/make.rs b/crates/ra_syntax/src/ast/make.rs
index f39559e9e..0f4a50be4 100644
--- a/crates/ra_syntax/src/ast/make.rs
+++ b/crates/ra_syntax/src/ast/make.rs
@@ -100,6 +100,9 @@ pub fn expr_empty_block() -> ast::Expr {
 pub fn expr_unimplemented() -> ast::Expr {
     expr_from_text("unimplemented!()")
 }
+pub fn expr_todo() -> ast::Expr {
+    expr_from_text("todo!()")
+}
 pub fn expr_path(path: ast::Path) -> ast::Expr {
     expr_from_text(&path.to_string())
 }
diff --git a/crates/ra_syntax/src/ast/traits.rs b/crates/ra_syntax/src/ast/traits.rs
index 870e83804..bfc05e08b 100644
--- a/crates/ra_syntax/src/ast/traits.rs
+++ b/crates/ra_syntax/src/ast/traits.rs
@@ -1,83 +1,77 @@
 //! Various traits that are implemented by ast nodes.
 //!
 //! The implementations are usually trivial, and live in generated.rs
-
-use itertools::Itertools;
+use stdx::SepBy;
 
 use crate::{
-    ast::{self, child_opt, children, support, AstChildren, AstNode, AstToken},
+    ast::{self, support, AstChildren, AstNode, AstToken},
     syntax_node::SyntaxElementChildren,
+    SyntaxToken, T,
 };
 
 pub trait TypeAscriptionOwner: AstNode {
     fn ascribed_type(&self) -> Option<ast::TypeRef> {
-        child_opt(self)
+        support::child(self.syntax())
     }
 }
 
 pub trait NameOwner: AstNode {
     fn name(&self) -> Option<ast::Name> {
-        child_opt(self)
+        support::child(self.syntax())
     }
 }
 
 pub trait VisibilityOwner: AstNode {
     fn visibility(&self) -> Option<ast::Visibility> {
-        child_opt(self)
+        support::child(self.syntax())
     }
 }
 
 pub trait LoopBodyOwner: AstNode {
     fn loop_body(&self) -> Option<ast::BlockExpr> {
-        child_opt(self)
+        support::child(self.syntax())
     }
 
     fn label(&self) -> Option<ast::Label> {
-        child_opt(self)
+        support::child(self.syntax())
     }
 }
 
 pub trait ArgListOwner: AstNode {
     fn arg_list(&self) -> Option<ast::ArgList> {
-        child_opt(self)
-    }
-}
-
-pub trait FnDefOwner: AstNode {
-    fn functions(&self) -> AstChildren<ast::FnDef> {
-        children(self)
+        support::child(self.syntax())
     }
 }
 
 pub trait ModuleItemOwner: AstNode {
     fn items(&self) -> AstChildren<ast::ModuleItem> {
-        children(self)
+        support::children(self.syntax())
     }
 }
 
 pub trait TypeParamsOwner: AstNode {
     fn type_param_list(&self) -> Option<ast::TypeParamList> {
-        child_opt(self)
+        support::child(self.syntax())
     }
 
     fn where_clause(&self) -> Option<ast::WhereClause> {
-        child_opt(self)
+        support::child(self.syntax())
     }
 }
 
 pub trait TypeBoundsOwner: AstNode {
     fn type_bound_list(&self) -> Option<ast::TypeBoundList> {
-        child_opt(self)
+        support::child(self.syntax())
     }
 
-    fn colon(&self) -> Option<ast::Colon> {
-        support::token(self.syntax())
+    fn colon_token(&self) -> Option<SyntaxToken> {
+        support::token(self.syntax(), T![:])
     }
 }
 
 pub trait AttrsOwner: AstNode {
     fn attrs(&self) -> AstChildren<ast::Attr> {
-        children(self)
+        support::children(self.syntax())
     }
     fn has_atom_attr(&self, atom: &str) -> bool {
         self.attrs().filter_map(|x| x.as_simple_atom()).any(|x| x == atom)
@@ -122,7 +116,8 @@ pub trait DocCommentsOwner: AstNode {
                 // of a line in markdown.
                 line[pos..end].to_owned()
             })
-            .join("\n");
+            .sep_by("\n")
+            .to_string();
 
         if has_comments {
             Some(docs)
diff --git a/crates/ra_syntax/src/lib.rs b/crates/ra_syntax/src/lib.rs
index f0e16dc2b..a796e78b1 100644
--- a/crates/ra_syntax/src/lib.rs
+++ b/crates/ra_syntax/src/lib.rs
@@ -19,6 +19,11 @@
 //! [RFC]: <https://github.com/rust-lang/rfcs/pull/2256>
 //! [Swift]: <https://github.com/apple/swift/blob/13d593df6f359d0cb2fc81cfaac273297c539455/lib/Syntax/README.md>
 
+#[allow(unused)]
+macro_rules! eprintln {
+    ($($tt:tt)*) => { stdx::eprintln!($($tt)*) };
+}
+
 mod syntax_node;
 mod syntax_error;
 mod parsing;
diff --git a/crates/ra_syntax/src/parsing/lexer.rs b/crates/ra_syntax/src/parsing/lexer.rs
index d1baaa607..67c1f1b48 100644
--- a/crates/ra_syntax/src/parsing/lexer.rs
+++ b/crates/ra_syntax/src/parsing/lexer.rs
@@ -4,7 +4,7 @@
 use crate::{
     SyntaxError,
     SyntaxKind::{self, *},
-    TextRange, TextUnit,
+    TextRange, TextUnit, T,
 };
 
 /// A token of Rust source.
@@ -115,21 +115,20 @@ fn rustc_token_kind_to_syntax_kind(
     // being `u16` that come from `rowan::SyntaxKind`.
 
     let syntax_kind = {
-        use rustc_lexer::TokenKind as TK;
         match rustc_token_kind {
-            TK::LineComment => COMMENT,
+            rustc_lexer::TokenKind::LineComment => COMMENT,
 
-            TK::BlockComment { terminated: true } => COMMENT,
-            TK::BlockComment { terminated: false } => {
+            rustc_lexer::TokenKind::BlockComment { terminated: true } => COMMENT,
+            rustc_lexer::TokenKind::BlockComment { terminated: false } => {
                 return (
                     COMMENT,
                     Some("Missing trailing `*/` symbols to terminate the block comment"),
                 );
             }
 
-            TK::Whitespace => WHITESPACE,
+            rustc_lexer::TokenKind::Whitespace => WHITESPACE,
 
-            TK::Ident => {
+            rustc_lexer::TokenKind::Ident => {
                 if token_text == "_" {
                     UNDERSCORE
                 } else {
@@ -137,42 +136,42 @@ fn rustc_token_kind_to_syntax_kind(
                 }
             }
 
-            TK::RawIdent => IDENT,
-            TK::Literal { kind, .. } => return match_literal_kind(&kind),
+            rustc_lexer::TokenKind::RawIdent => IDENT,
+            rustc_lexer::TokenKind::Literal { kind, .. } => return match_literal_kind(&kind),
 
-            TK::Lifetime { starts_with_number: false } => LIFETIME,
-            TK::Lifetime { starts_with_number: true } => {
+            rustc_lexer::TokenKind::Lifetime { starts_with_number: false } => LIFETIME,
+            rustc_lexer::TokenKind::Lifetime { starts_with_number: true } => {
                 return (LIFETIME, Some("Lifetime name cannot start with a number"))
             }
 
-            TK::Semi => SEMI,
-            TK::Comma => COMMA,
-            TK::Dot => DOT,
-            TK::OpenParen => L_PAREN,
-            TK::CloseParen => R_PAREN,
-            TK::OpenBrace => L_CURLY,
-            TK::CloseBrace => R_CURLY,
-            TK::OpenBracket => L_BRACK,
-            TK::CloseBracket => R_BRACK,
-            TK::At => AT,
-            TK::Pound => POUND,
-            TK::Tilde => TILDE,
-            TK::Question => QUESTION,
-            TK::Colon => COLON,
-            TK::Dollar => DOLLAR,
-            TK::Eq => EQ,
-            TK::Not => EXCL,
-            TK::Lt => L_ANGLE,
-            TK::Gt => R_ANGLE,
-            TK::Minus => MINUS,
-            TK::And => AMP,
-            TK::Or => PIPE,
-            TK::Plus => PLUS,
-            TK::Star => STAR,
-            TK::Slash => SLASH,
-            TK::Caret => CARET,
-            TK::Percent => PERCENT,
-            TK::Unknown => ERROR,
+            rustc_lexer::TokenKind::Semi => T![;],
+            rustc_lexer::TokenKind::Comma => T![,],
+            rustc_lexer::TokenKind::Dot => T![.],
+            rustc_lexer::TokenKind::OpenParen => T!['('],
+            rustc_lexer::TokenKind::CloseParen => T![')'],
+            rustc_lexer::TokenKind::OpenBrace => T!['{'],
+            rustc_lexer::TokenKind::CloseBrace => T!['}'],
+            rustc_lexer::TokenKind::OpenBracket => T!['['],
+            rustc_lexer::TokenKind::CloseBracket => T![']'],
+            rustc_lexer::TokenKind::At => T![@],
+            rustc_lexer::TokenKind::Pound => T![#],
+            rustc_lexer::TokenKind::Tilde => T![~],
+            rustc_lexer::TokenKind::Question => T![?],
+            rustc_lexer::TokenKind::Colon => T![:],
+            rustc_lexer::TokenKind::Dollar => T![$],
+            rustc_lexer::TokenKind::Eq => T![=],
+            rustc_lexer::TokenKind::Not => T![!],
+            rustc_lexer::TokenKind::Lt => T![<],
+            rustc_lexer::TokenKind::Gt => T![>],
+            rustc_lexer::TokenKind::Minus => T![-],
+            rustc_lexer::TokenKind::And => T![&],
+            rustc_lexer::TokenKind::Or => T![|],
+            rustc_lexer::TokenKind::Plus => T![+],
+            rustc_lexer::TokenKind::Star => T![*],
+            rustc_lexer::TokenKind::Slash => T![/],
+            rustc_lexer::TokenKind::Caret => T![^],
+            rustc_lexer::TokenKind::Percent => T![%],
+            rustc_lexer::TokenKind::Unknown => ERROR,
         }
     };
 
diff --git a/crates/ra_syntax/src/ptr.rs b/crates/ra_syntax/src/ptr.rs
index db6230aab..bc48a2e71 100644
--- a/crates/ra_syntax/src/ptr.rs
+++ b/crates/ra_syntax/src/ptr.rs
@@ -10,7 +10,7 @@ use crate::{AstNode, SyntaxKind, SyntaxNode, TextRange};
 
 /// A pointer to a syntax node inside a file. It can be used to remember a
 /// specific node across reparses of the same file.
-#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
+#[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub struct SyntaxNodePtr {
     pub(crate) range: TextRange,
     kind: SyntaxKind,
@@ -21,7 +21,7 @@ impl SyntaxNodePtr {
         SyntaxNodePtr { range: node.text_range(), kind: node.kind() }
     }
 
-    pub fn to_node(self, root: &SyntaxNode) -> SyntaxNode {
+    pub fn to_node(&self, root: &SyntaxNode) -> SyntaxNode {
         assert!(root.parent().is_none());
         successors(Some(root.clone()), |node| {
             node.children().find(|it| self.range.is_subrange(&it.text_range()))
@@ -30,11 +30,11 @@ impl SyntaxNodePtr {
         .unwrap_or_else(|| panic!("can't resolve local ptr to SyntaxNode: {:?}", self))
     }
 
-    pub fn range(self) -> TextRange {
+    pub fn range(&self) -> TextRange {
         self.range
     }
 
-    pub fn kind(self) -> SyntaxKind {
+    pub fn kind(&self) -> SyntaxKind {
         self.kind
     }
 
@@ -53,10 +53,9 @@ pub struct AstPtr<N: AstNode> {
     _ty: PhantomData<fn() -> N>,
 }
 
-impl<N: AstNode> Copy for AstPtr<N> {}
 impl<N: AstNode> Clone for AstPtr<N> {
     fn clone(&self) -> AstPtr<N> {
-        *self
+        AstPtr { raw: self.raw.clone(), _ty: PhantomData }
     }
 }
 
@@ -79,13 +78,13 @@ impl<N: AstNode> AstPtr<N> {
         AstPtr { raw: SyntaxNodePtr::new(node.syntax()), _ty: PhantomData }
     }
 
-    pub fn to_node(self, root: &SyntaxNode) -> N {
+    pub fn to_node(&self, root: &SyntaxNode) -> N {
         let syntax_node = self.raw.to_node(root);
         N::cast(syntax_node).unwrap()
     }
 
-    pub fn syntax_node_ptr(self) -> SyntaxNodePtr {
-        self.raw
+    pub fn syntax_node_ptr(&self) -> SyntaxNodePtr {
+        self.raw.clone()
     }
 
     pub fn cast<U: AstNode>(self) -> Option<AstPtr<U>> {
diff --git a/crates/ra_syntax/test_data/lexer/err/0049_unstarted_raw_string_with_ascii.txt b/crates/ra_syntax/test_data/lexer/err/0049_unstarted_raw_string_with_ascii.txt
index 782dfd974..290e0bd7c 100644
--- a/crates/ra_syntax/test_data/lexer/err/0049_unstarted_raw_string_with_ascii.txt
+++ b/crates/ra_syntax/test_data/lexer/err/0049_unstarted_raw_string_with_ascii.txt
@@ -6,5 +6,5 @@ WHITESPACE 1 " "
 IDENT 1 "a"
 WHITESPACE 1 " "
 IDENT 5 "quote"
-EXCL 1 "!"
+BANG 1 "!"
 > error[0; 4) token("r## ") msg(Missing `"` symbol after `#` symbols to begin the raw string literal)
diff --git a/crates/ra_syntax/test_data/lexer/err/0050_unstarted_raw_byte_string_with_ascii.txt b/crates/ra_syntax/test_data/lexer/err/0050_unstarted_raw_byte_string_with_ascii.txt
index 59c40cd65..5c492906d 100644
--- a/crates/ra_syntax/test_data/lexer/err/0050_unstarted_raw_byte_string_with_ascii.txt
+++ b/crates/ra_syntax/test_data/lexer/err/0050_unstarted_raw_byte_string_with_ascii.txt
@@ -6,5 +6,5 @@ WHITESPACE 1 " "
 IDENT 1 "a"
 WHITESPACE 1 " "
 IDENT 5 "quote"
-EXCL 1 "!"
+BANG 1 "!"
 > error[0; 5) token("br## ") msg(Missing `"` symbol after `#` symbols to begin the raw byte string literal)
diff --git a/crates/ra_syntax/test_data/lexer/ok/0005_symbols.txt b/crates/ra_syntax/test_data/lexer/ok/0005_symbols.txt
index 469a90e42..2049c2f1d 100644
--- a/crates/ra_syntax/test_data/lexer/ok/0005_symbols.txt
+++ b/crates/ra_syntax/test_data/lexer/ok/0005_symbols.txt
@@ -1,4 +1,4 @@
-SEMI 1 ";"
+SEMICOLON 1 ";"
 WHITESPACE 1 " "
 COMMA 1 ","
 WHITESPACE 1 " "
@@ -65,9 +65,9 @@ WHITESPACE 1 " "
 EQ 1 "="
 R_ANGLE 1 ">"
 WHITESPACE 1 "\n"
-EXCL 1 "!"
+BANG 1 "!"
 WHITESPACE 1 " "
-EXCL 1 "!"
+BANG 1 "!"
 EQ 1 "="
 WHITESPACE 1 "\n"
 MINUS 1 "-"
diff --git a/crates/ra_syntax/test_data/parser/err/0002_duplicate_shebang.rast b/crates/ra_syntax/test_data/parser/err/0002_duplicate_shebang.rast
index 002680583..831bbf83f 100644
--- a/crates/ra_syntax/test_data/parser/err/0002_duplicate_shebang.rast
+++ b/crates/ra_syntax/test_data/parser/err/0002_duplicate_shebang.rast
@@ -3,7 +3,7 @@ SOURCE_FILE@[0; 42)
   WHITESPACE@[20; 21) "\n"
   ATTR@[21; 23)
     POUND@[21; 22) "#"
-    EXCL@[22; 23) "!"
+    BANG@[22; 23) "!"
   ERROR@[23; 24)
     SLASH@[23; 24) "/"
   USE_ITEM@[24; 28)
@@ -29,11 +29,11 @@ SOURCE_FILE@[0; 42)
 error [23; 23): expected `[`
 error [23; 23): expected an item
 error [27; 27): expected one of `*`, `::`, `{`, `self`, `super` or an identifier
-error [28; 28): expected SEMI
-error [31; 31): expected EXCL
+error [28; 28): expected SEMICOLON
+error [31; 31): expected BANG
 error [31; 31): expected `{`, `[`, `(`
-error [31; 31): expected SEMI
+error [31; 31): expected SEMICOLON
 error [31; 31): expected an item
-error [35; 35): expected EXCL
+error [35; 35): expected BANG
 error [41; 41): expected `{`, `[`, `(`
-error [41; 41): expected SEMI
+error [41; 41): expected SEMICOLON
diff --git a/crates/ra_syntax/test_data/parser/err/0003_C++_semicolon.rast b/crates/ra_syntax/test_data/parser/err/0003_C++_semicolon.rast
index 8039a8913..6b89e7572 100644
--- a/crates/ra_syntax/test_data/parser/err/0003_C++_semicolon.rast
+++ b/crates/ra_syntax/test_data/parser/err/0003_C++_semicolon.rast
@@ -34,6 +34,6 @@ SOURCE_FILE@[0; 40)
       WHITESPACE@[37; 38) "\n"
       R_CURLY@[38; 39) "}"
   ERROR@[39; 40)
-    SEMI@[39; 40) ";"
+    SEMICOLON@[39; 40) ";"
 error [39; 39): expected item, found `;`
 consider removing this semicolon
diff --git a/crates/ra_syntax/test_data/parser/err/0004_use_path_bad_segment.rast b/crates/ra_syntax/test_data/parser/err/0004_use_path_bad_segment.rast
index 5f6e10986..1d27d4cd6 100644
--- a/crates/ra_syntax/test_data/parser/err/0004_use_path_bad_segment.rast
+++ b/crates/ra_syntax/test_data/parser/err/0004_use_path_bad_segment.rast
@@ -8,9 +8,9 @@ SOURCE_FILE@[0; 12)
           PATH_SEGMENT@[4; 7)
             NAME_REF@[4; 7)
               IDENT@[4; 7) "foo"
-        COLONCOLON@[7; 9) "::"
+        COLON2@[7; 9) "::"
         PATH_SEGMENT@[9; 11)
           ERROR@[9; 11)
             INT_NUMBER@[9; 11) "92"
-    SEMI@[11; 12) ";"
+    SEMICOLON@[11; 12) ";"
 error [9; 9): expected identifier
diff --git a/crates/ra_syntax/test_data/parser/err/0007_stray_curly_in_file.rast b/crates/ra_syntax/test_data/parser/err/0007_stray_curly_in_file.rast
index 1978f30fa..c24e478f3 100644
--- a/crates/ra_syntax/test_data/parser/err/0007_stray_curly_in_file.rast
+++ b/crates/ra_syntax/test_data/parser/err/0007_stray_curly_in_file.rast
@@ -7,7 +7,7 @@ SOURCE_FILE@[0; 31)
     WHITESPACE@[9; 10) " "
     NAME@[10; 11)
       IDENT@[10; 11) "S"
-    SEMI@[11; 12) ";"
+    SEMICOLON@[11; 12) ";"
   WHITESPACE@[12; 14) "\n\n"
   ERROR@[14; 15)
     R_CURLY@[14; 15) "}"
diff --git a/crates/ra_syntax/test_data/parser/err/0008_item_block_recovery.rast b/crates/ra_syntax/test_data/parser/err/0008_item_block_recovery.rast
index 98248227d..9f5041ae4 100644
--- a/crates/ra_syntax/test_data/parser/err/0008_item_block_recovery.rast
+++ b/crates/ra_syntax/test_data/parser/err/0008_item_block_recovery.rast
@@ -76,6 +76,6 @@ SOURCE_FILE@[0; 95)
         WHITESPACE@[92; 93) "\n"
         R_CURLY@[93; 94) "}"
   WHITESPACE@[94; 95) "\n"
-error [17; 17): expected EXCL
-error [19; 19): expected SEMI
+error [17; 17): expected BANG
+error [19; 19): expected SEMICOLON
 error [20; 20): expected an item
diff --git a/crates/ra_syntax/test_data/parser/err/0009_broken_struct_type_parameter.rast b/crates/ra_syntax/test_data/parser/err/0009_broken_struct_type_parameter.rast
index ca508ac7c..7ed80477d 100644
--- a/crates/ra_syntax/test_data/parser/err/0009_broken_struct_type_parameter.rast
+++ b/crates/ra_syntax/test_data/parser/err/0009_broken_struct_type_parameter.rast
@@ -43,7 +43,7 @@ SOURCE_FILE@[0; 43)
     WHITESPACE@[39; 40) " "
     NAME@[40; 41)
       IDENT@[40; 41) "T"
-    SEMI@[41; 42) ";"
+    SEMICOLON@[41; 42) ";"
   WHITESPACE@[42; 43) "\n"
 error [9; 9): expected type parameter
 error [11; 11): expected COMMA
@@ -53,6 +53,6 @@ error [12; 12): expected an item
 error [14; 14): expected an item
 error [15; 15): expected an item
 error [17; 17): expected an item
-error [24; 24): expected SEMI
+error [24; 24): expected SEMICOLON
 error [24; 24): expected expression
-error [25; 25): expected SEMI
+error [25; 25): expected SEMICOLON
diff --git a/crates/ra_syntax/test_data/parser/err/0010_unsafe_lambda_block.rast b/crates/ra_syntax/test_data/parser/err/0010_unsafe_lambda_block.rast
index 0ffbd25aa..5559c3297 100644
--- a/crates/ra_syntax/test_data/parser/err/0010_unsafe_lambda_block.rast
+++ b/crates/ra_syntax/test_data/parser/err/0010_unsafe_lambda_block.rast
@@ -37,9 +37,9 @@ SOURCE_FILE@[0; 42)
                 R_PAREN@[35; 36) ")"
               WHITESPACE@[36; 37) " "
               R_CURLY@[37; 38) "}"
-          SEMI@[38; 39) ";"
+          SEMICOLON@[38; 39) ";"
         WHITESPACE@[39; 40) "\n"
         R_CURLY@[40; 41) "}"
   WHITESPACE@[41; 42) "\n"
 error [24; 24): expected `{`
-error [24; 24): expected SEMI
+error [24; 24): expected SEMICOLON
diff --git a/crates/ra_syntax/test_data/parser/err/0011_extern_struct.rast b/crates/ra_syntax/test_data/parser/err/0011_extern_struct.rast
index 900894dcf..99c212fd6 100644
--- a/crates/ra_syntax/test_data/parser/err/0011_extern_struct.rast
+++ b/crates/ra_syntax/test_data/parser/err/0011_extern_struct.rast
@@ -8,6 +8,6 @@ SOURCE_FILE@[0; 19)
     WHITESPACE@[13; 14) " "
     NAME@[14; 17)
       IDENT@[14; 17) "Foo"
-    SEMI@[17; 18) ";"
+    SEMICOLON@[17; 18) ";"
   WHITESPACE@[18; 19) "\n"
 error [6; 6): expected existential, fn, trait or impl
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 12ebc2a3a..0a3c0313d 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
@@ -106,7 +106,7 @@ SOURCE_FILE@[0; 389)
         WHITESPACE@[122; 123)
         LITERAL@[123; 124)
           INT_NUMBER@[123; 124) "0"
-        SEMI@[124; 125)
+        SEMICOLON@[124; 125)
       WHITESPACE@[125; 130)
       LET_STMT@[130; 389)
         LET_KW@[130; 133)
@@ -226,7 +226,7 @@ SOURCE_FILE@[0; 389)
             err: `expected pattern`
             PARAM@[236; 237)
               ERROR@[236; 237)
-                EXCL@[236; 237)
+                BANG@[236; 237)
                 err: `expected COMMA`
             PARAM@[237; 242)
               BIND_PAT@[237; 242)
@@ -272,7 +272,7 @@ SOURCE_FILE@[0; 389)
                   err: `expected pattern`
             PARAM@[283; 284)
               ERROR@[283; 284)
-                SEMI@[283; 284)
+                SEMICOLON@[283; 284)
                 err: `expected COMMA`
             WHITESPACE@[284; 297)
             err: `expected pattern`
@@ -327,7 +327,7 @@ SOURCE_FILE@[0; 389)
                 err: `expected pattern`
             PARAM@[346; 347)
               ERROR@[346; 347)
-                SEMI@[346; 347)
+                SEMICOLON@[346; 347)
                 err: `expected COMMA`
             WHITESPACE@[347; 360)
             err: `expected pattern`
@@ -371,7 +371,7 @@ SOURCE_FILE@[0; 389)
                 err: `expected pattern`
             PARAM@[385; 386)
               ERROR@[385; 386)
-                SEMI@[385; 386)
+                SEMICOLON@[385; 386)
                 err: `expected COMMA`
             WHITESPACE@[386; 387)
             err: `expected pattern`
diff --git a/crates/ra_syntax/test_data/parser/err/0013_invalid_type.rast b/crates/ra_syntax/test_data/parser/err/0013_invalid_type.rast
index 7a934cf66..cb570dc1c 100644
--- a/crates/ra_syntax/test_data/parser/err/0013_invalid_type.rast
+++ b/crates/ra_syntax/test_data/parser/err/0013_invalid_type.rast
@@ -67,7 +67,7 @@ SOURCE_FILE@[0; 86)
   ERROR@[82; 83)
     R_PAREN@[82; 83) ")"
   ERROR@[83; 84)
-    SEMI@[83; 84) ";"
+    SEMICOLON@[83; 84) ";"
   WHITESPACE@[84; 86) "\n\n"
 error [67; 67): expected type
 error [68; 68): expected COMMA
@@ -80,7 +80,7 @@ error [68; 68): expected COMMA
 error [72; 72): expected COMMA
 error [72; 72): expected a type
 error [72; 72): expected R_PAREN
-error [72; 72): expected SEMI
+error [72; 72): expected SEMICOLON
 error [72; 72): expected an item
 error [73; 73): expected an item
 error [79; 79): expected an item
diff --git a/crates/ra_syntax/test_data/parser/err/0016_missing_semi.rast b/crates/ra_syntax/test_data/parser/err/0016_missing_semi.rast
index 6343580e0..aca5a3ada 100644
--- a/crates/ra_syntax/test_data/parser/err/0016_missing_semi.rast
+++ b/crates/ra_syntax/test_data/parser/err/0016_missing_semi.rast
@@ -37,8 +37,8 @@ SOURCE_FILE@[0; 56)
             WHITESPACE@[49; 50) " "
             LITERAL@[50; 52)
               INT_NUMBER@[50; 52) "92"
-          SEMI@[52; 53) ";"
+          SEMICOLON@[52; 53) ";"
         WHITESPACE@[53; 54) "\n"
         R_CURLY@[54; 55) "}"
   WHITESPACE@[55; 56) "\n"
-error [38; 38): expected SEMI
+error [38; 38): expected SEMICOLON
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 59480e999..f9f4b9bc2 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
@@ -34,7 +34,7 @@ SOURCE_FILE@[0; 47)
           WHITESPACE@[32; 33) " "
           LITERAL@[33; 35)
             INT_NUMBER@[33; 35) "92"
-          SEMI@[35; 36) ";"
+          SEMICOLON@[35; 36) ";"
         WHITESPACE@[36; 41) "\n    "
         BIN_EXPR@[41; 44)
           LITERAL@[41; 42)
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 4b13a7236..9a8f76673 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
@@ -60,7 +60,7 @@ SOURCE_FILE@[0; 183)
                 ARG_LIST@[82; 84)
                   L_PAREN@[82; 83) "("
                   R_PAREN@[83; 84) ")"
-              SEMI@[84; 85) ";"
+              SEMICOLON@[84; 85) ";"
             WHITESPACE@[85; 94) "\n        "
             METHOD_CALL_EXPR@[94; 155)
               FIELD_EXPR@[94; 105)
@@ -107,7 +107,7 @@ SOURCE_FILE@[0; 183)
                           PATH_SEGMENT@[146; 149)
                             NAME_REF@[146; 149)
                               IDENT@[146; 149) "vec"
-                        EXCL@[149; 150) "!"
+                        BANG@[149; 150) "!"
                         TOKEN_TREE@[150; 152)
                           L_BRACK@[150; 151) "["
                           R_BRACK@[151; 152) "]"
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 97e91a94f..e283091e1 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
@@ -32,7 +32,7 @@ SOURCE_FILE@[0; 139)
           WHITESPACE@[38; 39) " "
           LITERAL@[39; 40)
             INT_NUMBER@[39; 40) "1"
-          SEMI@[40; 41) ";"
+          SEMICOLON@[40; 41) ";"
         WHITESPACE@[41; 46) "\n    "
         LET_STMT@[46; 49)
           LET_KW@[46; 49) "let"
@@ -48,7 +48,7 @@ SOURCE_FILE@[0; 139)
           WHITESPACE@[63; 64) " "
           LITERAL@[64; 66)
             INT_NUMBER@[64; 66) "92"
-          SEMI@[66; 67) ";"
+          SEMICOLON@[66; 67) ";"
         WHITESPACE@[67; 72) "\n    "
         LET_STMT@[72; 75)
           LET_KW@[72; 75) "let"
@@ -96,12 +96,12 @@ SOURCE_FILE@[0; 139)
         R_CURLY@[137; 138) "}"
   WHITESPACE@[138; 139) "\n"
 error [24; 24): expected expression
-error [24; 24): expected SEMI
+error [24; 24): expected SEMICOLON
 error [49; 49): expected pattern
-error [49; 49): expected SEMI
+error [49; 49): expected SEMICOLON
 error [75; 75): expected pattern
-error [75; 75): expected SEMI
+error [75; 75): expected SEMICOLON
 error [98; 98): expected pattern
-error [98; 98): expected SEMI
+error [98; 98): expected SEMICOLON
 error [124; 124): expected pattern
-error [124; 124): expected SEMI
+error [124; 124): expected SEMICOLON
diff --git a/crates/ra_syntax/test_data/parser/err/0022_bad_exprs.rast b/crates/ra_syntax/test_data/parser/err/0022_bad_exprs.rast
index 9f50c85e5..465749f95 100644
--- a/crates/ra_syntax/test_data/parser/err/0022_bad_exprs.rast
+++ b/crates/ra_syntax/test_data/parser/err/0022_bad_exprs.rast
@@ -150,34 +150,34 @@ SOURCE_FILE@[0; 112)
   WHITESPACE@[111; 112) "\n"
 error [16; 16): expected expression
 error [17; 17): expected R_BRACK
-error [17; 17): expected SEMI
+error [17; 17): expected SEMICOLON
 error [17; 17): expected expression
-error [18; 18): expected SEMI
+error [18; 18): expected SEMICOLON
 error [25; 25): expected a name
 error [26; 26): expected `;`, `{`, or `(`
 error [30; 30): expected pattern
-error [31; 31): expected SEMI
+error [31; 31): expected SEMICOLON
 error [53; 53): expected expression
-error [54; 54): expected SEMI
+error [54; 54): expected SEMICOLON
 error [54; 54): expected expression
-error [55; 55): expected SEMI
+error [55; 55): expected SEMICOLON
 error [60; 60): expected type
 error [60; 60): expected `{`
 error [60; 60): expected expression
-error [61; 61): expected SEMI
+error [61; 61): expected SEMICOLON
 error [65; 65): expected pattern
-error [65; 65): expected SEMI
+error [65; 65): expected SEMICOLON
 error [65; 65): expected expression
 error [92; 92): expected expression
-error [93; 93): expected SEMI
+error [93; 93): expected SEMICOLON
 error [93; 93): expected expression
-error [94; 94): expected SEMI
+error [94; 94): expected SEMICOLON
 error [95; 95): expected expression
-error [96; 96): expected SEMI
+error [96; 96): expected SEMICOLON
 error [96; 96): expected expression
-error [97; 97): expected SEMI
+error [97; 97): expected SEMICOLON
 error [103; 103): expected a name
 error [104; 104): expected `{`
 error [108; 108): expected pattern
-error [108; 108): expected SEMI
+error [108; 108): expected SEMICOLON
 error [108; 108): expected expression
diff --git a/crates/ra_syntax/test_data/parser/err/0023_mismatched_paren.rast b/crates/ra_syntax/test_data/parser/err/0023_mismatched_paren.rast
index 775e4b0da..97abe9510 100644
--- a/crates/ra_syntax/test_data/parser/err/0023_mismatched_paren.rast
+++ b/crates/ra_syntax/test_data/parser/err/0023_mismatched_paren.rast
@@ -17,7 +17,7 @@ SOURCE_FILE@[0; 94)
             PATH_SEGMENT@[16; 19)
               NAME_REF@[16; 19)
                 IDENT@[16; 19) "foo"
-          EXCL@[19; 20) "!"
+          BANG@[19; 20) "!"
           WHITESPACE@[20; 21) " "
           TOKEN_TREE@[21; 49)
             L_PAREN@[21; 22) "("
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 c5c8a29ba..a3cf3e60a 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
@@ -144,7 +144,7 @@ SOURCE_FILE@[0; 240)
         EXPR_STMT@[121; 123)
           ERROR@[121; 122)
             R_ANGLE@[121; 122) ">"
-          SEMI@[122; 123) ";"
+          SEMICOLON@[122; 123) ";"
         WHITESPACE@[123; 128) "\n    "
         LET_STMT@[128; 141)
           LET_KW@[128; 131) "let"
@@ -219,7 +219,7 @@ SOURCE_FILE@[0; 240)
                   R_PAREN@[177; 178) ")"
               R_ANGLE@[178; 179) ">"
               ERROR@[179; 180)
-                SEMI@[179; 180) ";"
+                SEMICOLON@[179; 180) ";"
         WHITESPACE@[180; 185) "\n    "
         LET_STMT@[185; 235)
           LET_KW@[185; 188) "let"
@@ -286,24 +286,24 @@ SOURCE_FILE@[0; 240)
         EXPR_STMT@[235; 237)
           ERROR@[235; 236)
             R_ANGLE@[235; 236) ">"
-          SEMI@[236; 237) ";"
+          SEMICOLON@[236; 237) ";"
         WHITESPACE@[237; 238) "\n"
         R_CURLY@[238; 239) "}"
   WHITESPACE@[239; 240) "\n"
 error [88; 88): expected COMMA
 error [88; 88): expected R_ANGLE
-error [121; 121): expected SEMI
+error [121; 121): expected SEMICOLON
 error [121; 121): expected expression
 error [140; 140): expected type
 error [141; 141): expected R_PAREN
 error [141; 141): expected COMMA
 error [141; 141): expected R_ANGLE
-error [141; 141): expected SEMI
-error [146; 146): expected SEMI
+error [141; 141): expected SEMICOLON
+error [146; 146): expected SEMICOLON
 error [146; 146): expected expression
-error [147; 147): expected SEMI
+error [147; 147): expected SEMICOLON
 error [148; 148): expected expression
-error [149; 149): expected SEMI
+error [149; 149): expected SEMICOLON
 error [154; 154): expected pattern
 error [155; 155): expected IN_KW
 error [155; 155): expected expression
@@ -314,8 +314,8 @@ error [179; 179): expected expression
 error [180; 180): expected COMMA
 error [180; 180): expected expression
 error [180; 180): expected R_PAREN
-error [180; 180): expected SEMI
+error [180; 180): expected SEMICOLON
 error [215; 215): expected COMMA
 error [215; 215): expected R_ANGLE
-error [235; 235): expected SEMI
+error [235; 235): expected SEMICOLON
 error [235; 235): expected expression
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 ca7f2d255..2b37ce94d 100644
--- a/crates/ra_syntax/test_data/parser/err/0025_nope.rast
+++ b/crates/ra_syntax/test_data/parser/err/0025_nope.rast
@@ -78,7 +78,7 @@ SOURCE_FILE@[0; 575)
           WHITESPACE@[183; 184) " "
           LITERAL@[184; 185)
             INT_NUMBER@[184; 185) "1"
-          SEMI@[185; 186) ";"
+          SEMICOLON@[185; 186) ";"
         WHITESPACE@[186; 191) "\n    "
         ENUM_DEF@[191; 223)
           ENUM_KW@[191; 195) "enum"
@@ -185,7 +185,7 @@ SOURCE_FILE@[0; 575)
           WHITESPACE@[507; 508) " "
           ERROR@[508; 509)
             UNDERSCORE@[508; 509) "_"
-          SEMI@[509; 510) ";"
+          SEMICOLON@[509; 510) ";"
         WHITESPACE@[510; 511) " "
         COMMENT@[511; 572) "//~ ERROR: expected e ..."
         WHITESPACE@[572; 573) "\n"
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 522a0d0e0..00d9fd511 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
@@ -27,7 +27,7 @@ SOURCE_FILE@[0; 350)
               WHITESPACE@[30; 39) "\n        "
               ATTR@[39; 83)
                 POUND@[39; 40) "#"
-                EXCL@[40; 41) "!"
+                BANG@[40; 41) "!"
                 L_BRACK@[41; 42) "["
                 PATH@[42; 45)
                   PATH_SEGMENT@[42; 45)
@@ -42,7 +42,7 @@ SOURCE_FILE@[0; 350)
               COMMENT@[92; 122) "//! Nor are ModuleDoc ..."
               WHITESPACE@[122; 127) "\n    "
               R_CURLY@[127; 128) "}"
-          SEMI@[128; 129) ";"
+          SEMICOLON@[128; 129) ";"
         WHITESPACE@[129; 134) "\n    "
         EXPR_STMT@[134; 257)
           IF_EXPR@[134; 257)
@@ -58,7 +58,7 @@ SOURCE_FILE@[0; 350)
                 WHITESPACE@[143; 152) "\n        "
                 ATTR@[152; 171)
                   POUND@[152; 153) "#"
-                  EXCL@[153; 154) "!"
+                  BANG@[153; 154) "!"
                   L_BRACK@[154; 155) "["
                   PATH@[155; 158)
                     PATH_SEGMENT@[155; 158)
@@ -72,7 +72,7 @@ SOURCE_FILE@[0; 350)
                 WHITESPACE@[171; 180) "\n        "
                 ATTR@[180; 212)
                   POUND@[180; 181) "#"
-                  EXCL@[181; 182) "!"
+                  BANG@[181; 182) "!"
                   L_BRACK@[182; 183) "["
                   PATH@[183; 186)
                     PATH_SEGMENT@[183; 186)
@@ -101,7 +101,7 @@ SOURCE_FILE@[0; 350)
               WHITESPACE@[274; 283) "\n        "
               ATTR@[283; 302)
                 POUND@[283; 284) "#"
-                EXCL@[284; 285) "!"
+                BANG@[284; 285) "!"
                 L_BRACK@[285; 286) "["
                 PATH@[286; 289)
                   PATH_SEGMENT@[286; 289)
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 c36e2f770..b80101e60 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
@@ -38,7 +38,7 @@ SOURCE_FILE@[0; 293)
                 ATTR@[51; 52)
                   POUND@[51; 52) "#"
                 ERROR@[52; 53)
-                  EXCL@[52; 53) "!"
+                  BANG@[52; 53) "!"
                 ARRAY_EXPR@[53; 78)
                   L_BRACK@[53; 54) "["
                   CALL_EXPR@[54; 77)
@@ -104,7 +104,7 @@ SOURCE_FILE@[0; 293)
                 ATTR@[160; 161)
                   POUND@[160; 161) "#"
                 ERROR@[161; 162)
-                  EXCL@[161; 162) "!"
+                  BANG@[161; 162) "!"
                 ARRAY_EXPR@[162; 179)
                   L_BRACK@[162; 163) "["
                   CALL_EXPR@[163; 178)
@@ -149,7 +149,7 @@ SOURCE_FILE@[0; 293)
               ATTR@[231; 232)
                 POUND@[231; 232) "#"
               ERROR@[232; 233)
-                EXCL@[232; 233) "!"
+                BANG@[232; 233) "!"
               ARRAY_EXPR@[233; 250)
                 L_BRACK@[233; 234) "["
                 CALL_EXPR@[234; 249)
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 2c91b6841..2ab9ee56f 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
@@ -34,7 +34,7 @@ SOURCE_FILE@[0; 91)
             TUPLE_EXPR@[32; 34)
               L_PAREN@[32; 33) "("
               R_PAREN@[33; 34) ")"
-          SEMI@[34; 35) ";"
+          SEMICOLON@[34; 35) ";"
         WHITESPACE@[35; 40) "\n    "
         LET_STMT@[40; 51)
           LET_KW@[40; 43) "let"
@@ -58,7 +58,7 @@ SOURCE_FILE@[0; 91)
             TUPLE_EXPR@[56; 58)
               L_PAREN@[56; 57) "("
               R_PAREN@[57; 58) ")"
-          SEMI@[58; 59) ";"
+          SEMICOLON@[58; 59) ";"
         WHITESPACE@[59; 64) "\n    "
         LET_STMT@[64; 79)
           LET_KW@[64; 67) "let"
@@ -84,13 +84,13 @@ SOURCE_FILE@[0; 91)
             TUPLE_EXPR@[84; 86)
               L_PAREN@[84; 85) "("
               R_PAREN@[85; 86) ")"
-          SEMI@[86; 87) ";"
+          SEMICOLON@[86; 87) ";"
         WHITESPACE@[87; 88) "\n"
         R_CURLY@[88; 89) "}"
   WHITESPACE@[89; 91) "\n\n"
 error [24; 24): expected a name
-error [27; 27): expected SEMI
+error [27; 27): expected SEMICOLON
 error [48; 48): expected a name
-error [51; 51): expected SEMI
+error [51; 51): expected SEMICOLON
 error [76; 76): expected a name
-error [79; 79): expected SEMI
+error [79; 79): expected SEMICOLON
diff --git a/crates/ra_syntax/test_data/parser/err/0035_use_recover.rast b/crates/ra_syntax/test_data/parser/err/0035_use_recover.rast
index 8cb4ea796..f255b0a6b 100644
--- a/crates/ra_syntax/test_data/parser/err/0035_use_recover.rast
+++ b/crates/ra_syntax/test_data/parser/err/0035_use_recover.rast
@@ -8,11 +8,11 @@ SOURCE_FILE@[0; 48)
           PATH_SEGMENT@[4; 7)
             NAME_REF@[4; 7)
               IDENT@[4; 7) "foo"
-        COLONCOLON@[7; 9) "::"
+        COLON2@[7; 9) "::"
         PATH_SEGMENT@[9; 12)
           NAME_REF@[9; 12)
             IDENT@[9; 12) "bar"
-    SEMI@[12; 13) ";"
+    SEMICOLON@[12; 13) ";"
   WHITESPACE@[13; 14) "\n"
   USE_ITEM@[14; 17)
     USE_KW@[14; 17) "use"
@@ -25,11 +25,11 @@ SOURCE_FILE@[0; 48)
         PATH@[22; 27)
           PATH_SEGMENT@[22; 27)
             CRATE_KW@[22; 27) "crate"
-        COLONCOLON@[27; 29) "::"
+        COLON2@[27; 29) "::"
         PATH_SEGMENT@[29; 32)
           NAME_REF@[29; 32)
             IDENT@[29; 32) "baz"
-    SEMI@[32; 33) ";"
+    SEMICOLON@[32; 33) ";"
   WHITESPACE@[33; 34) "\n"
   USE_ITEM@[34; 37)
     USE_KW@[34; 37) "use"
@@ -49,6 +49,6 @@ SOURCE_FILE@[0; 48)
         R_CURLY@[46; 47) "}"
   WHITESPACE@[47; 48) "\n"
 error [17; 17): expected one of `*`, `::`, `{`, `self`, `super` or an identifier
-error [17; 17): expected SEMI
+error [17; 17): expected SEMICOLON
 error [37; 37): expected one of `*`, `::`, `{`, `self`, `super` or an identifier
-error [37; 37): expected SEMI
+error [37; 37): expected SEMICOLON
diff --git a/crates/ra_syntax/test_data/parser/err/0036_partial_use.rast b/crates/ra_syntax/test_data/parser/err/0036_partial_use.rast
index f5490fbe8..1f2b4f6d9 100644
--- a/crates/ra_syntax/test_data/parser/err/0036_partial_use.rast
+++ b/crates/ra_syntax/test_data/parser/err/0036_partial_use.rast
@@ -7,7 +7,7 @@ SOURCE_FILE@[0; 37)
         PATH_SEGMENT@[4; 7)
           NAME_REF@[4; 7)
             IDENT@[4; 7) "std"
-      COLONCOLON@[7; 9) "::"
+      COLON2@[7; 9) "::"
       USE_TREE_LIST@[9; 36)
         L_CURLY@[9; 10) "{"
         USE_TREE@[10; 22)
@@ -16,12 +16,12 @@ SOURCE_FILE@[0; 37)
               PATH_SEGMENT@[10; 15)
                 NAME_REF@[10; 15)
                   IDENT@[10; 15) "error"
-            COLONCOLON@[15; 17) "::"
+            COLON2@[15; 17) "::"
             PATH_SEGMENT@[17; 22)
               NAME_REF@[17; 22)
                 IDENT@[17; 22) "Error"
         ERROR@[22; 23)
-          SEMI@[22; 23) ";"
+          SEMICOLON@[22; 23) ";"
         WHITESPACE@[23; 24) "\n"
         ERROR@[24; 27)
           USE_KW@[24; 27) "use"
@@ -32,12 +32,12 @@ SOURCE_FILE@[0; 37)
               PATH_SEGMENT@[28; 31)
                 NAME_REF@[28; 31)
                   IDENT@[28; 31) "std"
-            COLONCOLON@[31; 33) "::"
+            COLON2@[31; 33) "::"
             PATH_SEGMENT@[33; 35)
               NAME_REF@[33; 35)
                 IDENT@[33; 35) "io"
         ERROR@[35; 36)
-          SEMI@[35; 36) ";"
+          SEMICOLON@[35; 36) ";"
   WHITESPACE@[36; 37) "\n"
 error [22; 22): expected COMMA
 error [22; 22): expected one of `*`, `::`, `{`, `self`, `super` or an identifier
@@ -48,4 +48,4 @@ error [35; 35): expected COMMA
 error [35; 35): expected one of `*`, `::`, `{`, `self`, `super` or an identifier
 error [36; 36): expected COMMA
 error [36; 36): expected R_CURLY
-error [36; 36): expected SEMI
+error [36; 36): expected SEMICOLON
diff --git a/crates/ra_syntax/test_data/parser/err/0037_visibility_in_traits.rast b/crates/ra_syntax/test_data/parser/err/0037_visibility_in_traits.rast
index d8622d45f..5319bf936 100644
--- a/crates/ra_syntax/test_data/parser/err/0037_visibility_in_traits.rast
+++ b/crates/ra_syntax/test_data/parser/err/0037_visibility_in_traits.rast
@@ -65,7 +65,7 @@ SOURCE_FILE@[0; 118)
         TUPLE_TYPE@[78; 80)
           L_PAREN@[78; 79) "("
           R_PAREN@[79; 80) ")"
-        SEMI@[80; 81) ";"
+        SEMICOLON@[80; 81) ";"
       WHITESPACE@[81; 86) "\n    "
       CONST_DEF@[86; 115)
         VISIBILITY@[86; 96)
@@ -90,7 +90,7 @@ SOURCE_FILE@[0; 118)
         WHITESPACE@[111; 112) " "
         LITERAL@[112; 114)
           INT_NUMBER@[112; 114) "92"
-        SEMI@[114; 115) ";"
+        SEMICOLON@[114; 115) ";"
       WHITESPACE@[115; 116) "\n"
       R_CURLY@[116; 117) "}"
   WHITESPACE@[117; 118) "\n"
diff --git a/crates/ra_syntax/test_data/parser/err/0038_endless_inclusive_range.rast b/crates/ra_syntax/test_data/parser/err/0038_endless_inclusive_range.rast
index 3810b9680..9efdf7ef4 100644
--- a/crates/ra_syntax/test_data/parser/err/0038_endless_inclusive_range.rast
+++ b/crates/ra_syntax/test_data/parser/err/0038_endless_inclusive_range.rast
@@ -16,13 +16,13 @@ SOURCE_FILE@[0; 33)
           RANGE_EXPR@[16; 20)
             LITERAL@[16; 17)
               INT_NUMBER@[16; 17) "0"
-            DOTDOTEQ@[17; 20) "..="
-          SEMI@[20; 21) ";"
+            DOT2EQ@[17; 20) "..="
+          SEMICOLON@[20; 21) ";"
         WHITESPACE@[21; 26) "\n    "
         EXPR_STMT@[26; 30)
           RANGE_EXPR@[26; 29)
-            DOTDOTEQ@[26; 29) "..="
-          SEMI@[29; 30) ";"
+            DOT2EQ@[26; 29) "..="
+          SEMICOLON@[29; 30) ";"
         WHITESPACE@[30; 31) "\n"
         R_CURLY@[31; 32) "}"
   WHITESPACE@[32; 33) "\n"
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 4a2f0a696..edf9c3247 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
@@ -64,7 +64,7 @@ SOURCE_FILE@[0; 83)
             NAME_REF@[67; 70)
               IDENT@[67; 70) "max"
             TYPE_ARG_LIST@[70; 77)
-              COLONCOLON@[70; 72) "::"
+              COLON2@[70; 72) "::"
               L_ANGLE@[72; 73) "<"
               TYPE_ARG@[73; 76)
                 PATH_TYPE@[73; 76)
@@ -76,7 +76,7 @@ SOURCE_FILE@[0; 83)
             ARG_LIST@[77; 79)
               L_PAREN@[77; 78) "("
               R_PAREN@[78; 79) ")"
-          SEMI@[79; 80) ";"
+          SEMICOLON@[79; 80) ";"
         WHITESPACE@[80; 81) "\n"
         R_CURLY@[81; 82) "}"
   WHITESPACE@[82; 83) "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/err/0001_array_type_missing_semi.rast b/crates/ra_syntax/test_data/parser/inline/err/0001_array_type_missing_semi.rast
index 530533b71..9d807c84f 100644
--- a/crates/ra_syntax/test_data/parser/inline/err/0001_array_type_missing_semi.rast
+++ b/crates/ra_syntax/test_data/parser/inline/err/0001_array_type_missing_semi.rast
@@ -18,10 +18,10 @@ SOURCE_FILE@[0; 18)
   ERROR@[15; 16)
     R_BRACK@[15; 16) "]"
   ERROR@[16; 17)
-    SEMI@[16; 17) ";"
+    SEMICOLON@[16; 17) ";"
   WHITESPACE@[17; 18) "\n"
 error [12; 12): expected `;` or `]`
-error [12; 12): expected SEMI
+error [12; 12): expected SEMICOLON
 error [13; 13): expected an item
 error [15; 15): expected an item
 error [16; 16): expected an item
diff --git a/crates/ra_syntax/test_data/parser/inline/err/0002_misplaced_label_err.rast b/crates/ra_syntax/test_data/parser/inline/err/0002_misplaced_label_err.rast
index 01a853d63..a85855f8c 100644
--- a/crates/ra_syntax/test_data/parser/inline/err/0002_misplaced_label_err.rast
+++ b/crates/ra_syntax/test_data/parser/inline/err/0002_misplaced_label_err.rast
@@ -24,6 +24,6 @@ SOURCE_FILE@[0; 30)
         R_CURLY@[28; 29) "}"
   WHITESPACE@[29; 30) "\n"
 error [22; 22): expected a loop
-error [22; 22): expected SEMI
+error [22; 22): expected SEMICOLON
 error [27; 27): expected type
 error [27; 27): expected `{`
diff --git a/crates/ra_syntax/test_data/parser/inline/err/0003_pointer_type_no_mutability.rast b/crates/ra_syntax/test_data/parser/inline/err/0003_pointer_type_no_mutability.rast
index 2ab29eecc..e9efad674 100644
--- a/crates/ra_syntax/test_data/parser/inline/err/0003_pointer_type_no_mutability.rast
+++ b/crates/ra_syntax/test_data/parser/inline/err/0003_pointer_type_no_mutability.rast
@@ -12,6 +12,6 @@ SOURCE_FILE@[0; 14)
       TUPLE_TYPE@[10; 12)
         L_PAREN@[10; 11) "("
         R_PAREN@[11; 12) ")"
-    SEMI@[12; 13) ";"
+    SEMICOLON@[12; 13) ";"
   WHITESPACE@[13; 14) "\n"
 error [10; 10): expected mut or const in raw pointer type (use `*mut T` or `*const T` as appropriate)
diff --git a/crates/ra_syntax/test_data/parser/inline/err/0005_fn_pointer_type_missing_fn.rast b/crates/ra_syntax/test_data/parser/inline/err/0005_fn_pointer_type_missing_fn.rast
index 9e9186ad4..b8a494085 100644
--- a/crates/ra_syntax/test_data/parser/inline/err/0005_fn_pointer_type_missing_fn.rast
+++ b/crates/ra_syntax/test_data/parser/inline/err/0005_fn_pointer_type_missing_fn.rast
@@ -14,10 +14,10 @@ SOURCE_FILE@[0; 20)
   ERROR@[17; 18)
     R_PAREN@[17; 18) ")"
   ERROR@[18; 19)
-    SEMI@[18; 19) ";"
+    SEMICOLON@[18; 19) ";"
   WHITESPACE@[19; 20) "\n"
 error [15; 15): expected `fn`
-error [15; 15): expected SEMI
+error [15; 15): expected SEMICOLON
 error [16; 16): expected an item
 error [17; 17): expected an item
 error [18; 18): expected an item
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 a4002a998..c3f7eb477 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
@@ -29,4 +29,4 @@ SOURCE_FILE@[0; 30)
         WHITESPACE@[27; 28) " "
         R_CURLY@[28; 29) "}"
   WHITESPACE@[29; 30) "\n"
-error [27; 27): expected SEMI
+error [27; 27): expected SEMICOLON
diff --git a/crates/ra_syntax/test_data/parser/inline/err/0008_pub_expr.rast b/crates/ra_syntax/test_data/parser/inline/err/0008_pub_expr.rast
index 6f45a4fa6..a345f8488 100644
--- a/crates/ra_syntax/test_data/parser/inline/err/0008_pub_expr.rast
+++ b/crates/ra_syntax/test_data/parser/inline/err/0008_pub_expr.rast
@@ -19,7 +19,7 @@ SOURCE_FILE@[0; 21)
         EXPR_STMT@[15; 18)
           LITERAL@[15; 17)
             INT_NUMBER@[15; 17) "92"
-          SEMI@[17; 18) ";"
+          SEMICOLON@[17; 18) ";"
         WHITESPACE@[18; 19) " "
         R_CURLY@[19; 20) "}"
   WHITESPACE@[20; 21) "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/err/0009_attr_on_expr_not_allowed.rast b/crates/ra_syntax/test_data/parser/inline/err/0009_attr_on_expr_not_allowed.rast
index e6d3a5c95..c3a70147a 100644
--- a/crates/ra_syntax/test_data/parser/inline/err/0009_attr_on_expr_not_allowed.rast
+++ b/crates/ra_syntax/test_data/parser/inline/err/0009_attr_on_expr_not_allowed.rast
@@ -30,7 +30,7 @@ SOURCE_FILE@[0; 48)
             WHITESPACE@[22; 23) " "
             LITERAL@[23; 24)
               INT_NUMBER@[23; 24) "2"
-          SEMI@[24; 25) ";"
+          SEMICOLON@[24; 25) ";"
         WHITESPACE@[25; 29) "\n   "
         EXPR_STMT@[29; 45)
           ATTR@[29; 33)
@@ -53,7 +53,7 @@ SOURCE_FILE@[0; 48)
               BLOCK@[42; 44)
                 L_CURLY@[42; 43) "{"
                 R_CURLY@[43; 44) "}"
-          SEMI@[44; 45) ";"
+          SEMICOLON@[44; 45) ";"
         WHITESPACE@[45; 46) "\n"
         R_CURLY@[46; 47) "}"
   WHITESPACE@[47; 48) "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/err/0010_bad_tuple_index_expr.rast b/crates/ra_syntax/test_data/parser/inline/err/0010_bad_tuple_index_expr.rast
index 8ad2a588f..61d737abe 100644
--- a/crates/ra_syntax/test_data/parser/inline/err/0010_bad_tuple_index_expr.rast
+++ b/crates/ra_syntax/test_data/parser/inline/err/0010_bad_tuple_index_expr.rast
@@ -21,7 +21,7 @@ SOURCE_FILE@[0; 47)
                     IDENT@[15; 16) "x"
             DOT@[16; 17) "."
             FLOAT_NUMBER@[17; 19) "0."
-          SEMI@[19; 20) ";"
+          SEMICOLON@[19; 20) ";"
         WHITESPACE@[20; 25) "\n    "
         EXPR_STMT@[25; 32)
           FIELD_EXPR@[25; 31)
@@ -33,7 +33,7 @@ SOURCE_FILE@[0; 47)
             DOT@[26; 27) "."
             NAME_REF@[27; 31)
               INT_NUMBER@[27; 31) "1i32"
-          SEMI@[31; 32) ";"
+          SEMICOLON@[31; 32) ";"
         WHITESPACE@[32; 37) "\n    "
         EXPR_STMT@[37; 44)
           FIELD_EXPR@[37; 43)
@@ -45,7 +45,7 @@ SOURCE_FILE@[0; 47)
             DOT@[38; 39) "."
             NAME_REF@[39; 43)
               INT_NUMBER@[39; 43) "0x01"
-          SEMI@[43; 44) ";"
+          SEMICOLON@[43; 44) ";"
         WHITESPACE@[44; 45) "\n"
         R_CURLY@[45; 46) "}"
   WHITESPACE@[46; 47) "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/err/0013_static_underscore.rast b/crates/ra_syntax/test_data/parser/inline/err/0013_static_underscore.rast
index 5b3dc5af2..62fca0a39 100644
--- a/crates/ra_syntax/test_data/parser/inline/err/0013_static_underscore.rast
+++ b/crates/ra_syntax/test_data/parser/inline/err/0013_static_underscore.rast
@@ -16,6 +16,6 @@ SOURCE_FILE@[0; 19)
     WHITESPACE@[15; 16) " "
     LITERAL@[16; 17)
       INT_NUMBER@[16; 17) "5"
-    SEMI@[17; 18) ";"
+    SEMICOLON@[17; 18) ";"
   WHITESPACE@[18; 19) "\n"
 error [7; 7): expected a name
diff --git a/crates/ra_syntax/test_data/parser/inline/err/0014_default_fn_type.rast b/crates/ra_syntax/test_data/parser/inline/err/0014_default_fn_type.rast
index 25d80be1d..aa960d3ef 100644
--- a/crates/ra_syntax/test_data/parser/inline/err/0014_default_fn_type.rast
+++ b/crates/ra_syntax/test_data/parser/inline/err/0014_default_fn_type.rast
@@ -27,7 +27,7 @@ SOURCE_FILE@[0; 62)
             PATH_SEGMENT@[31; 34)
               NAME_REF@[31; 34)
                 IDENT@[31; 34) "Bar"
-        SEMI@[34; 35) ";"
+        SEMICOLON@[34; 35) ";"
       WHITESPACE@[35; 40) "\n    "
       MACRO_CALL@[40; 47)
         PATH@[40; 47)
@@ -51,9 +51,9 @@ SOURCE_FILE@[0; 62)
       WHITESPACE@[59; 60) "\n"
       R_CURLY@[60; 61) "}"
   WHITESPACE@[61; 62) "\n"
-error [21; 21): expected EXCL
+error [21; 21): expected BANG
 error [21; 21): expected `{`, `[`, `(`
-error [21; 21): expected SEMI
-error [47; 47): expected EXCL
+error [21; 21): expected SEMICOLON
+error [47; 47): expected BANG
 error [47; 47): expected `{`, `[`, `(`
-error [47; 47): expected SEMI
+error [47; 47): expected SEMICOLON
diff --git a/crates/ra_syntax/test_data/parser/inline/err/0014_record_literal_before_ellipsis_recovery.rast b/crates/ra_syntax/test_data/parser/inline/err/0014_record_literal_before_ellipsis_recovery.rast
new file mode 100644
index 000000000..75043c9c0
--- /dev/null
+++ b/crates/ra_syntax/test_data/parser/inline/err/0014_record_literal_before_ellipsis_recovery.rast
@@ -0,0 +1,49 @@
+SOURCE_FILE@[0; 45)
+  FN_DEF@[0; 44)
+    FN_KW@[0; 2) "fn"
+    WHITESPACE@[2; 3) " "
+    NAME@[3; 7)
+      IDENT@[3; 7) "main"
+    PARAM_LIST@[7; 9)
+      L_PAREN@[7; 8) "("
+      R_PAREN@[8; 9) ")"
+    WHITESPACE@[9; 10) " "
+    BLOCK_EXPR@[10; 44)
+      BLOCK@[10; 44)
+        L_CURLY@[10; 11) "{"
+        WHITESPACE@[11; 16) "\n    "
+        RECORD_LIT@[16; 42)
+          PATH@[16; 17)
+            PATH_SEGMENT@[16; 17)
+              NAME_REF@[16; 17)
+                IDENT@[16; 17) "S"
+          WHITESPACE@[17; 18) " "
+          RECORD_FIELD_LIST@[18; 42)
+            L_CURLY@[18; 19) "{"
+            WHITESPACE@[19; 20) " "
+            RECORD_FIELD@[20; 40)
+              NAME_REF@[20; 25)
+                IDENT@[20; 25) "field"
+              WHITESPACE@[25; 26) " "
+              RANGE_EXPR@[26; 40)
+                DOT2@[26; 28) ".."
+                CALL_EXPR@[28; 40)
+                  PATH_EXPR@[28; 38)
+                    PATH@[28; 38)
+                      PATH@[28; 29)
+                        PATH_SEGMENT@[28; 29)
+                          NAME_REF@[28; 29)
+                            IDENT@[28; 29) "S"
+                      COLON2@[29; 31) "::"
+                      PATH_SEGMENT@[31; 38)
+                        NAME_REF@[31; 38)
+                          IDENT@[31; 38) "default"
+                  ARG_LIST@[38; 40)
+                    L_PAREN@[38; 39) "("
+                    R_PAREN@[39; 40) ")"
+            WHITESPACE@[40; 41) " "
+            R_CURLY@[41; 42) "}"
+        WHITESPACE@[42; 43) "\n"
+        R_CURLY@[43; 44) "}"
+  WHITESPACE@[44; 45) "\n"
+error [25; 25): expected COLON
diff --git a/crates/ra_syntax/test_data/parser/inline/err/0014_record_literal_before_ellipsis_recovery.rs b/crates/ra_syntax/test_data/parser/inline/err/0014_record_literal_before_ellipsis_recovery.rs
new file mode 100644
index 000000000..a4e5b2f69
--- /dev/null
+++ b/crates/ra_syntax/test_data/parser/inline/err/0014_record_literal_before_ellipsis_recovery.rs
@@ -0,0 +1,3 @@
+fn main() {
+    S { field ..S::default() }
+}
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0001_trait_item_list.rast b/crates/ra_syntax/test_data/parser/inline/ok/0001_trait_item_list.rast
index ad9f0965e..25c6ef7e3 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0001_trait_item_list.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0001_trait_item_list.rast
@@ -25,7 +25,7 @@ SOURCE_FILE@[0; 83)
                 PATH_SEGMENT@[21; 26)
                   NAME_REF@[21; 26)
                     IDENT@[21; 26) "Clone"
-        SEMI@[26; 27) ";"
+        SEMICOLON@[26; 27) ";"
       WHITESPACE@[27; 32) "\n    "
       CONST_DEF@[32; 45)
         CONST_KW@[32; 37) "const"
@@ -39,7 +39,7 @@ SOURCE_FILE@[0; 83)
             PATH_SEGMENT@[41; 44)
               NAME_REF@[41; 44)
                 IDENT@[41; 44) "i32"
-        SEMI@[44; 45) ";"
+        SEMICOLON@[44; 45) ";"
       WHITESPACE@[45; 50) "\n    "
       FN_DEF@[50; 61)
         FN_KW@[50; 52) "fn"
@@ -66,7 +66,7 @@ SOURCE_FILE@[0; 83)
             AMP@[73; 74) "&"
             SELF_KW@[74; 78) "self"
           R_PAREN@[78; 79) ")"
-        SEMI@[79; 80) ";"
+        SEMICOLON@[79; 80) ";"
       WHITESPACE@[80; 81) "\n"
       R_CURLY@[81; 82) "}"
   WHITESPACE@[82; 83) "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0002_use_tree_list.rast b/crates/ra_syntax/test_data/parser/inline/ok/0002_use_tree_list.rast
index 1b318dfb9..69c459daf 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0002_use_tree_list.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0002_use_tree_list.rast
@@ -12,15 +12,15 @@ SOURCE_FILE@[0; 250)
                 PATH@[5; 10)
                   PATH_SEGMENT@[5; 10)
                     CRATE_KW@[5; 10) "crate"
-                COLONCOLON@[10; 12) "::"
+                COLON2@[10; 12) "::"
                 PATH_SEGMENT@[12; 16)
                   NAME_REF@[12; 16)
                     IDENT@[12; 16) "path"
-              COLONCOLON@[16; 18) "::"
+              COLON2@[16; 18) "::"
               PATH_SEGMENT@[18; 22)
                 NAME_REF@[18; 22)
                   IDENT@[18; 22) "from"
-            COLONCOLON@[22; 24) "::"
+            COLON2@[22; 24) "::"
             PATH_SEGMENT@[24; 28)
               NAME_REF@[24; 28)
                 IDENT@[24; 28) "root"
@@ -34,20 +34,20 @@ SOURCE_FILE@[0; 250)
                   PATH_SEGMENT@[30; 32)
                     NAME_REF@[30; 32)
                       IDENT@[30; 32) "or"
-                COLONCOLON@[32; 34) "::"
+                COLON2@[32; 34) "::"
                 PATH_SEGMENT@[34; 38)
                   NAME_REF@[34; 38)
                     IDENT@[34; 38) "path"
-              COLONCOLON@[38; 40) "::"
+              COLON2@[38; 40) "::"
               PATH_SEGMENT@[40; 44)
                 NAME_REF@[40; 44)
                   IDENT@[40; 44) "from"
-            COLONCOLON@[44; 46) "::"
+            COLON2@[44; 46) "::"
             PATH_SEGMENT@[46; 56)
               NAME_REF@[46; 56)
                 IDENT@[46; 56) "crate_name"
         R_CURLY@[56; 57) "}"
-    SEMI@[57; 58) ";"
+    SEMICOLON@[57; 58) ";"
   WHITESPACE@[58; 59) " "
   COMMENT@[59; 97) "// Rust 2018 (with a  ..."
   WHITESPACE@[97; 98) "\n"
@@ -64,16 +64,16 @@ SOURCE_FILE@[0; 250)
                 PATH_SEGMENT@[103; 107)
                   NAME_REF@[103; 107)
                     IDENT@[103; 107) "path"
-              COLONCOLON@[107; 109) "::"
+              COLON2@[107; 109) "::"
               PATH_SEGMENT@[109; 113)
                 NAME_REF@[109; 113)
                   IDENT@[109; 113) "from"
-            COLONCOLON@[113; 115) "::"
+            COLON2@[113; 115) "::"
             PATH_SEGMENT@[115; 119)
               NAME_REF@[115; 119)
                 IDENT@[115; 119) "root"
         R_CURLY@[119; 120) "}"
-    SEMI@[120; 121) ";"
+    SEMICOLON@[120; 121) ";"
   WHITESPACE@[121; 122) " "
   COMMENT@[122; 134) "// Rust 2015"
   WHITESPACE@[134; 135) "\n"
@@ -81,7 +81,7 @@ SOURCE_FILE@[0; 250)
     USE_KW@[135; 138) "use"
     WHITESPACE@[138; 139) " "
     USE_TREE@[139; 165)
-      COLONCOLON@[139; 141) "::"
+      COLON2@[139; 141) "::"
       USE_TREE_LIST@[141; 165)
         L_CURLY@[141; 142) "{"
         USE_TREE@[142; 164)
@@ -91,16 +91,16 @@ SOURCE_FILE@[0; 250)
                 PATH_SEGMENT@[142; 146)
                   NAME_REF@[142; 146)
                     IDENT@[142; 146) "some"
-              COLONCOLON@[146; 148) "::"
+              COLON2@[146; 148) "::"
               PATH_SEGMENT@[148; 158)
                 NAME_REF@[148; 158)
                   IDENT@[148; 158) "arbritrary"
-            COLONCOLON@[158; 160) "::"
+            COLON2@[158; 160) "::"
             PATH_SEGMENT@[160; 164)
               NAME_REF@[160; 164)
                 IDENT@[160; 164) "path"
         R_CURLY@[164; 165) "}"
-    SEMI@[165; 166) ";"
+    SEMICOLON@[165; 166) ";"
   WHITESPACE@[166; 167) " "
   COMMENT@[167; 179) "// Rust 2015"
   WHITESPACE@[179; 180) "\n"
@@ -108,7 +108,7 @@ SOURCE_FILE@[0; 250)
     USE_KW@[180; 183) "use"
     WHITESPACE@[183; 184) " "
     USE_TREE@[184; 205)
-      COLONCOLON@[184; 186) "::"
+      COLON2@[184; 186) "::"
       USE_TREE_LIST@[186; 205)
         L_CURLY@[186; 187) "{"
         USE_TREE@[187; 204)
@@ -122,14 +122,14 @@ SOURCE_FILE@[0; 250)
                     PATH@[189; 194)
                       PATH_SEGMENT@[189; 194)
                         CRATE_KW@[189; 194) "crate"
-                    COLONCOLON@[194; 196) "::"
+                    COLON2@[194; 196) "::"
                     PATH_SEGMENT@[196; 202)
                       NAME_REF@[196; 202)
                         IDENT@[196; 202) "export"
                 R_CURLY@[202; 203) "}"
             R_CURLY@[203; 204) "}"
         R_CURLY@[204; 205) "}"
-    SEMI@[205; 206) ";"
+    SEMICOLON@[205; 206) ";"
   WHITESPACE@[206; 207) " "
   COMMENT@[207; 249) "// Nonsensical but pe ..."
   WHITESPACE@[249; 250) "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0004_value_parameters_no_patterns.rast b/crates/ra_syntax/test_data/parser/inline/ok/0004_value_parameters_no_patterns.rast
index 9241f6fb2..a0cf1e4f6 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0004_value_parameters_no_patterns.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0004_value_parameters_no_patterns.rast
@@ -56,5 +56,5 @@ SOURCE_FILE@[0; 39)
                           R_PAREN@[34; 35) ")"
                       R_PAREN@[35; 36) ")"
             R_ANGLE@[36; 37) ">"
-    SEMI@[37; 38) ";"
+    SEMICOLON@[37; 38) ";"
   WHITESPACE@[38; 39) "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0007_type_param_bounds.rast b/crates/ra_syntax/test_data/parser/inline/ok/0007_type_param_bounds.rast
index a7186c7a8..027abf179 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0007_type_param_bounds.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0007_type_param_bounds.rast
@@ -36,5 +36,5 @@ SOURCE_FILE@[0; 35)
                     IDENT@[27; 31) "Copy"
             R_PAREN@[31; 32) ")"
       R_ANGLE@[32; 33) ">"
-    SEMI@[33; 34) ";"
+    SEMICOLON@[33; 34) ";"
   WHITESPACE@[34; 35) "\n"
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 3812adc9e..f4697fed6 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
@@ -21,7 +21,7 @@ SOURCE_FILE@[0; 103)
                 PATH_SEGMENT@[19; 22)
                   NAME_REF@[19; 22)
                     IDENT@[19; 22) "foo"
-              COLONCOLON@[22; 24) "::"
+              COLON2@[22; 24) "::"
               PATH_SEGMENT@[24; 27)
                 NAME_REF@[24; 27)
                   IDENT@[24; 27) "Bar"
@@ -31,7 +31,7 @@ SOURCE_FILE@[0; 103)
           TUPLE_EXPR@[30; 32)
             L_PAREN@[30; 31) "("
             R_PAREN@[31; 32) ")"
-          SEMI@[32; 33) ";"
+          SEMICOLON@[32; 33) ";"
         WHITESPACE@[33; 38) "\n    "
         LET_STMT@[38; 53)
           LET_KW@[38; 41) "let"
@@ -39,7 +39,7 @@ SOURCE_FILE@[0; 103)
           PATH_PAT@[42; 47)
             PATH@[42; 47)
               PATH_SEGMENT@[42; 47)
-                COLONCOLON@[42; 44) "::"
+                COLON2@[42; 44) "::"
                 NAME_REF@[44; 47)
                   IDENT@[44; 47) "Bar"
           WHITESPACE@[47; 48) " "
@@ -48,7 +48,7 @@ SOURCE_FILE@[0; 103)
           TUPLE_EXPR@[50; 52)
             L_PAREN@[50; 51) "("
             R_PAREN@[51; 52) ")"
-          SEMI@[52; 53) ";"
+          SEMICOLON@[52; 53) ";"
         WHITESPACE@[53; 58) "\n    "
         LET_STMT@[58; 78)
           LET_KW@[58; 61) "let"
@@ -62,7 +62,7 @@ SOURCE_FILE@[0; 103)
             RECORD_FIELD_PAT_LIST@[66; 72)
               L_CURLY@[66; 67) "{"
               WHITESPACE@[67; 68) " "
-              DOTDOT@[68; 70) ".."
+              DOT2@[68; 70) ".."
               WHITESPACE@[70; 71) " "
               R_CURLY@[71; 72) "}"
           WHITESPACE@[72; 73) " "
@@ -71,7 +71,7 @@ SOURCE_FILE@[0; 103)
           TUPLE_EXPR@[75; 77)
             L_PAREN@[75; 76) "("
             R_PAREN@[76; 77) ")"
-          SEMI@[77; 78) ";"
+          SEMICOLON@[77; 78) ";"
         WHITESPACE@[78; 83) "\n    "
         LET_STMT@[83; 100)
           LET_KW@[83; 86) "let"
@@ -83,7 +83,7 @@ SOURCE_FILE@[0; 103)
                   IDENT@[87; 90) "Bar"
             L_PAREN@[90; 91) "("
             DOT_DOT_PAT@[91; 93)
-              DOTDOT@[91; 93) ".."
+              DOT2@[91; 93) ".."
             R_PAREN@[93; 94) ")"
           WHITESPACE@[94; 95) " "
           EQ@[95; 96) "="
@@ -91,7 +91,7 @@ SOURCE_FILE@[0; 103)
           TUPLE_EXPR@[97; 99)
             L_PAREN@[97; 98) "("
             R_PAREN@[98; 99) ")"
-          SEMI@[99; 100) ";"
+          SEMICOLON@[99; 100) ";"
         WHITESPACE@[100; 101) "\n"
         R_CURLY@[101; 102) "}"
   WHITESPACE@[102; 103) "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0009_loop_expr.rast b/crates/ra_syntax/test_data/parser/inline/ok/0009_loop_expr.rast
index 2d8872022..cc759310a 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0009_loop_expr.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0009_loop_expr.rast
@@ -20,7 +20,7 @@ SOURCE_FILE@[0; 26)
               BLOCK@[20; 22)
                 L_CURLY@[20; 21) "{"
                 R_CURLY@[21; 22) "}"
-          SEMI@[22; 23) ";"
+          SEMICOLON@[22; 23) ";"
         WHITESPACE@[23; 24) "\n"
         R_CURLY@[24; 25) "}"
   WHITESPACE@[25; 26) "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0011_field_expr.rast b/crates/ra_syntax/test_data/parser/inline/ok/0011_field_expr.rast
index 29b268b55..c2fafe472 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0011_field_expr.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0011_field_expr.rast
@@ -22,7 +22,7 @@ SOURCE_FILE@[0; 48)
             DOT@[16; 17) "."
             NAME_REF@[17; 20)
               IDENT@[17; 20) "foo"
-          SEMI@[20; 21) ";"
+          SEMICOLON@[20; 21) ";"
         WHITESPACE@[21; 26) "\n    "
         EXPR_STMT@[26; 34)
           FIELD_EXPR@[26; 33)
@@ -38,7 +38,7 @@ SOURCE_FILE@[0; 48)
             DOT@[29; 30) "."
             NAME_REF@[30; 33)
               IDENT@[30; 33) "bar"
-          SEMI@[33; 34) ";"
+          SEMICOLON@[33; 34) ";"
         WHITESPACE@[34; 39) "\n    "
         EXPR_STMT@[39; 45)
           CALL_EXPR@[39; 44)
@@ -54,7 +54,7 @@ SOURCE_FILE@[0; 48)
             ARG_LIST@[42; 44)
               L_PAREN@[42; 43) "("
               R_PAREN@[43; 44) ")"
-          SEMI@[44; 45) ";"
+          SEMICOLON@[44; 45) ";"
         WHITESPACE@[45; 46) "\n"
         R_CURLY@[46; 47) "}"
   WHITESPACE@[47; 48) "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0012_type_item_where_clause.rast b/crates/ra_syntax/test_data/parser/inline/ok/0012_type_item_where_clause.rast
index da04dac5c..15d8c736d 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0012_type_item_where_clause.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0012_type_item_where_clause.rast
@@ -29,5 +29,5 @@ SOURCE_FILE@[0; 31)
     TUPLE_TYPE@[27; 29)
       L_PAREN@[27; 28) "("
       R_PAREN@[28; 29) ")"
-    SEMI@[29; 30) ";"
+    SEMICOLON@[29; 30) ";"
   WHITESPACE@[30; 31) "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0013_pointer_type_mut.rast b/crates/ra_syntax/test_data/parser/inline/ok/0013_pointer_type_mut.rast
index c05f873d6..a72d56495 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0013_pointer_type_mut.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0013_pointer_type_mut.rast
@@ -14,7 +14,7 @@ SOURCE_FILE@[0; 36)
       TUPLE_TYPE@[14; 16)
         L_PAREN@[14; 15) "("
         R_PAREN@[15; 16) ")"
-    SEMI@[16; 17) ";"
+    SEMICOLON@[16; 17) ";"
   WHITESPACE@[17; 18) "\n"
   TYPE_ALIAS_DEF@[18; 35)
     TYPE_KW@[18; 22) "type"
@@ -31,5 +31,5 @@ SOURCE_FILE@[0; 36)
       TUPLE_TYPE@[32; 34)
         L_PAREN@[32; 33) "("
         R_PAREN@[33; 34) ")"
-    SEMI@[34; 35) ";"
+    SEMICOLON@[34; 35) ";"
   WHITESPACE@[35; 36) "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0014_never_type.rast b/crates/ra_syntax/test_data/parser/inline/ok/0014_never_type.rast
index ac53e4fd3..3c98467c7 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0014_never_type.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0014_never_type.rast
@@ -8,6 +8,6 @@ SOURCE_FILE@[0; 16)
     EQ@[11; 12) "="
     WHITESPACE@[12; 13) " "
     NEVER_TYPE@[13; 14)
-      EXCL@[13; 14) "!"
-    SEMI@[14; 15) ";"
+      BANG@[13; 14) "!"
+    SEMICOLON@[14; 15) ";"
   WHITESPACE@[15; 16) "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0015_continue_expr.rast b/crates/ra_syntax/test_data/parser/inline/ok/0015_continue_expr.rast
index c051c1c86..adaece119 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0015_continue_expr.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0015_continue_expr.rast
@@ -22,14 +22,14 @@ SOURCE_FILE@[0; 69)
               EXPR_STMT@[30; 39)
                 CONTINUE_EXPR@[30; 38)
                   CONTINUE_KW@[30; 38) "continue"
-                SEMI@[38; 39) ";"
+                SEMICOLON@[38; 39) ";"
               WHITESPACE@[39; 48) "\n        "
               EXPR_STMT@[48; 60)
                 CONTINUE_EXPR@[48; 59)
                   CONTINUE_KW@[48; 56) "continue"
                   WHITESPACE@[56; 57) " "
                   LIFETIME@[57; 59) "\'l"
-                SEMI@[59; 60) ";"
+                SEMICOLON@[59; 60) ";"
               WHITESPACE@[60; 65) "\n    "
               R_CURLY@[65; 66) "}"
         WHITESPACE@[66; 67) "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0017_array_type.rast b/crates/ra_syntax/test_data/parser/inline/ok/0017_array_type.rast
index b4055c9f0..f4c86a05f 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0017_array_type.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0017_array_type.rast
@@ -12,10 +12,10 @@ SOURCE_FILE@[0; 19)
       TUPLE_TYPE@[10; 12)
         L_PAREN@[10; 11) "("
         R_PAREN@[11; 12) ")"
-      SEMI@[12; 13) ";"
+      SEMICOLON@[12; 13) ";"
       WHITESPACE@[13; 14) " "
       LITERAL@[14; 16)
         INT_NUMBER@[14; 16) "92"
       R_BRACK@[16; 17) "]"
-    SEMI@[17; 18) ";"
+    SEMICOLON@[17; 18) ";"
   WHITESPACE@[18; 19) "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0019_unary_expr.rast b/crates/ra_syntax/test_data/parser/inline/ok/0019_unary_expr.rast
index 2d71efd86..5a42f360c 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0019_unary_expr.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0019_unary_expr.rast
@@ -21,16 +21,16 @@ SOURCE_FILE@[0; 44)
                 AMP@[17; 18) "&"
                 LITERAL@[18; 19)
                   INT_NUMBER@[18; 19) "1"
-          SEMI@[19; 20) ";"
+          SEMICOLON@[19; 20) ";"
         WHITESPACE@[20; 25) "\n    "
         EXPR_STMT@[25; 32)
           PREFIX_EXPR@[25; 31)
-            EXCL@[25; 26) "!"
+            BANG@[25; 26) "!"
             PREFIX_EXPR@[26; 31)
-              EXCL@[26; 27) "!"
+              BANG@[26; 27) "!"
               LITERAL@[27; 31)
                 TRUE_KW@[27; 31) "true"
-          SEMI@[31; 32) ";"
+          SEMICOLON@[31; 32) ";"
         WHITESPACE@[32; 37) "\n    "
         EXPR_STMT@[37; 41)
           PREFIX_EXPR@[37; 40)
@@ -39,7 +39,7 @@ SOURCE_FILE@[0; 44)
               MINUS@[38; 39) "-"
               LITERAL@[39; 40)
                 INT_NUMBER@[39; 40) "1"
-          SEMI@[40; 41) ";"
+          SEMICOLON@[40; 41) ";"
         WHITESPACE@[41; 42) "\n"
         R_CURLY@[42; 43) "}"
   WHITESPACE@[43; 44) "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0020_use_star.rast b/crates/ra_syntax/test_data/parser/inline/ok/0020_use_star.rast
index dd2095d90..c1bedb37c 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0020_use_star.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0020_use_star.rast
@@ -4,15 +4,15 @@ SOURCE_FILE@[0; 60)
     WHITESPACE@[3; 4) " "
     USE_TREE@[4; 5)
       STAR@[4; 5) "*"
-    SEMI@[5; 6) ";"
+    SEMICOLON@[5; 6) ";"
   WHITESPACE@[6; 7) "\n"
   USE_ITEM@[7; 15)
     USE_KW@[7; 10) "use"
     WHITESPACE@[10; 11) " "
     USE_TREE@[11; 14)
-      COLONCOLON@[11; 13) "::"
+      COLON2@[11; 13) "::"
       STAR@[13; 14) "*"
-    SEMI@[14; 15) ";"
+    SEMICOLON@[14; 15) ";"
   WHITESPACE@[15; 16) "\n"
   USE_ITEM@[16; 36)
     USE_KW@[16; 19) "use"
@@ -23,17 +23,17 @@ SOURCE_FILE@[0; 60)
           PATH_SEGMENT@[20; 24)
             NAME_REF@[20; 24)
               IDENT@[20; 24) "some"
-        COLONCOLON@[24; 26) "::"
+        COLON2@[24; 26) "::"
         PATH_SEGMENT@[26; 30)
           NAME_REF@[26; 30)
             IDENT@[26; 30) "path"
-      COLONCOLON@[30; 32) "::"
+      COLON2@[30; 32) "::"
       USE_TREE_LIST@[32; 35)
         L_CURLY@[32; 33) "{"
         USE_TREE@[33; 34)
           STAR@[33; 34) "*"
         R_CURLY@[34; 35) "}"
-    SEMI@[35; 36) ";"
+    SEMICOLON@[35; 36) ";"
   WHITESPACE@[36; 37) "\n"
   USE_ITEM@[37; 59)
     USE_KW@[37; 40) "use"
@@ -44,16 +44,16 @@ SOURCE_FILE@[0; 60)
           PATH_SEGMENT@[41; 45)
             NAME_REF@[41; 45)
               IDENT@[41; 45) "some"
-        COLONCOLON@[45; 47) "::"
+        COLON2@[45; 47) "::"
         PATH_SEGMENT@[47; 51)
           NAME_REF@[47; 51)
             IDENT@[47; 51) "path"
-      COLONCOLON@[51; 53) "::"
+      COLON2@[51; 53) "::"
       USE_TREE_LIST@[53; 58)
         L_CURLY@[53; 54) "{"
         USE_TREE@[54; 57)
-          COLONCOLON@[54; 56) "::"
+          COLON2@[54; 56) "::"
           STAR@[56; 57) "*"
         R_CURLY@[57; 58) "}"
-    SEMI@[58; 59) ";"
+    SEMICOLON@[58; 59) ";"
   WHITESPACE@[59; 60) "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0021_impl_item_list.rast b/crates/ra_syntax/test_data/parser/inline/ok/0021_impl_item_list.rast
index b1af67976..767a49ce6 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0021_impl_item_list.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0021_impl_item_list.rast
@@ -24,7 +24,7 @@ SOURCE_FILE@[0; 89)
             PATH_SEGMENT@[22; 25)
               NAME_REF@[22; 25)
                 IDENT@[22; 25) "i32"
-        SEMI@[25; 26) ";"
+        SEMICOLON@[25; 26) ";"
       WHITESPACE@[26; 31) "\n    "
       CONST_DEF@[31; 49)
         CONST_KW@[31; 36) "const"
@@ -43,7 +43,7 @@ SOURCE_FILE@[0; 89)
         WHITESPACE@[45; 46) " "
         LITERAL@[46; 48)
           INT_NUMBER@[46; 48) "92"
-        SEMI@[48; 49) ";"
+        SEMICOLON@[48; 49) ";"
       WHITESPACE@[49; 54) "\n    "
       FN_DEF@[54; 65)
         FN_KW@[54; 56) "fn"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0022_crate_visibility.rast b/crates/ra_syntax/test_data/parser/inline/ok/0022_crate_visibility.rast
index 891943f6e..e0fc96d33 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0022_crate_visibility.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0022_crate_visibility.rast
@@ -10,7 +10,7 @@ SOURCE_FILE@[0; 81)
     WHITESPACE@[17; 18) " "
     NAME@[18; 19)
       IDENT@[18; 19) "S"
-    SEMI@[19; 20) ";"
+    SEMICOLON@[19; 20) ";"
   WHITESPACE@[20; 21) "\n"
   STRUCT_DEF@[21; 40)
     VISIBILITY@[21; 30)
@@ -23,7 +23,7 @@ SOURCE_FILE@[0; 81)
     WHITESPACE@[37; 38) " "
     NAME@[38; 39)
       IDENT@[38; 39) "S"
-    SEMI@[39; 40) ";"
+    SEMICOLON@[39; 40) ";"
   WHITESPACE@[40; 41) "\n"
   STRUCT_DEF@[41; 60)
     VISIBILITY@[41; 50)
@@ -36,7 +36,7 @@ SOURCE_FILE@[0; 81)
     WHITESPACE@[57; 58) " "
     NAME@[58; 59)
       IDENT@[58; 59) "S"
-    SEMI@[59; 60) ";"
+    SEMICOLON@[59; 60) ";"
   WHITESPACE@[60; 61) "\n"
   STRUCT_DEF@[61; 80)
     VISIBILITY@[61; 70)
@@ -49,5 +49,5 @@ SOURCE_FILE@[0; 81)
     WHITESPACE@[77; 78) " "
     NAME@[78; 79)
       IDENT@[78; 79) "S"
-    SEMI@[79; 80) ";"
+    SEMICOLON@[79; 80) ";"
   WHITESPACE@[80; 81) "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0023_placeholder_type.rast b/crates/ra_syntax/test_data/parser/inline/ok/0023_placeholder_type.rast
index 0f32aec9e..b7acc3f07 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0023_placeholder_type.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0023_placeholder_type.rast
@@ -9,5 +9,5 @@ SOURCE_FILE@[0; 22)
     WHITESPACE@[18; 19) " "
     PLACEHOLDER_TYPE@[19; 20)
       UNDERSCORE@[19; 20) "_"
-    SEMI@[20; 21) ";"
+    SEMICOLON@[20; 21) ";"
   WHITESPACE@[21; 22) "\n"
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 48aaeaf07..430e4a999 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
@@ -28,7 +28,7 @@ SOURCE_FILE@[0; 39)
             COMMA@[25; 26) ","
             WHITESPACE@[26; 27) " "
             DOT_DOT_PAT@[27; 29)
-              DOTDOT@[27; 29) ".."
+              DOT2@[27; 29) ".."
             R_BRACK@[29; 30) "]"
           WHITESPACE@[30; 31) " "
           EQ@[31; 32) "="
@@ -36,7 +36,7 @@ SOURCE_FILE@[0; 39)
           ARRAY_EXPR@[33; 35)
             L_BRACK@[33; 34) "["
             R_BRACK@[34; 35) "]"
-          SEMI@[35; 36) ";"
+          SEMICOLON@[35; 36) ";"
         WHITESPACE@[36; 37) "\n"
         R_CURLY@[37; 38) "}"
   WHITESPACE@[38; 39) "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0025_slice_type.rast b/crates/ra_syntax/test_data/parser/inline/ok/0025_slice_type.rast
index b3a24281e..4eee1e7f1 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0025_slice_type.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0025_slice_type.rast
@@ -13,5 +13,5 @@ SOURCE_FILE@[0; 15)
         L_PAREN@[10; 11) "("
         R_PAREN@[11; 12) ")"
       R_BRACK@[12; 13) "]"
-    SEMI@[13; 14) ";"
+    SEMICOLON@[13; 14) ";"
   WHITESPACE@[14; 15) "\n"
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 666386d31..d8d82dacc 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
@@ -28,7 +28,7 @@ SOURCE_FILE@[0; 97)
           TUPLE_EXPR@[25; 27)
             L_PAREN@[25; 26) "("
             R_PAREN@[26; 27) ")"
-          SEMI@[27; 28) ";"
+          SEMICOLON@[27; 28) ";"
         WHITESPACE@[28; 33) "\n    "
         LET_STMT@[33; 47)
           LET_KW@[33; 36) "let"
@@ -48,7 +48,7 @@ SOURCE_FILE@[0; 97)
           TUPLE_EXPR@[44; 46)
             L_PAREN@[44; 45) "("
             R_PAREN@[45; 46) ")"
-          SEMI@[46; 47) ";"
+          SEMICOLON@[46; 47) ";"
         WHITESPACE@[47; 52) "\n    "
         LET_STMT@[52; 67)
           LET_KW@[52; 55) "let"
@@ -69,7 +69,7 @@ SOURCE_FILE@[0; 97)
           TUPLE_EXPR@[64; 66)
             L_PAREN@[64; 65) "("
             R_PAREN@[65; 66) ")"
-          SEMI@[66; 67) ";"
+          SEMICOLON@[66; 67) ";"
         WHITESPACE@[67; 72) "\n    "
         LET_STMT@[72; 94)
           LET_KW@[72; 75) "let"
@@ -85,7 +85,7 @@ SOURCE_FILE@[0; 97)
             COMMA@[79; 80) ","
             WHITESPACE@[80; 81) " "
             DOT_DOT_PAT@[81; 83)
-              DOTDOT@[81; 83) ".."
+              DOT2@[81; 83) ".."
             WHITESPACE@[83; 84) " "
             COMMA@[84; 85) ","
             WHITESPACE@[85; 86) " "
@@ -99,7 +99,7 @@ SOURCE_FILE@[0; 97)
           TUPLE_EXPR@[91; 93)
             L_PAREN@[91; 92) "("
             R_PAREN@[92; 93) ")"
-          SEMI@[93; 94) ";"
+          SEMICOLON@[93; 94) ";"
         WHITESPACE@[94; 95) "\n"
         R_CURLY@[95; 96) "}"
   WHITESPACE@[96; 97) "\n"
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 0f1a367f7..ac6ab31f2 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
@@ -26,7 +26,7 @@ SOURCE_FILE@[0; 52)
           TUPLE_EXPR@[25; 27)
             L_PAREN@[25; 26) "("
             R_PAREN@[26; 27) ")"
-          SEMI@[27; 28) ";"
+          SEMICOLON@[27; 28) ";"
         WHITESPACE@[28; 33) "\n    "
         LET_STMT@[33; 49)
           LET_KW@[33; 36) "let"
@@ -44,7 +44,7 @@ SOURCE_FILE@[0; 52)
           TUPLE_EXPR@[46; 48)
             L_PAREN@[46; 47) "("
             R_PAREN@[47; 48) ")"
-          SEMI@[48; 49) ";"
+          SEMICOLON@[48; 49) ";"
         WHITESPACE@[49; 50) "\n"
         R_CURLY@[50; 51) "}"
   WHITESPACE@[51; 52) "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0028_impl_trait_type.rast b/crates/ra_syntax/test_data/parser/inline/ok/0028_impl_trait_type.rast
index f07027fa7..3371cab82 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0028_impl_trait_type.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0028_impl_trait_type.rast
@@ -39,5 +39,5 @@ SOURCE_FILE@[0; 43)
         WHITESPACE@[38; 39) " "
         TYPE_BOUND@[39; 41)
           LIFETIME@[39; 41) "\'a"
-    SEMI@[41; 42) ";"
+    SEMICOLON@[41; 42) ";"
   WHITESPACE@[42; 43) "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0029_cast_expr.rast b/crates/ra_syntax/test_data/parser/inline/ok/0029_cast_expr.rast
index b17a2c257..e9ca214bb 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0029_cast_expr.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0029_cast_expr.rast
@@ -24,7 +24,7 @@ SOURCE_FILE@[0; 89)
                 PATH_SEGMENT@[21; 24)
                   NAME_REF@[21; 24)
                     IDENT@[21; 24) "i32"
-          SEMI@[24; 25) ";"
+          SEMICOLON@[24; 25) ";"
         WHITESPACE@[25; 30) "\n    "
         EXPR_STMT@[30; 43)
           BIN_EXPR@[30; 42)
@@ -44,7 +44,7 @@ SOURCE_FILE@[0; 89)
             WHITESPACE@[40; 41) " "
             LITERAL@[41; 42)
               INT_NUMBER@[41; 42) "1"
-          SEMI@[42; 43) ";"
+          SEMICOLON@[42; 43) ";"
         WHITESPACE@[43; 48) "\n    "
         EXPR_STMT@[48; 62)
           BIN_EXPR@[48; 61)
@@ -64,7 +64,7 @@ SOURCE_FILE@[0; 89)
             WHITESPACE@[59; 60) " "
             LITERAL@[60; 61)
               INT_NUMBER@[60; 61) "1"
-          SEMI@[61; 62) ";"
+          SEMICOLON@[61; 62) ";"
         WHITESPACE@[62; 67) "\n    "
         EXPR_STMT@[67; 86)
           BIN_EXPR@[67; 85)
@@ -84,7 +84,7 @@ SOURCE_FILE@[0; 89)
             WHITESPACE@[80; 81) " "
             LITERAL@[81; 85)
               INT_NUMBER@[81; 85) "0x37"
-          SEMI@[85; 86) ";"
+          SEMICOLON@[85; 86) ";"
         WHITESPACE@[86; 87) "\n"
         R_CURLY@[87; 88) "}"
   WHITESPACE@[88; 89) "\n"
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 a6e14a114..aaef408cc 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
@@ -24,7 +24,7 @@ SOURCE_FILE@[0; 93)
               BLOCK@[26; 28)
                 L_CURLY@[26; 27) "{"
                 R_CURLY@[27; 28) "}"
-          SEMI@[28; 29) ";"
+          SEMICOLON@[28; 29) ";"
         WHITESPACE@[29; 34) "\n    "
         EXPR_STMT@[34; 67)
           WHILE_EXPR@[34; 66)
@@ -63,7 +63,7 @@ SOURCE_FILE@[0; 93)
               BLOCK@[64; 66)
                 L_CURLY@[64; 65) "{"
                 R_CURLY@[65; 66) "}"
-          SEMI@[66; 67) ";"
+          SEMICOLON@[66; 67) ";"
         WHITESPACE@[67; 72) "\n    "
         EXPR_STMT@[72; 90)
           WHILE_EXPR@[72; 89)
@@ -83,7 +83,7 @@ SOURCE_FILE@[0; 93)
               BLOCK@[87; 89)
                 L_CURLY@[87; 88) "{"
                 R_CURLY@[88; 89) "}"
-          SEMI@[89; 90) ";"
+          SEMICOLON@[89; 90) ";"
         WHITESPACE@[90; 91) "\n"
         R_CURLY@[91; 92) "}"
   WHITESPACE@[92; 93) "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0032_fn_pointer_type.rast b/crates/ra_syntax/test_data/parser/inline/ok/0032_fn_pointer_type.rast
index 4c17f0db8..bad769850 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0032_fn_pointer_type.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0032_fn_pointer_type.rast
@@ -12,7 +12,7 @@ SOURCE_FILE@[0; 113)
       PARAM_LIST@[11; 13)
         L_PAREN@[11; 12) "("
         R_PAREN@[12; 13) ")"
-    SEMI@[13; 14) ";"
+    SEMICOLON@[13; 14) ";"
   WHITESPACE@[14; 15) "\n"
   TYPE_ALIAS_DEF@[15; 36)
     TYPE_KW@[15; 19) "type"
@@ -29,7 +29,7 @@ SOURCE_FILE@[0; 113)
       PARAM_LIST@[33; 35)
         L_PAREN@[33; 34) "("
         R_PAREN@[34; 35) ")"
-    SEMI@[35; 36) ";"
+    SEMICOLON@[35; 36) ";"
   WHITESPACE@[36; 37) "\n"
   TYPE_ALIAS_DEF@[37; 69)
     TYPE_KW@[37; 41) "type"
@@ -51,7 +51,7 @@ SOURCE_FILE@[0; 113)
       PARAM_LIST@[66; 68)
         L_PAREN@[66; 67) "("
         R_PAREN@[67; 68) ")"
-    SEMI@[68; 69) ";"
+    SEMICOLON@[68; 69) ";"
   WHITESPACE@[69; 70) "\n"
   TYPE_ALIAS_DEF@[70; 112)
     TYPE_KW@[70; 74) "type"
@@ -82,7 +82,7 @@ SOURCE_FILE@[0; 113)
         COMMA@[98; 99) ","
         WHITESPACE@[99; 100) " "
         PARAM@[100; 103)
-          DOTDOTDOT@[100; 103) "..."
+          DOT3@[100; 103) "..."
         WHITESPACE@[103; 104) " "
         R_PAREN@[104; 105) ")"
       WHITESPACE@[105; 106) " "
@@ -94,5 +94,5 @@ SOURCE_FILE@[0; 113)
             PATH_SEGMENT@[109; 111)
               NAME_REF@[109; 111)
                 IDENT@[109; 111) "u8"
-    SEMI@[111; 112) ";"
+    SEMICOLON@[111; 112) ";"
   WHITESPACE@[112; 113) "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0033_reference_type;.rast b/crates/ra_syntax/test_data/parser/inline/ok/0033_reference_type;.rast
index 7642ea659..e6ee20b9a 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0033_reference_type;.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0033_reference_type;.rast
@@ -12,7 +12,7 @@ SOURCE_FILE@[0; 54)
       TUPLE_TYPE@[10; 12)
         L_PAREN@[10; 11) "("
         R_PAREN@[11; 12) ")"
-    SEMI@[12; 13) ";"
+    SEMICOLON@[12; 13) ";"
   WHITESPACE@[13; 14) "\n"
   TYPE_ALIAS_DEF@[14; 35)
     TYPE_KW@[14; 18) "type"
@@ -29,7 +29,7 @@ SOURCE_FILE@[0; 54)
       TUPLE_TYPE@[32; 34)
         L_PAREN@[32; 33) "("
         R_PAREN@[33; 34) ")"
-    SEMI@[34; 35) ";"
+    SEMICOLON@[34; 35) ";"
   WHITESPACE@[35; 36) "\n"
   TYPE_ALIAS_DEF@[36; 53)
     TYPE_KW@[36; 40) "type"
@@ -46,5 +46,5 @@ SOURCE_FILE@[0; 54)
       TUPLE_TYPE@[50; 52)
         L_PAREN@[50; 51) "("
         R_PAREN@[51; 52) ")"
-    SEMI@[52; 53) ";"
+    SEMICOLON@[52; 53) ";"
   WHITESPACE@[53; 54) "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0034_break_expr.rast b/crates/ra_syntax/test_data/parser/inline/ok/0034_break_expr.rast
index 67ffdfd67..4bb95314f 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0034_break_expr.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0034_break_expr.rast
@@ -22,14 +22,14 @@ SOURCE_FILE@[0; 102)
               EXPR_STMT@[30; 36)
                 BREAK_EXPR@[30; 35)
                   BREAK_KW@[30; 35) "break"
-                SEMI@[35; 36) ";"
+                SEMICOLON@[35; 36) ";"
               WHITESPACE@[36; 45) "\n        "
               EXPR_STMT@[45; 54)
                 BREAK_EXPR@[45; 53)
                   BREAK_KW@[45; 50) "break"
                   WHITESPACE@[50; 51) " "
                   LIFETIME@[51; 53) "\'l"
-                SEMI@[53; 54) ";"
+                SEMICOLON@[53; 54) ";"
               WHITESPACE@[54; 63) "\n        "
               EXPR_STMT@[63; 72)
                 BREAK_EXPR@[63; 71)
@@ -37,7 +37,7 @@ SOURCE_FILE@[0; 102)
                   WHITESPACE@[68; 69) " "
                   LITERAL@[69; 71)
                     INT_NUMBER@[69; 71) "92"
-                SEMI@[71; 72) ";"
+                SEMICOLON@[71; 72) ";"
               WHITESPACE@[72; 81) "\n        "
               EXPR_STMT@[81; 93)
                 BREAK_EXPR@[81; 92)
@@ -47,7 +47,7 @@ SOURCE_FILE@[0; 102)
                   WHITESPACE@[89; 90) " "
                   LITERAL@[90; 92)
                     INT_NUMBER@[90; 92) "92"
-                SEMI@[92; 93) ";"
+                SEMICOLON@[92; 93) ";"
               WHITESPACE@[93; 98) "\n    "
               R_CURLY@[98; 99) "}"
         WHITESPACE@[99; 100) "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0037_qual_paths.rast b/crates/ra_syntax/test_data/parser/inline/ok/0037_qual_paths.rast
index 6e226de4b..1cd7a443f 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0037_qual_paths.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0037_qual_paths.rast
@@ -26,11 +26,11 @@ SOURCE_FILE@[0; 71)
                   NAME_REF@[15; 16)
                     IDENT@[15; 16) "B"
             R_ANGLE@[16; 17) ">"
-        COLONCOLON@[17; 19) "::"
+        COLON2@[17; 19) "::"
         PATH_SEGMENT@[19; 25)
           NAME_REF@[19; 25)
             IDENT@[19; 25) "Output"
-    SEMI@[25; 26) ";"
+    SEMICOLON@[25; 26) ";"
   WHITESPACE@[26; 27) "\n"
   FN_DEF@[27; 70)
     FN_KW@[27; 29) "fn"
@@ -66,14 +66,14 @@ SOURCE_FILE@[0; 71)
                           NAME_REF@[48; 55)
                             IDENT@[48; 55) "Default"
                     R_ANGLE@[55; 56) ">"
-                COLONCOLON@[56; 58) "::"
+                COLON2@[56; 58) "::"
                 PATH_SEGMENT@[58; 65)
                   NAME_REF@[58; 65)
                     IDENT@[58; 65) "default"
             ARG_LIST@[65; 67)
               L_PAREN@[65; 66) "("
               R_PAREN@[66; 67) ")"
-          SEMI@[67; 68) ";"
+          SEMICOLON@[67; 68) ";"
         WHITESPACE@[68; 69) " "
         R_CURLY@[69; 70) "}"
   WHITESPACE@[70; 71) "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0038_full_range_expr.rast b/crates/ra_syntax/test_data/parser/inline/ok/0038_full_range_expr.rast
index 042cee879..f5db5a9e6 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0038_full_range_expr.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0038_full_range_expr.rast
@@ -21,9 +21,9 @@ SOURCE_FILE@[0; 21)
                     IDENT@[11; 13) "xs"
             L_BRACK@[13; 14) "["
             RANGE_EXPR@[14; 16)
-              DOTDOT@[14; 16) ".."
+              DOT2@[14; 16) ".."
             R_BRACK@[16; 17) "]"
-          SEMI@[17; 18) ";"
+          SEMICOLON@[17; 18) ";"
         WHITESPACE@[18; 19) " "
         R_CURLY@[19; 20) "}"
   WHITESPACE@[20; 21) "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0039_type_arg.rast b/crates/ra_syntax/test_data/parser/inline/ok/0039_type_arg.rast
index 025faf5ca..2d9db61b3 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0039_type_arg.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0039_type_arg.rast
@@ -51,5 +51,5 @@ SOURCE_FILE@[0; 46)
                     NAME_REF@[40; 43)
                       IDENT@[40; 43) "u64"
             R_ANGLE@[43; 44) ">"
-    SEMI@[44; 45) ";"
+    SEMICOLON@[44; 45) ";"
   WHITESPACE@[45; 46) "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0040_crate_keyword_vis.rast b/crates/ra_syntax/test_data/parser/inline/ok/0040_crate_keyword_vis.rast
index d180fcf20..4c175e210 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0040_crate_keyword_vis.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0040_crate_keyword_vis.rast
@@ -59,5 +59,5 @@ SOURCE_FILE@[0; 71)
               NAME_REF@[65; 68)
                 IDENT@[65; 68) "u32"
       R_PAREN@[68; 69) ")"
-    SEMI@[69; 70) ";"
+    SEMICOLON@[69; 70) ";"
   WHITESPACE@[70; 71) "\n"
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 e8003bf91..f9e677a03 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
@@ -29,7 +29,7 @@ SOURCE_FILE@[0; 118)
             ARG_LIST@[24; 26)
               L_PAREN@[24; 25) "("
               R_PAREN@[25; 26) ")"
-          SEMI@[26; 27) ";"
+          SEMICOLON@[26; 27) ";"
         WHITESPACE@[27; 32) "\n    "
         LET_STMT@[32; 54)
           LET_KW@[32; 35) "let"
@@ -65,7 +65,7 @@ SOURCE_FILE@[0; 118)
                 INT_NUMBER@[50; 51) "2"
               COMMA@[51; 52) ","
               R_PAREN@[52; 53) ")"
-          SEMI@[53; 54) ";"
+          SEMICOLON@[53; 54) ";"
         WHITESPACE@[54; 59) "\n    "
         LET_STMT@[59; 84)
           LET_KW@[59; 62) "let"
@@ -95,7 +95,7 @@ SOURCE_FILE@[0; 118)
                               NAME_REF@[70; 73)
                                 IDENT@[70; 73) "Foo"
                         R_ANGLE@[73; 74) ">"
-                    COLONCOLON@[74; 76) "::"
+                    COLON2@[74; 76) "::"
                     PATH_SEGMENT@[76; 80)
                       NAME_REF@[76; 80)
                         IDENT@[76; 80) "func"
@@ -103,7 +103,7 @@ SOURCE_FILE@[0; 118)
                   L_PAREN@[80; 81) "("
                   R_PAREN@[81; 82) ")"
               R_PAREN@[82; 83) ")"
-          SEMI@[83; 84) ";"
+          SEMICOLON@[83; 84) ";"
         WHITESPACE@[84; 89) "\n    "
         EXPR_STMT@[89; 115)
           CALL_EXPR@[89; 114)
@@ -134,7 +134,7 @@ SOURCE_FILE@[0; 118)
                               NAME_REF@[99; 104)
                                 IDENT@[99; 104) "Trait"
                         R_ANGLE@[104; 105) ">"
-                    COLONCOLON@[105; 107) "::"
+                    COLON2@[105; 107) "::"
                     PATH_SEGMENT@[107; 111)
                       NAME_REF@[107; 111)
                         IDENT@[107; 111) "func"
@@ -142,7 +142,7 @@ SOURCE_FILE@[0; 118)
                   L_PAREN@[111; 112) "("
                   R_PAREN@[112; 113) ")"
               R_PAREN@[113; 114) ")"
-          SEMI@[114; 115) ";"
+          SEMICOLON@[114; 115) ";"
         WHITESPACE@[115; 116) "\n"
         R_CURLY@[116; 117) "}"
   WHITESPACE@[117; 118) "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0043_use_alias.rast b/crates/ra_syntax/test_data/parser/inline/ok/0043_use_alias.rast
index 18d8a151f..580f29cfb 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0043_use_alias.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0043_use_alias.rast
@@ -8,7 +8,7 @@ SOURCE_FILE@[0; 198)
           PATH_SEGMENT@[4; 8)
             NAME_REF@[4; 8)
               IDENT@[4; 8) "some"
-        COLONCOLON@[8; 10) "::"
+        COLON2@[8; 10) "::"
         PATH_SEGMENT@[10; 14)
           NAME_REF@[10; 14)
             IDENT@[10; 14) "path"
@@ -18,7 +18,7 @@ SOURCE_FILE@[0; 198)
         WHITESPACE@[17; 18) " "
         NAME@[18; 27)
           IDENT@[18; 27) "some_name"
-    SEMI@[27; 28) ";"
+    SEMICOLON@[27; 28) ";"
   WHITESPACE@[28; 29) "\n"
   USE_ITEM@[29; 181)
     USE_KW@[29; 32) "use"
@@ -28,7 +28,7 @@ SOURCE_FILE@[0; 198)
         PATH_SEGMENT@[33; 37)
           NAME_REF@[33; 37)
             IDENT@[33; 37) "some"
-      COLONCOLON@[37; 39) "::"
+      COLON2@[37; 39) "::"
       USE_TREE_LIST@[39; 180)
         L_CURLY@[39; 40) "{"
         WHITESPACE@[40; 42) "\n "
@@ -38,7 +38,7 @@ SOURCE_FILE@[0; 198)
               PATH_SEGMENT@[42; 47)
                 NAME_REF@[42; 47)
                   IDENT@[42; 47) "other"
-            COLONCOLON@[47; 49) "::"
+            COLON2@[47; 49) "::"
             PATH_SEGMENT@[49; 53)
               NAME_REF@[49; 53)
                 IDENT@[49; 53) "path"
@@ -56,7 +56,7 @@ SOURCE_FILE@[0; 198)
               PATH_SEGMENT@[75; 84)
                 NAME_REF@[75; 84)
                   IDENT@[75; 84) "different"
-            COLONCOLON@[84; 86) "::"
+            COLON2@[84; 86) "::"
             PATH_SEGMENT@[86; 90)
               NAME_REF@[86; 90)
                 IDENT@[86; 90) "path"
@@ -75,11 +75,11 @@ SOURCE_FILE@[0; 198)
                 PATH_SEGMENT@[111; 114)
                   NAME_REF@[111; 114)
                     IDENT@[111; 114) "yet"
-              COLONCOLON@[114; 116) "::"
+              COLON2@[114; 116) "::"
               PATH_SEGMENT@[116; 123)
                 NAME_REF@[116; 123)
                   IDENT@[116; 123) "another"
-            COLONCOLON@[123; 125) "::"
+            COLON2@[123; 125) "::"
             PATH_SEGMENT@[125; 129)
               NAME_REF@[125; 129)
                 IDENT@[125; 129) "path"
@@ -95,31 +95,31 @@ SOURCE_FILE@[0; 198)
                       PATH_SEGMENT@[132; 139)
                         NAME_REF@[132; 139)
                           IDENT@[132; 139) "running"
-                    COLONCOLON@[139; 141) "::"
+                    COLON2@[139; 141) "::"
                     PATH_SEGMENT@[141; 144)
                       NAME_REF@[141; 144)
                         IDENT@[141; 144) "out"
-                  COLONCOLON@[144; 146) "::"
+                  COLON2@[144; 146) "::"
                   PATH_SEGMENT@[146; 148)
                     NAME_REF@[146; 148)
                       IDENT@[146; 148) "of"
-                COLONCOLON@[148; 150) "::"
+                COLON2@[148; 150) "::"
                 PATH_SEGMENT@[150; 158)
                   NAME_REF@[150; 158)
                     IDENT@[150; 158) "synonyms"
-              COLONCOLON@[158; 160) "::"
+              COLON2@[158; 160) "::"
               PATH_SEGMENT@[160; 164)
                 NAME_REF@[160; 164)
                   IDENT@[160; 164) "for_"
-            COLONCOLON@[164; 166) "::"
+            COLON2@[164; 166) "::"
             PATH_SEGMENT@[166; 175)
               NAME_REF@[166; 175)
                 IDENT@[166; 175) "different"
-          COLONCOLON@[175; 177) "::"
+          COLON2@[175; 177) "::"
           STAR@[177; 178) "*"
         WHITESPACE@[178; 179) "\n"
         R_CURLY@[179; 180) "}"
-    SEMI@[180; 181) ";"
+    SEMICOLON@[180; 181) ";"
   WHITESPACE@[181; 182) "\n"
   USE_ITEM@[182; 197)
     USE_KW@[182; 185) "use"
@@ -134,5 +134,5 @@ SOURCE_FILE@[0; 198)
         AS_KW@[192; 194) "as"
         WHITESPACE@[194; 195) " "
         UNDERSCORE@[195; 196) "_"
-    SEMI@[196; 197) ";"
+    SEMICOLON@[196; 197) ";"
   WHITESPACE@[197; 198) "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0046_singleton_tuple_type.rast b/crates/ra_syntax/test_data/parser/inline/ok/0046_singleton_tuple_type.rast
index c7b4e614d..988b58d82 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0046_singleton_tuple_type.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0046_singleton_tuple_type.rast
@@ -16,5 +16,5 @@ SOURCE_FILE@[0; 17)
               IDENT@[10; 13) "i32"
       COMMA@[13; 14) ","
       R_PAREN@[14; 15) ")"
-    SEMI@[15; 16) ";"
+    SEMICOLON@[15; 16) ";"
   WHITESPACE@[16; 17) "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0050_fn_decl.rast b/crates/ra_syntax/test_data/parser/inline/ok/0050_fn_decl.rast
index 19f961e29..036035f6c 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0050_fn_decl.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0050_fn_decl.rast
@@ -16,7 +16,7 @@ SOURCE_FILE@[0; 22)
         PARAM_LIST@[16; 18)
           L_PAREN@[16; 17) "("
           R_PAREN@[17; 18) ")"
-        SEMI@[18; 19) ";"
+        SEMICOLON@[18; 19) ";"
       WHITESPACE@[19; 20) " "
       R_CURLY@[20; 21) "}"
   WHITESPACE@[21; 22) "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0051_unit_type.rast b/crates/ra_syntax/test_data/parser/inline/ok/0051_unit_type.rast
index 6a469f8aa..d9fc5eb8a 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0051_unit_type.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0051_unit_type.rast
@@ -10,5 +10,5 @@ SOURCE_FILE@[0; 13)
     TUPLE_TYPE@[9; 11)
       L_PAREN@[9; 10) "("
       R_PAREN@[10; 11) ")"
-    SEMI@[11; 12) ";"
+    SEMICOLON@[11; 12) ";"
   WHITESPACE@[12; 13) "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0052_path_type.rast b/crates/ra_syntax/test_data/parser/inline/ok/0052_path_type.rast
index ee55ee219..8647c23bf 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0052_path_type.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0052_path_type.rast
@@ -12,7 +12,7 @@ SOURCE_FILE@[0; 71)
         PATH_SEGMENT@[9; 12)
           NAME_REF@[9; 12)
             IDENT@[9; 12) "Foo"
-    SEMI@[12; 13) ";"
+    SEMICOLON@[12; 13) ";"
   WHITESPACE@[13; 14) "\n"
   TYPE_ALIAS_DEF@[14; 29)
     TYPE_KW@[14; 18) "type"
@@ -25,10 +25,10 @@ SOURCE_FILE@[0; 71)
     PATH_TYPE@[23; 28)
       PATH@[23; 28)
         PATH_SEGMENT@[23; 28)
-          COLONCOLON@[23; 25) "::"
+          COLON2@[23; 25) "::"
           NAME_REF@[25; 28)
             IDENT@[25; 28) "Foo"
-    SEMI@[28; 29) ";"
+    SEMICOLON@[28; 29) ";"
   WHITESPACE@[29; 30) "\n"
   TYPE_ALIAS_DEF@[30; 49)
     TYPE_KW@[30; 34) "type"
@@ -43,11 +43,11 @@ SOURCE_FILE@[0; 71)
         PATH@[39; 43)
           PATH_SEGMENT@[39; 43)
             SELF_KW@[39; 43) "self"
-        COLONCOLON@[43; 45) "::"
+        COLON2@[43; 45) "::"
         PATH_SEGMENT@[45; 48)
           NAME_REF@[45; 48)
             IDENT@[45; 48) "Foo"
-    SEMI@[48; 49) ";"
+    SEMICOLON@[48; 49) ";"
   WHITESPACE@[49; 50) "\n"
   TYPE_ALIAS_DEF@[50; 70)
     TYPE_KW@[50; 54) "type"
@@ -62,9 +62,9 @@ SOURCE_FILE@[0; 71)
         PATH@[59; 64)
           PATH_SEGMENT@[59; 64)
             SUPER_KW@[59; 64) "super"
-        COLONCOLON@[64; 66) "::"
+        COLON2@[64; 66) "::"
         PATH_SEGMENT@[66; 69)
           NAME_REF@[66; 69)
             IDENT@[66; 69) "Foo"
-    SEMI@[69; 70) ";"
+    SEMICOLON@[69; 70) ";"
   WHITESPACE@[70; 71) "\n"
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 f1018fcab..690d8504e 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
@@ -25,7 +25,7 @@ SOURCE_FILE@[0; 91)
               PATH_SEGMENT@[23; 24)
                 NAME_REF@[23; 24)
                   IDENT@[23; 24) "a"
-          SEMI@[24; 25) ";"
+          SEMICOLON@[24; 25) ";"
         WHITESPACE@[25; 30) "\n    "
         LET_STMT@[30; 43)
           LET_KW@[30; 33) "let"
@@ -41,11 +41,11 @@ SOURCE_FILE@[0; 91)
                 PATH_SEGMENT@[38; 39)
                   NAME_REF@[38; 39)
                     IDENT@[38; 39) "a"
-              COLONCOLON@[39; 41) "::"
+              COLON2@[39; 41) "::"
               PATH_SEGMENT@[41; 42)
                 NAME_REF@[41; 42)
                   IDENT@[41; 42) "b"
-          SEMI@[42; 43) ";"
+          SEMICOLON@[42; 43) ";"
         WHITESPACE@[43; 48) "\n    "
         LET_STMT@[48; 65)
           LET_KW@[48; 51) "let"
@@ -58,11 +58,11 @@ SOURCE_FILE@[0; 91)
           PATH_EXPR@[56; 64)
             PATH@[56; 64)
               PATH_SEGMENT@[56; 64)
-                COLONCOLON@[56; 58) "::"
+                COLON2@[56; 58) "::"
                 NAME_REF@[58; 59)
                   IDENT@[58; 59) "a"
                 TYPE_ARG_LIST@[59; 64)
-                  COLONCOLON@[59; 61) "::"
+                  COLON2@[59; 61) "::"
                   L_ANGLE@[61; 62) "<"
                   TYPE_ARG@[62; 63)
                     PATH_TYPE@[62; 63)
@@ -71,7 +71,7 @@ SOURCE_FILE@[0; 91)
                           NAME_REF@[62; 63)
                             IDENT@[62; 63) "b"
                   R_ANGLE@[63; 64) ">"
-          SEMI@[64; 65) ";"
+          SEMICOLON@[64; 65) ";"
         WHITESPACE@[65; 70) "\n    "
         LET_STMT@[70; 88)
           LET_KW@[70; 73) "let"
@@ -86,11 +86,11 @@ SOURCE_FILE@[0; 91)
               PATH_SEGMENT@[78; 84)
                 NAME_REF@[78; 84)
                   IDENT@[78; 84) "format"
-            EXCL@[84; 85) "!"
+            BANG@[84; 85) "!"
             TOKEN_TREE@[85; 87)
               L_PAREN@[85; 86) "("
               R_PAREN@[86; 87) ")"
-          SEMI@[87; 88) ";"
+          SEMICOLON@[87; 88) ";"
         WHITESPACE@[88; 89) "\n"
         R_CURLY@[89; 90) "}"
   WHITESPACE@[90; 91) "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0056_where_clause.rast b/crates/ra_syntax/test_data/parser/inline/ok/0056_where_clause.rast
index 9a9a13370..c6082791a 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0056_where_clause.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0056_where_clause.rast
@@ -63,7 +63,7 @@ SOURCE_FILE@[0; 116)
               PATH_SEGMENT@[64; 72)
                 NAME_REF@[64; 72)
                   IDENT@[64; 72) "Iterator"
-            COLONCOLON@[72; 74) "::"
+            COLON2@[72; 74) "::"
             PATH_SEGMENT@[74; 78)
               NAME_REF@[74; 78)
                 IDENT@[74; 78) "Item"
@@ -94,7 +94,7 @@ SOURCE_FILE@[0; 116)
                       NAME_REF@[93; 101)
                         IDENT@[93; 101) "Iterator"
                 R_ANGLE@[101; 102) ">"
-            COLONCOLON@[102; 104) "::"
+            COLON2@[102; 104) "::"
             PATH_SEGMENT@[104; 108)
               NAME_REF@[104; 108)
                 IDENT@[104; 108) "Item"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0058_range_pat.rast b/crates/ra_syntax/test_data/parser/inline/ok/0058_range_pat.rast
index 3d659ce10..8d7083e97 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0058_range_pat.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0058_range_pat.rast
@@ -27,7 +27,7 @@ SOURCE_FILE@[0; 112)
                   LITERAL@[35; 36)
                     INT_NUMBER@[35; 36) "0"
                 WHITESPACE@[36; 37) " "
-                DOTDOTDOT@[37; 40) "..."
+                DOT3@[37; 40) "..."
                 WHITESPACE@[40; 41) " "
                 LITERAL_PAT@[41; 44)
                   LITERAL@[41; 44)
@@ -46,7 +46,7 @@ SOURCE_FILE@[0; 112)
                   LITERAL@[60; 63)
                     INT_NUMBER@[60; 63) "101"
                 WHITESPACE@[63; 64) " "
-                DOTDOTEQ@[64; 67) "..="
+                DOT2EQ@[64; 67) "..="
                 WHITESPACE@[67; 68) " "
                 LITERAL_PAT@[68; 71)
                   LITERAL@[68; 71)
@@ -65,7 +65,7 @@ SOURCE_FILE@[0; 112)
                   LITERAL@[87; 90)
                     INT_NUMBER@[87; 90) "200"
                 WHITESPACE@[90; 91) " "
-                DOTDOT@[91; 93) ".."
+                DOT2@[91; 93) ".."
                 WHITESPACE@[93; 94) " "
                 LITERAL_PAT@[94; 97)
                   LITERAL@[94; 97)
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0060_extern_crate.rast b/crates/ra_syntax/test_data/parser/inline/ok/0060_extern_crate.rast
index 7667201ba..c6e4ee532 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0060_extern_crate.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0060_extern_crate.rast
@@ -6,5 +6,5 @@ SOURCE_FILE@[0; 18)
     WHITESPACE@[12; 13) " "
     NAME_REF@[13; 16)
       IDENT@[13; 16) "foo"
-    SEMI@[16; 17) ";"
+    SEMICOLON@[16; 17) ";"
   WHITESPACE@[17; 18) "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0061_record_lit.rast b/crates/ra_syntax/test_data/parser/inline/ok/0061_record_lit.rast
index dcf527639..89a611799 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0061_record_lit.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0061_record_lit.rast
@@ -22,7 +22,7 @@ SOURCE_FILE@[0; 112)
             RECORD_FIELD_LIST@[17; 19)
               L_CURLY@[17; 18) "{"
               R_CURLY@[18; 19) "}"
-          SEMI@[19; 20) ";"
+          SEMICOLON@[19; 20) ";"
         WHITESPACE@[20; 25) "\n    "
         EXPR_STMT@[25; 41)
           RECORD_LIT@[25; 40)
@@ -35,8 +35,11 @@ SOURCE_FILE@[0; 112)
               L_CURLY@[27; 28) "{"
               WHITESPACE@[28; 29) " "
               RECORD_FIELD@[29; 30)
-                NAME_REF@[29; 30)
-                  IDENT@[29; 30) "x"
+                PATH_EXPR@[29; 30)
+                  PATH@[29; 30)
+                    PATH_SEGMENT@[29; 30)
+                      NAME_REF@[29; 30)
+                        IDENT@[29; 30) "x"
               COMMA@[30; 31) ","
               WHITESPACE@[31; 32) " "
               RECORD_FIELD@[32; 37)
@@ -49,7 +52,7 @@ SOURCE_FILE@[0; 112)
               COMMA@[37; 38) ","
               WHITESPACE@[38; 39) " "
               R_CURLY@[39; 40) "}"
-          SEMI@[40; 41) ";"
+          SEMICOLON@[40; 41) ";"
         WHITESPACE@[41; 46) "\n    "
         EXPR_STMT@[46; 83)
           RECORD_LIT@[46; 82)
@@ -62,8 +65,11 @@ SOURCE_FILE@[0; 112)
               L_CURLY@[48; 49) "{"
               WHITESPACE@[49; 50) " "
               RECORD_FIELD@[50; 51)
-                NAME_REF@[50; 51)
-                  IDENT@[50; 51) "x"
+                PATH_EXPR@[50; 51)
+                  PATH@[50; 51)
+                    PATH_SEGMENT@[50; 51)
+                      NAME_REF@[50; 51)
+                        IDENT@[50; 51) "x"
               COMMA@[51; 52) ","
               WHITESPACE@[52; 53) " "
               RECORD_FIELD@[53; 58)
@@ -75,7 +81,7 @@ SOURCE_FILE@[0; 112)
                   INT_NUMBER@[56; 58) "32"
               COMMA@[58; 59) ","
               WHITESPACE@[59; 60) " "
-              DOTDOT@[60; 62) ".."
+              DOT2@[60; 62) ".."
               CALL_EXPR@[62; 80)
                 PATH_EXPR@[62; 78)
                   PATH@[62; 78)
@@ -83,7 +89,7 @@ SOURCE_FILE@[0; 112)
                       PATH_SEGMENT@[62; 69)
                         NAME_REF@[62; 69)
                           IDENT@[62; 69) "Default"
-                    COLONCOLON@[69; 71) "::"
+                    COLON2@[69; 71) "::"
                     PATH_SEGMENT@[71; 78)
                       NAME_REF@[71; 78)
                         IDENT@[71; 78) "default"
@@ -92,7 +98,7 @@ SOURCE_FILE@[0; 112)
                   R_PAREN@[79; 80) ")"
               WHITESPACE@[80; 81) " "
               R_CURLY@[81; 82) "}"
-          SEMI@[82; 83) ";"
+          SEMICOLON@[82; 83) ";"
         WHITESPACE@[83; 88) "\n    "
         EXPR_STMT@[88; 109)
           RECORD_LIT@[88; 108)
@@ -113,7 +119,7 @@ SOURCE_FILE@[0; 112)
                   INT_NUMBER@[105; 106) "1"
               WHITESPACE@[106; 107) " "
               R_CURLY@[107; 108) "}"
-          SEMI@[108; 109) ";"
+          SEMICOLON@[108; 109) ";"
         WHITESPACE@[109; 110) "\n"
         R_CURLY@[110; 111) "}"
   WHITESPACE@[111; 112) "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0062_mod_contents.rast b/crates/ra_syntax/test_data/parser/inline/ok/0062_mod_contents.rast
index 6b528c252..99e0a0bec 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0062_mod_contents.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0062_mod_contents.rast
@@ -18,7 +18,7 @@ SOURCE_FILE@[0; 70)
       PATH_SEGMENT@[12; 23)
         NAME_REF@[12; 23)
           IDENT@[12; 23) "macro_rules"
-    EXCL@[23; 24) "!"
+    BANG@[23; 24) "!"
     WHITESPACE@[24; 25) " "
     NAME@[25; 28)
       IDENT@[25; 28) "foo"
@@ -33,26 +33,26 @@ SOURCE_FILE@[0; 70)
         PATH_SEGMENT@[32; 35)
           NAME_REF@[32; 35)
             IDENT@[32; 35) "foo"
-      COLONCOLON@[35; 37) "::"
+      COLON2@[35; 37) "::"
       PATH_SEGMENT@[37; 40)
         NAME_REF@[37; 40)
           IDENT@[37; 40) "bar"
-    EXCL@[40; 41) "!"
+    BANG@[40; 41) "!"
     TOKEN_TREE@[41; 43)
       L_PAREN@[41; 42) "("
       R_PAREN@[42; 43) ")"
-    SEMI@[43; 44) ";"
+    SEMICOLON@[43; 44) ";"
   WHITESPACE@[44; 45) "\n"
   MACRO_CALL@[45; 59)
     PATH@[45; 55)
       PATH@[45; 50)
         PATH_SEGMENT@[45; 50)
           SUPER_KW@[45; 50) "super"
-      COLONCOLON@[50; 52) "::"
+      COLON2@[50; 52) "::"
       PATH_SEGMENT@[52; 55)
         NAME_REF@[52; 55)
           IDENT@[52; 55) "baz"
-    EXCL@[55; 56) "!"
+    BANG@[55; 56) "!"
     WHITESPACE@[56; 57) " "
     TOKEN_TREE@[57; 59)
       L_CURLY@[57; 58) "{"
@@ -63,5 +63,5 @@ SOURCE_FILE@[0; 70)
     WHITESPACE@[66; 67) " "
     NAME@[67; 68)
       IDENT@[67; 68) "S"
-    SEMI@[68; 69) ";"
+    SEMICOLON@[68; 69) ";"
   WHITESPACE@[69; 70) "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0063_impl_def_neg.rast b/crates/ra_syntax/test_data/parser/inline/ok/0063_impl_def_neg.rast
index 0cc3ac085..278549a46 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0063_impl_def_neg.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0063_impl_def_neg.rast
@@ -2,7 +2,7 @@ SOURCE_FILE@[0; 20)
   IMPL_DEF@[0; 19)
     IMPL_KW@[0; 4) "impl"
     WHITESPACE@[4; 5) " "
-    EXCL@[5; 6) "!"
+    BANG@[5; 6) "!"
     PATH_TYPE@[6; 10)
       PATH@[6; 10)
         PATH_SEGMENT@[6; 10)
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0064_if_expr.rast b/crates/ra_syntax/test_data/parser/inline/ok/0064_if_expr.rast
index 2ace3c8ee..df24ae189 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0064_if_expr.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0064_if_expr.rast
@@ -24,7 +24,7 @@ SOURCE_FILE@[0; 137)
               BLOCK@[23; 25)
                 L_CURLY@[23; 24) "{"
                 R_CURLY@[24; 25) "}"
-          SEMI@[25; 26) ";"
+          SEMICOLON@[25; 26) ";"
         WHITESPACE@[26; 31) "\n    "
         EXPR_STMT@[31; 50)
           IF_EXPR@[31; 49)
@@ -45,7 +45,7 @@ SOURCE_FILE@[0; 137)
               BLOCK@[47; 49)
                 L_CURLY@[47; 48) "{"
                 R_CURLY@[48; 49) "}"
-          SEMI@[49; 50) ";"
+          SEMICOLON@[49; 50) ";"
         WHITESPACE@[50; 55) "\n    "
         EXPR_STMT@[55; 91)
           IF_EXPR@[55; 90)
@@ -80,7 +80,7 @@ SOURCE_FILE@[0; 137)
                 BLOCK@[88; 90)
                   L_CURLY@[88; 89) "{"
                   R_CURLY@[89; 90) "}"
-          SEMI@[90; 91) ";"
+          SEMICOLON@[90; 91) ";"
         WHITESPACE@[91; 96) "\n    "
         EXPR_STMT@[96; 104)
           IF_EXPR@[96; 103)
@@ -97,7 +97,7 @@ SOURCE_FILE@[0; 137)
               BLOCK@[101; 103)
                 L_CURLY@[101; 102) "{"
                 R_CURLY@[102; 103) "}"
-          SEMI@[103; 104) ";"
+          SEMICOLON@[103; 104) ";"
         WHITESPACE@[104; 109) "\n    "
         EXPR_STMT@[109; 134)
           IF_EXPR@[109; 133)
@@ -126,7 +126,7 @@ SOURCE_FILE@[0; 137)
                 L_CURLY@[130; 131) "{"
                 WHITESPACE@[131; 132) " "
                 R_CURLY@[132; 133) "}"
-          SEMI@[133; 134) ";"
+          SEMICOLON@[133; 134) ";"
         WHITESPACE@[134; 135) "\n"
         R_CURLY@[135; 136) "}"
   WHITESPACE@[136; 137) "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0065_dyn_trait_type.rast b/crates/ra_syntax/test_data/parser/inline/ok/0065_dyn_trait_type.rast
index 2ee0dc199..bbf347580 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0065_dyn_trait_type.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0065_dyn_trait_type.rast
@@ -39,5 +39,5 @@ SOURCE_FILE@[0; 42)
         WHITESPACE@[37; 38) " "
         TYPE_BOUND@[38; 40)
           LIFETIME@[38; 40) "\'a"
-    SEMI@[40; 41) ";"
+    SEMICOLON@[40; 41) ";"
   WHITESPACE@[41; 42) "\n"
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 2f07af4e1..85edd0845 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
@@ -146,7 +146,7 @@ SOURCE_FILE@[0; 167)
               COMMA@[156; 157) ","
               WHITESPACE@[157; 162) "\n    "
               R_CURLY@[162; 163) "}"
-          SEMI@[163; 164) ";"
+          SEMICOLON@[163; 164) ";"
         WHITESPACE@[164; 165) "\n"
         R_CURLY@[165; 166) "}"
   WHITESPACE@[166; 167) "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0067_crate_path.rast b/crates/ra_syntax/test_data/parser/inline/ok/0067_crate_path.rast
index f2ba4e909..35994e3fd 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0067_crate_path.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0067_crate_path.rast
@@ -7,9 +7,9 @@ SOURCE_FILE@[0; 16)
         PATH@[4; 9)
           PATH_SEGMENT@[4; 9)
             CRATE_KW@[4; 9) "crate"
-        COLONCOLON@[9; 11) "::"
+        COLON2@[9; 11) "::"
         PATH_SEGMENT@[11; 14)
           NAME_REF@[11; 14)
             IDENT@[11; 14) "foo"
-    SEMI@[14; 15) ";"
+    SEMICOLON@[14; 15) ";"
   WHITESPACE@[15; 16) "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0069_use_tree_list_after_path.rast b/crates/ra_syntax/test_data/parser/inline/ok/0069_use_tree_list_after_path.rast
index 86afc9362..e24247890 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0069_use_tree_list_after_path.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0069_use_tree_list_after_path.rast
@@ -6,7 +6,7 @@ SOURCE_FILE@[0; 37)
       PATH@[4; 9)
         PATH_SEGMENT@[4; 9)
           CRATE_KW@[4; 9) "crate"
-      COLONCOLON@[9; 11) "::"
+      COLON2@[9; 11) "::"
       USE_TREE_LIST@[11; 17)
         L_CURLY@[11; 12) "{"
         USE_TREE@[12; 16)
@@ -15,7 +15,7 @@ SOURCE_FILE@[0; 37)
               NAME_REF@[12; 16)
                 IDENT@[12; 16) "Item"
         R_CURLY@[16; 17) "}"
-    SEMI@[17; 18) ";"
+    SEMICOLON@[17; 18) ";"
   WHITESPACE@[18; 19) "\n"
   USE_ITEM@[19; 36)
     USE_KW@[19; 22) "use"
@@ -24,7 +24,7 @@ SOURCE_FILE@[0; 37)
       PATH@[23; 27)
         PATH_SEGMENT@[23; 27)
           SELF_KW@[23; 27) "self"
-      COLONCOLON@[27; 29) "::"
+      COLON2@[27; 29) "::"
       USE_TREE_LIST@[29; 35)
         L_CURLY@[29; 30) "{"
         USE_TREE@[30; 34)
@@ -33,5 +33,5 @@ SOURCE_FILE@[0; 37)
               NAME_REF@[30; 34)
                 IDENT@[30; 34) "Item"
         R_CURLY@[34; 35) "}"
-    SEMI@[35; 36) ";"
+    SEMICOLON@[35; 36) ";"
   WHITESPACE@[36; 37) "\n"
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 cd63d10f7..4b075569a 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
@@ -32,7 +32,7 @@ SOURCE_FILE@[0; 46)
             WHITESPACE@[28; 29) " "
             LITERAL@[29; 30)
               INT_NUMBER@[29; 30) "2"
-          SEMI@[30; 31) ";"
+          SEMICOLON@[30; 31) ";"
         WHITESPACE@[31; 36) "\n    "
         EXPR_STMT@[36; 39)
           BLOCK_EXPR@[36; 39)
@@ -47,7 +47,7 @@ SOURCE_FILE@[0; 46)
             AMP@[40; 41) "&"
             LITERAL@[41; 42)
               INT_NUMBER@[41; 42) "2"
-          SEMI@[42; 43) ";"
+          SEMICOLON@[42; 43) ";"
         WHITESPACE@[43; 44) "\n"
         R_CURLY@[44; 45) "}"
   WHITESPACE@[45; 46) "\n"
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 0af668056..559ffb578 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
@@ -24,7 +24,7 @@ SOURCE_FILE@[0; 97)
               L_CURLY@[24; 25) "{"
               WHITESPACE@[25; 26) " "
               R_CURLY@[26; 27) "}"
-          SEMI@[27; 28) ";"
+          SEMICOLON@[27; 28) ";"
         WHITESPACE@[28; 33) "\n    "
         EXPR_STMT@[33; 44)
           MATCH_EXPR@[33; 43)
@@ -39,7 +39,7 @@ SOURCE_FILE@[0; 97)
             MATCH_ARM_LIST@[41; 43)
               L_CURLY@[41; 42) "{"
               R_CURLY@[42; 43) "}"
-          SEMI@[43; 44) ";"
+          SEMICOLON@[43; 44) ";"
         WHITESPACE@[44; 49) "\n    "
         EXPR_STMT@[49; 71)
           MATCH_EXPR@[49; 70)
@@ -65,7 +65,7 @@ SOURCE_FILE@[0; 97)
                   R_PAREN@[67; 68) ")"
               WHITESPACE@[68; 69) " "
               R_CURLY@[69; 70) "}"
-          SEMI@[70; 71) ";"
+          SEMICOLON@[70; 71) ";"
         WHITESPACE@[71; 76) "\n    "
         EXPR_STMT@[76; 94)
           MATCH_EXPR@[76; 93)
@@ -90,7 +90,7 @@ SOURCE_FILE@[0; 97)
             MATCH_ARM_LIST@[91; 93)
               L_CURLY@[91; 92) "{"
               R_CURLY@[92; 93) "}"
-          SEMI@[93; 94) ";"
+          SEMICOLON@[93; 94) ";"
         WHITESPACE@[94; 95) "\n"
         R_CURLY@[95; 96) "}"
   WHITESPACE@[96; 97) "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0072_return_expr.rast b/crates/ra_syntax/test_data/parser/inline/ok/0072_return_expr.rast
index 4a83a7200..084efaee2 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0072_return_expr.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0072_return_expr.rast
@@ -15,7 +15,7 @@ SOURCE_FILE@[0; 40)
         EXPR_STMT@[15; 22)
           RETURN_EXPR@[15; 21)
             RETURN_KW@[15; 21) "return"
-          SEMI@[21; 22) ";"
+          SEMICOLON@[21; 22) ";"
         WHITESPACE@[22; 27) "\n    "
         EXPR_STMT@[27; 37)
           RETURN_EXPR@[27; 36)
@@ -23,7 +23,7 @@ SOURCE_FILE@[0; 40)
             WHITESPACE@[33; 34) " "
             LITERAL@[34; 36)
               INT_NUMBER@[34; 36) "92"
-          SEMI@[36; 37) ";"
+          SEMICOLON@[36; 37) ";"
         WHITESPACE@[37; 38) "\n"
         R_CURLY@[38; 39) "}"
   WHITESPACE@[39; 40) "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0073_type_item_type_params.rast b/crates/ra_syntax/test_data/parser/inline/ok/0073_type_item_type_params.rast
index 2dd6db28f..64150b774 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0073_type_item_type_params.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0073_type_item_type_params.rast
@@ -16,5 +16,5 @@ SOURCE_FILE@[0; 21)
     TUPLE_TYPE@[17; 19)
       L_PAREN@[17; 18) "("
       R_PAREN@[18; 19) ")"
-    SEMI@[19; 20) ";"
+    SEMICOLON@[19; 20) ";"
   WHITESPACE@[20; 21) "\n"
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 28d1bad97..5c7cb4a88 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
@@ -36,7 +36,7 @@ SOURCE_FILE@[0; 65)
           WHITESPACE@[26; 27) " "
           LITERAL@[27; 28)
             INT_NUMBER@[27; 28) "1"
-          SEMI@[28; 29) ";"
+          SEMICOLON@[28; 29) ";"
         WHITESPACE@[29; 30) " "
         R_CURLY@[30; 31) "}"
   WHITESPACE@[31; 32) "\n"
@@ -56,12 +56,12 @@ SOURCE_FILE@[0; 65)
         EXPR_STMT@[41; 43)
           LITERAL@[41; 42)
             INT_NUMBER@[41; 42) "1"
-          SEMI@[42; 43) ";"
+          SEMICOLON@[42; 43) ";"
         WHITESPACE@[43; 44) " "
         EXPR_STMT@[44; 46)
           LITERAL@[44; 45)
             INT_NUMBER@[44; 45) "2"
-          SEMI@[45; 46) ";"
+          SEMICOLON@[45; 46) ";"
         WHITESPACE@[46; 47) " "
         R_CURLY@[47; 48) "}"
   WHITESPACE@[48; 49) "\n"
@@ -81,7 +81,7 @@ SOURCE_FILE@[0; 65)
         EXPR_STMT@[58; 60)
           LITERAL@[58; 59)
             INT_NUMBER@[58; 59) "1"
-          SEMI@[59; 60) ";"
+          SEMICOLON@[59; 60) ";"
         WHITESPACE@[60; 61) " "
         LITERAL@[61; 62)
           INT_NUMBER@[61; 62) "2"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0077_try_expr.rast b/crates/ra_syntax/test_data/parser/inline/ok/0077_try_expr.rast
index 18ccfe9ef..bb9f674e1 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0077_try_expr.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0077_try_expr.rast
@@ -20,7 +20,7 @@ SOURCE_FILE@[0; 21)
                   NAME_REF@[15; 16)
                     IDENT@[15; 16) "x"
             QUESTION@[16; 17) "?"
-          SEMI@[17; 18) ";"
+          SEMICOLON@[17; 18) ";"
         WHITESPACE@[18; 19) "\n"
         R_CURLY@[19; 20) "}"
   WHITESPACE@[20; 21) "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0078_type_item.rast b/crates/ra_syntax/test_data/parser/inline/ok/0078_type_item.rast
index 4bc0b1858..9a38192d9 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0078_type_item.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0078_type_item.rast
@@ -12,5 +12,5 @@ SOURCE_FILE@[0; 16)
         PATH_SEGMENT@[11; 14)
           NAME_REF@[11; 14)
             IDENT@[11; 14) "Bar"
-    SEMI@[14; 15) ";"
+    SEMICOLON@[14; 15) ";"
   WHITESPACE@[15; 16) "\n"
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 9f8a6b0f6..b8bafc220 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
@@ -24,8 +24,8 @@ SOURCE_FILE@[0; 89)
           RANGE_EXPR@[23; 26)
             LITERAL@[23; 24)
               INT_NUMBER@[23; 24) "1"
-            DOTDOT@[24; 26) ".."
-          SEMI@[26; 27) ";"
+            DOT2@[24; 26) ".."
+          SEMICOLON@[26; 27) ";"
         WHITESPACE@[27; 32) "\n    "
         EXPR_STMT@[32; 54)
           MATCH_EXPR@[32; 53)
@@ -34,7 +34,7 @@ SOURCE_FILE@[0; 89)
             RANGE_EXPR@[38; 41)
               LITERAL@[38; 39)
                 INT_NUMBER@[38; 39) "1"
-              DOTDOT@[39; 41) ".."
+              DOT2@[39; 41) ".."
             WHITESPACE@[41; 42) " "
             MATCH_ARM_LIST@[42; 53)
               L_CURLY@[42; 43) "{"
@@ -50,7 +50,7 @@ SOURCE_FILE@[0; 89)
                   R_PAREN@[50; 51) ")"
               WHITESPACE@[51; 52) " "
               R_CURLY@[52; 53) "}"
-          SEMI@[53; 54) ";"
+          SEMICOLON@[53; 54) ";"
         WHITESPACE@[54; 59) "\n    "
         EXPR_STMT@[59; 86)
           MATCH_EXPR@[59; 85)
@@ -69,7 +69,7 @@ SOURCE_FILE@[0; 89)
                 ARG_LIST@[68; 70)
                   L_PAREN@[68; 69) "("
                   R_PAREN@[69; 70) ")"
-              DOTDOT@[70; 72) ".."
+              DOT2@[70; 72) ".."
               PATH_EXPR@[72; 73)
                 PATH@[72; 73)
                   PATH_SEGMENT@[72; 73)
@@ -90,7 +90,7 @@ SOURCE_FILE@[0; 89)
                   R_PAREN@[82; 83) ")"
               WHITESPACE@[83; 84) " "
               R_CURLY@[84; 85) "}"
-          SEMI@[85; 86) ";"
+          SEMICOLON@[85; 86) ";"
         WHITESPACE@[86; 87) "\n"
         R_CURLY@[87; 88) "}"
   WHITESPACE@[88; 89) "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0081_for_type.rast b/crates/ra_syntax/test_data/parser/inline/ok/0081_for_type.rast
index b1353c2c6..00c4e4220 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0081_for_type.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0081_for_type.rast
@@ -27,7 +27,7 @@ SOURCE_FILE@[0; 200)
           TUPLE_TYPE@[25; 27)
             L_PAREN@[25; 26) "("
             R_PAREN@[26; 27) ")"
-    SEMI@[27; 28) ";"
+    SEMICOLON@[27; 28) ";"
   WHITESPACE@[28; 29) "\n"
   FN_DEF@[29; 79)
     FN_KW@[29; 31) "fn"
@@ -222,7 +222,7 @@ SOURCE_FILE@[0; 200)
                         NAME_REF@[177; 180)
                           IDENT@[177; 180) "Baz"
                   R_ANGLE@[180; 181) ">"
-              COLONCOLON@[181; 183) "::"
+              COLON2@[181; 183) "::"
               PATH_SEGMENT@[183; 186)
                 NAME_REF@[183; 186)
                   IDENT@[183; 186) "Foo"
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 8f34afe76..2999977fc 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
@@ -24,7 +24,7 @@ SOURCE_FILE@[0; 52)
             AMP@[23; 24) "&"
             LITERAL@[24; 25)
               INT_NUMBER@[24; 25) "1"
-          SEMI@[25; 26) ";"
+          SEMICOLON@[25; 26) ";"
         WHITESPACE@[26; 31) "\n    "
         LET_STMT@[31; 49)
           LET_KW@[31; 34) "let"
@@ -49,7 +49,7 @@ SOURCE_FILE@[0; 52)
                 ARG_LIST@[46; 48)
                   L_PAREN@[46; 47) "("
                   R_PAREN@[47; 48) ")"
-          SEMI@[48; 49) ";"
+          SEMICOLON@[48; 49) ";"
         WHITESPACE@[49; 50) "\n"
         R_CURLY@[50; 51) "}"
   WHITESPACE@[51; 52) "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0083_struct_items.rast b/crates/ra_syntax/test_data/parser/inline/ok/0083_struct_items.rast
index e909f2b78..13393e4b8 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0083_struct_items.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0083_struct_items.rast
@@ -4,7 +4,7 @@ SOURCE_FILE@[0; 106)
     WHITESPACE@[6; 7) " "
     NAME@[7; 10)
       IDENT@[7; 10) "Foo"
-    SEMI@[10; 11) ";"
+    SEMICOLON@[10; 11) ";"
   WHITESPACE@[11; 12) "\n"
   STRUCT_DEF@[12; 25)
     STRUCT_KW@[12; 18) "struct"
@@ -24,7 +24,7 @@ SOURCE_FILE@[0; 106)
     TUPLE_FIELD_DEF_LIST@[36; 38)
       L_PAREN@[36; 37) "("
       R_PAREN@[37; 38) ")"
-    SEMI@[38; 39) ";"
+    SEMICOLON@[38; 39) ";"
   WHITESPACE@[39; 40) "\n"
   STRUCT_DEF@[40; 66)
     STRUCT_KW@[40; 46) "struct"
@@ -48,7 +48,7 @@ SOURCE_FILE@[0; 106)
               NAME_REF@[59; 64)
                 IDENT@[59; 64) "usize"
       R_PAREN@[64; 65) ")"
-    SEMI@[65; 66) ";"
+    SEMICOLON@[65; 66) ";"
   WHITESPACE@[66; 67) "\n"
   STRUCT_DEF@[67; 105)
     STRUCT_KW@[67; 73) "struct"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0084_paren_type.rast b/crates/ra_syntax/test_data/parser/inline/ok/0084_paren_type.rast
index c0cf48af5..79d193616 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0084_paren_type.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0084_paren_type.rast
@@ -15,5 +15,5 @@ SOURCE_FILE@[0; 16)
             NAME_REF@[10; 13)
               IDENT@[10; 13) "i32"
       R_PAREN@[13; 14) ")"
-    SEMI@[14; 15) ";"
+    SEMICOLON@[14; 15) ";"
   WHITESPACE@[15; 16) "\n"
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 2903c6f9a..c2cec89b4 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
@@ -22,7 +22,7 @@ SOURCE_FILE@[0; 189)
           WHITESPACE@[22; 23) " "
           LITERAL@[23; 27)
             TRUE_KW@[23; 27) "true"
-          SEMI@[27; 28) ";"
+          SEMICOLON@[27; 28) ";"
         WHITESPACE@[28; 33) "\n    "
         LET_STMT@[33; 47)
           LET_KW@[33; 36) "let"
@@ -34,7 +34,7 @@ SOURCE_FILE@[0; 189)
           WHITESPACE@[40; 41) " "
           LITERAL@[41; 46)
             FALSE_KW@[41; 46) "false"
-          SEMI@[46; 47) ";"
+          SEMICOLON@[46; 47) ";"
         WHITESPACE@[47; 52) "\n    "
         LET_STMT@[52; 62)
           LET_KW@[52; 55) "let"
@@ -46,7 +46,7 @@ SOURCE_FILE@[0; 189)
           WHITESPACE@[59; 60) " "
           LITERAL@[60; 61)
             INT_NUMBER@[60; 61) "1"
-          SEMI@[61; 62) ";"
+          SEMICOLON@[61; 62) ";"
         WHITESPACE@[62; 67) "\n    "
         LET_STMT@[67; 79)
           LET_KW@[67; 70) "let"
@@ -58,7 +58,7 @@ SOURCE_FILE@[0; 189)
           WHITESPACE@[74; 75) " "
           LITERAL@[75; 78)
             FLOAT_NUMBER@[75; 78) "2.0"
-          SEMI@[78; 79) ";"
+          SEMICOLON@[78; 79) ";"
         WHITESPACE@[79; 84) "\n    "
         LET_STMT@[84; 97)
           LET_KW@[84; 87) "let"
@@ -70,7 +70,7 @@ SOURCE_FILE@[0; 189)
           WHITESPACE@[91; 92) " "
           LITERAL@[92; 96)
             BYTE@[92; 96) "b\'a\'"
-          SEMI@[96; 97) ";"
+          SEMICOLON@[96; 97) ";"
         WHITESPACE@[97; 102) "\n    "
         LET_STMT@[102; 114)
           LET_KW@[102; 105) "let"
@@ -82,7 +82,7 @@ SOURCE_FILE@[0; 189)
           WHITESPACE@[109; 110) " "
           LITERAL@[110; 113)
             CHAR@[110; 113) "\'b\'"
-          SEMI@[113; 114) ";"
+          SEMICOLON@[113; 114) ";"
         WHITESPACE@[114; 119) "\n    "
         LET_STMT@[119; 131)
           LET_KW@[119; 122) "let"
@@ -94,7 +94,7 @@ SOURCE_FILE@[0; 189)
           WHITESPACE@[126; 127) " "
           LITERAL@[127; 130)
             STRING@[127; 130) "\"c\""
-          SEMI@[130; 131) ";"
+          SEMICOLON@[130; 131) ";"
         WHITESPACE@[131; 136) "\n    "
         LET_STMT@[136; 149)
           LET_KW@[136; 139) "let"
@@ -106,7 +106,7 @@ SOURCE_FILE@[0; 189)
           WHITESPACE@[143; 144) " "
           LITERAL@[144; 148)
             RAW_STRING@[144; 148) "r\"d\""
-          SEMI@[148; 149) ";"
+          SEMICOLON@[148; 149) ";"
         WHITESPACE@[149; 154) "\n    "
         LET_STMT@[154; 167)
           LET_KW@[154; 157) "let"
@@ -118,7 +118,7 @@ SOURCE_FILE@[0; 189)
           WHITESPACE@[161; 162) " "
           LITERAL@[162; 166)
             BYTE_STRING@[162; 166) "b\"e\""
-          SEMI@[166; 167) ";"
+          SEMICOLON@[166; 167) ";"
         WHITESPACE@[167; 172) "\n    "
         LET_STMT@[172; 186)
           LET_KW@[172; 175) "let"
@@ -130,7 +130,7 @@ SOURCE_FILE@[0; 189)
           WHITESPACE@[179; 180) " "
           LITERAL@[180; 185)
             RAW_BYTE_STRING@[180; 185) "br\"f\""
-          SEMI@[185; 186) ";"
+          SEMICOLON@[185; 186) ";"
         WHITESPACE@[186; 187) "\n"
         R_CURLY@[187; 188) "}"
   WHITESPACE@[188; 189) "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0090_type_param_default.rast b/crates/ra_syntax/test_data/parser/inline/ok/0090_type_param_default.rast
index 8d2579cd6..1d7796449 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0090_type_param_default.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0090_type_param_default.rast
@@ -18,5 +18,5 @@ SOURCE_FILE@[0; 19)
               NAME_REF@[13; 16)
                 IDENT@[13; 16) "i32"
       R_ANGLE@[16; 17) ">"
-    SEMI@[17; 18) ";"
+    SEMICOLON@[17; 18) ";"
   WHITESPACE@[18; 19) "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0092_fn_pointer_type_with_ret.rast b/crates/ra_syntax/test_data/parser/inline/ok/0092_fn_pointer_type_with_ret.rast
index fae822367..db6013c6f 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0092_fn_pointer_type_with_ret.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0092_fn_pointer_type_with_ret.rast
@@ -19,5 +19,5 @@ SOURCE_FILE@[0; 21)
         TUPLE_TYPE@[17; 19)
           L_PAREN@[17; 18) "("
           R_PAREN@[18; 19) ")"
-    SEMI@[19; 20) ";"
+    SEMICOLON@[19; 20) ";"
   WHITESPACE@[20; 21) "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0093_index_expr.rast b/crates/ra_syntax/test_data/parser/inline/ok/0093_index_expr.rast
index 1a979e597..118cfc096 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0093_index_expr.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0093_index_expr.rast
@@ -28,7 +28,7 @@ SOURCE_FILE@[0; 26)
             LITERAL@[20; 21)
               INT_NUMBER@[20; 21) "2"
             R_BRACK@[21; 22) "]"
-          SEMI@[22; 23) ";"
+          SEMICOLON@[22; 23) ";"
         WHITESPACE@[23; 24) "\n"
         R_CURLY@[24; 25) "}"
   WHITESPACE@[25; 26) "\n"
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 fe86894a9..ebe7816a4 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
@@ -23,7 +23,7 @@ SOURCE_FILE@[0; 26)
           TUPLE_EXPR@[20; 22)
             L_PAREN@[20; 21) "("
             R_PAREN@[21; 22) ")"
-          SEMI@[22; 23) ";"
+          SEMICOLON@[22; 23) ";"
         WHITESPACE@[23; 24) " "
         R_CURLY@[24; 25) "}"
   WHITESPACE@[25; 26) "\n"
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 157aa29f5..6bd6f5a6b 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
@@ -95,7 +95,7 @@ SOURCE_FILE@[0; 167)
               PATH_SEGMENT@[109; 120)
                 NAME_REF@[109; 120)
                   IDENT@[109; 120) "macro_rules"
-            EXCL@[120; 121) "!"
+            BANG@[120; 121) "!"
             WHITESPACE@[121; 122) " "
             NAME@[122; 126)
               IDENT@[122; 126) "test"
@@ -121,7 +121,7 @@ SOURCE_FILE@[0; 167)
             PATH_SEGMENT@[157; 161)
               NAME_REF@[157; 161)
                 IDENT@[157; 161) "test"
-          EXCL@[161; 162) "!"
+          BANG@[161; 162) "!"
           TOKEN_TREE@[162; 164)
             L_CURLY@[162; 163) "{"
             R_CURLY@[163; 164) "}"
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 83c58d25f..d25f087a5 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
@@ -30,7 +30,7 @@ SOURCE_FILE@[0; 33)
               BLOCK@[27; 29)
                 L_CURLY@[27; 28) "{"
                 R_CURLY@[28; 29) "}"
-          SEMI@[29; 30) ";"
+          SEMICOLON@[29; 30) ";"
         WHITESPACE@[30; 31) "\n"
         R_CURLY@[31; 32) "}"
   WHITESPACE@[32; 33) "\n"
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 d8e04bd90..c2614543c 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
@@ -30,7 +30,7 @@ SOURCE_FILE@[0; 119)
           TUPLE_EXPR@[26; 28)
             L_PAREN@[26; 27) "("
             R_PAREN@[27; 28) ")"
-          SEMI@[28; 29) ";"
+          SEMICOLON@[28; 29) ";"
         WHITESPACE@[29; 34) "\n    "
         LET_STMT@[34; 62)
           LET_KW@[34; 37) "let"
@@ -64,7 +64,7 @@ SOURCE_FILE@[0; 119)
           TUPLE_EXPR@[59; 61)
             L_PAREN@[59; 60) "("
             R_PAREN@[60; 61) ")"
-          SEMI@[61; 62) ";"
+          SEMICOLON@[61; 62) ";"
         WHITESPACE@[62; 67) "\n    "
         LET_STMT@[67; 90)
           LET_KW@[67; 70) "let"
@@ -87,7 +87,7 @@ SOURCE_FILE@[0; 119)
                   UNDERSCORE@[78; 79) "_"
               COMMA@[79; 80) ","
               WHITESPACE@[80; 81) " "
-              DOTDOT@[81; 83) ".."
+              DOT2@[81; 83) ".."
               R_CURLY@[83; 84) "}"
           WHITESPACE@[84; 85) " "
           EQ@[85; 86) "="
@@ -95,7 +95,7 @@ SOURCE_FILE@[0; 119)
           TUPLE_EXPR@[87; 89)
             L_PAREN@[87; 88) "("
             R_PAREN@[88; 89) ")"
-          SEMI@[89; 90) ";"
+          SEMICOLON@[89; 90) ";"
         WHITESPACE@[90; 95) "\n    "
         LET_STMT@[95; 116)
           LET_KW@[95; 98) "let"
@@ -125,7 +125,7 @@ SOURCE_FILE@[0; 119)
           TUPLE_EXPR@[113; 115)
             L_PAREN@[113; 114) "("
             R_PAREN@[114; 115) ")"
-          SEMI@[115; 116) ";"
+          SEMICOLON@[115; 116) ";"
         WHITESPACE@[116; 117) "\n"
         R_CURLY@[117; 118) "}"
   WHITESPACE@[118; 119) "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0103_array_expr.rast b/crates/ra_syntax/test_data/parser/inline/ok/0103_array_expr.rast
index 0db62a1f5..60fbf2771 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0103_array_expr.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0103_array_expr.rast
@@ -16,7 +16,7 @@ SOURCE_FILE@[0; 55)
           ARRAY_EXPR@[15; 17)
             L_BRACK@[15; 16) "["
             R_BRACK@[16; 17) "]"
-          SEMI@[17; 18) ";"
+          SEMICOLON@[17; 18) ";"
         WHITESPACE@[18; 23) "\n    "
         EXPR_STMT@[23; 27)
           ARRAY_EXPR@[23; 26)
@@ -24,7 +24,7 @@ SOURCE_FILE@[0; 55)
             LITERAL@[24; 25)
               INT_NUMBER@[24; 25) "1"
             R_BRACK@[25; 26) "]"
-          SEMI@[26; 27) ";"
+          SEMICOLON@[26; 27) ";"
         WHITESPACE@[27; 32) "\n    "
         EXPR_STMT@[32; 40)
           ARRAY_EXPR@[32; 39)
@@ -37,19 +37,19 @@ SOURCE_FILE@[0; 55)
               INT_NUMBER@[36; 37) "2"
             COMMA@[37; 38) ","
             R_BRACK@[38; 39) "]"
-          SEMI@[39; 40) ";"
+          SEMICOLON@[39; 40) ";"
         WHITESPACE@[40; 45) "\n    "
         EXPR_STMT@[45; 52)
           ARRAY_EXPR@[45; 51)
             L_BRACK@[45; 46) "["
             LITERAL@[46; 47)
               INT_NUMBER@[46; 47) "1"
-            SEMI@[47; 48) ";"
+            SEMICOLON@[47; 48) ";"
             WHITESPACE@[48; 49) " "
             LITERAL@[49; 50)
               INT_NUMBER@[49; 50) "2"
             R_BRACK@[50; 51) "]"
-          SEMI@[51; 52) ";"
+          SEMICOLON@[51; 52) ";"
         WHITESPACE@[52; 53) "\n"
         R_CURLY@[53; 54) "}"
   WHITESPACE@[54; 55) "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0104_path_fn_trait_args.rast b/crates/ra_syntax/test_data/parser/inline/ok/0104_path_fn_trait_args.rast
index a983d5954..d65c75c65 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0104_path_fn_trait_args.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0104_path_fn_trait_args.rast
@@ -37,5 +37,5 @@ SOURCE_FILE@[0; 29)
                         L_PAREN@[24; 25) "("
                         R_PAREN@[25; 26) ")"
             R_ANGLE@[26; 27) ">"
-    SEMI@[27; 28) ";"
+    SEMICOLON@[27; 28) ";"
   WHITESPACE@[28; 29) "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0105_block_expr.rast b/crates/ra_syntax/test_data/parser/inline/ok/0105_block_expr.rast
index 6bce37a4f..5635cba9b 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0105_block_expr.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0105_block_expr.rast
@@ -17,7 +17,7 @@ SOURCE_FILE@[0; 52)
             BLOCK@[15; 17)
               L_CURLY@[15; 16) "{"
               R_CURLY@[16; 17) "}"
-          SEMI@[17; 18) ";"
+          SEMICOLON@[17; 18) ";"
         WHITESPACE@[18; 23) "\n    "
         EXPR_STMT@[23; 33)
           BLOCK_EXPR@[23; 32)
@@ -26,7 +26,7 @@ SOURCE_FILE@[0; 52)
             BLOCK@[30; 32)
               L_CURLY@[30; 31) "{"
               R_CURLY@[31; 32) "}"
-          SEMI@[32; 33) ";"
+          SEMICOLON@[32; 33) ";"
         WHITESPACE@[33; 38) "\n    "
         EXPR_STMT@[38; 49)
           BLOCK_EXPR@[38; 48)
@@ -37,7 +37,7 @@ SOURCE_FILE@[0; 52)
             BLOCK@[46; 48)
               L_CURLY@[46; 47) "{"
               R_CURLY@[47; 48) "}"
-          SEMI@[48; 49) ";"
+          SEMICOLON@[48; 49) ";"
         WHITESPACE@[49; 50) "\n"
         R_CURLY@[50; 51) "}"
   WHITESPACE@[51; 52) "\n"
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 0216123f0..157dfcdb8 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
@@ -21,7 +21,7 @@ SOURCE_FILE@[0; 134)
             TUPLE_EXPR@[18; 20)
               L_PAREN@[18; 19) "("
               R_PAREN@[19; 20) ")"
-          SEMI@[20; 21) ";"
+          SEMICOLON@[20; 21) ";"
         WHITESPACE@[21; 26) "\n    "
         EXPR_STMT@[26; 43)
           LAMBDA_EXPR@[26; 42)
@@ -46,7 +46,7 @@ SOURCE_FILE@[0; 134)
                   INT_NUMBER@[38; 40) "92"
                 WHITESPACE@[40; 41) " "
                 R_CURLY@[41; 42) "}"
-          SEMI@[42; 43) ";"
+          SEMICOLON@[42; 43) ";"
         WHITESPACE@[43; 48) "\n    "
         EXPR_STMT@[48; 54)
           LAMBDA_EXPR@[48; 53)
@@ -63,7 +63,7 @@ SOURCE_FILE@[0; 134)
                 PATH_SEGMENT@[52; 53)
                   NAME_REF@[52; 53)
                     IDENT@[52; 53) "x"
-          SEMI@[53; 54) ";"
+          SEMICOLON@[53; 54) ";"
         WHITESPACE@[54; 59) "\n    "
         EXPR_STMT@[59; 76)
           LAMBDA_EXPR@[59; 75)
@@ -90,7 +90,7 @@ SOURCE_FILE@[0; 134)
                 PATH_SEGMENT@[74; 75)
                   NAME_REF@[74; 75)
                     IDENT@[74; 75) "x"
-          SEMI@[75; 76) ";"
+          SEMICOLON@[75; 76) ";"
         WHITESPACE@[76; 81) "\n    "
         EXPR_STMT@[81; 93)
           LAMBDA_EXPR@[81; 92)
@@ -104,7 +104,7 @@ SOURCE_FILE@[0; 134)
               BLOCK@[90; 92)
                 L_CURLY@[90; 91) "{"
                 R_CURLY@[91; 92) "}"
-          SEMI@[92; 93) ";"
+          SEMICOLON@[92; 93) ";"
         WHITESPACE@[93; 98) "\n    "
         EXPR_STMT@[98; 109)
           LAMBDA_EXPR@[98; 108)
@@ -118,7 +118,7 @@ SOURCE_FILE@[0; 134)
               BLOCK@[106; 108)
                 L_CURLY@[106; 107) "{"
                 R_CURLY@[107; 108) "}"
-          SEMI@[108; 109) ";"
+          SEMICOLON@[108; 109) ";"
         WHITESPACE@[109; 114) "\n    "
         EXPR_STMT@[114; 131)
           LAMBDA_EXPR@[114; 130)
@@ -134,7 +134,7 @@ SOURCE_FILE@[0; 134)
               BLOCK@[128; 130)
                 L_CURLY@[128; 129) "{"
                 R_CURLY@[129; 130) "}"
-          SEMI@[130; 131) ";"
+          SEMICOLON@[130; 131) ";"
         WHITESPACE@[131; 132) "\n"
         R_CURLY@[132; 133) "}"
   WHITESPACE@[133; 134) "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0107_method_call_expr.rast b/crates/ra_syntax/test_data/parser/inline/ok/0107_method_call_expr.rast
index ba478528c..cc813038c 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0107_method_call_expr.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0107_method_call_expr.rast
@@ -25,7 +25,7 @@ SOURCE_FILE@[0; 49)
             ARG_LIST@[20; 22)
               L_PAREN@[20; 21) "("
               R_PAREN@[21; 22) ")"
-          SEMI@[22; 23) ";"
+          SEMICOLON@[22; 23) ";"
         WHITESPACE@[23; 28) "\n    "
         EXPR_STMT@[28; 46)
           METHOD_CALL_EXPR@[28; 45)
@@ -38,7 +38,7 @@ SOURCE_FILE@[0; 49)
             NAME_REF@[30; 33)
               IDENT@[30; 33) "bar"
             TYPE_ARG_LIST@[33; 38)
-              COLONCOLON@[33; 35) "::"
+              COLON2@[33; 35) "::"
               L_ANGLE@[35; 36) "<"
               TYPE_ARG@[36; 37)
                 PATH_TYPE@[36; 37)
@@ -57,7 +57,7 @@ SOURCE_FILE@[0; 49)
                 INT_NUMBER@[42; 43) "2"
               COMMA@[43; 44) ","
               R_PAREN@[44; 45) ")"
-          SEMI@[45; 46) ";"
+          SEMICOLON@[45; 46) ";"
         WHITESPACE@[46; 47) "\n"
         R_CURLY@[47; 48) "}"
   WHITESPACE@[48; 49) "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0108_tuple_expr.rast b/crates/ra_syntax/test_data/parser/inline/ok/0108_tuple_expr.rast
index 6f685ca8d..27c3f398e 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0108_tuple_expr.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0108_tuple_expr.rast
@@ -16,7 +16,7 @@ SOURCE_FILE@[0; 40)
           TUPLE_EXPR@[15; 17)
             L_PAREN@[15; 16) "("
             R_PAREN@[16; 17) ")"
-          SEMI@[17; 18) ";"
+          SEMICOLON@[17; 18) ";"
         WHITESPACE@[18; 23) "\n    "
         EXPR_STMT@[23; 27)
           PAREN_EXPR@[23; 26)
@@ -24,7 +24,7 @@ SOURCE_FILE@[0; 40)
             LITERAL@[24; 25)
               INT_NUMBER@[24; 25) "1"
             R_PAREN@[25; 26) ")"
-          SEMI@[26; 27) ";"
+          SEMICOLON@[26; 27) ";"
         WHITESPACE@[27; 32) "\n    "
         EXPR_STMT@[32; 37)
           TUPLE_EXPR@[32; 36)
@@ -33,7 +33,7 @@ SOURCE_FILE@[0; 40)
               INT_NUMBER@[33; 34) "1"
             COMMA@[34; 35) ","
             R_PAREN@[35; 36) ")"
-          SEMI@[36; 37) ";"
+          SEMICOLON@[36; 37) ";"
         WHITESPACE@[37; 38) "\n"
         R_CURLY@[38; 39) "}"
   WHITESPACE@[39; 40) "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0110_use_path.rast b/crates/ra_syntax/test_data/parser/inline/ok/0110_use_path.rast
index 7dbcd3927..d4f5737d5 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0110_use_path.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0110_use_path.rast
@@ -5,10 +5,10 @@ SOURCE_FILE@[0; 154)
     USE_TREE@[4; 16)
       PATH@[4; 16)
         PATH_SEGMENT@[4; 16)
-          COLONCOLON@[4; 6) "::"
+          COLON2@[4; 6) "::"
           NAME_REF@[6; 16)
             IDENT@[6; 16) "crate_name"
-    SEMI@[16; 17) ";"
+    SEMICOLON@[16; 17) ";"
   WHITESPACE@[17; 18) " "
   COMMENT@[18; 45) "// Rust 2018 - All fl ..."
   WHITESPACE@[45; 46) "\n"
@@ -20,7 +20,7 @@ SOURCE_FILE@[0; 154)
         PATH_SEGMENT@[50; 60)
           NAME_REF@[50; 60)
             IDENT@[50; 60) "crate_name"
-    SEMI@[60; 61) ";"
+    SEMICOLON@[60; 61) ";"
   WHITESPACE@[61; 62) " "
   COMMENT@[62; 91) "// Rust 2018 - Anchor ..."
   WHITESPACE@[91; 92) "\n"
@@ -32,7 +32,7 @@ SOURCE_FILE@[0; 154)
         PATH_SEGMENT@[96; 123)
           NAME_REF@[96; 123)
             IDENT@[96; 123) "item_in_scope_or_crat ..."
-    SEMI@[123; 124) ";"
+    SEMICOLON@[123; 124) ";"
   WHITESPACE@[124; 125) " "
   COMMENT@[125; 153) "// Rust 2018 - Unifor ..."
   WHITESPACE@[153; 154) "\n"
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 4680c267e..88e72d057 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
@@ -28,7 +28,7 @@ SOURCE_FILE@[0; 94)
             COMMA@[25; 26) ","
             WHITESPACE@[26; 27) " "
             DOT_DOT_PAT@[27; 29)
-              DOTDOT@[27; 29) ".."
+              DOT2@[27; 29) ".."
             R_PAREN@[29; 30) ")"
           WHITESPACE@[30; 31) " "
           EQ@[31; 32) "="
@@ -36,7 +36,7 @@ SOURCE_FILE@[0; 94)
           TUPLE_EXPR@[33; 35)
             L_PAREN@[33; 34) "("
             R_PAREN@[34; 35) ")"
-          SEMI@[35; 36) ";"
+          SEMICOLON@[35; 36) ";"
         WHITESPACE@[36; 41) "\n    "
         LET_STMT@[41; 55)
           LET_KW@[41; 44) "let"
@@ -54,7 +54,7 @@ SOURCE_FILE@[0; 94)
           TUPLE_EXPR@[52; 54)
             L_PAREN@[52; 53) "("
             R_PAREN@[53; 54) ")"
-          SEMI@[54; 55) ";"
+          SEMICOLON@[54; 55) ";"
         WHITESPACE@[55; 60) "\n    "
         LET_STMT@[60; 74)
           LET_KW@[60; 63) "let"
@@ -62,7 +62,7 @@ SOURCE_FILE@[0; 94)
           TUPLE_PAT@[64; 68)
             L_PAREN@[64; 65) "("
             DOT_DOT_PAT@[65; 67)
-              DOTDOT@[65; 67) ".."
+              DOT2@[65; 67) ".."
             R_PAREN@[67; 68) ")"
           WHITESPACE@[68; 69) " "
           EQ@[69; 70) "="
@@ -70,7 +70,7 @@ SOURCE_FILE@[0; 94)
           TUPLE_EXPR@[71; 73)
             L_PAREN@[71; 72) "("
             R_PAREN@[72; 73) ")"
-          SEMI@[73; 74) ";"
+          SEMICOLON@[73; 74) ";"
         WHITESPACE@[74; 79) "\n    "
         LET_STMT@[79; 91)
           LET_KW@[79; 82) "let"
@@ -84,7 +84,7 @@ SOURCE_FILE@[0; 94)
           TUPLE_EXPR@[88; 90)
             L_PAREN@[88; 89) "("
             R_PAREN@[89; 90) ")"
-          SEMI@[90; 91) ";"
+          SEMICOLON@[90; 91) ";"
         WHITESPACE@[91; 92) "\n"
         R_CURLY@[92; 93) "}"
   WHITESPACE@[93; 94) "\n"
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 ad1d47b0e..5e8f625dc 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
@@ -24,7 +24,7 @@ SOURCE_FILE@[0; 146)
           TUPLE_EXPR@[24; 26)
             L_PAREN@[24; 25) "("
             R_PAREN@[25; 26) ")"
-          SEMI@[26; 27) ";"
+          SEMICOLON@[26; 27) ";"
         WHITESPACE@[27; 32) "\n    "
         LET_STMT@[32; 47)
           LET_KW@[32; 35) "let"
@@ -40,7 +40,7 @@ SOURCE_FILE@[0; 146)
           TUPLE_EXPR@[44; 46)
             L_PAREN@[44; 45) "("
             R_PAREN@[45; 46) ")"
-          SEMI@[46; 47) ";"
+          SEMICOLON@[46; 47) ";"
         WHITESPACE@[47; 52) "\n    "
         LET_STMT@[52; 67)
           LET_KW@[52; 55) "let"
@@ -56,7 +56,7 @@ SOURCE_FILE@[0; 146)
           TUPLE_EXPR@[64; 66)
             L_PAREN@[64; 65) "("
             R_PAREN@[65; 66) ")"
-          SEMI@[66; 67) ";"
+          SEMICOLON@[66; 67) ";"
         WHITESPACE@[67; 72) "\n    "
         LET_STMT@[72; 91)
           LET_KW@[72; 75) "let"
@@ -74,7 +74,7 @@ SOURCE_FILE@[0; 146)
           TUPLE_EXPR@[88; 90)
             L_PAREN@[88; 89) "("
             R_PAREN@[89; 90) ")"
-          SEMI@[90; 91) ";"
+          SEMICOLON@[90; 91) ";"
         WHITESPACE@[91; 96) "\n    "
         LET_STMT@[96; 111)
           LET_KW@[96; 99) "let"
@@ -93,7 +93,7 @@ SOURCE_FILE@[0; 146)
           TUPLE_EXPR@[108; 110)
             L_PAREN@[108; 109) "("
             R_PAREN@[109; 110) ")"
-          SEMI@[110; 111) ";"
+          SEMICOLON@[110; 111) ";"
         WHITESPACE@[111; 116) "\n    "
         LET_STMT@[116; 143)
           LET_KW@[116; 119) "let"
@@ -122,7 +122,7 @@ SOURCE_FILE@[0; 146)
           TUPLE_EXPR@[140; 142)
             L_PAREN@[140; 141) "("
             R_PAREN@[141; 142) ")"
-          SEMI@[142; 143) ";"
+          SEMICOLON@[142; 143) ";"
         WHITESPACE@[143; 144) "\n"
         R_CURLY@[144; 145) "}"
   WHITESPACE@[145; 146) "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0113_nocontentexpr.rast b/crates/ra_syntax/test_data/parser/inline/ok/0113_nocontentexpr.rast
index 5db1ff2af..f2f649410 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0113_nocontentexpr.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0113_nocontentexpr.rast
@@ -11,9 +11,9 @@ SOURCE_FILE@[0; 50)
       BLOCK@[8; 49)
         L_CURLY@[8; 9) "{"
         WHITESPACE@[9; 14) "\n    "
-        SEMI@[14; 15) ";"
-        SEMI@[15; 16) ";"
-        SEMI@[16; 17) ";"
+        SEMICOLON@[14; 15) ";"
+        SEMICOLON@[15; 16) ";"
+        SEMICOLON@[16; 17) ";"
         EXPR_STMT@[17; 29)
           CALL_EXPR@[17; 28)
             PATH_EXPR@[17; 26)
@@ -24,22 +24,22 @@ SOURCE_FILE@[0; 50)
             ARG_LIST@[26; 28)
               L_PAREN@[26; 27) "("
               R_PAREN@[27; 28) ")"
-          SEMI@[28; 29) ";"
-        SEMI@[29; 30) ";"
-        SEMI@[30; 31) ";"
-        SEMI@[31; 32) ";"
+          SEMICOLON@[28; 29) ";"
+        SEMICOLON@[29; 30) ";"
+        SEMICOLON@[30; 31) ";"
+        SEMICOLON@[31; 32) ";"
         EXPR_STMT@[32; 38)
           BLOCK_EXPR@[32; 37)
             BLOCK@[32; 37)
               L_CURLY@[32; 33) "{"
-              SEMI@[33; 34) ";"
-              SEMI@[34; 35) ";"
-              SEMI@[35; 36) ";"
+              SEMICOLON@[33; 34) ";"
+              SEMICOLON@[34; 35) ";"
+              SEMICOLON@[35; 36) ";"
               R_CURLY@[36; 37) "}"
-          SEMI@[37; 38) ";"
-        SEMI@[38; 39) ";"
-        SEMI@[39; 40) ";"
-        SEMI@[40; 41) ";"
+          SEMICOLON@[37; 38) ";"
+        SEMICOLON@[38; 39) ";"
+        SEMICOLON@[39; 40) ";"
+        SEMICOLON@[40; 41) ";"
         CALL_EXPR@[41; 47)
           PATH_EXPR@[41; 43)
             PATH@[41; 43)
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0114_tuple_struct_where.rast b/crates/ra_syntax/test_data/parser/inline/ok/0114_tuple_struct_where.rast
index f5de01405..457c82e74 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0114_tuple_struct_where.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0114_tuple_struct_where.rast
@@ -38,7 +38,7 @@ SOURCE_FILE@[0; 53)
                 PATH_SEGMENT@[27; 32)
                   NAME_REF@[27; 32)
                     IDENT@[27; 32) "Clone"
-    SEMI@[32; 33) ";"
+    SEMICOLON@[32; 33) ";"
   WHITESPACE@[33; 34) "\n"
   STRUCT_DEF@[34; 52)
     STRUCT_KW@[34; 40) "struct"
@@ -60,5 +60,5 @@ SOURCE_FILE@[0; 53)
               NAME_REF@[49; 50)
                 IDENT@[49; 50) "T"
       R_PAREN@[50; 51) ")"
-    SEMI@[51; 52) ";"
+    SEMICOLON@[51; 52) ";"
   WHITESPACE@[52; 53) "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0115_tuple_field_attrs.rast b/crates/ra_syntax/test_data/parser/inline/ok/0115_tuple_field_attrs.rast
index 8fe15d8e2..0b1552a9d 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0115_tuple_field_attrs.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0115_tuple_field_attrs.rast
@@ -37,5 +37,5 @@ SOURCE_FILE@[0; 60)
       COMMA@[55; 56) ","
       WHITESPACE@[56; 57) "\n"
       R_PAREN@[57; 58) ")"
-    SEMI@[58; 59) ";"
+    SEMICOLON@[58; 59) ";"
   WHITESPACE@[59; 60) "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0117_macro_call_type.rast b/crates/ra_syntax/test_data/parser/inline/ok/0117_macro_call_type.rast
index 892dc813a..4f9e80e2e 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0117_macro_call_type.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0117_macro_call_type.rast
@@ -12,11 +12,11 @@ SOURCE_FILE@[0; 41)
         PATH_SEGMENT@[9; 12)
           NAME_REF@[9; 12)
             IDENT@[9; 12) "foo"
-      EXCL@[12; 13) "!"
+      BANG@[12; 13) "!"
       TOKEN_TREE@[13; 15)
         L_PAREN@[13; 14) "("
         R_PAREN@[14; 15) ")"
-    SEMI@[15; 16) ";"
+    SEMICOLON@[15; 16) ";"
   WHITESPACE@[16; 17) "\n"
   TYPE_ALIAS_DEF@[17; 40)
     TYPE_KW@[17; 21) "type"
@@ -31,13 +31,13 @@ SOURCE_FILE@[0; 41)
         PATH@[26; 31)
           PATH_SEGMENT@[26; 31)
             CRATE_KW@[26; 31) "crate"
-        COLONCOLON@[31; 33) "::"
+        COLON2@[31; 33) "::"
         PATH_SEGMENT@[33; 36)
           NAME_REF@[33; 36)
             IDENT@[33; 36) "foo"
-      EXCL@[36; 37) "!"
+      BANG@[36; 37) "!"
       TOKEN_TREE@[37; 39)
         L_PAREN@[37; 38) "("
         R_PAREN@[38; 39) ")"
-    SEMI@[39; 40) ";"
+    SEMICOLON@[39; 40) ";"
   WHITESPACE@[40; 41) "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0118_impl_inner_attributes.rast b/crates/ra_syntax/test_data/parser/inline/ok/0118_impl_inner_attributes.rast
index 5053ebde7..f9a4bc81b 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0118_impl_inner_attributes.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0118_impl_inner_attributes.rast
@@ -24,7 +24,7 @@ SOURCE_FILE@[0; 94)
       WHITESPACE@[48; 54) "\n     "
       ATTR@[54; 91)
         POUND@[54; 55) "#"
-        EXCL@[55; 56) "!"
+        BANG@[55; 56) "!"
         L_BRACK@[56; 57) "["
         PATH@[57; 60)
           PATH_SEGMENT@[57; 60)
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 640e0640f..7eec92e1b 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
@@ -24,7 +24,7 @@ SOURCE_FILE@[0; 139)
             WHITESPACE@[25; 34) "\n        "
             ATTR@[34; 60)
               POUND@[34; 35) "#"
-              EXCL@[35; 36) "!"
+              BANG@[35; 36) "!"
               L_BRACK@[36; 37) "["
               PATH@[37; 40)
                 PATH_SEGMENT@[37; 40)
@@ -38,7 +38,7 @@ SOURCE_FILE@[0; 139)
             WHITESPACE@[60; 69) "\n        "
             ATTR@[69; 86)
               POUND@[69; 70) "#"
-              EXCL@[70; 71) "!"
+              BANG@[70; 71) "!"
               L_BRACK@[71; 72) "["
               PATH@[72; 75)
                 PATH_SEGMENT@[72; 75)
@@ -52,7 +52,7 @@ SOURCE_FILE@[0; 139)
             WHITESPACE@[86; 95) "\n        "
             ATTR@[95; 113)
               POUND@[95; 96) "#"
-              EXCL@[96; 97) "!"
+              BANG@[96; 97) "!"
               L_BRACK@[97; 98) "["
               PATH@[98; 101)
                 PATH_SEGMENT@[98; 101)
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 6c3b17868..af8067b12 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
@@ -33,7 +33,7 @@ SOURCE_FILE@[0; 57)
           COMMA@[40; 41) ","
           WHITESPACE@[41; 42) " "
           PARAM@[42; 45)
-            DOTDOTDOT@[42; 45) "..."
+            DOT3@[42; 45) "..."
           R_PAREN@[45; 46) ")"
         WHITESPACE@[46; 47) " "
         RET_TYPE@[47; 53)
@@ -44,7 +44,7 @@ SOURCE_FILE@[0; 57)
               PATH_SEGMENT@[50; 53)
                 NAME_REF@[50; 53)
                   IDENT@[50; 53) "i32"
-        SEMI@[53; 54) ";"
+        SEMICOLON@[53; 54) ";"
       WHITESPACE@[54; 55) " "
       R_CURLY@[55; 56) "}"
   WHITESPACE@[56; 57) "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0125_crate_keyword_path.rast b/crates/ra_syntax/test_data/parser/inline/ok/0125_crate_keyword_path.rast
index 6a9f3bf72..f1f4de976 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0125_crate_keyword_path.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0125_crate_keyword_path.rast
@@ -19,14 +19,14 @@ SOURCE_FILE@[0; 27)
                 PATH@[11; 16)
                   PATH_SEGMENT@[11; 16)
                     CRATE_KW@[11; 16) "crate"
-                COLONCOLON@[16; 18) "::"
+                COLON2@[16; 18) "::"
                 PATH_SEGMENT@[18; 21)
                   NAME_REF@[18; 21)
                     IDENT@[18; 21) "foo"
             ARG_LIST@[21; 23)
               L_PAREN@[21; 22) "("
               R_PAREN@[22; 23) ")"
-          SEMI@[23; 24) ";"
+          SEMICOLON@[23; 24) ";"
         WHITESPACE@[24; 25) " "
         R_CURLY@[25; 26) "}"
   WHITESPACE@[26; 27) "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0126_attr_on_expr_stmt.rast b/crates/ra_syntax/test_data/parser/inline/ok/0126_attr_on_expr_stmt.rast
index 5c311d18a..3b462871a 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0126_attr_on_expr_stmt.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0126_attr_on_expr_stmt.rast
@@ -31,7 +31,7 @@ SOURCE_FILE@[0; 82)
             ARG_LIST@[23; 25)
               L_PAREN@[23; 24) "("
               R_PAREN@[24; 25) ")"
-          SEMI@[25; 26) ";"
+          SEMICOLON@[25; 26) ";"
         WHITESPACE@[26; 31) "\n    "
         EXPR_STMT@[31; 42)
           ATTR@[31; 35)
@@ -48,7 +48,7 @@ SOURCE_FILE@[0; 82)
               PATH_SEGMENT@[36; 39)
                 NAME_REF@[36; 39)
                   IDENT@[36; 39) "bar"
-            EXCL@[39; 40) "!"
+            BANG@[39; 40) "!"
             TOKEN_TREE@[40; 42)
               L_CURLY@[40; 41) "{"
               R_CURLY@[41; 42) "}"
@@ -93,7 +93,7 @@ SOURCE_FILE@[0; 82)
             TUPLE_EXPR@[76; 78)
               L_PAREN@[76; 77) "("
               R_PAREN@[77; 78) ")"
-          SEMI@[78; 79) ";"
+          SEMICOLON@[78; 79) ";"
         WHITESPACE@[79; 80) "\n"
         R_CURLY@[80; 81) "}"
   WHITESPACE@[81; 82) "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0127_attr_on_last_expr_in_block.rast b/crates/ra_syntax/test_data/parser/inline/ok/0127_attr_on_last_expr_in_block.rast
index 21f49690a..9bc6be62d 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0127_attr_on_last_expr_in_block.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0127_attr_on_last_expr_in_block.rast
@@ -32,7 +32,7 @@ SOURCE_FILE@[0; 47)
                     PATH_SEGMENT@[22; 25)
                       NAME_REF@[22; 25)
                         IDENT@[22; 25) "bar"
-                  EXCL@[25; 26) "!"
+                  BANG@[25; 26) "!"
                   TOKEN_TREE@[26; 28)
                     L_PAREN@[26; 27) "("
                     R_PAREN@[27; 28) ")"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0129_marco_pat.rast b/crates/ra_syntax/test_data/parser/inline/ok/0129_marco_pat.rast
index 36d8f4a5f..31481d2f9 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0129_marco_pat.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0129_marco_pat.rast
@@ -21,7 +21,7 @@ SOURCE_FILE@[0; 33)
                 PATH_SEGMENT@[20; 21)
                   NAME_REF@[20; 21)
                     IDENT@[20; 21) "m"
-              EXCL@[21; 22) "!"
+              BANG@[21; 22) "!"
               TOKEN_TREE@[22; 25)
                 L_PAREN@[22; 23) "("
                 IDENT@[23; 24) "x"
@@ -31,7 +31,7 @@ SOURCE_FILE@[0; 33)
           WHITESPACE@[27; 28) " "
           LITERAL@[28; 29)
             INT_NUMBER@[28; 29) "0"
-          SEMI@[29; 30) ";"
+          SEMICOLON@[29; 30) ";"
         WHITESPACE@[30; 31) "\n"
         R_CURLY@[31; 32) "}"
   WHITESPACE@[32; 33) "\n"
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 17739dfbd..1f2690c00 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
@@ -18,7 +18,7 @@ SOURCE_FILE@[0; 135)
           BIND_PAT@[19; 20)
             NAME@[19; 20)
               IDENT@[19; 20) "a"
-          SEMI@[20; 21) ";"
+          SEMICOLON@[20; 21) ";"
         WHITESPACE@[21; 26) "\n    "
         LET_STMT@[26; 37)
           LET_KW@[26; 29) "let"
@@ -33,7 +33,7 @@ SOURCE_FILE@[0; 135)
               PATH_SEGMENT@[33; 36)
                 NAME_REF@[33; 36)
                   IDENT@[33; 36) "i32"
-          SEMI@[36; 37) ";"
+          SEMICOLON@[36; 37) ";"
         WHITESPACE@[37; 42) "\n    "
         LET_STMT@[42; 53)
           LET_KW@[42; 45) "let"
@@ -46,7 +46,7 @@ SOURCE_FILE@[0; 135)
           WHITESPACE@[49; 50) " "
           LITERAL@[50; 52)
             INT_NUMBER@[50; 52) "92"
-          SEMI@[52; 53) ";"
+          SEMICOLON@[52; 53) ";"
         WHITESPACE@[53; 58) "\n    "
         LET_STMT@[58; 74)
           LET_KW@[58; 61) "let"
@@ -66,7 +66,7 @@ SOURCE_FILE@[0; 135)
           WHITESPACE@[70; 71) " "
           LITERAL@[71; 73)
             INT_NUMBER@[71; 73) "92"
-          SEMI@[73; 74) ";"
+          SEMICOLON@[73; 74) ";"
         WHITESPACE@[74; 79) "\n    "
         LET_STMT@[79; 88)
           LET_KW@[79; 82) "let"
@@ -77,8 +77,8 @@ SOURCE_FILE@[0; 135)
           COLON@[84; 85) ":"
           WHITESPACE@[85; 86) " "
           NEVER_TYPE@[86; 87)
-            EXCL@[86; 87) "!"
-          SEMI@[87; 88) ";"
+            BANG@[86; 87) "!"
+          SEMICOLON@[87; 88) ";"
         WHITESPACE@[88; 93) "\n    "
         LET_STMT@[93; 107)
           LET_KW@[93; 96) "let"
@@ -88,7 +88,7 @@ SOURCE_FILE@[0; 135)
           COLON@[98; 99) ":"
           WHITESPACE@[99; 100) " "
           NEVER_TYPE@[100; 101)
-            EXCL@[100; 101) "!"
+            BANG@[100; 101) "!"
           WHITESPACE@[101; 102) " "
           EQ@[102; 103) "="
           WHITESPACE@[103; 104) " "
@@ -96,7 +96,7 @@ SOURCE_FILE@[0; 135)
             BLOCK@[104; 106)
               L_CURLY@[104; 105) "{"
               R_CURLY@[105; 106) "}"
-          SEMI@[106; 107) ";"
+          SEMICOLON@[106; 107) ";"
         WHITESPACE@[107; 112) "\n    "
         LET_STMT@[112; 132)
           LET_KW@[112; 115) "let"
@@ -123,7 +123,7 @@ SOURCE_FILE@[0; 135)
               BLOCK@[129; 131)
                 L_CURLY@[129; 130) "{"
                 R_CURLY@[130; 131) "}"
-          SEMI@[131; 132) ";"
+          SEMICOLON@[131; 132) ";"
         WHITESPACE@[132; 133) "\n"
         R_CURLY@[133; 134) "}"
   WHITESPACE@[134; 135) "\n"
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 d6df1aba2..b96991035 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
@@ -27,7 +27,7 @@ SOURCE_FILE@[0; 33)
               BLOCK@[27; 29)
                 L_CURLY@[27; 28) "{"
                 R_CURLY@[28; 29) "}"
-          SEMI@[29; 30) ";"
+          SEMICOLON@[29; 30) ";"
         WHITESPACE@[30; 31) "\n"
         R_CURLY@[31; 32) "}"
   WHITESPACE@[32; 33) "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0131_existential_type.rast b/crates/ra_syntax/test_data/parser/inline/ok/0131_existential_type.rast
index 6bfac985a..ed3d8fb0b 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0131_existential_type.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0131_existential_type.rast
@@ -27,5 +27,5 @@ SOURCE_FILE@[0; 37)
                     PATH_SEGMENT@[30; 35)
                       NAME_REF@[30; 35)
                         IDENT@[30; 35) "usize"
-    SEMI@[35; 36) ";"
+    SEMICOLON@[35; 36) ";"
   WHITESPACE@[36; 37) "\n"
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 12294210e..c392a7d84 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
@@ -26,7 +26,7 @@ SOURCE_FILE@[0; 106)
             WHITESPACE@[26; 27) " "
             LITERAL@[27; 31)
               INT_NUMBER@[27; 31) "1i32"
-          SEMI@[31; 32) ";"
+          SEMICOLON@[31; 32) ";"
         WHITESPACE@[32; 37) "\n    "
         LET_STMT@[37; 66)
           LET_KW@[37; 40) "let"
@@ -52,7 +52,7 @@ SOURCE_FILE@[0; 106)
               LITERAL@[60; 64)
                 INT_NUMBER@[60; 64) "2i32"
             R_PAREN@[64; 65) ")"
-          SEMI@[65; 66) ";"
+          SEMICOLON@[65; 66) ";"
         WHITESPACE@[66; 71) "\n    "
         LET_STMT@[71; 103)
           LET_KW@[71; 74) "let"
@@ -84,7 +84,7 @@ SOURCE_FILE@[0; 106)
                 LITERAL@[97; 101)
                   INT_NUMBER@[97; 101) "2i32"
               R_PAREN@[101; 102) ")"
-          SEMI@[102; 103) ";"
+          SEMICOLON@[102; 103) ";"
         WHITESPACE@[103; 104) "\n"
         R_CURLY@[104; 105) "}"
   WHITESPACE@[105; 106) "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0132_default_fn_type.rast b/crates/ra_syntax/test_data/parser/inline/ok/0132_default_fn_type.rast
index e1734224b..cff03fcf3 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0132_default_fn_type.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0132_default_fn_type.rast
@@ -34,7 +34,7 @@ SOURCE_FILE@[0; 69)
             PATH_SEGMENT@[38; 41)
               NAME_REF@[38; 41)
                 IDENT@[38; 41) "Bar"
-        SEMI@[41; 42) ";"
+        SEMICOLON@[41; 42) ";"
       WHITESPACE@[42; 47) "\n    "
       FN_DEF@[47; 66)
         DEFAULT_KW@[47; 54) "default"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0134_nocontentexpr_after_item.rast b/crates/ra_syntax/test_data/parser/inline/ok/0134_nocontentexpr_after_item.rast
index 14655d332..f66f32370 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0134_nocontentexpr_after_item.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0134_nocontentexpr_after_item.rast
@@ -32,7 +32,7 @@ SOURCE_FILE@[0; 111)
             COMMA@[68; 69) ","
             WHITESPACE@[69; 74) "\n    "
             R_CURLY@[74; 75) "}"
-        SEMI@[75; 76) ";"
+        SEMICOLON@[75; 76) ";"
         WHITESPACE@[76; 81) "\n    "
         FN_DEF@[81; 90)
           FN_KW@[81; 83) "fn"
@@ -47,7 +47,7 @@ SOURCE_FILE@[0; 111)
             BLOCK@[88; 90)
               L_CURLY@[88; 89) "{"
               R_CURLY@[89; 90) "}"
-        SEMI@[90; 91) ";"
+        SEMICOLON@[90; 91) ";"
         WHITESPACE@[91; 96) "\n    "
         STRUCT_DEF@[96; 107)
           STRUCT_KW@[96; 102) "struct"
@@ -58,7 +58,7 @@ SOURCE_FILE@[0; 111)
           RECORD_FIELD_DEF_LIST@[105; 107)
             L_CURLY@[105; 106) "{"
             R_CURLY@[106; 107) "}"
-        SEMI@[107; 108) ";"
+        SEMICOLON@[107; 108) ";"
         WHITESPACE@[108; 109) "\n"
         R_CURLY@[109; 110) "}"
   WHITESPACE@[110; 111) "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0137_await_expr.rast b/crates/ra_syntax/test_data/parser/inline/ok/0137_await_expr.rast
index a6ac0dbd8..4946e6325 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0137_await_expr.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0137_await_expr.rast
@@ -21,7 +21,7 @@ SOURCE_FILE@[0; 67)
                     IDENT@[15; 16) "x"
             DOT@[16; 17) "."
             AWAIT_KW@[17; 22) "await"
-          SEMI@[22; 23) ";"
+          SEMICOLON@[22; 23) ";"
         WHITESPACE@[23; 28) "\n    "
         EXPR_STMT@[28; 38)
           AWAIT_EXPR@[28; 37)
@@ -36,7 +36,7 @@ SOURCE_FILE@[0; 67)
                 INT_NUMBER@[30; 31) "0"
             DOT@[31; 32) "."
             AWAIT_KW@[32; 37) "await"
-          SEMI@[37; 38) ";"
+          SEMICOLON@[37; 38) ";"
         WHITESPACE@[38; 43) "\n    "
         EXPR_STMT@[43; 64)
           METHOD_CALL_EXPR@[43; 63)
@@ -64,7 +64,7 @@ SOURCE_FILE@[0; 67)
             ARG_LIST@[61; 63)
               L_PAREN@[61; 62) "("
               R_PAREN@[62; 63) ")"
-          SEMI@[63; 64) ";"
+          SEMICOLON@[63; 64) ";"
         WHITESPACE@[64; 65) "\n"
         R_CURLY@[65; 66) "}"
   WHITESPACE@[66; 67) "\n"
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 df4c04149..ca1d69f64 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
@@ -38,7 +38,7 @@ SOURCE_FILE@[0; 52)
                 LITERAL@[31; 32)
                   INT_NUMBER@[31; 32) "5"
               R_CURLY@[32; 33) "}"
-          SEMI@[33; 34) ";"
+          SEMICOLON@[33; 34) ";"
         WHITESPACE@[34; 38) "\n   "
         EXPR_STMT@[38; 49)
           BIN_EXPR@[38; 48)
@@ -60,7 +60,7 @@ SOURCE_FILE@[0; 52)
             WHITESPACE@[45; 46) " "
             LITERAL@[46; 48)
               INT_NUMBER@[46; 48) "10"
-          SEMI@[48; 49) ";"
+          SEMICOLON@[48; 49) ";"
         WHITESPACE@[49; 50) "\n"
         R_CURLY@[50; 51) "}"
   WHITESPACE@[51; 52) "\n"
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 eec1cba1e..6d01140d2 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
@@ -25,7 +25,7 @@ SOURCE_FILE@[0; 51)
             LITERAL@[23; 24)
               INT_NUMBER@[23; 24) "0"
             WHITESPACE@[24; 25) " "
-            DOTDOT@[25; 27) ".."
+            DOT2@[25; 27) ".."
           WHITESPACE@[27; 28) " "
           BLOCK_EXPR@[28; 48)
             BLOCK@[28; 48)
@@ -34,7 +34,7 @@ SOURCE_FILE@[0; 51)
               EXPR_STMT@[37; 43)
                 BREAK_EXPR@[37; 42)
                   BREAK_KW@[37; 42) "break"
-                SEMI@[42; 43) ";"
+                SEMICOLON@[42; 43) ";"
               WHITESPACE@[43; 47) "\n   "
               R_CURLY@[47; 48) "}"
         WHITESPACE@[48; 49) "\n"
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 4d2048711..f75673070 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
@@ -27,7 +27,7 @@ SOURCE_FILE@[0; 118)
           TUPLE_EXPR@[28; 30)
             L_PAREN@[28; 29) "("
             R_PAREN@[29; 30) ")"
-          SEMI@[30; 31) ";"
+          SEMICOLON@[30; 31) ";"
         WHITESPACE@[31; 36) "\n    "
         LET_STMT@[36; 87)
           LET_KW@[36; 39) "let"
@@ -83,7 +83,7 @@ SOURCE_FILE@[0; 118)
           TUPLE_EXPR@[84; 86)
             L_PAREN@[84; 85) "("
             R_PAREN@[85; 86) ")"
-          SEMI@[86; 87) ";"
+          SEMICOLON@[86; 87) ";"
         WHITESPACE@[87; 92) "\n    "
         LET_STMT@[92; 115)
           LET_KW@[92; 95) "let"
@@ -104,7 +104,7 @@ SOURCE_FILE@[0; 118)
           TUPLE_EXPR@[112; 114)
             L_PAREN@[112; 113) "("
             R_PAREN@[113; 114) ")"
-          SEMI@[114; 115) ";"
+          SEMICOLON@[114; 115) ";"
         WHITESPACE@[115; 116) "\n"
         R_CURLY@[116; 117) "}"
   WHITESPACE@[117; 118) "\n"
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 325b1bd08..60186a992 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
@@ -16,14 +16,14 @@ SOURCE_FILE@[0; 555)
           LET_KW@[16; 19) "let"
           WHITESPACE@[19; 20) " "
           DOT_DOT_PAT@[20; 22)
-            DOTDOT@[20; 22) ".."
+            DOT2@[20; 22) ".."
           WHITESPACE@[22; 23) " "
           EQ@[23; 24) "="
           WHITESPACE@[24; 25) " "
           TUPLE_EXPR@[25; 27)
             L_PAREN@[25; 26) "("
             R_PAREN@[26; 27) ")"
-          SEMI@[27; 28) ";"
+          SEMICOLON@[27; 28) ";"
         WHITESPACE@[28; 33) "\n    "
         COMMENT@[33; 35) "//"
         WHITESPACE@[35; 40) "\n    "
@@ -42,7 +42,7 @@ SOURCE_FILE@[0; 555)
             COMMA@[67; 68) ","
             WHITESPACE@[68; 69) " "
             DOT_DOT_PAT@[69; 71)
-              DOTDOT@[69; 71) ".."
+              DOT2@[69; 71) ".."
             R_PAREN@[71; 72) ")"
           WHITESPACE@[72; 73) " "
           EQ@[73; 74) "="
@@ -50,7 +50,7 @@ SOURCE_FILE@[0; 555)
           TUPLE_EXPR@[75; 77)
             L_PAREN@[75; 76) "("
             R_PAREN@[76; 77) ")"
-          SEMI@[77; 78) ";"
+          SEMICOLON@[77; 78) ";"
         WHITESPACE@[78; 83) "\n    "
         LET_STMT@[83; 101)
           LET_KW@[83; 86) "let"
@@ -63,7 +63,7 @@ SOURCE_FILE@[0; 555)
             COMMA@[89; 90) ","
             WHITESPACE@[90; 91) " "
             DOT_DOT_PAT@[91; 93)
-              DOTDOT@[91; 93) ".."
+              DOT2@[91; 93) ".."
             COMMA@[93; 94) ","
             R_PAREN@[94; 95) ")"
           WHITESPACE@[95; 96) " "
@@ -72,7 +72,7 @@ SOURCE_FILE@[0; 555)
           TUPLE_EXPR@[98; 100)
             L_PAREN@[98; 99) "("
             R_PAREN@[99; 100) ")"
-          SEMI@[100; 101) ";"
+          SEMICOLON@[100; 101) ";"
         WHITESPACE@[101; 106) "\n    "
         LET_STMT@[106; 128)
           LET_KW@[106; 109) "let"
@@ -89,7 +89,7 @@ SOURCE_FILE@[0; 555)
             COMMA@[117; 118) ","
             WHITESPACE@[118; 119) " "
             DOT_DOT_PAT@[119; 121)
-              DOTDOT@[119; 121) ".."
+              DOT2@[119; 121) ".."
             R_PAREN@[121; 122) ")"
           WHITESPACE@[122; 123) " "
           EQ@[123; 124) "="
@@ -97,7 +97,7 @@ SOURCE_FILE@[0; 555)
           TUPLE_EXPR@[125; 127)
             L_PAREN@[125; 126) "("
             R_PAREN@[126; 127) ")"
-          SEMI@[127; 128) ";"
+          SEMICOLON@[127; 128) ";"
         WHITESPACE@[128; 133) "\n    "
         LET_STMT@[133; 156)
           LET_KW@[133; 136) "let"
@@ -114,7 +114,7 @@ SOURCE_FILE@[0; 555)
             COMMA@[144; 145) ","
             WHITESPACE@[145; 146) " "
             DOT_DOT_PAT@[146; 148)
-              DOTDOT@[146; 148) ".."
+              DOT2@[146; 148) ".."
             COMMA@[148; 149) ","
             R_PAREN@[149; 150) ")"
           WHITESPACE@[150; 151) " "
@@ -123,7 +123,7 @@ SOURCE_FILE@[0; 555)
           TUPLE_EXPR@[153; 155)
             L_PAREN@[153; 154) "("
             R_PAREN@[154; 155) ")"
-          SEMI@[155; 156) ";"
+          SEMICOLON@[155; 156) ";"
         WHITESPACE@[156; 161) "\n    "
         LET_STMT@[161; 179)
           LET_KW@[161; 164) "let"
@@ -131,11 +131,11 @@ SOURCE_FILE@[0; 555)
           TUPLE_PAT@[165; 173)
             L_PAREN@[165; 166) "("
             DOT_DOT_PAT@[166; 168)
-              DOTDOT@[166; 168) ".."
+              DOT2@[166; 168) ".."
             COMMA@[168; 169) ","
             WHITESPACE@[169; 170) " "
             DOT_DOT_PAT@[170; 172)
-              DOTDOT@[170; 172) ".."
+              DOT2@[170; 172) ".."
             R_PAREN@[172; 173) ")"
           WHITESPACE@[173; 174) " "
           EQ@[174; 175) "="
@@ -143,7 +143,7 @@ SOURCE_FILE@[0; 555)
           TUPLE_EXPR@[176; 178)
             L_PAREN@[176; 177) "("
             R_PAREN@[177; 178) ")"
-          SEMI@[178; 179) ";"
+          SEMICOLON@[178; 179) ";"
         WHITESPACE@[179; 184) "\n    "
         LET_STMT@[184; 207)
           LET_KW@[184; 187) "let"
@@ -155,11 +155,11 @@ SOURCE_FILE@[0; 555)
                   IDENT@[188; 193) "Tuple"
             L_PAREN@[193; 194) "("
             DOT_DOT_PAT@[194; 196)
-              DOTDOT@[194; 196) ".."
+              DOT2@[194; 196) ".."
             COMMA@[196; 197) ","
             WHITESPACE@[197; 198) " "
             DOT_DOT_PAT@[198; 200)
-              DOTDOT@[198; 200) ".."
+              DOT2@[198; 200) ".."
             R_PAREN@[200; 201) ")"
           WHITESPACE@[201; 202) " "
           EQ@[202; 203) "="
@@ -167,7 +167,7 @@ SOURCE_FILE@[0; 555)
           TUPLE_EXPR@[204; 206)
             L_PAREN@[204; 205) "("
             R_PAREN@[205; 206) ")"
-          SEMI@[206; 207) ";"
+          SEMICOLON@[206; 207) ";"
         WHITESPACE@[207; 212) "\n    "
         LET_STMT@[212; 233)
           LET_KW@[212; 215) "let"
@@ -175,7 +175,7 @@ SOURCE_FILE@[0; 555)
           TUPLE_PAT@[216; 227)
             L_PAREN@[216; 217) "("
             DOT_DOT_PAT@[217; 219)
-              DOTDOT@[217; 219) ".."
+              DOT2@[217; 219) ".."
             COMMA@[219; 220) ","
             WHITESPACE@[220; 221) " "
             BIND_PAT@[221; 222)
@@ -184,7 +184,7 @@ SOURCE_FILE@[0; 555)
             COMMA@[222; 223) ","
             WHITESPACE@[223; 224) " "
             DOT_DOT_PAT@[224; 226)
-              DOTDOT@[224; 226) ".."
+              DOT2@[224; 226) ".."
             R_PAREN@[226; 227) ")"
           WHITESPACE@[227; 228) " "
           EQ@[228; 229) "="
@@ -192,7 +192,7 @@ SOURCE_FILE@[0; 555)
           TUPLE_EXPR@[230; 232)
             L_PAREN@[230; 231) "("
             R_PAREN@[231; 232) ")"
-          SEMI@[232; 233) ";"
+          SEMICOLON@[232; 233) ";"
         WHITESPACE@[233; 238) "\n    "
         LET_STMT@[238; 264)
           LET_KW@[238; 241) "let"
@@ -204,7 +204,7 @@ SOURCE_FILE@[0; 555)
                   IDENT@[242; 247) "Tuple"
             L_PAREN@[247; 248) "("
             DOT_DOT_PAT@[248; 250)
-              DOTDOT@[248; 250) ".."
+              DOT2@[248; 250) ".."
             COMMA@[250; 251) ","
             WHITESPACE@[251; 252) " "
             BIND_PAT@[252; 253)
@@ -213,7 +213,7 @@ SOURCE_FILE@[0; 555)
             COMMA@[253; 254) ","
             WHITESPACE@[254; 255) " "
             DOT_DOT_PAT@[255; 257)
-              DOTDOT@[255; 257) ".."
+              DOT2@[255; 257) ".."
             R_PAREN@[257; 258) ")"
           WHITESPACE@[258; 259) " "
           EQ@[259; 260) "="
@@ -221,7 +221,7 @@ SOURCE_FILE@[0; 555)
           TUPLE_EXPR@[261; 263)
             L_PAREN@[261; 262) "("
             R_PAREN@[262; 263) ")"
-          SEMI@[263; 264) ";"
+          SEMICOLON@[263; 264) ";"
         WHITESPACE@[264; 269) "\n    "
         COMMENT@[269; 271) "//"
         WHITESPACE@[271; 276) "\n    "
@@ -235,7 +235,7 @@ SOURCE_FILE@[0; 555)
           SLICE_PAT@[301; 305)
             L_BRACK@[301; 302) "["
             DOT_DOT_PAT@[302; 304)
-              DOTDOT@[302; 304) ".."
+              DOT2@[302; 304) ".."
             R_BRACK@[304; 305) "]"
           WHITESPACE@[305; 306) " "
           EQ@[306; 307) "="
@@ -243,7 +243,7 @@ SOURCE_FILE@[0; 555)
           TUPLE_EXPR@[308; 310)
             L_PAREN@[308; 309) "("
             R_PAREN@[309; 310) ")"
-          SEMI@[310; 311) ";"
+          SEMICOLON@[310; 311) ";"
         WHITESPACE@[311; 316) "\n    "
         LET_STMT@[316; 336)
           LET_KW@[316; 319) "let"
@@ -256,7 +256,7 @@ SOURCE_FILE@[0; 555)
             COMMA@[325; 326) ","
             WHITESPACE@[326; 327) " "
             DOT_DOT_PAT@[327; 329)
-              DOTDOT@[327; 329) ".."
+              DOT2@[327; 329) ".."
             R_BRACK@[329; 330) "]"
           WHITESPACE@[330; 331) " "
           EQ@[331; 332) "="
@@ -264,7 +264,7 @@ SOURCE_FILE@[0; 555)
           TUPLE_EXPR@[333; 335)
             L_PAREN@[333; 334) "("
             R_PAREN@[334; 335) ")"
-          SEMI@[335; 336) ";"
+          SEMICOLON@[335; 336) ";"
         WHITESPACE@[336; 341) "\n    "
         LET_STMT@[341; 368)
           LET_KW@[341; 344) "let"
@@ -283,7 +283,7 @@ SOURCE_FILE@[0; 555)
               AT@[357; 358) "@"
               WHITESPACE@[358; 359) " "
               DOT_DOT_PAT@[359; 361)
-                DOTDOT@[359; 361) ".."
+                DOT2@[359; 361) ".."
             R_BRACK@[361; 362) "]"
           WHITESPACE@[362; 363) " "
           EQ@[363; 364) "="
@@ -291,7 +291,7 @@ SOURCE_FILE@[0; 555)
           TUPLE_EXPR@[365; 367)
             L_PAREN@[365; 366) "("
             R_PAREN@[366; 367) ")"
-          SEMI@[367; 368) ";"
+          SEMICOLON@[367; 368) ";"
         WHITESPACE@[368; 373) "\n    "
         LET_STMT@[373; 399)
           LET_KW@[373; 376) "let"
@@ -304,7 +304,7 @@ SOURCE_FILE@[0; 555)
             COMMA@[382; 383) ","
             WHITESPACE@[383; 384) " "
             DOT_DOT_PAT@[384; 386)
-              DOTDOT@[384; 386) ".."
+              DOT2@[384; 386) ".."
             COMMA@[386; 387) ","
             WHITESPACE@[387; 388) " "
             BIND_PAT@[388; 392)
@@ -317,7 +317,7 @@ SOURCE_FILE@[0; 555)
           TUPLE_EXPR@[396; 398)
             L_PAREN@[396; 397) "("
             R_PAREN@[397; 398) ")"
-          SEMI@[398; 399) ";"
+          SEMICOLON@[398; 399) ";"
         WHITESPACE@[399; 404) "\n    "
         LET_STMT@[404; 436)
           LET_KW@[404; 407) "let"
@@ -336,7 +336,7 @@ SOURCE_FILE@[0; 555)
               AT@[419; 420) "@"
               WHITESPACE@[420; 421) " "
               DOT_DOT_PAT@[421; 423)
-                DOTDOT@[421; 423) ".."
+                DOT2@[421; 423) ".."
             COMMA@[423; 424) ","
             WHITESPACE@[424; 425) " "
             BIND_PAT@[425; 429)
@@ -349,7 +349,7 @@ SOURCE_FILE@[0; 555)
           TUPLE_EXPR@[433; 435)
             L_PAREN@[433; 434) "("
             R_PAREN@[434; 435) ")"
-          SEMI@[435; 436) ";"
+          SEMICOLON@[435; 436) ";"
         WHITESPACE@[436; 441) "\n    "
         LET_STMT@[441; 471)
           LET_KW@[441; 444) "let"
@@ -362,11 +362,11 @@ SOURCE_FILE@[0; 555)
             COMMA@[450; 451) ","
             WHITESPACE@[451; 452) " "
             DOT_DOT_PAT@[452; 454)
-              DOTDOT@[452; 454) ".."
+              DOT2@[452; 454) ".."
             COMMA@[454; 455) ","
             WHITESPACE@[455; 456) " "
             DOT_DOT_PAT@[456; 458)
-              DOTDOT@[456; 458) ".."
+              DOT2@[456; 458) ".."
             COMMA@[458; 459) ","
             WHITESPACE@[459; 460) " "
             BIND_PAT@[460; 464)
@@ -379,7 +379,7 @@ SOURCE_FILE@[0; 555)
           TUPLE_EXPR@[468; 470)
             L_PAREN@[468; 469) "("
             R_PAREN@[469; 470) ")"
-          SEMI@[470; 471) ";"
+          SEMICOLON@[470; 471) ";"
         WHITESPACE@[471; 476) "\n    "
         LET_STMT@[476; 512)
           LET_KW@[476; 479) "let"
@@ -392,7 +392,7 @@ SOURCE_FILE@[0; 555)
             COMMA@[485; 486) ","
             WHITESPACE@[486; 487) " "
             DOT_DOT_PAT@[487; 489)
-              DOTDOT@[487; 489) ".."
+              DOT2@[487; 489) ".."
             COMMA@[489; 490) ","
             WHITESPACE@[490; 491) " "
             BIND_PAT@[491; 494)
@@ -407,7 +407,7 @@ SOURCE_FILE@[0; 555)
               AT@[501; 502) "@"
               WHITESPACE@[502; 503) " "
               DOT_DOT_PAT@[503; 505)
-                DOTDOT@[503; 505) ".."
+                DOT2@[503; 505) ".."
             R_BRACK@[505; 506) "]"
           WHITESPACE@[506; 507) " "
           EQ@[507; 508) "="
@@ -415,7 +415,7 @@ SOURCE_FILE@[0; 555)
           TUPLE_EXPR@[509; 511)
             L_PAREN@[509; 510) "("
             R_PAREN@[510; 511) ")"
-          SEMI@[511; 512) ";"
+          SEMICOLON@[511; 512) ";"
         WHITESPACE@[512; 517) "\n    "
         LET_STMT@[517; 552)
           LET_KW@[517; 520) "let"
@@ -428,7 +428,7 @@ SOURCE_FILE@[0; 555)
             COMMA@[526; 527) ","
             WHITESPACE@[527; 528) " "
             DOT_DOT_PAT@[528; 530)
-              DOTDOT@[528; 530) ".."
+              DOT2@[528; 530) ".."
             COMMA@[530; 531) ","
             WHITESPACE@[531; 532) " "
             BIND_PAT@[532; 535)
@@ -437,7 +437,7 @@ SOURCE_FILE@[0; 555)
             COMMA@[535; 536) ","
             WHITESPACE@[536; 537) " "
             DOT_DOT_PAT@[537; 539)
-              DOTDOT@[537; 539) ".."
+              DOT2@[537; 539) ".."
             COMMA@[539; 540) ","
             WHITESPACE@[540; 541) " "
             BIND_PAT@[541; 545)
@@ -450,7 +450,7 @@ SOURCE_FILE@[0; 555)
           TUPLE_EXPR@[549; 551)
             L_PAREN@[549; 550) "("
             R_PAREN@[550; 551) ")"
-          SEMI@[551; 552) ";"
+          SEMICOLON@[551; 552) ";"
         WHITESPACE@[552; 553) "\n"
         R_CURLY@[553; 554) "}"
   WHITESPACE@[554; 555) "\n"
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 06fbdfabf..0d786f597 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
@@ -39,7 +39,7 @@ SOURCE_FILE@[0; 63)
           TUPLE_EXPR@[32; 34)
             L_PAREN@[32; 33) "("
             R_PAREN@[33; 34) ")"
-          SEMI@[34; 35) ";"
+          SEMICOLON@[34; 35) ";"
         WHITESPACE@[35; 40) "\n    "
         LET_STMT@[40; 60)
           LET_KW@[40; 43) "let"
@@ -69,7 +69,7 @@ SOURCE_FILE@[0; 63)
           TUPLE_EXPR@[57; 59)
             L_PAREN@[57; 58) "("
             R_PAREN@[58; 59) ")"
-          SEMI@[59; 60) ";"
+          SEMICOLON@[59; 60) ";"
         WHITESPACE@[60; 61) "\n"
         R_CURLY@[61; 62) "}"
   WHITESPACE@[62; 63) "\n"
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 9e3767fb7..d2f6d8fde 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
@@ -37,7 +37,7 @@ SOURCE_FILE@[0; 43)
                   PATH_SEGMENT@[36; 39)
                     NAME_REF@[36; 39)
                       IDENT@[36; 39) "i32"
-          SEMI@[39; 40) ";"
+          SEMICOLON@[39; 40) ";"
         WHITESPACE@[40; 41) "\n"
         R_CURLY@[41; 42) "}"
   WHITESPACE@[42; 43) "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0147_const_param.rast b/crates/ra_syntax/test_data/parser/inline/ok/0147_const_param.rast
index f81de7bac..21161f7bf 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0147_const_param.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0147_const_param.rast
@@ -19,5 +19,5 @@ SOURCE_FILE@[0; 24)
               NAME_REF@[18; 21)
                 IDENT@[18; 21) "u32"
       R_ANGLE@[21; 22) ">"
-    SEMI@[22; 23) ";"
+    SEMICOLON@[22; 23) ";"
   WHITESPACE@[23; 24) "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0150_array_attrs.rast b/crates/ra_syntax/test_data/parser/inline/ok/0150_array_attrs.rast
index 78e296f88..1f297e479 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0150_array_attrs.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0150_array_attrs.rast
@@ -43,5 +43,5 @@ SOURCE_FILE@[0; 40)
           WHITESPACE@[35; 36) " "
           INT_NUMBER@[36; 37) "2"
         R_BRACK@[37; 38) "]"
-    SEMI@[38; 39) ";"
+    SEMICOLON@[38; 39) ";"
   WHITESPACE@[39; 40) "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0151_trait_alias.rast b/crates/ra_syntax/test_data/parser/inline/ok/0151_trait_alias.rast
index de1536ef0..167c0fffa 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0151_trait_alias.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0151_trait_alias.rast
@@ -29,7 +29,7 @@ SOURCE_FILE@[0; 83)
                         NAME_REF@[15; 16)
                           IDENT@[15; 16) "U"
                 R_ANGLE@[16; 17) ">"
-    SEMI@[17; 18) ";"
+    SEMICOLON@[17; 18) ";"
   WHITESPACE@[18; 19) "\n"
   TRAIT_DEF@[19; 51)
     TRAIT_KW@[19; 24) "trait"
@@ -80,7 +80,7 @@ SOURCE_FILE@[0; 83)
                 PATH_SEGMENT@[46; 50)
                   NAME_REF@[46; 50)
                     IDENT@[46; 50) "Copy"
-    SEMI@[50; 51) ";"
+    SEMICOLON@[50; 51) ";"
   WHITESPACE@[51; 52) "\n"
   TRAIT_DEF@[52; 82)
     TRAIT_KW@[52; 57) "trait"
@@ -124,5 +124,5 @@ SOURCE_FILE@[0; 83)
                             NAME_REF@[79; 80)
                               IDENT@[79; 80) "U"
                     R_ANGLE@[80; 81) ">"
-    SEMI@[81; 82) ";"
+    SEMICOLON@[81; 82) ";"
   WHITESPACE@[82; 83) "\n"
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 cb686854a..ee1bd361d 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
@@ -18,12 +18,12 @@ SOURCE_FILE@[0; 55)
                 PATH_SEGMENT@[14; 17)
                   NAME_REF@[14; 17)
                     IDENT@[14; 17) "Bar"
-              COLONCOLON@[17; 19) "::"
+              COLON2@[17; 19) "::"
               PATH_SEGMENT@[19; 22)
                 NAME_REF@[19; 22)
                   IDENT@[19; 22) "Baz"
         R_PAREN@[22; 23) ")"
-    SEMI@[23; 24) ";"
+    SEMICOLON@[23; 24) ";"
   WHITESPACE@[24; 25) "\n"
   TYPE_ALIAS_DEF@[25; 54)
     TYPE_KW@[25; 29) "type"
@@ -49,10 +49,10 @@ SOURCE_FILE@[0; 55)
                 PATH_SEGMENT@[44; 47)
                   NAME_REF@[44; 47)
                     IDENT@[44; 47) "Bar"
-              COLONCOLON@[47; 49) "::"
+              COLON2@[47; 49) "::"
               PATH_SEGMENT@[49; 52)
                 NAME_REF@[49; 52)
                   IDENT@[49; 52) "Baz"
         R_PAREN@[52; 53) ")"
-    SEMI@[53; 54) ";"
+    SEMICOLON@[53; 54) ";"
   WHITESPACE@[54; 55) "\n"
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 98727ae98..a5f8b6480 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
@@ -55,7 +55,7 @@ SOURCE_FILE@[0; 63)
                       PATH_SEGMENT@[46; 49)
                         NAME_REF@[46; 49)
                           IDENT@[46; 49) "Qux"
-                    COLONCOLON@[49; 51) "::"
+                    COLON2@[49; 51) "::"
                     PATH_SEGMENT@[51; 55)
                       NAME_REF@[51; 55)
                         IDENT@[51; 55) "Quux"
@@ -64,7 +64,7 @@ SOURCE_FILE@[0; 63)
             TUPLE_EXPR@[57; 59)
               L_PAREN@[57; 58) "("
               R_PAREN@[58; 59) ")"
-          SEMI@[59; 60) ";"
+          SEMICOLON@[59; 60) ";"
         WHITESPACE@[60; 61) "\n"
         R_CURLY@[61; 62) "}"
   WHITESPACE@[62; 63) "\n"
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 52d8f21a4..e0081a9f2 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
@@ -22,5 +22,5 @@ SOURCE_FILE@[0; 23)
                 NAME_REF@[17; 20)
                   IDENT@[17; 20) "bar"
         R_PAREN@[20; 21) ")"
-    SEMI@[21; 22) ";"
+    SEMICOLON@[21; 22) ";"
   WHITESPACE@[22; 23) "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0158_binop_resets_statementness.rast b/crates/ra_syntax/test_data/parser/inline/ok/0158_binop_resets_statementness.rast
index d568a1d45..548be2698 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0158_binop_resets_statementness.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0158_binop_resets_statementness.rast
@@ -32,7 +32,7 @@ SOURCE_FILE@[0; 28)
               AMP@[22; 23) "&"
               LITERAL@[23; 24)
                 INT_NUMBER@[23; 24) "2"
-          SEMI@[24; 25) ";"
+          SEMICOLON@[24; 25) ";"
         WHITESPACE@[25; 26) "\n"
         R_CURLY@[26; 27) "}"
   WHITESPACE@[27; 28) "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0158_lambda_ret_block.rast b/crates/ra_syntax/test_data/parser/inline/ok/0158_lambda_ret_block.rast
index ba8779094..a7a547fce 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0158_lambda_ret_block.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0158_lambda_ret_block.rast
@@ -39,7 +39,7 @@ SOURCE_FILE@[0; 34)
             ARG_LIST@[28; 30)
               L_PAREN@[28; 29) "("
               R_PAREN@[29; 30) ")"
-          SEMI@[30; 31) ";"
+          SEMICOLON@[30; 31) ";"
         WHITESPACE@[31; 32) " "
         R_CURLY@[32; 33) "}"
   WHITESPACE@[33; 34) "\n"
diff --git a/crates/ra_syntax/test_data/parser/ok/0006_inner_attributes.rast b/crates/ra_syntax/test_data/parser/ok/0006_inner_attributes.rast
index d72b72561..308b5680f 100644
--- a/crates/ra_syntax/test_data/parser/ok/0006_inner_attributes.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0006_inner_attributes.rast
@@ -1,7 +1,7 @@
 SOURCE_FILE@[0; 236)
   ATTR@[0; 8)
     POUND@[0; 1) "#"
-    EXCL@[1; 2) "!"
+    BANG@[1; 2) "!"
     L_BRACK@[2; 3) "["
     PATH@[3; 7)
       PATH_SEGMENT@[3; 7)
@@ -11,7 +11,7 @@ SOURCE_FILE@[0; 236)
   WHITESPACE@[8; 9) "\n"
   ATTR@[9; 23)
     POUND@[9; 10) "#"
-    EXCL@[10; 11) "!"
+    BANG@[10; 11) "!"
     L_BRACK@[11; 12) "["
     PATH@[12; 16)
       PATH_SEGMENT@[12; 16)
@@ -25,7 +25,7 @@ SOURCE_FILE@[0; 236)
   WHITESPACE@[23; 24) "\n"
   ATTR@[24; 39)
     POUND@[24; 25) "#"
-    EXCL@[25; 26) "!"
+    BANG@[25; 26) "!"
     L_BRACK@[26; 27) "["
     PATH@[27; 31)
       PATH_SEGMENT@[27; 31)
@@ -39,7 +39,7 @@ SOURCE_FILE@[0; 236)
   WHITESPACE@[39; 40) "\n"
   ATTR@[40; 116)
     POUND@[40; 41) "#"
-    EXCL@[41; 42) "!"
+    BANG@[41; 42) "!"
     L_BRACK@[42; 43) "["
     PATH@[43; 47)
       PATH_SEGMENT@[43; 47)
@@ -83,7 +83,7 @@ SOURCE_FILE@[0; 236)
   WHITESPACE@[116; 117) "\n"
   ATTR@[117; 130)
     POUND@[117; 118) "#"
-    EXCL@[118; 119) "!"
+    BANG@[118; 119) "!"
     L_BRACK@[119; 120) "["
     PATH@[120; 124)
       PATH_SEGMENT@[120; 124)
@@ -97,7 +97,7 @@ SOURCE_FILE@[0; 236)
   WHITESPACE@[130; 131) "\n"
   ATTR@[131; 155)
     POUND@[131; 132) "#"
-    EXCL@[132; 133) "!"
+    BANG@[132; 133) "!"
     L_BRACK@[133; 134) "["
     PATH@[134; 138)
       PATH_SEGMENT@[134; 138)
@@ -115,7 +115,7 @@ SOURCE_FILE@[0; 236)
   WHITESPACE@[155; 156) "\n"
   ATTR@[156; 173)
     POUND@[156; 157) "#"
-    EXCL@[157; 158) "!"
+    BANG@[157; 158) "!"
     L_BRACK@[158; 159) "["
     PATH@[159; 166)
       PATH_SEGMENT@[159; 166)
@@ -129,7 +129,7 @@ SOURCE_FILE@[0; 236)
   WHITESPACE@[173; 174) "\n"
   ATTR@[174; 191)
     POUND@[174; 175) "#"
-    EXCL@[175; 176) "!"
+    BANG@[175; 176) "!"
     L_BRACK@[176; 177) "["
     PATH@[177; 181)
       PATH_SEGMENT@[177; 181)
@@ -143,7 +143,7 @@ SOURCE_FILE@[0; 236)
   WHITESPACE@[191; 192) "\n"
   ATTR@[192; 214)
     POUND@[192; 193) "#"
-    EXCL@[193; 194) "!"
+    BANG@[193; 194) "!"
     L_BRACK@[194; 195) "["
     PATH@[195; 199)
       PATH_SEGMENT@[195; 199)
@@ -164,7 +164,7 @@ SOURCE_FILE@[0; 236)
   WHITESPACE@[214; 215) "\n"
   ATTR@[215; 236)
     POUND@[215; 216) "#"
-    EXCL@[216; 217) "!"
+    BANG@[216; 217) "!"
     L_BRACK@[217; 218) "["
     PATH@[218; 222)
       PATH_SEGMENT@[218; 222)
diff --git a/crates/ra_syntax/test_data/parser/ok/0007_extern_crate.rast b/crates/ra_syntax/test_data/parser/ok/0007_extern_crate.rast
index 1ffa36c7e..4856b4f81 100644
--- a/crates/ra_syntax/test_data/parser/ok/0007_extern_crate.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0007_extern_crate.rast
@@ -6,7 +6,7 @@ SOURCE_FILE@[0; 69)
     WHITESPACE@[12; 13) " "
     NAME_REF@[13; 16)
       IDENT@[13; 16) "foo"
-    SEMI@[16; 17) ";"
+    SEMICOLON@[16; 17) ";"
   WHITESPACE@[17; 18) "\n"
   EXTERN_CRATE_ITEM@[18; 42)
     EXTERN_KW@[18; 24) "extern"
@@ -21,7 +21,7 @@ SOURCE_FILE@[0; 69)
       WHITESPACE@[37; 38) " "
       NAME@[38; 41)
         IDENT@[38; 41) "bar"
-    SEMI@[41; 42) ";"
+    SEMICOLON@[41; 42) ";"
   WHITESPACE@[42; 43) "\n"
   EXTERN_CRATE_ITEM@[43; 68)
     EXTERN_KW@[43; 49) "extern"
@@ -36,5 +36,5 @@ SOURCE_FILE@[0; 69)
       WHITESPACE@[63; 64) " "
       NAME@[64; 67)
         IDENT@[64; 67) "baz"
-    SEMI@[67; 68) ";"
+    SEMICOLON@[67; 68) ";"
   WHITESPACE@[68; 69) "\n"
diff --git a/crates/ra_syntax/test_data/parser/ok/0008_mod_item.rast b/crates/ra_syntax/test_data/parser/ok/0008_mod_item.rast
index 061019a73..1c18edd4e 100644
--- a/crates/ra_syntax/test_data/parser/ok/0008_mod_item.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0008_mod_item.rast
@@ -4,7 +4,7 @@ SOURCE_FILE@[0; 118)
     WHITESPACE@[3; 4) " "
     NAME@[4; 5)
       IDENT@[4; 5) "a"
-    SEMI@[5; 6) ";"
+    SEMICOLON@[5; 6) ";"
   WHITESPACE@[6; 8) "\n\n"
   MODULE@[8; 17)
     MOD_KW@[8; 11) "mod"
@@ -64,7 +64,7 @@ SOURCE_FILE@[0; 118)
       WHITESPACE@[74; 79) "\n    "
       ATTR@[79; 87)
         POUND@[79; 80) "#"
-        EXCL@[80; 81) "!"
+        BANG@[80; 81) "!"
         L_BRACK@[81; 82) "["
         PATH@[82; 86)
           PATH_SEGMENT@[82; 86)
@@ -77,7 +77,7 @@ SOURCE_FILE@[0; 118)
         WHITESPACE@[95; 96) " "
         NAME@[96; 97)
           IDENT@[96; 97) "e"
-        SEMI@[97; 98) ";"
+        SEMICOLON@[97; 98) ";"
       WHITESPACE@[98; 103) "\n    "
       MODULE@[103; 116)
         MOD_KW@[103; 106) "mod"
diff --git a/crates/ra_syntax/test_data/parser/ok/0009_use_item.rast b/crates/ra_syntax/test_data/parser/ok/0009_use_item.rast
index 41db9dbb7..62a8ae433 100644
--- a/crates/ra_syntax/test_data/parser/ok/0009_use_item.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0009_use_item.rast
@@ -7,7 +7,7 @@ SOURCE_FILE@[0; 19)
         PATH_SEGMENT@[4; 7)
           NAME_REF@[4; 7)
             IDENT@[4; 7) "foo"
-    SEMI@[7; 8) ";"
+    SEMICOLON@[7; 8) ";"
   WHITESPACE@[8; 9) "\n"
   USE_ITEM@[9; 19)
     USE_KW@[9; 12) "use"
@@ -15,7 +15,7 @@ SOURCE_FILE@[0; 19)
     USE_TREE@[13; 18)
       PATH@[13; 18)
         PATH_SEGMENT@[13; 18)
-          COLONCOLON@[13; 15) "::"
+          COLON2@[13; 15) "::"
           NAME_REF@[15; 18)
             IDENT@[15; 18) "bar"
-    SEMI@[18; 19) ";"
+    SEMICOLON@[18; 19) ";"
diff --git a/crates/ra_syntax/test_data/parser/ok/0010_use_path_segments.rast b/crates/ra_syntax/test_data/parser/ok/0010_use_path_segments.rast
index 09871b84d..f2689e1ed 100644
--- a/crates/ra_syntax/test_data/parser/ok/0010_use_path_segments.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0010_use_path_segments.rast
@@ -7,18 +7,18 @@ SOURCE_FILE@[0; 40)
         PATH@[4; 14)
           PATH@[4; 9)
             PATH_SEGMENT@[4; 9)
-              COLONCOLON@[4; 6) "::"
+              COLON2@[4; 6) "::"
               NAME_REF@[6; 9)
                 IDENT@[6; 9) "foo"
-          COLONCOLON@[9; 11) "::"
+          COLON2@[9; 11) "::"
           PATH_SEGMENT@[11; 14)
             NAME_REF@[11; 14)
               IDENT@[11; 14) "bar"
-        COLONCOLON@[14; 16) "::"
+        COLON2@[14; 16) "::"
         PATH_SEGMENT@[16; 19)
           NAME_REF@[16; 19)
             IDENT@[16; 19) "baz"
-    SEMI@[19; 20) ";"
+    SEMICOLON@[19; 20) ";"
   WHITESPACE@[20; 21) "\n"
   USE_ITEM@[21; 39)
     USE_KW@[21; 24) "use"
@@ -30,13 +30,13 @@ SOURCE_FILE@[0; 40)
             PATH_SEGMENT@[25; 28)
               NAME_REF@[25; 28)
                 IDENT@[25; 28) "foo"
-          COLONCOLON@[28; 30) "::"
+          COLON2@[28; 30) "::"
           PATH_SEGMENT@[30; 33)
             NAME_REF@[30; 33)
               IDENT@[30; 33) "bar"
-        COLONCOLON@[33; 35) "::"
+        COLON2@[33; 35) "::"
         PATH_SEGMENT@[35; 38)
           NAME_REF@[35; 38)
             IDENT@[35; 38) "baz"
-    SEMI@[38; 39) ";"
+    SEMICOLON@[38; 39) ";"
   WHITESPACE@[39; 40) "\n"
diff --git a/crates/ra_syntax/test_data/parser/ok/0011_outer_attribute.rast b/crates/ra_syntax/test_data/parser/ok/0011_outer_attribute.rast
index f7aa8afe4..4426d586a 100644
--- a/crates/ra_syntax/test_data/parser/ok/0011_outer_attribute.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0011_outer_attribute.rast
@@ -54,5 +54,5 @@ SOURCE_FILE@[0; 60)
     WHITESPACE@[56; 57) " "
     NAME@[57; 58)
       IDENT@[57; 58) "b"
-    SEMI@[58; 59) ";"
+    SEMICOLON@[58; 59) ";"
   WHITESPACE@[59; 60) "\n"
diff --git a/crates/ra_syntax/test_data/parser/ok/0012_visibility.rast b/crates/ra_syntax/test_data/parser/ok/0012_visibility.rast
index 68e692fd0..c76cf9fe9 100644
--- a/crates/ra_syntax/test_data/parser/ok/0012_visibility.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0012_visibility.rast
@@ -82,11 +82,11 @@ SOURCE_FILE@[0; 98)
             PATH_SEGMENT@[73; 76)
               NAME_REF@[73; 76)
                 IDENT@[73; 76) "foo"
-          COLONCOLON@[76; 78) "::"
+          COLON2@[76; 78) "::"
           PATH_SEGMENT@[78; 81)
             NAME_REF@[78; 81)
               IDENT@[78; 81) "bar"
-        COLONCOLON@[81; 83) "::"
+        COLON2@[81; 83) "::"
         PATH_SEGMENT@[83; 86)
           NAME_REF@[83; 86)
             IDENT@[83; 86) "baz"
diff --git a/crates/ra_syntax/test_data/parser/ok/0013_use_path_self_super.rast b/crates/ra_syntax/test_data/parser/ok/0013_use_path_self_super.rast
index 50730e958..552cb3daf 100644
--- a/crates/ra_syntax/test_data/parser/ok/0013_use_path_self_super.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0013_use_path_self_super.rast
@@ -7,11 +7,11 @@ SOURCE_FILE@[0; 65)
         PATH@[4; 8)
           PATH_SEGMENT@[4; 8)
             SELF_KW@[4; 8) "self"
-        COLONCOLON@[8; 10) "::"
+        COLON2@[8; 10) "::"
         PATH_SEGMENT@[10; 13)
           NAME_REF@[10; 13)
             IDENT@[10; 13) "foo"
-    SEMI@[13; 14) ";"
+    SEMICOLON@[13; 14) ";"
   WHITESPACE@[14; 15) "\n"
   USE_ITEM@[15; 37)
     USE_KW@[15; 18) "use"
@@ -22,14 +22,14 @@ SOURCE_FILE@[0; 65)
           PATH@[19; 24)
             PATH_SEGMENT@[19; 24)
               SUPER_KW@[19; 24) "super"
-          COLONCOLON@[24; 26) "::"
+          COLON2@[24; 26) "::"
           PATH_SEGMENT@[26; 31)
             SUPER_KW@[26; 31) "super"
-        COLONCOLON@[31; 33) "::"
+        COLON2@[31; 33) "::"
         PATH_SEGMENT@[33; 36)
           NAME_REF@[33; 36)
             IDENT@[33; 36) "bar"
-    SEMI@[36; 37) ";"
+    SEMICOLON@[36; 37) ";"
   WHITESPACE@[37; 38) "\n"
   USE_ITEM@[38; 64)
     USE_KW@[38; 41) "use"
@@ -40,18 +40,18 @@ SOURCE_FILE@[0; 65)
           PATH@[42; 51)
             PATH@[42; 48)
               PATH_SEGMENT@[42; 48)
-                COLONCOLON@[42; 44) "::"
+                COLON2@[42; 44) "::"
                 SELF_KW@[44; 48) "self"
-            COLONCOLON@[48; 50) "::"
+            COLON2@[48; 50) "::"
             PATH_SEGMENT@[50; 51)
               NAME_REF@[50; 51)
                 IDENT@[50; 51) "a"
-          COLONCOLON@[51; 53) "::"
+          COLON2@[51; 53) "::"
           PATH_SEGMENT@[53; 58)
             SUPER_KW@[53; 58) "super"
-        COLONCOLON@[58; 60) "::"
+        COLON2@[58; 60) "::"
         PATH_SEGMENT@[60; 63)
           NAME_REF@[60; 63)
             IDENT@[60; 63) "bar"
-    SEMI@[63; 64) ";"
+    SEMICOLON@[63; 64) ";"
   WHITESPACE@[64; 65) "\n"
diff --git a/crates/ra_syntax/test_data/parser/ok/0014_use_tree.rast b/crates/ra_syntax/test_data/parser/ok/0014_use_tree.rast
index 3fe34d001..49a68e881 100644
--- a/crates/ra_syntax/test_data/parser/ok/0014_use_tree.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0014_use_tree.rast
@@ -4,25 +4,25 @@ SOURCE_FILE@[0; 81)
     WHITESPACE@[3; 4) " "
     USE_TREE@[4; 5)
       STAR@[4; 5) "*"
-    SEMI@[5; 6) ";"
+    SEMICOLON@[5; 6) ";"
   WHITESPACE@[6; 7) "\n"
   USE_ITEM@[7; 15)
     USE_KW@[7; 10) "use"
     WHITESPACE@[10; 11) " "
     USE_TREE@[11; 14)
-      COLONCOLON@[11; 13) "::"
+      COLON2@[11; 13) "::"
       STAR@[13; 14) "*"
-    SEMI@[14; 15) ";"
+    SEMICOLON@[14; 15) ";"
   WHITESPACE@[15; 16) "\n"
   USE_ITEM@[16; 25)
     USE_KW@[16; 19) "use"
     WHITESPACE@[19; 20) " "
     USE_TREE@[20; 24)
-      COLONCOLON@[20; 22) "::"
+      COLON2@[20; 22) "::"
       USE_TREE_LIST@[22; 24)
         L_CURLY@[22; 23) "{"
         R_CURLY@[23; 24) "}"
-    SEMI@[24; 25) ";"
+    SEMICOLON@[24; 25) ";"
   WHITESPACE@[25; 26) "\n"
   USE_ITEM@[26; 33)
     USE_KW@[26; 29) "use"
@@ -31,7 +31,7 @@ SOURCE_FILE@[0; 81)
       USE_TREE_LIST@[30; 32)
         L_CURLY@[30; 31) "{"
         R_CURLY@[31; 32) "}"
-    SEMI@[32; 33) ";"
+    SEMICOLON@[32; 33) ";"
   WHITESPACE@[33; 34) "\n"
   USE_ITEM@[34; 45)
     USE_KW@[34; 37) "use"
@@ -41,9 +41,9 @@ SOURCE_FILE@[0; 81)
         PATH_SEGMENT@[38; 41)
           NAME_REF@[38; 41)
             IDENT@[38; 41) "foo"
-      COLONCOLON@[41; 43) "::"
+      COLON2@[41; 43) "::"
       STAR@[43; 44) "*"
-    SEMI@[44; 45) ";"
+    SEMICOLON@[44; 45) ";"
   WHITESPACE@[45; 46) "\n"
   USE_ITEM@[46; 58)
     USE_KW@[46; 49) "use"
@@ -53,11 +53,11 @@ SOURCE_FILE@[0; 81)
         PATH_SEGMENT@[50; 53)
           NAME_REF@[50; 53)
             IDENT@[50; 53) "foo"
-      COLONCOLON@[53; 55) "::"
+      COLON2@[53; 55) "::"
       USE_TREE_LIST@[55; 57)
         L_CURLY@[55; 56) "{"
         R_CURLY@[56; 57) "}"
-    SEMI@[57; 58) ";"
+    SEMICOLON@[57; 58) ";"
   WHITESPACE@[58; 59) "\n"
   USE_ITEM@[59; 80)
     USE_KW@[59; 62) "use"
@@ -65,10 +65,10 @@ SOURCE_FILE@[0; 81)
     USE_TREE@[63; 79)
       PATH@[63; 68)
         PATH_SEGMENT@[63; 68)
-          COLONCOLON@[63; 65) "::"
+          COLON2@[63; 65) "::"
           NAME_REF@[65; 68)
             IDENT@[65; 68) "foo"
-      COLONCOLON@[68; 70) "::"
+      COLON2@[68; 70) "::"
       USE_TREE_LIST@[70; 79)
         L_CURLY@[70; 71) "{"
         USE_TREE@[71; 72)
@@ -91,5 +91,5 @@ SOURCE_FILE@[0; 81)
               NAME_REF@[77; 78)
                 IDENT@[77; 78) "c"
         R_CURLY@[78; 79) "}"
-    SEMI@[79; 80) ";"
+    SEMICOLON@[79; 80) ";"
   WHITESPACE@[80; 81) "\n"
diff --git a/crates/ra_syntax/test_data/parser/ok/0015_use_tree.rast b/crates/ra_syntax/test_data/parser/ok/0015_use_tree.rast
index e63f14253..719ac98ef 100644
--- a/crates/ra_syntax/test_data/parser/ok/0015_use_tree.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0015_use_tree.rast
@@ -13,7 +13,7 @@ SOURCE_FILE@[0; 55)
         WHITESPACE@[10; 11) " "
         NAME@[11; 14)
           IDENT@[11; 14) "bar"
-    SEMI@[14; 15) ";"
+    SEMICOLON@[14; 15) ";"
   WHITESPACE@[15; 16) "\n"
   USE_ITEM@[16; 54)
     USE_KW@[16; 19) "use"
@@ -23,7 +23,7 @@ SOURCE_FILE@[0; 55)
         PATH_SEGMENT@[20; 23)
           NAME_REF@[20; 23)
             IDENT@[20; 23) "foo"
-      COLONCOLON@[23; 25) "::"
+      COLON2@[23; 25) "::"
       USE_TREE_LIST@[25; 53)
         L_CURLY@[25; 26) "{"
         USE_TREE@[26; 32)
@@ -44,14 +44,14 @@ SOURCE_FILE@[0; 55)
         COMMA@[35; 36) ","
         WHITESPACE@[36; 37) " "
         USE_TREE@[37; 40)
-          COLONCOLON@[37; 39) "::"
+          COLON2@[37; 39) "::"
           STAR@[39; 40) "*"
         COMMA@[40; 41) ","
         WHITESPACE@[41; 42) " "
         USE_TREE@[42; 52)
           PATH@[42; 47)
             PATH_SEGMENT@[42; 47)
-              COLONCOLON@[42; 44) "::"
+              COLON2@[42; 44) "::"
               NAME_REF@[44; 47)
                 IDENT@[44; 47) "foo"
           WHITESPACE@[47; 48) " "
@@ -61,5 +61,5 @@ SOURCE_FILE@[0; 55)
             NAME@[51; 52)
               IDENT@[51; 52) "x"
         R_CURLY@[52; 53) "}"
-    SEMI@[53; 54) ";"
+    SEMICOLON@[53; 54) ";"
   WHITESPACE@[54; 55) "\n"
diff --git a/crates/ra_syntax/test_data/parser/ok/0016_struct_flavors.rast b/crates/ra_syntax/test_data/parser/ok/0016_struct_flavors.rast
index 3fbd14d7b..f4739451e 100644
--- a/crates/ra_syntax/test_data/parser/ok/0016_struct_flavors.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0016_struct_flavors.rast
@@ -4,7 +4,7 @@ SOURCE_FILE@[0; 97)
     WHITESPACE@[6; 7) " "
     NAME@[7; 8)
       IDENT@[7; 8) "A"
-    SEMI@[8; 9) ";"
+    SEMICOLON@[8; 9) ";"
   WHITESPACE@[9; 10) "\n"
   STRUCT_DEF@[10; 21)
     STRUCT_KW@[10; 16) "struct"
@@ -24,7 +24,7 @@ SOURCE_FILE@[0; 97)
     TUPLE_FIELD_DEF_LIST@[30; 32)
       L_PAREN@[30; 31) "("
       R_PAREN@[31; 32) ")"
-    SEMI@[32; 33) ";"
+    SEMICOLON@[32; 33) ";"
   WHITESPACE@[33; 35) "\n\n"
   STRUCT_DEF@[35; 74)
     STRUCT_KW@[35; 41) "struct"
@@ -89,5 +89,5 @@ SOURCE_FILE@[0; 97)
                 IDENT@[92; 93) "y"
       COMMA@[93; 94) ","
       R_PAREN@[94; 95) ")"
-    SEMI@[95; 96) ";"
+    SEMICOLON@[95; 96) ";"
   WHITESPACE@[96; 97) "\n"
diff --git a/crates/ra_syntax/test_data/parser/ok/0018_struct_type_params.rast b/crates/ra_syntax/test_data/parser/ok/0018_struct_type_params.rast
index 1e4e58dd3..5e859ef29 100644
--- a/crates/ra_syntax/test_data/parser/ok/0018_struct_type_params.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0018_struct_type_params.rast
@@ -10,7 +10,7 @@ SOURCE_FILE@[0; 290)
         NAME@[10; 11)
           IDENT@[10; 11) "T"
       R_ANGLE@[11; 12) ">"
-    SEMI@[12; 13) ";"
+    SEMICOLON@[12; 13) ";"
   WHITESPACE@[13; 14) "\n"
   STRUCT_DEF@[14; 32)
     STRUCT_KW@[14; 20) "struct"
@@ -32,7 +32,7 @@ SOURCE_FILE@[0; 290)
               NAME_REF@[27; 30)
                 IDENT@[27; 30) "u32"
       R_PAREN@[30; 31) ")"
-    SEMI@[31; 32) ";"
+    SEMICOLON@[31; 32) ";"
   WHITESPACE@[32; 33) "\n"
   STRUCT_DEF@[33; 56)
     STRUCT_KW@[33; 39) "struct"
@@ -70,7 +70,7 @@ SOURCE_FILE@[0; 290)
     TYPE_PARAM_LIST@[67; 69)
       L_ANGLE@[67; 68) "<"
       R_ANGLE@[68; 69) ">"
-    SEMI@[69; 70) ";"
+    SEMICOLON@[69; 70) ";"
   WHITESPACE@[70; 71) "\n"
   STRUCT_DEF@[71; 85)
     STRUCT_KW@[71; 77) "struct"
@@ -82,7 +82,7 @@ SOURCE_FILE@[0; 290)
       LIFETIME_PARAM@[81; 83)
         LIFETIME@[81; 83) "\'a"
       R_ANGLE@[83; 84) ">"
-    SEMI@[84; 85) ";"
+    SEMICOLON@[84; 85) ";"
   WHITESPACE@[85; 86) "\n"
   STRUCT_DEF@[86; 101)
     STRUCT_KW@[86; 92) "struct"
@@ -95,7 +95,7 @@ SOURCE_FILE@[0; 290)
         LIFETIME@[96; 98) "\'a"
         COLON@[98; 99) ":"
       R_ANGLE@[99; 100) ">"
-    SEMI@[100; 101) ";"
+    SEMICOLON@[100; 101) ";"
   WHITESPACE@[101; 102) "\n"
   STRUCT_DEF@[102; 120)
     STRUCT_KW@[102; 108) "struct"
@@ -110,7 +110,7 @@ SOURCE_FILE@[0; 290)
         WHITESPACE@[115; 116) " "
         LIFETIME@[116; 118) "\'b"
       R_ANGLE@[118; 119) ">"
-    SEMI@[119; 120) ";"
+    SEMICOLON@[119; 120) ";"
   WHITESPACE@[120; 121) "\n"
   STRUCT_DEF@[121; 142)
     STRUCT_KW@[121; 127) "struct"
@@ -128,7 +128,7 @@ SOURCE_FILE@[0; 290)
         PLUS@[138; 139) "+"
       WHITESPACE@[139; 140) " "
       R_ANGLE@[140; 141) ">"
-    SEMI@[141; 142) ";"
+    SEMICOLON@[141; 142) ";"
   WHITESPACE@[142; 143) "\n"
   STRUCT_DEF@[143; 166)
     STRUCT_KW@[143; 149) "struct"
@@ -147,7 +147,7 @@ SOURCE_FILE@[0; 290)
         WHITESPACE@[161; 162) " "
         LIFETIME@[162; 164) "\'c"
       R_ANGLE@[164; 165) ">"
-    SEMI@[165; 166) ";"
+    SEMICOLON@[165; 166) ";"
   WHITESPACE@[166; 167) "\n"
   STRUCT_DEF@[167; 183)
     STRUCT_KW@[167; 173) "struct"
@@ -160,7 +160,7 @@ SOURCE_FILE@[0; 290)
         LIFETIME@[178; 180) "\'a"
       COMMA@[180; 181) ","
       R_ANGLE@[181; 182) ">"
-    SEMI@[182; 183) ";"
+    SEMICOLON@[182; 183) ";"
   WHITESPACE@[183; 184) "\n"
   STRUCT_DEF@[184; 203)
     STRUCT_KW@[184; 190) "struct"
@@ -176,7 +176,7 @@ SOURCE_FILE@[0; 290)
       LIFETIME_PARAM@[199; 201)
         LIFETIME@[199; 201) "\'b"
       R_ANGLE@[201; 202) ">"
-    SEMI@[202; 203) ";"
+    SEMICOLON@[202; 203) ";"
   WHITESPACE@[203; 204) "\n"
   STRUCT_DEF@[204; 233)
     STRUCT_KW@[204; 210) "struct"
@@ -200,7 +200,7 @@ SOURCE_FILE@[0; 290)
         LIFETIME@[228; 230) "\'c"
       COMMA@[230; 231) ","
       R_ANGLE@[231; 232) ">"
-    SEMI@[232; 233) ";"
+    SEMICOLON@[232; 233) ";"
   WHITESPACE@[233; 235) "\n\n"
   STRUCT_DEF@[235; 249)
     STRUCT_KW@[235; 241) "struct"
@@ -213,7 +213,7 @@ SOURCE_FILE@[0; 290)
         NAME@[246; 247)
           IDENT@[246; 247) "T"
       R_ANGLE@[247; 248) ">"
-    SEMI@[248; 249) ";"
+    SEMICOLON@[248; 249) ";"
   WHITESPACE@[249; 250) "\n"
   STRUCT_DEF@[250; 267)
     STRUCT_KW@[250; 256) "struct"
@@ -231,7 +231,7 @@ SOURCE_FILE@[0; 290)
         NAME@[264; 265)
           IDENT@[264; 265) "U"
       R_ANGLE@[265; 266) ">"
-    SEMI@[266; 267) ";"
+    SEMICOLON@[266; 267) ";"
   WHITESPACE@[267; 268) "\n"
   STRUCT_DEF@[268; 289)
     STRUCT_KW@[268; 274) "struct"
@@ -253,5 +253,5 @@ SOURCE_FILE@[0; 290)
         NAME@[286; 287)
           IDENT@[286; 287) "U"
       R_ANGLE@[287; 288) ">"
-    SEMI@[288; 289) ";"
+    SEMICOLON@[288; 289) ";"
   WHITESPACE@[289; 290) "\n"
diff --git a/crates/ra_syntax/test_data/parser/ok/0020_type_param_bounds.rast b/crates/ra_syntax/test_data/parser/ok/0020_type_param_bounds.rast
index 18a5fd784..edacc4bd9 100644
--- a/crates/ra_syntax/test_data/parser/ok/0020_type_param_bounds.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0020_type_param_bounds.rast
@@ -10,7 +10,7 @@ SOURCE_FILE@[0; 250)
         NAME@[9; 10)
           IDENT@[9; 10) "T"
       R_ANGLE@[10; 11) ">"
-    SEMI@[11; 12) ";"
+    SEMICOLON@[11; 12) ";"
   WHITESPACE@[12; 13) "\n"
   STRUCT_DEF@[13; 26)
     STRUCT_KW@[13; 19) "struct"
@@ -25,7 +25,7 @@ SOURCE_FILE@[0; 250)
         COLON@[23; 24) ":"
         TYPE_BOUND_LIST@[24; 24)
       R_ANGLE@[24; 25) ">"
-    SEMI@[25; 26) ";"
+    SEMICOLON@[25; 26) ";"
   WHITESPACE@[26; 27) "\n"
   STRUCT_DEF@[27; 43)
     STRUCT_KW@[27; 33) "struct"
@@ -43,7 +43,7 @@ SOURCE_FILE@[0; 250)
           TYPE_BOUND@[39; 41)
             LIFETIME@[39; 41) "\'a"
       R_ANGLE@[41; 42) ">"
-    SEMI@[42; 43) ";"
+    SEMICOLON@[42; 43) ";"
   WHITESPACE@[43; 44) "\n"
   STRUCT_DEF@[44; 63)
     STRUCT_KW@[44; 50) "struct"
@@ -64,7 +64,7 @@ SOURCE_FILE@[0; 250)
           PLUS@[59; 60) "+"
       WHITESPACE@[60; 61) " "
       R_ANGLE@[61; 62) ">"
-    SEMI@[62; 63) ";"
+    SEMICOLON@[62; 63) ";"
   WHITESPACE@[63; 64) "\n"
   STRUCT_DEF@[64; 86)
     STRUCT_KW@[64; 70) "struct"
@@ -88,7 +88,7 @@ SOURCE_FILE@[0; 250)
             LIFETIME@[81; 83) "\'d"
       WHITESPACE@[83; 84) " "
       R_ANGLE@[84; 85) ">"
-    SEMI@[85; 86) ";"
+    SEMICOLON@[85; 86) ";"
   WHITESPACE@[86; 87) "\n"
   STRUCT_DEF@[87; 116)
     STRUCT_KW@[87; 93) "struct"
@@ -120,7 +120,7 @@ SOURCE_FILE@[0; 250)
                   NAME_REF@[109; 114)
                     IDENT@[109; 114) "Clone"
       R_ANGLE@[114; 115) ">"
-    SEMI@[115; 116) ";"
+    SEMICOLON@[115; 116) ";"
   WHITESPACE@[116; 117) "\n"
   STRUCT_DEF@[117; 143)
     STRUCT_KW@[117; 123) "struct"
@@ -151,7 +151,7 @@ SOURCE_FILE@[0; 250)
                   NAME_REF@[137; 141)
                     IDENT@[137; 141) "Copy"
       R_ANGLE@[141; 142) ">"
-    SEMI@[142; 143) ";"
+    SEMICOLON@[142; 143) ";"
   WHITESPACE@[143; 144) "\n"
   STRUCT_DEF@[144; 180)
     STRUCT_KW@[144; 150) "struct"
@@ -170,7 +170,7 @@ SOURCE_FILE@[0; 250)
             PATH_TYPE@[156; 161)
               PATH@[156; 161)
                 PATH_SEGMENT@[156; 161)
-                  COLONCOLON@[156; 158) "::"
+                  COLON2@[156; 158) "::"
                   NAME_REF@[158; 161)
                     IDENT@[158; 161) "Foo"
           WHITESPACE@[161; 162) " "
@@ -182,7 +182,7 @@ SOURCE_FILE@[0; 250)
                 PATH@[164; 168)
                   PATH_SEGMENT@[164; 168)
                     SELF_KW@[164; 168) "self"
-                COLONCOLON@[168; 170) "::"
+                COLON2@[168; 170) "::"
                 PATH_SEGMENT@[170; 173)
                   NAME_REF@[170; 173)
                     IDENT@[170; 173) "Bar"
@@ -192,7 +192,7 @@ SOURCE_FILE@[0; 250)
           TYPE_BOUND@[176; 178)
             LIFETIME@[176; 178) "\'a"
       R_ANGLE@[178; 179) ">"
-    SEMI@[179; 180) ";"
+    SEMICOLON@[179; 180) ";"
   WHITESPACE@[180; 181) "\n"
   STRUCT_DEF@[181; 199)
     STRUCT_KW@[181; 187) "struct"
@@ -215,7 +215,7 @@ SOURCE_FILE@[0; 250)
         TYPE_BOUND_LIST@[196; 196)
       COMMA@[196; 197) ","
       R_ANGLE@[197; 198) ">"
-    SEMI@[198; 199) ";"
+    SEMICOLON@[198; 199) ";"
   WHITESPACE@[199; 200) "\n"
   STRUCT_DEF@[200; 250)
     STRUCT_KW@[200; 206) "struct"
@@ -265,4 +265,4 @@ SOURCE_FILE@[0; 250)
                   NAME_REF@[243; 248)
                     IDENT@[243; 248) "Clone"
       R_ANGLE@[248; 249) ">"
-    SEMI@[249; 250) ";"
+    SEMICOLON@[249; 250) ";"
diff --git a/crates/ra_syntax/test_data/parser/ok/0023_static_items.rast b/crates/ra_syntax/test_data/parser/ok/0023_static_items.rast
index 5591f95eb..dadf24fa6 100644
--- a/crates/ra_syntax/test_data/parser/ok/0023_static_items.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0023_static_items.rast
@@ -16,7 +16,7 @@ SOURCE_FILE@[0; 47)
     WHITESPACE@[17; 18) " "
     LITERAL@[18; 19)
       INT_NUMBER@[18; 19) "1"
-    SEMI@[19; 20) ";"
+    SEMICOLON@[19; 20) ";"
   WHITESPACE@[20; 21) "\n"
   STATIC_DEF@[21; 46)
     STATIC_KW@[21; 27) "static"
@@ -37,5 +37,5 @@ SOURCE_FILE@[0; 47)
     WHITESPACE@[42; 43) " "
     LITERAL@[43; 45)
       INT_NUMBER@[43; 45) "92"
-    SEMI@[45; 46) ";"
+    SEMICOLON@[45; 46) ";"
   WHITESPACE@[46; 47) "\n"
diff --git a/crates/ra_syntax/test_data/parser/ok/0024_const_item.rast b/crates/ra_syntax/test_data/parser/ok/0024_const_item.rast
index abe9f851b..262e31f7f 100644
--- a/crates/ra_syntax/test_data/parser/ok/0024_const_item.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0024_const_item.rast
@@ -15,7 +15,7 @@ SOURCE_FILE@[0; 64)
     WHITESPACE@[14; 15) " "
     LITERAL@[15; 16)
       INT_NUMBER@[15; 16) "0"
-    SEMI@[16; 17) ";"
+    SEMICOLON@[16; 17) ";"
   WHITESPACE@[17; 18) "\n"
   CONST_DEF@[18; 38)
     CONST_KW@[18; 23) "const"
@@ -34,7 +34,7 @@ SOURCE_FILE@[0; 64)
     WHITESPACE@[34; 35) " "
     LITERAL@[35; 37)
       INT_NUMBER@[35; 37) "92"
-    SEMI@[37; 38) ";"
+    SEMICOLON@[37; 38) ";"
   WHITESPACE@[38; 39) "\n"
   CONST_DEF@[39; 63)
     CONST_KW@[39; 44) "const"
@@ -55,5 +55,5 @@ SOURCE_FILE@[0; 64)
     WHITESPACE@[59; 60) " "
     LITERAL@[60; 62)
       INT_NUMBER@[60; 62) "62"
-    SEMI@[62; 63) ";"
+    SEMICOLON@[62; 63) ";"
   WHITESPACE@[63; 64) "\n"
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 afca1fba2..5542f7701 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
@@ -53,7 +53,7 @@ SOURCE_FILE@[0; 248)
               WHITESPACE@[52; 53) " "
               LITERAL@[53; 54)
                 INT_NUMBER@[53; 54) "6"
-          SEMI@[54; 55) ";"
+          SEMICOLON@[54; 55) ";"
         WHITESPACE@[55; 60) "\n    "
         EXPR_STMT@[60; 70)
           BIN_EXPR@[60; 69)
@@ -70,7 +70,7 @@ SOURCE_FILE@[0; 248)
               WHITESPACE@[67; 68) " "
               LITERAL@[68; 69)
                 INT_NUMBER@[68; 69) "3"
-          SEMI@[69; 70) ";"
+          SEMICOLON@[69; 70) ";"
         WHITESPACE@[70; 75) "\n    "
         EXPR_STMT@[75; 86)
           BIN_EXPR@[75; 85)
@@ -87,7 +87,7 @@ SOURCE_FILE@[0; 248)
               WHITESPACE@[83; 84) " "
               LITERAL@[84; 85)
                 INT_NUMBER@[84; 85) "3"
-          SEMI@[85; 86) ";"
+          SEMICOLON@[85; 86) ";"
         WHITESPACE@[86; 91) "\n    "
         EXPR_STMT@[91; 102)
           BIN_EXPR@[91; 101)
@@ -104,7 +104,7 @@ SOURCE_FILE@[0; 248)
               WHITESPACE@[99; 100) " "
               LITERAL@[100; 101)
                 INT_NUMBER@[100; 101) "3"
-          SEMI@[101; 102) ";"
+          SEMICOLON@[101; 102) ";"
         WHITESPACE@[102; 107) "\n    "
         EXPR_STMT@[107; 117)
           BIN_EXPR@[107; 116)
@@ -121,7 +121,7 @@ SOURCE_FILE@[0; 248)
               WHITESPACE@[114; 115) " "
               LITERAL@[115; 116)
                 INT_NUMBER@[115; 116) "3"
-          SEMI@[116; 117) ";"
+          SEMICOLON@[116; 117) ";"
         WHITESPACE@[117; 122) "\n    "
         EXPR_STMT@[122; 132)
           BIN_EXPR@[122; 131)
@@ -138,14 +138,14 @@ SOURCE_FILE@[0; 248)
               WHITESPACE@[129; 130) " "
               LITERAL@[130; 131)
                 INT_NUMBER@[130; 131) "3"
-          SEMI@[131; 132) ";"
+          SEMICOLON@[131; 132) ";"
         WHITESPACE@[132; 137) "\n    "
         EXPR_STMT@[137; 148)
           BIN_EXPR@[137; 147)
             LITERAL@[137; 138)
               INT_NUMBER@[137; 138) "1"
             WHITESPACE@[138; 139) " "
-            EQEQ@[139; 141) "=="
+            EQ2@[139; 141) "=="
             WHITESPACE@[141; 142) " "
             BIN_EXPR@[142; 147)
               LITERAL@[142; 143)
@@ -155,24 +155,24 @@ SOURCE_FILE@[0; 248)
               WHITESPACE@[145; 146) " "
               LITERAL@[146; 147)
                 INT_NUMBER@[146; 147) "3"
-          SEMI@[147; 148) ";"
+          SEMICOLON@[147; 148) ";"
         WHITESPACE@[148; 153) "\n    "
         EXPR_STMT@[153; 165)
           BIN_EXPR@[153; 164)
             LITERAL@[153; 154)
               INT_NUMBER@[153; 154) "1"
             WHITESPACE@[154; 155) " "
-            AMPAMP@[155; 157) "&&"
+            AMP2@[155; 157) "&&"
             WHITESPACE@[157; 158) " "
             BIN_EXPR@[158; 164)
               LITERAL@[158; 159)
                 INT_NUMBER@[158; 159) "2"
               WHITESPACE@[159; 160) " "
-              EQEQ@[160; 162) "=="
+              EQ2@[160; 162) "=="
               WHITESPACE@[162; 163) " "
               LITERAL@[163; 164)
                 INT_NUMBER@[163; 164) "3"
-          SEMI@[164; 165) ";"
+          SEMICOLON@[164; 165) ";"
         WHITESPACE@[165; 170) "\n    "
         COMMENT@[170; 184) "//1 || 2 && 2;"
         WHITESPACE@[184; 189) "\n    "
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 95dae4870..78056aa95 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
@@ -14,7 +14,7 @@ SOURCE_FILE@[0; 153)
         WHITESPACE@[10; 15) "\n    "
         EXPR_STMT@[15; 23)
           RANGE_EXPR@[15; 22)
-            DOTDOT@[15; 17) ".."
+            DOT2@[15; 17) ".."
             BIN_EXPR@[17; 22)
               LITERAL@[17; 18)
                 INT_NUMBER@[17; 18) "1"
@@ -23,12 +23,12 @@ SOURCE_FILE@[0; 153)
               WHITESPACE@[20; 21) " "
               LITERAL@[21; 22)
                 INT_NUMBER@[21; 22) "1"
-          SEMI@[22; 23) ";"
+          SEMICOLON@[22; 23) ";"
         WHITESPACE@[23; 28) "\n    "
         EXPR_STMT@[28; 36)
           BIN_EXPR@[28; 35)
             RANGE_EXPR@[28; 31)
-              DOTDOT@[28; 30) ".."
+              DOT2@[28; 30) ".."
               PATH_EXPR@[30; 31)
                 PATH@[30; 31)
                   PATH_SEGMENT@[30; 31)
@@ -39,7 +39,7 @@ SOURCE_FILE@[0; 153)
             WHITESPACE@[33; 34) " "
             LITERAL@[34; 35)
               INT_NUMBER@[34; 35) "2"
-          SEMI@[35; 36) ";"
+          SEMICOLON@[35; 36) ";"
         WHITESPACE@[36; 41) "\n    "
         EXPR_STMT@[41; 59)
           BIN_EXPR@[41; 58)
@@ -54,16 +54,16 @@ SOURCE_FILE@[0; 153)
             RANGE_EXPR@[45; 58)
               LITERAL@[45; 50)
                 FALSE_KW@[45; 50) "false"
-              DOTDOT@[50; 52) ".."
+              DOT2@[50; 52) ".."
               BIN_EXPR@[52; 58)
                 LITERAL@[52; 53)
                   INT_NUMBER@[52; 53) "1"
                 WHITESPACE@[53; 54) " "
-                EQEQ@[54; 56) "=="
+                EQ2@[54; 56) "=="
                 WHITESPACE@[56; 57) " "
                 LITERAL@[57; 58)
                   INT_NUMBER@[57; 58) "1"
-          SEMI@[58; 59) ";"
+          SEMICOLON@[58; 59) ";"
         WHITESPACE@[59; 64) "\n    "
         LET_STMT@[64; 76)
           LET_KW@[64; 67) "let"
@@ -77,12 +77,12 @@ SOURCE_FILE@[0; 153)
           RANGE_EXPR@[72; 75)
             LITERAL@[72; 73)
               INT_NUMBER@[72; 73) "1"
-            DOTDOT@[73; 75) ".."
-          SEMI@[75; 76) ";"
+            DOT2@[73; 75) ".."
+          SEMICOLON@[75; 76) ";"
         WHITESPACE@[76; 86) "\n    \n    "
         EXPR_STMT@[86; 95)
           RANGE_EXPR@[86; 94)
-            DOTDOTEQ@[86; 89) "..="
+            DOT2EQ@[86; 89) "..="
             BIN_EXPR@[89; 94)
               LITERAL@[89; 90)
                 INT_NUMBER@[89; 90) "1"
@@ -91,12 +91,12 @@ SOURCE_FILE@[0; 153)
               WHITESPACE@[92; 93) " "
               LITERAL@[93; 94)
                 INT_NUMBER@[93; 94) "1"
-          SEMI@[94; 95) ";"
+          SEMICOLON@[94; 95) ";"
         WHITESPACE@[95; 100) "\n    "
         EXPR_STMT@[100; 109)
           BIN_EXPR@[100; 108)
             RANGE_EXPR@[100; 104)
-              DOTDOTEQ@[100; 103) "..="
+              DOT2EQ@[100; 103) "..="
               PATH_EXPR@[103; 104)
                 PATH@[103; 104)
                   PATH_SEGMENT@[103; 104)
@@ -107,7 +107,7 @@ SOURCE_FILE@[0; 153)
             WHITESPACE@[106; 107) " "
             LITERAL@[107; 108)
               INT_NUMBER@[107; 108) "2"
-          SEMI@[108; 109) ";"
+          SEMICOLON@[108; 109) ";"
         WHITESPACE@[109; 114) "\n    "
         EXPR_STMT@[114; 133)
           BIN_EXPR@[114; 132)
@@ -122,16 +122,16 @@ SOURCE_FILE@[0; 153)
             RANGE_EXPR@[118; 132)
               LITERAL@[118; 123)
                 FALSE_KW@[118; 123) "false"
-              DOTDOTEQ@[123; 126) "..="
+              DOT2EQ@[123; 126) "..="
               BIN_EXPR@[126; 132)
                 LITERAL@[126; 127)
                   INT_NUMBER@[126; 127) "1"
                 WHITESPACE@[127; 128) " "
-                EQEQ@[128; 130) "=="
+                EQ2@[128; 130) "=="
                 WHITESPACE@[130; 131) " "
                 LITERAL@[131; 132)
                   INT_NUMBER@[131; 132) "1"
-          SEMI@[132; 133) ";"
+          SEMICOLON@[132; 133) ";"
         WHITESPACE@[133; 138) "\n    "
         LET_STMT@[138; 150)
           LET_KW@[138; 141) "let"
@@ -145,8 +145,8 @@ SOURCE_FILE@[0; 153)
           RANGE_EXPR@[146; 149)
             LITERAL@[146; 147)
               INT_NUMBER@[146; 147) "1"
-            DOTDOT@[147; 149) ".."
-          SEMI@[149; 150) ";"
+            DOT2@[147; 149) ".."
+          SEMICOLON@[149; 150) ";"
         WHITESPACE@[150; 151) "\n"
         R_CURLY@[151; 152) "}"
   WHITESPACE@[152; 153) "\n"
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 cdc9f05ae..4e583c6e8 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
@@ -22,7 +22,7 @@ SOURCE_FILE@[0; 112)
           WHITESPACE@[23; 24) " "
           LITERAL@[24; 30)
             CHAR@[24; 30) "\'c\'u32"
-          SEMI@[30; 31) ";"
+          SEMICOLON@[30; 31) ";"
         WHITESPACE@[31; 36) "\n    "
         LET_STMT@[36; 60)
           LET_KW@[36; 39) "let"
@@ -34,7 +34,7 @@ SOURCE_FILE@[0; 112)
           WHITESPACE@[43; 44) " "
           LITERAL@[44; 59)
             STRING@[44; 59) "\"string\"invalid"
-          SEMI@[59; 60) ";"
+          SEMICOLON@[59; 60) ";"
         WHITESPACE@[60; 65) "\n    "
         LET_STMT@[65; 83)
           LET_KW@[65; 68) "let"
@@ -46,7 +46,7 @@ SOURCE_FILE@[0; 112)
           WHITESPACE@[72; 73) " "
           LITERAL@[73; 82)
             BYTE@[73; 82) "b\'b\'_suff"
-          SEMI@[82; 83) ";"
+          SEMICOLON@[82; 83) ";"
         WHITESPACE@[83; 88) "\n    "
         LET_STMT@[88; 109)
           LET_KW@[88; 91) "let"
@@ -58,7 +58,7 @@ SOURCE_FILE@[0; 112)
           WHITESPACE@[95; 96) " "
           LITERAL@[96; 108)
             BYTE_STRING@[96; 108) "b\"bs\"invalid"
-          SEMI@[108; 109) ";"
+          SEMICOLON@[108; 109) ";"
         WHITESPACE@[109; 110) "\n"
         R_CURLY@[110; 111) "}"
   WHITESPACE@[111; 112) "\n"
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 ac314ae50..4131cd81a 100644
--- a/crates/ra_syntax/test_data/parser/ok/0030_traits.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0030_traits.rast
@@ -16,7 +16,7 @@ SOURCE_FILE@[0; 96)
         PARAM_LIST@[31; 33)
           L_PAREN@[31; 32) "("
           R_PAREN@[32; 33) ")"
-        SEMI@[33; 34) ";"
+        SEMICOLON@[33; 34) ";"
       WHITESPACE@[34; 35) "\n"
       R_CURLY@[35; 36) "}"
   WHITESPACE@[36; 38) "\n\n"
@@ -49,13 +49,13 @@ SOURCE_FILE@[0; 96)
                   PATH_SEGMENT@[84; 87)
                     NAME_REF@[84; 87)
                       IDENT@[84; 87) "i32"
-              SEMI@[87; 88) ";"
+              SEMICOLON@[87; 88) ";"
               WHITESPACE@[88; 89) " "
               LITERAL@[89; 90)
                 INT_NUMBER@[89; 90) "1"
               R_BRACK@[90; 91) "]"
           R_PAREN@[91; 92) ")"
-        SEMI@[92; 93) ";"
+        SEMICOLON@[92; 93) ";"
       WHITESPACE@[93; 94) "\n"
       R_CURLY@[94; 95) "}"
   WHITESPACE@[95; 96) "\n"
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 badbf76c5..23757df52 100644
--- a/crates/ra_syntax/test_data/parser/ok/0031_extern.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0031_extern.rast
@@ -25,7 +25,7 @@ SOURCE_FILE@[0; 1598)
             PATH_TYPE@[35; 42)
               PATH@[35; 42)
                 PATH_SEGMENT@[35; 42)
-                  COLONCOLON@[35; 37) "::"
+                  COLON2@[35; 37) "::"
                   NAME_REF@[37; 42)
                     IDENT@[37; 42) "c_int"
           COMMA@[42; 43) ","
@@ -39,7 +39,7 @@ SOURCE_FILE@[0; 1598)
             PATH_TYPE@[48; 55)
               PATH@[48; 55)
                 PATH_SEGMENT@[48; 55)
-                  COLONCOLON@[48; 50) "::"
+                  COLON2@[48; 50) "::"
                   NAME_REF@[50; 55)
                     IDENT@[50; 55) "c_int"
           COMMA@[55; 56) ","
@@ -53,7 +53,7 @@ SOURCE_FILE@[0; 1598)
             PATH_TYPE@[67; 74)
               PATH@[67; 74)
                 PATH_SEGMENT@[67; 74)
-                  COLONCOLON@[67; 69) "::"
+                  COLON2@[67; 69) "::"
                   NAME_REF@[69; 74)
                     IDENT@[69; 74) "c_int"
           R_PAREN@[74; 75) ")"
@@ -64,10 +64,10 @@ SOURCE_FILE@[0; 1598)
           PATH_TYPE@[79; 86)
             PATH@[79; 86)
               PATH_SEGMENT@[79; 86)
-                COLONCOLON@[79; 81) "::"
+                COLON2@[79; 81) "::"
                 NAME_REF@[81; 86)
                   IDENT@[81; 86) "c_int"
-        SEMI@[86; 87) ";"
+        SEMICOLON@[86; 87) ";"
       WHITESPACE@[87; 92) "\n    "
       FN_DEF@[92; 167)
         VISIBILITY@[92; 95)
@@ -88,7 +88,7 @@ SOURCE_FILE@[0; 1598)
             PATH_TYPE@[108; 115)
               PATH@[108; 115)
                 PATH_SEGMENT@[108; 115)
-                  COLONCOLON@[108; 110) "::"
+                  COLON2@[108; 110) "::"
                   NAME_REF@[110; 115)
                     IDENT@[110; 115) "c_int"
           COMMA@[115; 116) ","
@@ -129,10 +129,10 @@ SOURCE_FILE@[0; 1598)
           PATH_TYPE@[159; 166)
             PATH@[159; 166)
               PATH_SEGMENT@[159; 166)
-                COLONCOLON@[159; 161) "::"
+                COLON2@[159; 161) "::"
                 NAME_REF@[161; 166)
                   IDENT@[161; 166) "c_int"
-        SEMI@[166; 167) ";"
+        SEMICOLON@[166; 167) ";"
       WHITESPACE@[167; 172) "\n    "
       FN_DEF@[172; 276)
         VISIBILITY@[172; 175)
@@ -153,7 +153,7 @@ SOURCE_FILE@[0; 1598)
             PATH_TYPE@[195; 202)
               PATH@[195; 202)
                 PATH_SEGMENT@[195; 202)
-                  COLONCOLON@[195; 197) "::"
+                  COLON2@[195; 197) "::"
                   NAME_REF@[197; 202)
                     IDENT@[197; 202) "c_int"
           COMMA@[202; 203) ","
@@ -194,10 +194,10 @@ SOURCE_FILE@[0; 1598)
           PATH_TYPE@[268; 275)
             PATH@[268; 275)
               PATH_SEGMENT@[268; 275)
-                COLONCOLON@[268; 270) "::"
+                COLON2@[268; 270) "::"
                 NAME_REF@[270; 275)
                   IDENT@[270; 275) "c_int"
-        SEMI@[275; 276) ";"
+        SEMICOLON@[275; 276) ";"
       WHITESPACE@[276; 281) "\n    "
       FN_DEF@[281; 341)
         VISIBILITY@[281; 284)
@@ -218,7 +218,7 @@ SOURCE_FILE@[0; 1598)
             PATH_TYPE@[303; 310)
               PATH@[303; 310)
                 PATH_SEGMENT@[303; 310)
-                  COLONCOLON@[303; 305) "::"
+                  COLON2@[303; 305) "::"
                   NAME_REF@[305; 310)
                     IDENT@[305; 310) "c_int"
           COMMA@[310; 311) ","
@@ -232,7 +232,7 @@ SOURCE_FILE@[0; 1598)
             PATH_TYPE@[321; 328)
               PATH@[321; 328)
                 PATH_SEGMENT@[321; 328)
-                  COLONCOLON@[321; 323) "::"
+                  COLON2@[321; 323) "::"
                   NAME_REF@[323; 328)
                     IDENT@[323; 328) "c_int"
           R_PAREN@[328; 329) ")"
@@ -243,10 +243,10 @@ SOURCE_FILE@[0; 1598)
           PATH_TYPE@[333; 340)
             PATH@[333; 340)
               PATH_SEGMENT@[333; 340)
-                COLONCOLON@[333; 335) "::"
+                COLON2@[333; 335) "::"
                 NAME_REF@[335; 340)
                   IDENT@[335; 340) "c_int"
-        SEMI@[340; 341) ";"
+        SEMICOLON@[340; 341) ";"
       WHITESPACE@[341; 346) "\n    "
       FN_DEF@[346; 469)
         VISIBILITY@[346; 349)
@@ -267,7 +267,7 @@ SOURCE_FILE@[0; 1598)
             PATH_TYPE@[373; 380)
               PATH@[373; 380)
                 PATH_SEGMENT@[373; 380)
-                  COLONCOLON@[373; 375) "::"
+                  COLON2@[373; 375) "::"
                   NAME_REF@[375; 380)
                     IDENT@[375; 380) "c_int"
           COMMA@[380; 381) ","
@@ -312,10 +312,10 @@ SOURCE_FILE@[0; 1598)
           PATH_TYPE@[461; 468)
             PATH@[461; 468)
               PATH_SEGMENT@[461; 468)
-                COLONCOLON@[461; 463) "::"
+                COLON2@[461; 463) "::"
                 NAME_REF@[463; 468)
                   IDENT@[463; 468) "c_int"
-        SEMI@[468; 469) ";"
+        SEMICOLON@[468; 469) ";"
       WHITESPACE@[469; 474) "\n    "
       FN_DEF@[474; 691)
         VISIBILITY@[474; 477)
@@ -336,7 +336,7 @@ SOURCE_FILE@[0; 1598)
             PATH_TYPE@[500; 507)
               PATH@[500; 507)
                 PATH_SEGMENT@[500; 507)
-                  COLONCOLON@[500; 502) "::"
+                  COLON2@[500; 502) "::"
                   NAME_REF@[502; 507)
                     IDENT@[502; 507) "c_int"
           COMMA@[507; 508) ","
@@ -350,7 +350,7 @@ SOURCE_FILE@[0; 1598)
             PATH_TYPE@[538; 545)
               PATH@[538; 545)
                 PATH_SEGMENT@[538; 545)
-                  COLONCOLON@[538; 540) "::"
+                  COLON2@[538; 540) "::"
                   NAME_REF@[540; 545)
                     IDENT@[540; 545) "c_int"
           COMMA@[545; 546) ","
@@ -364,7 +364,7 @@ SOURCE_FILE@[0; 1598)
             PATH_TYPE@[578; 585)
               PATH@[578; 585)
                 PATH_SEGMENT@[578; 585)
-                  COLONCOLON@[578; 580) "::"
+                  COLON2@[578; 580) "::"
                   NAME_REF@[580; 585)
                     IDENT@[580; 585) "c_int"
           COMMA@[585; 586) ","
@@ -382,7 +382,7 @@ SOURCE_FILE@[0; 1598)
               PATH_TYPE@[622; 630)
                 PATH@[622; 630)
                   PATH_SEGMENT@[622; 630)
-                    COLONCOLON@[622; 624) "::"
+                    COLON2@[622; 624) "::"
                     NAME_REF@[624; 630)
                       IDENT@[624; 630) "c_void"
           COMMA@[630; 631) ","
@@ -400,7 +400,7 @@ SOURCE_FILE@[0; 1598)
               PATH_TYPE@[667; 678)
                 PATH@[667; 678)
                   PATH_SEGMENT@[667; 678)
-                    COLONCOLON@[667; 669) "::"
+                    COLON2@[667; 669) "::"
                     NAME_REF@[669; 678)
                       IDENT@[669; 678) "socklen_t"
           R_PAREN@[678; 679) ")"
@@ -411,10 +411,10 @@ SOURCE_FILE@[0; 1598)
           PATH_TYPE@[683; 690)
             PATH@[683; 690)
               PATH_SEGMENT@[683; 690)
-                COLONCOLON@[683; 685) "::"
+                COLON2@[683; 685) "::"
                 NAME_REF@[685; 690)
                   IDENT@[685; 690) "c_int"
-        SEMI@[690; 691) ";"
+        SEMICOLON@[690; 691) ";"
       WHITESPACE@[691; 696) "\n    "
       FN_DEF@[696; 864)
         VISIBILITY@[696; 699)
@@ -435,7 +435,7 @@ SOURCE_FILE@[0; 1598)
             PATH_TYPE@[722; 729)
               PATH@[722; 729)
                 PATH_SEGMENT@[722; 729)
-                  COLONCOLON@[722; 724) "::"
+                  COLON2@[722; 724) "::"
                   NAME_REF@[724; 729)
                     IDENT@[724; 729) "c_int"
           COMMA@[729; 730) ","
@@ -449,7 +449,7 @@ SOURCE_FILE@[0; 1598)
             PATH_TYPE@[738; 745)
               PATH@[738; 745)
                 PATH_SEGMENT@[738; 745)
-                  COLONCOLON@[738; 740) "::"
+                  COLON2@[738; 740) "::"
                   NAME_REF@[740; 745)
                     IDENT@[740; 745) "c_int"
           COMMA@[745; 746) ","
@@ -463,7 +463,7 @@ SOURCE_FILE@[0; 1598)
             PATH_TYPE@[753; 760)
               PATH@[753; 760)
                 PATH_SEGMENT@[753; 760)
-                  COLONCOLON@[753; 755) "::"
+                  COLON2@[753; 755) "::"
                   NAME_REF@[755; 760)
                     IDENT@[755; 760) "c_int"
           COMMA@[760; 761) ","
@@ -481,7 +481,7 @@ SOURCE_FILE@[0; 1598)
               PATH_TYPE@[798; 806)
                 PATH@[798; 806)
                   PATH_SEGMENT@[798; 806)
-                    COLONCOLON@[798; 800) "::"
+                    COLON2@[798; 800) "::"
                     NAME_REF@[800; 806)
                       IDENT@[800; 806) "c_void"
           COMMA@[806; 807) ","
@@ -505,10 +505,10 @@ SOURCE_FILE@[0; 1598)
           PATH_TYPE@[856; 863)
             PATH@[856; 863)
               PATH_SEGMENT@[856; 863)
-                COLONCOLON@[856; 858) "::"
+                COLON2@[856; 858) "::"
                 NAME_REF@[858; 863)
                   IDENT@[858; 863) "c_int"
-        SEMI@[863; 864) ";"
+        SEMICOLON@[863; 864) ";"
       WHITESPACE@[864; 869) "\n    "
       FN_DEF@[869; 992)
         VISIBILITY@[869; 872)
@@ -529,7 +529,7 @@ SOURCE_FILE@[0; 1598)
             PATH_TYPE@[896; 903)
               PATH@[896; 903)
                 PATH_SEGMENT@[896; 903)
-                  COLONCOLON@[896; 898) "::"
+                  COLON2@[896; 898) "::"
                   NAME_REF@[898; 903)
                     IDENT@[898; 903) "c_int"
           COMMA@[903; 904) ","
@@ -574,10 +574,10 @@ SOURCE_FILE@[0; 1598)
           PATH_TYPE@[984; 991)
             PATH@[984; 991)
               PATH_SEGMENT@[984; 991)
-                COLONCOLON@[984; 986) "::"
+                COLON2@[984; 986) "::"
                 NAME_REF@[986; 991)
                   IDENT@[986; 991) "c_int"
-        SEMI@[991; 992) ";"
+        SEMICOLON@[991; 992) ";"
       WHITESPACE@[992; 997) "\n    "
       FN_DEF@[997; 1173)
         VISIBILITY@[997; 1000)
@@ -598,7 +598,7 @@ SOURCE_FILE@[0; 1598)
             PATH_TYPE@[1019; 1026)
               PATH@[1019; 1026)
                 PATH_SEGMENT@[1019; 1026)
-                  COLONCOLON@[1019; 1021) "::"
+                  COLON2@[1019; 1021) "::"
                   NAME_REF@[1021; 1026)
                     IDENT@[1021; 1026) "c_int"
           COMMA@[1026; 1027) ","
@@ -616,7 +616,7 @@ SOURCE_FILE@[0; 1598)
               PATH_TYPE@[1040; 1048)
                 PATH@[1040; 1048)
                   PATH_SEGMENT@[1040; 1048)
-                    COLONCOLON@[1040; 1042) "::"
+                    COLON2@[1040; 1042) "::"
                     NAME_REF@[1042; 1048)
                       IDENT@[1042; 1048) "c_void"
           COMMA@[1048; 1049) ","
@@ -630,7 +630,7 @@ SOURCE_FILE@[0; 1598)
             PATH_TYPE@[1055; 1063)
               PATH@[1055; 1063)
                 PATH_SEGMENT@[1055; 1063)
-                  COLONCOLON@[1055; 1057) "::"
+                  COLON2@[1055; 1057) "::"
                   NAME_REF@[1057; 1063)
                     IDENT@[1057; 1063) "size_t"
           COMMA@[1063; 1064) ","
@@ -644,7 +644,7 @@ SOURCE_FILE@[0; 1598)
             PATH_TYPE@[1090; 1097)
               PATH@[1090; 1097)
                 PATH_SEGMENT@[1090; 1097)
-                  COLONCOLON@[1090; 1092) "::"
+                  COLON2@[1090; 1092) "::"
                   NAME_REF@[1092; 1097)
                     IDENT@[1092; 1097) "c_int"
           COMMA@[1097; 1098) ","
@@ -685,10 +685,10 @@ SOURCE_FILE@[0; 1598)
           PATH_TYPE@[1163; 1172)
             PATH@[1163; 1172)
               PATH_SEGMENT@[1163; 1172)
-                COLONCOLON@[1163; 1165) "::"
+                COLON2@[1163; 1165) "::"
                 NAME_REF@[1165; 1172)
                   IDENT@[1165; 1172) "ssize_t"
-        SEMI@[1172; 1173) ";"
+        SEMICOLON@[1172; 1173) ";"
       WHITESPACE@[1173; 1178) "\n    "
       FN_DEF@[1178; 1289)
         VISIBILITY@[1178; 1181)
@@ -709,7 +709,7 @@ SOURCE_FILE@[0; 1598)
             PATH_TYPE@[1198; 1205)
               PATH@[1198; 1205)
                 PATH_SEGMENT@[1198; 1205)
-                  COLONCOLON@[1198; 1200) "::"
+                  COLON2@[1198; 1200) "::"
                   NAME_REF@[1200; 1205)
                     IDENT@[1200; 1205) "c_int"
           COMMA@[1205; 1206) ","
@@ -727,7 +727,7 @@ SOURCE_FILE@[0; 1598)
               PATH_TYPE@[1219; 1227)
                 PATH@[1219; 1227)
                   PATH_SEGMENT@[1219; 1227)
-                    COLONCOLON@[1219; 1221) "::"
+                    COLON2@[1219; 1221) "::"
                     NAME_REF@[1221; 1227)
                       IDENT@[1221; 1227) "c_void"
           COMMA@[1227; 1228) ","
@@ -741,7 +741,7 @@ SOURCE_FILE@[0; 1598)
             PATH_TYPE@[1234; 1242)
               PATH@[1234; 1242)
                 PATH_SEGMENT@[1234; 1242)
-                  COLONCOLON@[1234; 1236) "::"
+                  COLON2@[1234; 1236) "::"
                   NAME_REF@[1236; 1242)
                     IDENT@[1236; 1242) "size_t"
           COMMA@[1242; 1243) ","
@@ -755,7 +755,7 @@ SOURCE_FILE@[0; 1598)
             PATH_TYPE@[1267; 1274)
               PATH@[1267; 1274)
                 PATH_SEGMENT@[1267; 1274)
-                  COLONCOLON@[1267; 1269) "::"
+                  COLON2@[1267; 1269) "::"
                   NAME_REF@[1269; 1274)
                     IDENT@[1269; 1274) "c_int"
           R_PAREN@[1274; 1275) ")"
@@ -766,10 +766,10 @@ SOURCE_FILE@[0; 1598)
           PATH_TYPE@[1279; 1288)
             PATH@[1279; 1288)
               PATH_SEGMENT@[1279; 1288)
-                COLONCOLON@[1279; 1281) "::"
+                COLON2@[1279; 1281) "::"
                 NAME_REF@[1281; 1288)
                   IDENT@[1281; 1288) "ssize_t"
-        SEMI@[1288; 1289) ";"
+        SEMICOLON@[1288; 1289) ";"
       WHITESPACE@[1289; 1294) "\n    "
       FN_DEF@[1294; 1481)
         VISIBILITY@[1294; 1297)
@@ -790,7 +790,7 @@ SOURCE_FILE@[0; 1598)
             PATH_TYPE@[1318; 1325)
               PATH@[1318; 1325)
                 PATH_SEGMENT@[1318; 1325)
-                  COLONCOLON@[1318; 1320) "::"
+                  COLON2@[1318; 1320) "::"
                   NAME_REF@[1320; 1325)
                     IDENT@[1320; 1325) "c_int"
           COMMA@[1325; 1326) ","
@@ -808,7 +808,7 @@ SOURCE_FILE@[0; 1598)
               PATH_TYPE@[1337; 1345)
                 PATH@[1337; 1345)
                   PATH_SEGMENT@[1337; 1345)
-                    COLONCOLON@[1337; 1339) "::"
+                    COLON2@[1337; 1339) "::"
                     NAME_REF@[1339; 1345)
                       IDENT@[1339; 1345) "c_void"
           COMMA@[1345; 1346) ","
@@ -822,7 +822,7 @@ SOURCE_FILE@[0; 1598)
             PATH_TYPE@[1352; 1360)
               PATH@[1352; 1360)
                 PATH_SEGMENT@[1352; 1360)
-                  COLONCOLON@[1352; 1354) "::"
+                  COLON2@[1352; 1354) "::"
                   NAME_REF@[1354; 1360)
                     IDENT@[1354; 1360) "size_t"
           COMMA@[1360; 1361) ","
@@ -836,7 +836,7 @@ SOURCE_FILE@[0; 1598)
             PATH_TYPE@[1389; 1396)
               PATH@[1389; 1396)
                 PATH_SEGMENT@[1389; 1396)
-                  COLONCOLON@[1389; 1391) "::"
+                  COLON2@[1389; 1391) "::"
                   NAME_REF@[1391; 1396)
                     IDENT@[1391; 1396) "c_int"
           COMMA@[1396; 1397) ","
@@ -854,7 +854,7 @@ SOURCE_FILE@[0; 1598)
               PATH_TYPE@[1409; 1419)
                 PATH@[1409; 1419)
                   PATH_SEGMENT@[1409; 1419)
-                    COLONCOLON@[1409; 1411) "::"
+                    COLON2@[1409; 1411) "::"
                     NAME_REF@[1411; 1419)
                       IDENT@[1411; 1419) "sockaddr"
           COMMA@[1419; 1420) ","
@@ -872,7 +872,7 @@ SOURCE_FILE@[0; 1598)
               PATH_TYPE@[1455; 1466)
                 PATH@[1455; 1466)
                   PATH_SEGMENT@[1455; 1466)
-                    COLONCOLON@[1455; 1457) "::"
+                    COLON2@[1455; 1457) "::"
                     NAME_REF@[1457; 1466)
                       IDENT@[1457; 1466) "socklen_t"
           R_PAREN@[1466; 1467) ")"
@@ -883,10 +883,10 @@ SOURCE_FILE@[0; 1598)
           PATH_TYPE@[1471; 1480)
             PATH@[1471; 1480)
               PATH_SEGMENT@[1471; 1480)
-                COLONCOLON@[1471; 1473) "::"
+                COLON2@[1471; 1473) "::"
                 NAME_REF@[1473; 1480)
                   IDENT@[1473; 1480) "ssize_t"
-        SEMI@[1480; 1481) ";"
+        SEMICOLON@[1480; 1481) ";"
       WHITESPACE@[1481; 1486) "\n    "
       FN_DEF@[1486; 1595)
         VISIBILITY@[1486; 1489)
@@ -907,7 +907,7 @@ SOURCE_FILE@[0; 1598)
             PATH_TYPE@[1506; 1513)
               PATH@[1506; 1513)
                 PATH_SEGMENT@[1506; 1513)
-                  COLONCOLON@[1506; 1508) "::"
+                  COLON2@[1506; 1508) "::"
                   NAME_REF@[1508; 1513)
                     IDENT@[1508; 1513) "c_int"
           COMMA@[1513; 1514) ","
@@ -925,7 +925,7 @@ SOURCE_FILE@[0; 1598)
               PATH_TYPE@[1525; 1533)
                 PATH@[1525; 1533)
                   PATH_SEGMENT@[1525; 1533)
-                    COLONCOLON@[1525; 1527) "::"
+                    COLON2@[1525; 1527) "::"
                     NAME_REF@[1527; 1533)
                       IDENT@[1527; 1533) "c_void"
           COMMA@[1533; 1534) ","
@@ -939,7 +939,7 @@ SOURCE_FILE@[0; 1598)
             PATH_TYPE@[1540; 1548)
               PATH@[1540; 1548)
                 PATH_SEGMENT@[1540; 1548)
-                  COLONCOLON@[1540; 1542) "::"
+                  COLON2@[1540; 1542) "::"
                   NAME_REF@[1542; 1548)
                     IDENT@[1542; 1548) "size_t"
           COMMA@[1548; 1549) ","
@@ -953,7 +953,7 @@ SOURCE_FILE@[0; 1598)
             PATH_TYPE@[1573; 1580)
               PATH@[1573; 1580)
                 PATH_SEGMENT@[1573; 1580)
-                  COLONCOLON@[1573; 1575) "::"
+                  COLON2@[1573; 1575) "::"
                   NAME_REF@[1575; 1580)
                     IDENT@[1575; 1580) "c_int"
           R_PAREN@[1580; 1581) ")"
@@ -964,10 +964,10 @@ SOURCE_FILE@[0; 1598)
           PATH_TYPE@[1585; 1594)
             PATH@[1585; 1594)
               PATH_SEGMENT@[1585; 1594)
-                COLONCOLON@[1585; 1587) "::"
+                COLON2@[1585; 1587) "::"
                 NAME_REF@[1587; 1594)
                   IDENT@[1587; 1594) "ssize_t"
-        SEMI@[1594; 1595) ";"
+        SEMICOLON@[1594; 1595) ";"
       WHITESPACE@[1595; 1596) "\n"
       R_CURLY@[1596; 1597) "}"
   WHITESPACE@[1597; 1598) "\n"
diff --git a/crates/ra_syntax/test_data/parser/ok/0032_where_for.rast b/crates/ra_syntax/test_data/parser/ok/0032_where_for.rast
index 3a333480e..f71cf5b6c 100644
--- a/crates/ra_syntax/test_data/parser/ok/0032_where_for.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0032_where_for.rast
@@ -74,11 +74,11 @@ SOURCE_FILE@[0; 116)
                     PATH_SEGMENT@[96; 99)
                       NAME_REF@[96; 99)
                         IDENT@[96; 99) "std"
-                  COLONCOLON@[99; 101) "::"
+                  COLON2@[99; 101) "::"
                   PATH_SEGMENT@[101; 104)
                     NAME_REF@[101; 104)
                       IDENT@[101; 104) "fmt"
-                COLONCOLON@[104; 106) "::"
+                COLON2@[104; 106) "::"
                 PATH_SEGMENT@[106; 111)
                   NAME_REF@[106; 111)
                     IDENT@[106; 111) "Debug"
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 bd9e3fd85..8af41caa0 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
@@ -43,7 +43,7 @@ SOURCE_FILE@[0; 506)
                   ARG_LIST@[98; 100)
                     L_PAREN@[98; 99) "("
                     R_PAREN@[99; 100) ")"
-                SEMI@[100; 101) ";"
+                SEMICOLON@[100; 101) ";"
               WHITESPACE@[101; 110) "\n        "
               EXPR_STMT@[110; 170)
                 IF_EXPR@[110; 170)
@@ -69,7 +69,7 @@ SOURCE_FILE@[0; 506)
                           BREAK_KW@[147; 152) "break"
                           WHITESPACE@[152; 153) " "
                           LIFETIME@[153; 159) "\'block"
-                        SEMI@[159; 160) ";"
+                        SEMICOLON@[159; 160) ";"
                       WHITESPACE@[160; 169) "\n        "
                       R_CURLY@[169; 170) "}"
               WHITESPACE@[170; 179) "\n        "
@@ -83,7 +83,7 @@ SOURCE_FILE@[0; 506)
                   ARG_LIST@[192; 194)
                     L_PAREN@[192; 193) "("
                     R_PAREN@[193; 194) ")"
-                SEMI@[194; 195) ";"
+                SEMICOLON@[194; 195) ";"
               WHITESPACE@[195; 204) "\n        "
               EXPR_STMT@[204; 264)
                 IF_EXPR@[204; 264)
@@ -109,7 +109,7 @@ SOURCE_FILE@[0; 506)
                           BREAK_KW@[241; 246) "break"
                           WHITESPACE@[246; 247) " "
                           LIFETIME@[247; 253) "\'block"
-                        SEMI@[253; 254) ";"
+                        SEMICOLON@[253; 254) ";"
                       WHITESPACE@[254; 263) "\n        "
                       R_CURLY@[263; 264) "}"
               WHITESPACE@[264; 273) "\n        "
@@ -123,7 +123,7 @@ SOURCE_FILE@[0; 506)
                   ARG_LIST@[286; 288)
                     L_PAREN@[286; 287) "("
                     R_PAREN@[287; 288) ")"
-                SEMI@[288; 289) ";"
+                SEMICOLON@[288; 289) ";"
               WHITESPACE@[289; 294) "\n    "
               R_CURLY@[294; 295) "}"
         WHITESPACE@[295; 301) "\n\n    "
@@ -173,7 +173,7 @@ SOURCE_FILE@[0; 506)
                           WHITESPACE@[390; 391) " "
                           LITERAL@[391; 392)
                             INT_NUMBER@[391; 392) "1"
-                        SEMI@[392; 393) ";"
+                        SEMICOLON@[392; 393) ";"
                       WHITESPACE@[393; 402) "\n        "
                       R_CURLY@[402; 403) "}"
               WHITESPACE@[403; 412) "\n        "
@@ -206,7 +206,7 @@ SOURCE_FILE@[0; 506)
                           WHITESPACE@[473; 474) " "
                           LITERAL@[474; 475)
                             INT_NUMBER@[474; 475) "2"
-                        SEMI@[475; 476) ";"
+                        SEMICOLON@[475; 476) ";"
                       WHITESPACE@[476; 485) "\n        "
                       R_CURLY@[485; 486) "}"
               WHITESPACE@[486; 495) "\n        "
@@ -214,7 +214,7 @@ SOURCE_FILE@[0; 506)
                 INT_NUMBER@[495; 496) "3"
               WHITESPACE@[496; 501) "\n    "
               R_CURLY@[501; 502) "}"
-          SEMI@[502; 503) ";"
+          SEMICOLON@[502; 503) ";"
         WHITESPACE@[503; 504) "\n"
         R_CURLY@[504; 505) "}"
   WHITESPACE@[505; 506) "\n"
diff --git a/crates/ra_syntax/test_data/parser/ok/0034_crate_path_in_call.rast b/crates/ra_syntax/test_data/parser/ok/0034_crate_path_in_call.rast
index fc0d452f4..beaa96388 100644
--- a/crates/ra_syntax/test_data/parser/ok/0034_crate_path_in_call.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0034_crate_path_in_call.rast
@@ -27,16 +27,16 @@ SOURCE_FILE@[0; 62)
                     PATH@[27; 32)
                       PATH_SEGMENT@[27; 32)
                         CRATE_KW@[27; 32) "crate"
-                    COLONCOLON@[32; 34) "::"
+                    COLON2@[32; 34) "::"
                     PATH_SEGMENT@[34; 44)
                       NAME_REF@[34; 44)
                         IDENT@[34; 44) "module_map"
-                  COLONCOLON@[44; 46) "::"
+                  COLON2@[44; 46) "::"
                   PATH_SEGMENT@[46; 57)
                     NAME_REF@[46; 57)
                       IDENT@[46; 57) "module_tree"
               R_PAREN@[57; 58) ")"
-          SEMI@[58; 59) ";"
+          SEMICOLON@[58; 59) ";"
         WHITESPACE@[59; 60) "\n"
         R_CURLY@[60; 61) "}"
   WHITESPACE@[61; 62) "\n"
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 90538b90d..7143a31a5 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
@@ -9,7 +9,7 @@ SOURCE_FILE@[0; 3813)
   WHITESPACE@[269; 271) "\n\n"
   ATTR@[271; 302)
     POUND@[271; 272) "#"
-    EXCL@[272; 273) "!"
+    BANG@[272; 273) "!"
     L_BRACK@[273; 274) "["
     PATH@[274; 279)
       PATH_SEGMENT@[274; 279)
@@ -23,7 +23,7 @@ SOURCE_FILE@[0; 3813)
   WHITESPACE@[302; 303) "\n"
   ATTR@[303; 323)
     POUND@[303; 304) "#"
-    EXCL@[304; 305) "!"
+    BANG@[304; 305) "!"
     L_BRACK@[305; 306) "["
     PATH@[306; 311)
       PATH_SEGMENT@[306; 311)
@@ -37,7 +37,7 @@ SOURCE_FILE@[0; 3813)
   WHITESPACE@[323; 324) "\n"
   ATTR@[324; 351)
     POUND@[324; 325) "#"
-    EXCL@[325; 326) "!"
+    BANG@[325; 326) "!"
     L_BRACK@[326; 327) "["
     PATH@[327; 332)
       PATH_SEGMENT@[327; 332)
@@ -51,7 +51,7 @@ SOURCE_FILE@[0; 3813)
   WHITESPACE@[351; 352) "\n"
   ATTR@[352; 376)
     POUND@[352; 353) "#"
-    EXCL@[353; 354) "!"
+    BANG@[353; 354) "!"
     L_BRACK@[354; 355) "["
     PATH@[355; 360)
       PATH_SEGMENT@[355; 360)
@@ -65,7 +65,7 @@ SOURCE_FILE@[0; 3813)
   WHITESPACE@[376; 378) "\n\n"
   ATTR@[378; 405)
     POUND@[378; 379) "#"
-    EXCL@[379; 380) "!"
+    BANG@[379; 380) "!"
     L_BRACK@[380; 381) "["
     PATH@[381; 396)
       PATH_SEGMENT@[381; 396)
@@ -88,15 +88,15 @@ SOURCE_FILE@[0; 3813)
             PATH_SEGMENT@[411; 414)
               NAME_REF@[411; 414)
                 IDENT@[411; 414) "std"
-          COLONCOLON@[414; 416) "::"
+          COLON2@[414; 416) "::"
           PATH_SEGMENT@[416; 420)
             NAME_REF@[416; 420)
               IDENT@[416; 420) "cell"
-        COLONCOLON@[420; 422) "::"
+        COLON2@[420; 422) "::"
         PATH_SEGMENT@[422; 426)
           NAME_REF@[422; 426)
             IDENT@[422; 426) "Cell"
-    SEMI@[426; 427) ";"
+    SEMICOLON@[426; 427) ";"
   WHITESPACE@[427; 428) "\n"
   USE_ITEM@[428; 447)
     USE_KW@[428; 431) "use"
@@ -108,15 +108,15 @@ SOURCE_FILE@[0; 3813)
             PATH_SEGMENT@[432; 435)
               NAME_REF@[432; 435)
                 IDENT@[432; 435) "std"
-          COLONCOLON@[435; 437) "::"
+          COLON2@[435; 437) "::"
           PATH_SEGMENT@[437; 440)
             NAME_REF@[437; 440)
               IDENT@[437; 440) "mem"
-        COLONCOLON@[440; 442) "::"
+        COLON2@[440; 442) "::"
         PATH_SEGMENT@[442; 446)
           NAME_REF@[442; 446)
             IDENT@[442; 446) "swap"
-    SEMI@[446; 447) ";"
+    SEMICOLON@[446; 447) ";"
   WHITESPACE@[447; 449) "\n\n"
   COMMENT@[449; 518) "// Just a grab bag of ..."
   WHITESPACE@[518; 520) "\n\n"
@@ -163,7 +163,7 @@ SOURCE_FILE@[0; 3813)
             WHITESPACE@[564; 565) " "
             LITERAL@[565; 569)
               TRUE_KW@[565; 569) "true"
-          SEMI@[569; 570) ";"
+          SEMICOLON@[569; 570) ";"
         WHITESPACE@[570; 571) " "
         R_CURLY@[571; 572) "}"
   WHITESPACE@[572; 574) "\n\n"
@@ -216,7 +216,7 @@ SOURCE_FILE@[0; 3813)
               RETURN_EXPR@[614; 620)
                 RETURN_KW@[614; 620) "return"
               R_PAREN@[620; 621) ")"
-          SEMI@[621; 622) ";"
+          SEMICOLON@[621; 622) ";"
         WHITESPACE@[622; 623) "\n"
         R_CURLY@[623; 624) "}"
   WHITESPACE@[624; 626) "\n\n"
@@ -277,7 +277,7 @@ SOURCE_FILE@[0; 3813)
                     WHITESPACE@[687; 688) " "
                     CONDITION@[688; 696)
                       PREFIX_EXPR@[688; 696)
-                        EXCL@[688; 689) "!"
+                        BANG@[688; 689) "!"
                         METHOD_CALL_EXPR@[689; 696)
                           PATH_EXPR@[689; 690)
                             PATH@[689; 690)
@@ -310,10 +310,10 @@ SOURCE_FILE@[0; 3813)
                               LITERAL@[705; 709)
                                 TRUE_KW@[705; 709) "true"
                               R_PAREN@[709; 710) ")"
-                          SEMI@[710; 711) ";"
+                          SEMICOLON@[710; 711) ";"
                         WHITESPACE@[711; 712) " "
                         R_CURLY@[712; 713) "}"
-                SEMI@[713; 714) ";"
+                SEMICOLON@[713; 714) ";"
               WHITESPACE@[714; 719) "\n    "
               R_CURLY@[719; 720) "}"
         WHITESPACE@[720; 725) "\n    "
@@ -335,7 +335,7 @@ SOURCE_FILE@[0; 3813)
                     PATH_SEGMENT@[734; 738)
                       NAME_REF@[734; 738)
                         IDENT@[734; 738) "Cell"
-                  COLONCOLON@[738; 740) "::"
+                  COLON2@[738; 740) "::"
                   PATH_SEGMENT@[740; 743)
                     NAME_REF@[740; 743)
                       IDENT@[740; 743) "new"
@@ -344,7 +344,7 @@ SOURCE_FILE@[0; 3813)
                 LITERAL@[744; 749)
                   FALSE_KW@[744; 749) "false"
                 R_PAREN@[749; 750) ")"
-          SEMI@[750; 751) ";"
+          SEMICOLON@[750; 751) ";"
         WHITESPACE@[751; 756) "\n    "
         LET_STMT@[756; 778)
           LET_KW@[756; 759) "let"
@@ -377,7 +377,7 @@ SOURCE_FILE@[0; 3813)
                             IDENT@[774; 775) "i"
                     R_PAREN@[775; 776) ")"
               R_CURLY@[776; 777) "}"
-          SEMI@[777; 778) ";"
+          SEMICOLON@[777; 778) ";"
         WHITESPACE@[778; 783) "\n    "
         EXPR_STMT@[783; 790)
           CALL_EXPR@[783; 789)
@@ -389,7 +389,7 @@ SOURCE_FILE@[0; 3813)
             ARG_LIST@[787; 789)
               L_PAREN@[787; 788) "("
               R_PAREN@[788; 789) ")"
-          SEMI@[789; 790) ";"
+          SEMICOLON@[789; 790) ";"
         WHITESPACE@[790; 795) "\n    "
         EXPR_STMT@[795; 814)
           MACRO_CALL@[795; 813)
@@ -397,7 +397,7 @@ SOURCE_FILE@[0; 3813)
               PATH_SEGMENT@[795; 801)
                 NAME_REF@[795; 801)
                   IDENT@[795; 801) "assert"
-            EXCL@[801; 802) "!"
+            BANG@[801; 802) "!"
             TOKEN_TREE@[802; 813)
               L_PAREN@[802; 803) "("
               TOKEN_TREE@[803; 812)
@@ -410,7 +410,7 @@ SOURCE_FILE@[0; 3813)
                   R_PAREN@[810; 811) ")"
                 R_PAREN@[811; 812) ")"
               R_PAREN@[812; 813) ")"
-          SEMI@[813; 814) ";"
+          SEMICOLON@[813; 814) ";"
         WHITESPACE@[814; 815) "\n"
         R_CURLY@[815; 816) "}"
   WHITESPACE@[816; 818) "\n\n"
@@ -535,7 +535,7 @@ SOURCE_FILE@[0; 3813)
                                         R_CURLY@[1182; 1183) "}"
                                   WHITESPACE@[1183; 1200) "\n                "
                                   R_CURLY@[1200; 1201) "}"
-                              SEMI@[1201; 1202) ";"
+                              SEMICOLON@[1201; 1202) ";"
                             WHITESPACE@[1202; 1215) "\n            "
                             R_CURLY@[1215; 1216) "}"
                         WHITESPACE@[1216; 1217) " "
@@ -558,7 +558,7 @@ SOURCE_FILE@[0; 3813)
                               EXPR_STMT@[1252; 1259)
                                 RETURN_EXPR@[1252; 1258)
                                   RETURN_KW@[1252; 1258) "return"
-                                SEMI@[1258; 1259) ";"
+                                SEMICOLON@[1258; 1259) ";"
                               WHITESPACE@[1259; 1272) "\n            "
                               R_CURLY@[1272; 1273) "}"
                       WHITESPACE@[1273; 1282) "\n        "
@@ -581,7 +581,7 @@ SOURCE_FILE@[0; 3813)
                     EXPR_STMT@[1306; 1312)
                       BREAK_EXPR@[1306; 1311)
                         BREAK_KW@[1306; 1311) "break"
-                      SEMI@[1311; 1312) ";"
+                      SEMICOLON@[1311; 1312) ";"
                     WHITESPACE@[1312; 1313) " "
                     R_CURLY@[1313; 1314) "}"
               WHITESPACE@[1314; 1319) "\n    "
@@ -617,7 +617,7 @@ SOURCE_FILE@[0; 3813)
               PATH_SEGMENT@[1355; 1360)
                 NAME_REF@[1355; 1360)
                   IDENT@[1355; 1360) "isize"
-          SEMI@[1360; 1361) ";"
+          SEMICOLON@[1360; 1361) ";"
         WHITESPACE@[1361; 1366) "\n    "
         LET_STMT@[1366; 1400)
           LET_KW@[1366; 1369) "let"
@@ -646,7 +646,7 @@ SOURCE_FILE@[0; 3813)
                   INT_NUMBER@[1385; 1386) "0"
               R_PAREN@[1386; 1387) ")"
             WHITESPACE@[1387; 1388) " "
-            EQEQ@[1388; 1390) "=="
+            EQ2@[1388; 1390) "=="
             WHITESPACE@[1390; 1391) " "
             PAREN_EXPR@[1391; 1399)
               L_PAREN@[1391; 1392) "("
@@ -662,7 +662,7 @@ SOURCE_FILE@[0; 3813)
                 LITERAL@[1397; 1398)
                   INT_NUMBER@[1397; 1398) "0"
               R_PAREN@[1398; 1399) ")"
-          SEMI@[1399; 1400) ";"
+          SEMICOLON@[1399; 1400) ";"
         WHITESPACE@[1400; 1405) "\n    "
         LET_STMT@[1405; 1438)
           LET_KW@[1405; 1408) "let"
@@ -707,7 +707,7 @@ SOURCE_FILE@[0; 3813)
                 LITERAL@[1435; 1436)
                   INT_NUMBER@[1435; 1436) "0"
               R_PAREN@[1436; 1437) ")"
-          SEMI@[1437; 1438) ";"
+          SEMICOLON@[1437; 1438) ";"
         WHITESPACE@[1438; 1443) "\n    "
         LET_STMT@[1443; 1474)
           LET_KW@[1443; 1446) "let"
@@ -734,7 +734,7 @@ SOURCE_FILE@[0; 3813)
                   INT_NUMBER@[1459; 1460) "0"
               R_PAREN@[1460; 1461) ")"
             WHITESPACE@[1461; 1462) " "
-            EQEQ@[1462; 1464) "=="
+            EQ2@[1462; 1464) "=="
             WHITESPACE@[1464; 1465) " "
             PAREN_EXPR@[1465; 1473)
               L_PAREN@[1465; 1466) "("
@@ -750,7 +750,7 @@ SOURCE_FILE@[0; 3813)
                 LITERAL@[1471; 1472)
                   INT_NUMBER@[1471; 1472) "0"
               R_PAREN@[1472; 1473) ")"
-          SEMI@[1473; 1474) ";"
+          SEMICOLON@[1473; 1474) ";"
         WHITESPACE@[1474; 1479) "\n    "
         LET_STMT@[1479; 1537)
           LET_KW@[1479; 1482) "let"
@@ -792,7 +792,7 @@ SOURCE_FILE@[0; 3813)
                           IDENT@[1507; 1509) "_z"
                 R_PAREN@[1509; 1510) ")"
             WHITESPACE@[1510; 1511) " "
-            EQEQ@[1511; 1513) "=="
+            EQ2@[1511; 1513) "=="
             WHITESPACE@[1513; 1514) " "
             CALL_EXPR@[1514; 1536)
               PATH_EXPR@[1514; 1518)
@@ -823,7 +823,7 @@ SOURCE_FILE@[0; 3813)
                         NAME_REF@[1533; 1535)
                           IDENT@[1533; 1535) "_z"
                 R_PAREN@[1535; 1536) ")"
-          SEMI@[1536; 1537) ";"
+          SEMICOLON@[1536; 1537) ";"
         WHITESPACE@[1537; 1538) "\n"
         R_CURLY@[1538; 1539) "}"
   WHITESPACE@[1539; 1541) "\n\n"
@@ -893,7 +893,7 @@ SOURCE_FILE@[0; 3813)
                   PATH_SEGMENT@[1613; 1619)
                     NAME_REF@[1613; 1619)
                       IDENT@[1613; 1619) "assert"
-                EXCL@[1619; 1620) "!"
+                BANG@[1619; 1620) "!"
                 TOKEN_TREE@[1620; 1628)
                   L_PAREN@[1620; 1621) "("
                   TOKEN_TREE@[1621; 1627)
@@ -902,7 +902,7 @@ SOURCE_FILE@[0; 3813)
                     R_PAREN@[1626; 1627) ")"
                   R_PAREN@[1627; 1628) ")"
               WHITESPACE@[1628; 1629) " "
-              EQEQ@[1629; 1631) "=="
+              EQ2@[1629; 1631) "=="
               WHITESPACE@[1631; 1632) " "
               PAREN_EXPR@[1632; 1646)
                 L_PAREN@[1632; 1633) "("
@@ -911,7 +911,7 @@ SOURCE_FILE@[0; 3813)
                     PATH_SEGMENT@[1633; 1639)
                       NAME_REF@[1633; 1639)
                         IDENT@[1633; 1639) "assert"
-                  EXCL@[1639; 1640) "!"
+                  BANG@[1639; 1640) "!"
                   TOKEN_TREE@[1640; 1645)
                     L_PAREN@[1640; 1641) "("
                     IDENT@[1641; 1642) "p"
@@ -921,7 +921,7 @@ SOURCE_FILE@[0; 3813)
                     R_PAREN@[1644; 1645) ")"
                 R_PAREN@[1645; 1646) ")"
             R_PAREN@[1646; 1647) ")"
-          SEMI@[1647; 1648) ";"
+          SEMICOLON@[1647; 1648) ";"
         WHITESPACE@[1648; 1653) "\n    "
         LET_STMT@[1653; 1685)
           LET_KW@[1653; 1656) "let"
@@ -940,7 +940,7 @@ SOURCE_FILE@[0; 3813)
                   PATH_SEGMENT@[1663; 1669)
                     NAME_REF@[1663; 1669)
                       IDENT@[1663; 1669) "assert"
-                EXCL@[1669; 1670) "!"
+                BANG@[1669; 1670) "!"
                 TOKEN_TREE@[1670; 1677)
                   L_PAREN@[1670; 1671) "("
                   TOKEN_TREE@[1671; 1676)
@@ -952,13 +952,13 @@ SOURCE_FILE@[0; 3813)
                     R_PAREN@[1675; 1676) ")"
                   R_PAREN@[1676; 1677) ")"
               WHITESPACE@[1677; 1678) " "
-              EQEQ@[1678; 1680) "=="
+              EQ2@[1678; 1680) "=="
               WHITESPACE@[1680; 1681) " "
               TUPLE_EXPR@[1681; 1683)
                 L_PAREN@[1681; 1682) "("
                 R_PAREN@[1682; 1683) ")"
             R_PAREN@[1683; 1684) ")"
-          SEMI@[1684; 1685) ";"
+          SEMICOLON@[1684; 1685) ";"
         WHITESPACE@[1685; 1690) "\n    "
         LET_STMT@[1690; 1739)
           LET_KW@[1690; 1693) "let"
@@ -984,7 +984,7 @@ SOURCE_FILE@[0; 3813)
                   PATH_SEGMENT@[1706; 1713)
                     NAME_REF@[1706; 1713)
                       IDENT@[1706; 1713) "println"
-                EXCL@[1713; 1714) "!"
+                BANG@[1713; 1714) "!"
                 TOKEN_TREE@[1714; 1723)
                   L_PAREN@[1714; 1715) "("
                   STRING@[1715; 1719) "\"{}\""
@@ -993,7 +993,7 @@ SOURCE_FILE@[0; 3813)
                   INT_NUMBER@[1721; 1722) "0"
                   R_PAREN@[1722; 1723) ")"
               WHITESPACE@[1723; 1724) " "
-              EQEQ@[1724; 1726) "=="
+              EQ2@[1724; 1726) "=="
               WHITESPACE@[1726; 1727) " "
               PAREN_EXPR@[1727; 1737)
                 L_PAREN@[1727; 1728) "("
@@ -1004,7 +1004,7 @@ SOURCE_FILE@[0; 3813)
                     INT_NUMBER@[1735; 1736) "0"
                 R_PAREN@[1736; 1737) ")"
             R_PAREN@[1737; 1738) ")"
-          SEMI@[1738; 1739) ";"
+          SEMICOLON@[1738; 1739) ";"
         WHITESPACE@[1739; 1740) "\n"
         R_CURLY@[1740; 1741) "}"
   WHITESPACE@[1741; 1743) "\n\n"
@@ -1057,7 +1057,7 @@ SOURCE_FILE@[0; 3813)
           WHITESPACE@[1801; 1802) " "
           LITERAL@[1802; 1803)
             INT_NUMBER@[1802; 1803) "0"
-          SEMI@[1803; 1804) ";"
+          SEMICOLON@[1803; 1804) ";"
         WHITESPACE@[1804; 1809) "\n    "
         LOOP_EXPR@[1809; 1902)
           LOOP_KW@[1809; 1813) "loop"
@@ -1078,7 +1078,7 @@ SOURCE_FILE@[0; 3813)
                   WHITESPACE@[1820; 1821) " "
                   LITERAL@[1821; 1822)
                     INT_NUMBER@[1821; 1822) "1"
-                SEMI@[1822; 1823) ";"
+                SEMICOLON@[1822; 1823) ";"
               WHITESPACE@[1823; 1824) " "
               EXPR_STMT@[1824; 1887)
                 IF_EXPR@[1824; 1887)
@@ -1092,7 +1092,7 @@ SOURCE_FILE@[0; 3813)
                             NAME_REF@[1827; 1828)
                               IDENT@[1827; 1828) "i"
                       WHITESPACE@[1828; 1829) " "
-                      EQEQ@[1829; 1831) "=="
+                      EQ2@[1829; 1831) "=="
                       WHITESPACE@[1831; 1832) " "
                       LITERAL@[1832; 1833)
                         INT_NUMBER@[1832; 1833) "1"
@@ -1138,7 +1138,7 @@ SOURCE_FILE@[0; 3813)
                                 PATH_SEGMENT@[1870; 1875)
                                   NAME_REF@[1870; 1875)
                                     IDENT@[1870; 1875) "panic"
-                              EXCL@[1875; 1876) "!"
+                              BANG@[1875; 1876) "!"
                               TOKEN_TREE@[1876; 1883)
                                 L_PAREN@[1876; 1877) "("
                                 STRING@[1877; 1882) "\"wat\""
@@ -1151,7 +1151,7 @@ SOURCE_FILE@[0; 3813)
               EXPR_STMT@[1894; 1900)
                 BREAK_EXPR@[1894; 1899)
                   BREAK_KW@[1894; 1899) "break"
-                SEMI@[1899; 1900) ";"
+                SEMICOLON@[1899; 1900) ";"
               WHITESPACE@[1900; 1901) " "
               R_CURLY@[1901; 1902) "}"
         WHITESPACE@[1902; 1903) "\n"
@@ -1184,12 +1184,12 @@ SOURCE_FILE@[0; 3813)
               PATH_SEGMENT@[1938; 1945)
                 NAME_REF@[1938; 1945)
                   IDENT@[1938; 1945) "println"
-            EXCL@[1945; 1946) "!"
+            BANG@[1945; 1946) "!"
             TOKEN_TREE@[1946; 1957)
               L_PAREN@[1946; 1947) "("
               STRING@[1947; 1956) "\"lincoln\""
               R_PAREN@[1956; 1957) ")"
-          SEMI@[1957; 1958) ";"
+          SEMICOLON@[1957; 1958) ";"
         WHITESPACE@[1958; 1959) " "
         R_CURLY@[1959; 1960) "}"
   WHITESPACE@[1960; 1962) "\n\n"
@@ -1212,7 +1212,7 @@ SOURCE_FILE@[0; 3813)
               PATH_SEGMENT@[1978; 1987)
                 NAME_REF@[1978; 1987)
                   IDENT@[1978; 1987) "assert_eq"
-            EXCL@[1987; 1988) "!"
+            BANG@[1987; 1988) "!"
             TOKEN_TREE@[1988; 2195)
               L_PAREN@[1988; 1989) "("
               IDENT@[1989; 1995) "String"
@@ -1226,7 +1226,7 @@ SOURCE_FILE@[0; 3813)
               COMMA@[2055; 2056) ","
               WHITESPACE@[2056; 2072) "\n               "
               IDENT@[2072; 2078) "format"
-              EXCL@[2078; 2079) "!"
+              BANG@[2078; 2079) "!"
               TOKEN_TREE@[2079; 2194)
                 L_PAREN@[2079; 2080) "("
                 STRING@[2080; 2086) "\"{:?}\""
@@ -1308,7 +1308,7 @@ SOURCE_FILE@[0; 3813)
                 DOT@[2192; 2193) "."
                 R_PAREN@[2193; 2194) ")"
               R_PAREN@[2194; 2195) ")"
-          SEMI@[2195; 2196) ";"
+          SEMICOLON@[2195; 2196) ";"
         WHITESPACE@[2196; 2197) "\n"
         R_CURLY@[2197; 2198) "}"
   WHITESPACE@[2198; 2200) "\n\n"
@@ -1362,7 +1362,7 @@ SOURCE_FILE@[0; 3813)
                     PATH_SEGMENT@[2243; 2252)
                       NAME_REF@[2243; 2252)
                         IDENT@[2243; 2252) "assert_eq"
-                  EXCL@[2252; 2253) "!"
+                  BANG@[2252; 2253) "!"
                   TOKEN_TREE@[2253; 2684)
                     L_PAREN@[2253; 2254) "("
                     INT_NUMBER@[2254; 2257) "8u8"
@@ -1372,7 +1372,7 @@ SOURCE_FILE@[0; 3813)
                       L_CURLY@[2259; 2260) "{"
                       WHITESPACE@[2260; 2273) "\n            "
                       IDENT@[2273; 2284) "macro_rules"
-                      EXCL@[2284; 2285) "!"
+                      BANG@[2284; 2285) "!"
                       WHITESPACE@[2285; 2286) " "
                       IDENT@[2286; 2288) "u8"
                       WHITESPACE@[2288; 2289) " "
@@ -1435,7 +1435,7 @@ SOURCE_FILE@[0; 3813)
                               L_CURLY@[2420; 2421) "{"
                               WHITESPACE@[2421; 2450) "\n                     ..."
                               STRING@[2450; 2454) "\"u8\""
-                              SEMI@[2454; 2455) ";"
+                              SEMICOLON@[2454; 2455) ";"
                               WHITESPACE@[2455; 2484) "\n                     ..."
                               IDENT@[2484; 2486) "u8"
                               WHITESPACE@[2486; 2511) "\n                     ..."
@@ -1444,17 +1444,17 @@ SOURCE_FILE@[0; 3813)
                             R_CURLY@[2533; 2534) "}"
                           WHITESPACE@[2534; 2551) "\n                "
                           R_CURLY@[2551; 2552) "}"
-                        SEMI@[2552; 2553) ";"
+                        SEMICOLON@[2552; 2553) ";"
                         WHITESPACE@[2553; 2566) "\n            "
                         R_CURLY@[2566; 2567) "}"
                       WHITESPACE@[2567; 2581) "\n\n            "
                       IDENT@[2581; 2583) "u8"
-                      EXCL@[2583; 2584) "!"
+                      BANG@[2583; 2584) "!"
                       TOKEN_TREE@[2584; 2588)
                         L_PAREN@[2584; 2585) "("
                         IDENT@[2585; 2587) "u8"
                         R_PAREN@[2587; 2588) ")"
-                      SEMI@[2588; 2589) ";"
+                      SEMICOLON@[2588; 2589) ";"
                       WHITESPACE@[2589; 2602) "\n            "
                       LET_KW@[2602; 2605) "let"
                       WHITESPACE@[2605; 2606) " "
@@ -1476,7 +1476,7 @@ SOURCE_FILE@[0; 3813)
                         AMP@[2624; 2625) "&"
                         INT_NUMBER@[2625; 2628) "8u8"
                         R_PAREN@[2628; 2629) ")"
-                      SEMI@[2629; 2630) ";"
+                      SEMICOLON@[2629; 2630) ";"
                       WHITESPACE@[2630; 2643) "\n            "
                       CRATE_KW@[2643; 2648) "crate"
                       COLON@[2648; 2649) ":"
@@ -1486,13 +1486,13 @@ SOURCE_FILE@[0; 3813)
                         L_PAREN@[2652; 2653) "("
                         INT_NUMBER@[2653; 2656) "0u8"
                         R_PAREN@[2656; 2657) ")"
-                      SEMI@[2657; 2658) ";"
+                      SEMICOLON@[2657; 2658) ";"
                       WHITESPACE@[2658; 2671) "\n            "
                       IDENT@[2671; 2673) "u8"
                       WHITESPACE@[2673; 2682) "\n        "
                       R_CURLY@[2682; 2683) "}"
                     R_PAREN@[2683; 2684) ")"
-                SEMI@[2684; 2685) ";"
+                SEMICOLON@[2684; 2685) ";"
               WHITESPACE@[2685; 2690) "\n    "
               R_CURLY@[2690; 2691) "}"
         WHITESPACE@[2691; 2692) "\n"
@@ -1517,7 +1517,7 @@ SOURCE_FILE@[0; 3813)
               PATH_SEGMENT@[2712; 2721)
                 NAME_REF@[2712; 2721)
                   IDENT@[2712; 2721) "assert_eq"
-            EXCL@[2721; 2722) "!"
+            BANG@[2721; 2722) "!"
             TOKEN_TREE@[2722; 2829)
               L_PAREN@[2722; 2723) "("
               IDENT@[2723; 2729) "String"
@@ -1575,7 +1575,7 @@ SOURCE_FILE@[0; 3813)
                 L_PAREN@[2826; 2827) "("
                 R_PAREN@[2827; 2828) ")"
               R_PAREN@[2828; 2829) ")"
-          SEMI@[2829; 2830) ";"
+          SEMICOLON@[2829; 2830) ";"
         WHITESPACE@[2830; 2831) "\n"
         R_CURLY@[2831; 2832) "}"
   WHITESPACE@[2832; 2834) "\n\n"
@@ -1654,7 +1654,7 @@ SOURCE_FILE@[0; 3813)
           EQ@[2946; 2947) "="
           WHITESPACE@[2947; 2948) " "
           PREFIX_EXPR@[2948; 3013)
-            EXCL@[2948; 2949) "!"
+            BANG@[2948; 2949) "!"
             PAREN_EXPR@[2949; 3013)
               L_PAREN@[2949; 2950) "("
               BIN_EXPR@[2950; 3012)
@@ -1668,7 +1668,7 @@ SOURCE_FILE@[0; 3813)
                           TUPLE_PAT@[2952; 2956)
                             L_PAREN@[2952; 2953) "("
                             DOT_DOT_PAT@[2953; 2955)
-                              DOTDOT@[2953; 2955) ".."
+                              DOT2@[2953; 2955) ".."
                             R_PAREN@[2955; 2956) ")"
                           COLON@[2956; 2957) ":"
                           TUPLE_TYPE@[2957; 2962)
@@ -1715,7 +1715,7 @@ SOURCE_FILE@[0; 3813)
                         L_CURLY@[2992; 2993) "{"
                         R_CURLY@[2993; 2994) "}"
                     R_PAREN@[2994; 2995) ")"
-                EQEQ@[2995; 2997) "=="
+                EQ2@[2995; 2997) "=="
                 BLOCK_EXPR@[2997; 3012)
                   BLOCK@[2997; 3012)
                     L_CURLY@[2997; 2998) "{"
@@ -1726,20 +1726,20 @@ SOURCE_FILE@[0; 3813)
                           ARRAY_EXPR@[2999; 3006)
                             L_BRACK@[2999; 3000) "["
                             RANGE_EXPR@[3000; 3005)
-                              DOTDOTEQ@[3000; 3003) "..="
+                              DOT2EQ@[3000; 3003) "..="
                               RANGE_EXPR@[3003; 3005)
-                                DOTDOT@[3003; 3005) ".."
+                                DOT2@[3003; 3005) ".."
                             R_BRACK@[3005; 3006) "]"
                           L_BRACK@[3006; 3007) "["
                           RANGE_EXPR@[3007; 3009)
-                            DOTDOT@[3007; 3009) ".."
+                            DOT2@[3007; 3009) ".."
                           R_BRACK@[3009; 3010) "]"
-                      SEMI@[3010; 3011) ";"
+                      SEMICOLON@[3010; 3011) ";"
                     R_CURLY@[3011; 3012) "}"
               R_PAREN@[3012; 3013) ")"
           COMMENT@[3013; 3015) "//"
           WHITESPACE@[3015; 3020) "\n    "
-          SEMI@[3020; 3021) ";"
+          SEMICOLON@[3020; 3021) ";"
         WHITESPACE@[3021; 3026) "\n    "
         EXPR_STMT@[3026; 3040)
           MACRO_CALL@[3026; 3039)
@@ -1747,13 +1747,13 @@ SOURCE_FILE@[0; 3813)
               PATH_SEGMENT@[3026; 3032)
                 NAME_REF@[3026; 3032)
                   IDENT@[3026; 3032) "assert"
-            EXCL@[3032; 3033) "!"
+            BANG@[3032; 3033) "!"
             TOKEN_TREE@[3033; 3039)
               L_PAREN@[3033; 3034) "("
-              EXCL@[3034; 3035) "!"
+              BANG@[3034; 3035) "!"
               IDENT@[3035; 3038) "val"
               R_PAREN@[3038; 3039) ")"
-          SEMI@[3039; 3040) ";"
+          SEMICOLON@[3039; 3040) ";"
         WHITESPACE@[3040; 3041) "\n"
         R_CURLY@[3041; 3042) "}"
   WHITESPACE@[3042; 3044) "\n\n"
@@ -1781,11 +1781,11 @@ SOURCE_FILE@[0; 3813)
                     PATH_SEGMENT@[3068; 3071)
                       NAME_REF@[3068; 3071)
                         IDENT@[3068; 3071) "std"
-                  COLONCOLON@[3071; 3073) "::"
+                  COLON2@[3071; 3073) "::"
                   PATH_SEGMENT@[3073; 3076)
                     NAME_REF@[3073; 3076)
                       IDENT@[3073; 3076) "fmt"
-                COLONCOLON@[3076; 3078) "::"
+                COLON2@[3076; 3078) "::"
                 PATH_SEGMENT@[3078; 3083)
                   NAME_REF@[3078; 3083)
                     IDENT@[3078; 3083) "Debug"
@@ -1795,300 +1795,300 @@ SOURCE_FILE@[0; 3813)
         L_CURLY@[3084; 3085) "{"
         WHITESPACE@[3085; 3090) "\n    "
         RANGE_EXPR@[3090; 3512)
-          DOTDOTEQ@[3090; 3093) "..="
+          DOT2EQ@[3090; 3093) "..="
           RANGE_EXPR@[3093; 3512)
-            DOTDOTEQ@[3093; 3096) "..="
+            DOT2EQ@[3093; 3096) "..="
             RANGE_EXPR@[3096; 3512)
-              DOTDOT@[3096; 3098) ".."
+              DOT2@[3096; 3098) ".."
               WHITESPACE@[3098; 3099) " "
               RANGE_EXPR@[3099; 3512)
-                DOTDOT@[3099; 3101) ".."
+                DOT2@[3099; 3101) ".."
                 WHITESPACE@[3101; 3105) "    "
                 RANGE_EXPR@[3105; 3512)
-                  DOTDOT@[3105; 3107) ".."
+                  DOT2@[3105; 3107) ".."
                   WHITESPACE@[3107; 3108) " "
                   RANGE_EXPR@[3108; 3512)
-                    DOTDOT@[3108; 3110) ".."
+                    DOT2@[3108; 3110) ".."
                     WHITESPACE@[3110; 3111) " "
                     RANGE_EXPR@[3111; 3512)
-                      DOTDOT@[3111; 3113) ".."
+                      DOT2@[3111; 3113) ".."
                       WHITESPACE@[3113; 3114) " "
                       RANGE_EXPR@[3114; 3512)
-                        DOTDOT@[3114; 3116) ".."
+                        DOT2@[3114; 3116) ".."
                         WHITESPACE@[3116; 3120) "    "
                         RANGE_EXPR@[3120; 3512)
-                          DOTDOT@[3120; 3122) ".."
+                          DOT2@[3120; 3122) ".."
                           WHITESPACE@[3122; 3123) " "
                           RANGE_EXPR@[3123; 3512)
-                            DOTDOT@[3123; 3125) ".."
+                            DOT2@[3123; 3125) ".."
                             WHITESPACE@[3125; 3126) " "
                             RANGE_EXPR@[3126; 3512)
-                              DOTDOT@[3126; 3128) ".."
+                              DOT2@[3126; 3128) ".."
                               WHITESPACE@[3128; 3129) " "
                               RANGE_EXPR@[3129; 3512)
-                                DOTDOT@[3129; 3131) ".."
+                                DOT2@[3129; 3131) ".."
                                 WHITESPACE@[3131; 3135) "    "
                                 RANGE_EXPR@[3135; 3512)
-                                  DOTDOT@[3135; 3137) ".."
+                                  DOT2@[3135; 3137) ".."
                                   WHITESPACE@[3137; 3138) " "
                                   RANGE_EXPR@[3138; 3512)
-                                    DOTDOTEQ@[3138; 3141) "..="
+                                    DOT2EQ@[3138; 3141) "..="
                                     RANGE_EXPR@[3141; 3512)
-                                      DOTDOT@[3141; 3143) ".."
+                                      DOT2@[3141; 3143) ".."
                                       WHITESPACE@[3143; 3144) " "
                                       RANGE_EXPR@[3144; 3512)
-                                        DOTDOT@[3144; 3146) ".."
+                                        DOT2@[3144; 3146) ".."
                                         WHITESPACE@[3146; 3151) "\n    "
                                         RANGE_EXPR@[3151; 3512)
-                                          DOTDOTEQ@[3151; 3154) "..="
+                                          DOT2EQ@[3151; 3154) "..="
                                           RANGE_EXPR@[3154; 3512)
-                                            DOTDOT@[3154; 3156) ".."
+                                            DOT2@[3154; 3156) ".."
                                             WHITESPACE@[3156; 3157) " "
                                             RANGE_EXPR@[3157; 3512)
-                                              DOTDOTEQ@[3157; 3160) "..="
+                                              DOT2EQ@[3157; 3160) "..="
                                               RANGE_EXPR@[3160; 3512)
-                                                DOTDOT@[3160; 3162) ".."
+                                                DOT2@[3160; 3162) ".."
                                                 WHITESPACE@[3162; 3166) "    "
                                                 RANGE_EXPR@[3166; 3512)
-                                                  DOTDOT@[3166; 3168) ".."
+                                                  DOT2@[3166; 3168) ".."
                                                   WHITESPACE@[3168; 3169) " "
                                                   RANGE_EXPR@[3169; 3512)
-                                                    DOTDOT@[3169; 3171) ".."
+                                                    DOT2@[3169; 3171) ".."
                                                     WHITESPACE@[3171; 3172) " "
                                                     RANGE_EXPR@[3172; 3512)
-                                                      DOTDOT@[3172; 3174) ".."
+                                                      DOT2@[3172; 3174) ".."
                                                       WHITESPACE@[3174; 3175) " "
                                                       RANGE_EXPR@[3175; 3512)
-                                                        DOTDOT@[3175; 3177) ".."
+                                                        DOT2@[3175; 3177) ".."
                                                         WHITESPACE@[3177; 3181) "    "
                                                         RANGE_EXPR@[3181; 3512)
-                                                          DOTDOT@[3181; 3183) ".."
+                                                          DOT2@[3181; 3183) ".."
                                                           WHITESPACE@[3183; 3184) " "
                                                           RANGE_EXPR@[3184; 3512)
-                                                            DOTDOT@[3184; 3186) ".."
+                                                            DOT2@[3184; 3186) ".."
                                                             WHITESPACE@[3186; 3187) " "
                                                             RANGE_EXPR@[3187; 3512)
-                                                              DOTDOT@[3187; 3189) ".."
+                                                              DOT2@[3187; 3189) ".."
                                                               WHITESPACE@[3189; 3190) " "
                                                               RANGE_EXPR@[3190; 3512)
-                                                                DOTDOT@[3190; 3192) ".."
+                                                                DOT2@[3190; 3192) ".."
                                                                 WHITESPACE@[3192; 3196) "    "
                                                                 RANGE_EXPR@[3196; 3512)
-                                                                  DOTDOTEQ@[3196; 3199) "..="
+                                                                  DOT2EQ@[3196; 3199) "..="
                                                                   RANGE_EXPR@[3199; 3512)
-                                                                    DOTDOTEQ@[3199; 3202) "..="
+                                                                    DOT2EQ@[3199; 3202) "..="
                                                                     RANGE_EXPR@[3202; 3512)
-                                                                      DOTDOTEQ@[3202; 3205) "..="
+                                                                      DOT2EQ@[3202; 3205) "..="
                                                                       RANGE_EXPR@[3205; 3512)
-                                                                        DOTDOT@[3205; 3207) ".."
+                                                                        DOT2@[3205; 3207) ".."
                                                                         WHITESPACE@[3207; 3212) "\n    "
                                                                         RANGE_EXPR@[3212; 3512)
-                                                                          DOTDOTEQ@[3212; 3215) "..="
+                                                                          DOT2EQ@[3212; 3215) "..="
                                                                           RANGE_EXPR@[3215; 3512)
-                                                                            DOTDOT@[3215; 3217) ".."
+                                                                            DOT2@[3215; 3217) ".."
                                                                             WHITESPACE@[3217; 3218) " "
                                                                             RANGE_EXPR@[3218; 3512)
-                                                                              DOTDOTEQ@[3218; 3221) "..="
+                                                                              DOT2EQ@[3218; 3221) "..="
                                                                               RANGE_EXPR@[3221; 3512)
-                                                                                DOTDOT@[3221; 3223) ".."
+                                                                                DOT2@[3221; 3223) ".."
                                                                                 WHITESPACE@[3223; 3227) "    "
                                                                                 RANGE_EXPR@[3227; 3512)
-                                                                                  DOTDOTEQ@[3227; 3230) "..="
+                                                                                  DOT2EQ@[3227; 3230) "..="
                                                                                   RANGE_EXPR@[3230; 3512)
-                                                                                    DOTDOT@[3230; 3232) ".."
+                                                                                    DOT2@[3230; 3232) ".."
                                                                                     WHITESPACE@[3232; 3233) " "
                                                                                     RANGE_EXPR@[3233; 3512)
-                                                                                      DOTDOTEQ@[3233; 3236) "..="
+                                                                                      DOT2EQ@[3233; 3236) "..="
                                                                                       RANGE_EXPR@[3236; 3512)
-                                                                                        DOTDOT@[3236; 3238) ".."
+                                                                                        DOT2@[3236; 3238) ".."
                                                                                         WHITESPACE@[3238; 3242) "    "
                                                                                         RANGE_EXPR@[3242; 3512)
-                                                                                          DOTDOT@[3242; 3244) ".."
+                                                                                          DOT2@[3242; 3244) ".."
                                                                                           WHITESPACE@[3244; 3245) " "
                                                                                           RANGE_EXPR@[3245; 3512)
-                                                                                            DOTDOTEQ@[3245; 3248) "..="
+                                                                                            DOT2EQ@[3245; 3248) "..="
                                                                                             RANGE_EXPR@[3248; 3512)
-                                                                                              DOTDOTEQ@[3248; 3251) "..="
+                                                                                              DOT2EQ@[3248; 3251) "..="
                                                                                               RANGE_EXPR@[3251; 3512)
-                                                                                                DOTDOT@[3251; 3253) ".."
+                                                                                                DOT2@[3251; 3253) ".."
                                                                                                 WHITESPACE@[3253; 3257) "    "
                                                                                                 RANGE_EXPR@[3257; 3512)
-                                                                                                  DOTDOT@[3257; 3259) ".."
+                                                                                                  DOT2@[3257; 3259) ".."
                                                                                                   WHITESPACE@[3259; 3260) " "
                                                                                                   RANGE_EXPR@[3260; 3512)
-                                                                                                    DOTDOTEQ@[3260; 3263) "..="
+                                                                                                    DOT2EQ@[3260; 3263) "..="
                                                                                                     RANGE_EXPR@[3263; 3512)
-                                                                                                      DOTDOT@[3263; 3265) ".."
+                                                                                                      DOT2@[3263; 3265) ".."
                                                                                                       WHITESPACE@[3265; 3266) " "
                                                                                                       RANGE_EXPR@[3266; 3512)
-                                                                                                        DOTDOT@[3266; 3268) ".."
+                                                                                                        DOT2@[3266; 3268) ".."
                                                                                                         WHITESPACE@[3268; 3273) "\n    "
                                                                                                         RANGE_EXPR@[3273; 3512)
-                                                                                                          DOTDOTEQ@[3273; 3276) "..="
+                                                                                                          DOT2EQ@[3273; 3276) "..="
                                                                                                           RANGE_EXPR@[3276; 3512)
-                                                                                                            DOTDOTEQ@[3276; 3279) "..="
+                                                                                                            DOT2EQ@[3276; 3279) "..="
                                                                                                             RANGE_EXPR@[3279; 3512)
-                                                                                                              DOTDOT@[3279; 3281) ".."
+                                                                                                              DOT2@[3279; 3281) ".."
                                                                                                               WHITESPACE@[3281; 3282) " "
                                                                                                               RANGE_EXPR@[3282; 3512)
-                                                                                                                DOTDOT@[3282; 3284) ".."
+                                                                                                                DOT2@[3282; 3284) ".."
                                                                                                                 WHITESPACE@[3284; 3288) "    "
                                                                                                                 RANGE_EXPR@[3288; 3512)
-                                                                                                                  DOTDOTEQ@[3288; 3291) "..="
+                                                                                                                  DOT2EQ@[3288; 3291) "..="
                                                                                                                   RANGE_EXPR@[3291; 3512)
-                                                                                                                    DOTDOT@[3291; 3293) ".."
+                                                                                                                    DOT2@[3291; 3293) ".."
                                                                                                                     WHITESPACE@[3293; 3294) " "
                                                                                                                     RANGE_EXPR@[3294; 3512)
-                                                                                                                      DOTDOTEQ@[3294; 3297) "..="
+                                                                                                                      DOT2EQ@[3294; 3297) "..="
                                                                                                                       RANGE_EXPR@[3297; 3512)
-                                                                                                                        DOTDOT@[3297; 3299) ".."
+                                                                                                                        DOT2@[3297; 3299) ".."
                                                                                                                         WHITESPACE@[3299; 3303) "    "
                                                                                                                         RANGE_EXPR@[3303; 3512)
-                                                                                                                          DOTDOTEQ@[3303; 3306) "..="
+                                                                                                                          DOT2EQ@[3303; 3306) "..="
                                                                                                                           RANGE_EXPR@[3306; 3512)
-                                                                                                                            DOTDOT@[3306; 3308) ".."
+                                                                                                                            DOT2@[3306; 3308) ".."
                                                                                                                             WHITESPACE@[3308; 3309) " "
                                                                                                                             RANGE_EXPR@[3309; 3512)
-                                                                                                                              DOTDOT@[3309; 3311) ".."
+                                                                                                                              DOT2@[3309; 3311) ".."
                                                                                                                               WHITESPACE@[3311; 3312) " "
                                                                                                                               RANGE_EXPR@[3312; 3512)
-                                                                                                                                DOTDOT@[3312; 3314) ".."
+                                                                                                                                DOT2@[3312; 3314) ".."
                                                                                                                                 WHITESPACE@[3314; 3318) "    "
                                                                                                                                 RANGE_EXPR@[3318; 3512)
-                                                                                                                                  DOTDOT@[3318; 3320) ".."
+                                                                                                                                  DOT2@[3318; 3320) ".."
                                                                                                                                   WHITESPACE@[3320; 3321) " "
                                                                                                                                   RANGE_EXPR@[3321; 3512)
-                                                                                                                                    DOTDOTEQ@[3321; 3324) "..="
+                                                                                                                                    DOT2EQ@[3321; 3324) "..="
                                                                                                                                     RANGE_EXPR@[3324; 3512)
-                                                                                                                                      DOTDOT@[3324; 3326) ".."
+                                                                                                                                      DOT2@[3324; 3326) ".."
                                                                                                                                       WHITESPACE@[3326; 3327) " "
                                                                                                                                       RANGE_EXPR@[3327; 3512)
-                                                                                                                                        DOTDOT@[3327; 3329) ".."
+                                                                                                                                        DOT2@[3327; 3329) ".."
                                                                                                                                         WHITESPACE@[3329; 3334) "\n    "
                                                                                                                                         RANGE_EXPR@[3334; 3512)
-                                                                                                                                          DOTDOTEQ@[3334; 3337) "..="
+                                                                                                                                          DOT2EQ@[3334; 3337) "..="
                                                                                                                                           RANGE_EXPR@[3337; 3512)
-                                                                                                                                            DOTDOT@[3337; 3339) ".."
+                                                                                                                                            DOT2@[3337; 3339) ".."
                                                                                                                                             WHITESPACE@[3339; 3340) " "
                                                                                                                                             RANGE_EXPR@[3340; 3512)
-                                                                                                                                              DOTDOTEQ@[3340; 3343) "..="
+                                                                                                                                              DOT2EQ@[3340; 3343) "..="
                                                                                                                                               RANGE_EXPR@[3343; 3512)
-                                                                                                                                                DOTDOT@[3343; 3345) ".."
+                                                                                                                                                DOT2@[3343; 3345) ".."
                                                                                                                                                 WHITESPACE@[3345; 3349) "    "
                                                                                                                                                 RANGE_EXPR@[3349; 3512)
-                                                                                                                                                  DOTDOTEQ@[3349; 3352) "..="
+                                                                                                                                                  DOT2EQ@[3349; 3352) "..="
                                                                                                                                                   RANGE_EXPR@[3352; 3512)
-                                                                                                                                                    DOTDOT@[3352; 3354) ".."
+                                                                                                                                                    DOT2@[3352; 3354) ".."
                                                                                                                                                     WHITESPACE@[3354; 3355) " "
                                                                                                                                                     RANGE_EXPR@[3355; 3512)
-                                                                                                                                                      DOTDOTEQ@[3355; 3358) "..="
+                                                                                                                                                      DOT2EQ@[3355; 3358) "..="
                                                                                                                                                       RANGE_EXPR@[3358; 3512)
-                                                                                                                                                        DOTDOT@[3358; 3360) ".."
+                                                                                                                                                        DOT2@[3358; 3360) ".."
                                                                                                                                                         WHITESPACE@[3360; 3364) "    "
                                                                                                                                                         RANGE_EXPR@[3364; 3512)
-                                                                                                                                                          DOTDOT@[3364; 3366) ".."
+                                                                                                                                                          DOT2@[3364; 3366) ".."
                                                                                                                                                           WHITESPACE@[3366; 3367) " "
                                                                                                                                                           RANGE_EXPR@[3367; 3512)
-                                                                                                                                                            DOTDOTEQ@[3367; 3370) "..="
+                                                                                                                                                            DOT2EQ@[3367; 3370) "..="
                                                                                                                                                             RANGE_EXPR@[3370; 3512)
-                                                                                                                                                              DOTDOT@[3370; 3372) ".."
+                                                                                                                                                              DOT2@[3370; 3372) ".."
                                                                                                                                                               WHITESPACE@[3372; 3373) " "
                                                                                                                                                               RANGE_EXPR@[3373; 3512)
-                                                                                                                                                                DOTDOT@[3373; 3375) ".."
+                                                                                                                                                                DOT2@[3373; 3375) ".."
                                                                                                                                                                 WHITESPACE@[3375; 3379) "    "
                                                                                                                                                                 RANGE_EXPR@[3379; 3512)
-                                                                                                                                                                  DOTDOT@[3379; 3381) ".."
+                                                                                                                                                                  DOT2@[3379; 3381) ".."
                                                                                                                                                                   WHITESPACE@[3381; 3382) " "
                                                                                                                                                                   RANGE_EXPR@[3382; 3512)
-                                                                                                                                                                    DOTDOTEQ@[3382; 3385) "..="
+                                                                                                                                                                    DOT2EQ@[3382; 3385) "..="
                                                                                                                                                                     RANGE_EXPR@[3385; 3512)
-                                                                                                                                                                      DOTDOT@[3385; 3387) ".."
+                                                                                                                                                                      DOT2@[3385; 3387) ".."
                                                                                                                                                                       WHITESPACE@[3387; 3388) " "
                                                                                                                                                                       RANGE_EXPR@[3388; 3512)
-                                                                                                                                                                        DOTDOT@[3388; 3390) ".."
+                                                                                                                                                                        DOT2@[3388; 3390) ".."
                                                                                                                                                                         WHITESPACE@[3390; 3395) "\n    "
                                                                                                                                                                         RANGE_EXPR@[3395; 3512)
-                                                                                                                                                                          DOTDOTEQ@[3395; 3398) "..="
+                                                                                                                                                                          DOT2EQ@[3395; 3398) "..="
                                                                                                                                                                           RANGE_EXPR@[3398; 3512)
-                                                                                                                                                                            DOTDOT@[3398; 3400) ".."
+                                                                                                                                                                            DOT2@[3398; 3400) ".."
                                                                                                                                                                             WHITESPACE@[3400; 3401) " "
                                                                                                                                                                             RANGE_EXPR@[3401; 3512)
-                                                                                                                                                                              DOTDOTEQ@[3401; 3404) "..="
+                                                                                                                                                                              DOT2EQ@[3401; 3404) "..="
                                                                                                                                                                               RANGE_EXPR@[3404; 3512)
-                                                                                                                                                                                DOTDOT@[3404; 3406) ".."
+                                                                                                                                                                                DOT2@[3404; 3406) ".."
                                                                                                                                                                                 WHITESPACE@[3406; 3410) "    "
                                                                                                                                                                                 RANGE_EXPR@[3410; 3512)
-                                                                                                                                                                                  DOTDOTEQ@[3410; 3413) "..="
+                                                                                                                                                                                  DOT2EQ@[3410; 3413) "..="
                                                                                                                                                                                   RANGE_EXPR@[3413; 3512)
-                                                                                                                                                                                    DOTDOT@[3413; 3415) ".."
+                                                                                                                                                                                    DOT2@[3413; 3415) ".."
                                                                                                                                                                                     WHITESPACE@[3415; 3416) " "
                                                                                                                                                                                     RANGE_EXPR@[3416; 3512)
-                                                                                                                                                                                      DOTDOTEQ@[3416; 3419) "..="
+                                                                                                                                                                                      DOT2EQ@[3416; 3419) "..="
                                                                                                                                                                                       RANGE_EXPR@[3419; 3512)
-                                                                                                                                                                                        DOTDOT@[3419; 3421) ".."
+                                                                                                                                                                                        DOT2@[3419; 3421) ".."
                                                                                                                                                                                         WHITESPACE@[3421; 3425) "    "
                                                                                                                                                                                         RANGE_EXPR@[3425; 3512)
-                                                                                                                                                                                          DOTDOT@[3425; 3427) ".."
+                                                                                                                                                                                          DOT2@[3425; 3427) ".."
                                                                                                                                                                                           WHITESPACE@[3427; 3428) " "
                                                                                                                                                                                           RANGE_EXPR@[3428; 3512)
-                                                                                                                                                                                            DOTDOT@[3428; 3430) ".."
+                                                                                                                                                                                            DOT2@[3428; 3430) ".."
                                                                                                                                                                                             WHITESPACE@[3430; 3431) " "
                                                                                                                                                                                             RANGE_EXPR@[3431; 3512)
-                                                                                                                                                                                              DOTDOTEQ@[3431; 3434) "..="
+                                                                                                                                                                                              DOT2EQ@[3431; 3434) "..="
                                                                                                                                                                                               RANGE_EXPR@[3434; 3512)
-                                                                                                                                                                                                DOTDOT@[3434; 3436) ".."
+                                                                                                                                                                                                DOT2@[3434; 3436) ".."
                                                                                                                                                                                                 WHITESPACE@[3436; 3440) "    "
                                                                                                                                                                                                 RANGE_EXPR@[3440; 3512)
-                                                                                                                                                                                                  DOTDOT@[3440; 3442) ".."
+                                                                                                                                                                                                  DOT2@[3440; 3442) ".."
                                                                                                                                                                                                   WHITESPACE@[3442; 3443) " "
                                                                                                                                                                                                   RANGE_EXPR@[3443; 3512)
-                                                                                                                                                                                                    DOTDOTEQ@[3443; 3446) "..="
+                                                                                                                                                                                                    DOT2EQ@[3443; 3446) "..="
                                                                                                                                                                                                     RANGE_EXPR@[3446; 3512)
-                                                                                                                                                                                                      DOTDOT@[3446; 3448) ".."
+                                                                                                                                                                                                      DOT2@[3446; 3448) ".."
                                                                                                                                                                                                       WHITESPACE@[3448; 3449) " "
                                                                                                                                                                                                       RANGE_EXPR@[3449; 3512)
-                                                                                                                                                                                                        DOTDOT@[3449; 3451) ".."
+                                                                                                                                                                                                        DOT2@[3449; 3451) ".."
                                                                                                                                                                                                         WHITESPACE@[3451; 3456) "\n    "
                                                                                                                                                                                                         RANGE_EXPR@[3456; 3512)
-                                                                                                                                                                                                          DOTDOTEQ@[3456; 3459) "..="
+                                                                                                                                                                                                          DOT2EQ@[3456; 3459) "..="
                                                                                                                                                                                                           RANGE_EXPR@[3459; 3512)
-                                                                                                                                                                                                            DOTDOT@[3459; 3461) ".."
+                                                                                                                                                                                                            DOT2@[3459; 3461) ".."
                                                                                                                                                                                                             WHITESPACE@[3461; 3462) " "
                                                                                                                                                                                                             RANGE_EXPR@[3462; 3512)
-                                                                                                                                                                                                              DOTDOTEQ@[3462; 3465) "..="
+                                                                                                                                                                                                              DOT2EQ@[3462; 3465) "..="
                                                                                                                                                                                                               RANGE_EXPR@[3465; 3512)
-                                                                                                                                                                                                                DOTDOT@[3465; 3467) ".."
+                                                                                                                                                                                                                DOT2@[3465; 3467) ".."
                                                                                                                                                                                                                 WHITESPACE@[3467; 3471) "    "
                                                                                                                                                                                                                 RANGE_EXPR@[3471; 3512)
-                                                                                                                                                                                                                  DOTDOT@[3471; 3473) ".."
+                                                                                                                                                                                                                  DOT2@[3471; 3473) ".."
                                                                                                                                                                                                                   WHITESPACE@[3473; 3474) " "
                                                                                                                                                                                                                   RANGE_EXPR@[3474; 3512)
-                                                                                                                                                                                                                    DOTDOTEQ@[3474; 3477) "..="
+                                                                                                                                                                                                                    DOT2EQ@[3474; 3477) "..="
                                                                                                                                                                                                                     RANGE_EXPR@[3477; 3512)
-                                                                                                                                                                                                                      DOTDOTEQ@[3477; 3480) "..="
+                                                                                                                                                                                                                      DOT2EQ@[3477; 3480) "..="
                                                                                                                                                                                                                       RANGE_EXPR@[3480; 3512)
-                                                                                                                                                                                                                        DOTDOT@[3480; 3482) ".."
+                                                                                                                                                                                                                        DOT2@[3480; 3482) ".."
                                                                                                                                                                                                                         WHITESPACE@[3482; 3486) "    "
                                                                                                                                                                                                                         RANGE_EXPR@[3486; 3512)
-                                                                                                                                                                                                                          DOTDOTEQ@[3486; 3489) "..="
+                                                                                                                                                                                                                          DOT2EQ@[3486; 3489) "..="
                                                                                                                                                                                                                           RANGE_EXPR@[3489; 3512)
-                                                                                                                                                                                                                            DOTDOTEQ@[3489; 3492) "..="
+                                                                                                                                                                                                                            DOT2EQ@[3489; 3492) "..="
                                                                                                                                                                                                                             RANGE_EXPR@[3492; 3512)
-                                                                                                                                                                                                                              DOTDOT@[3492; 3494) ".."
+                                                                                                                                                                                                                              DOT2@[3492; 3494) ".."
                                                                                                                                                                                                                               WHITESPACE@[3494; 3495) " "
                                                                                                                                                                                                                               RANGE_EXPR@[3495; 3512)
-                                                                                                                                                                                                                                DOTDOT@[3495; 3497) ".."
+                                                                                                                                                                                                                                DOT2@[3495; 3497) ".."
                                                                                                                                                                                                                                 WHITESPACE@[3497; 3501) "    "
                                                                                                                                                                                                                                 RANGE_EXPR@[3501; 3512)
-                                                                                                                                                                                                                                  DOTDOT@[3501; 3503) ".."
+                                                                                                                                                                                                                                  DOT2@[3501; 3503) ".."
                                                                                                                                                                                                                                   WHITESPACE@[3503; 3504) " "
                                                                                                                                                                                                                                   RANGE_EXPR@[3504; 3512)
-                                                                                                                                                                                                                                    DOTDOTEQ@[3504; 3507) "..="
+                                                                                                                                                                                                                                    DOT2EQ@[3504; 3507) "..="
                                                                                                                                                                                                                                     RANGE_EXPR@[3507; 3512)
-                                                                                                                                                                                                                                      DOTDOT@[3507; 3509) ".."
+                                                                                                                                                                                                                                      DOT2@[3507; 3509) ".."
                                                                                                                                                                                                                                       WHITESPACE@[3509; 3510) " "
                                                                                                                                                                                                                                       RANGE_EXPR@[3510; 3512)
-                                                                                                                                                                                                                                        DOTDOT@[3510; 3512) ".."
+                                                                                                                                                                                                                                        DOT2@[3510; 3512) ".."
         WHITESPACE@[3512; 3513) "\n"
         R_CURLY@[3513; 3514) "}"
   WHITESPACE@[3514; 3516) "\n\n"
@@ -2105,22 +2105,22 @@ SOURCE_FILE@[0; 3813)
       BLOCK@[3528; 3552)
         L_CURLY@[3528; 3529) "{"
         WHITESPACE@[3529; 3534) "\n    "
-        SEMI@[3534; 3535) ";"
-        SEMI@[3535; 3536) ";"
-        SEMI@[3536; 3537) ";"
+        SEMICOLON@[3534; 3535) ";"
+        SEMICOLON@[3535; 3536) ";"
+        SEMICOLON@[3536; 3537) ";"
         EXPR_STMT@[3537; 3540)
           TUPLE_EXPR@[3537; 3539)
             L_PAREN@[3537; 3538) "("
             R_PAREN@[3538; 3539) ")"
-          SEMI@[3539; 3540) ";"
-        SEMI@[3540; 3541) ";"
-        SEMI@[3541; 3542) ";"
-        SEMI@[3542; 3543) ";"
-        SEMI@[3543; 3544) ";"
-        SEMI@[3544; 3545) ";"
-        SEMI@[3545; 3546) ";"
-        SEMI@[3546; 3547) ";"
-        SEMI@[3547; 3548) ";"
+          SEMICOLON@[3539; 3540) ";"
+        SEMICOLON@[3540; 3541) ";"
+        SEMICOLON@[3541; 3542) ";"
+        SEMICOLON@[3542; 3543) ";"
+        SEMICOLON@[3543; 3544) ";"
+        SEMICOLON@[3544; 3545) ";"
+        SEMICOLON@[3545; 3546) ";"
+        SEMICOLON@[3546; 3547) ";"
+        SEMICOLON@[3547; 3548) ";"
         TUPLE_EXPR@[3548; 3550)
           L_PAREN@[3548; 3549) "("
           R_PAREN@[3549; 3550) ")"
@@ -2153,7 +2153,7 @@ SOURCE_FILE@[0; 3813)
             ARG_LIST@[3581; 3583)
               L_PAREN@[3581; 3582) "("
               R_PAREN@[3582; 3583) ")"
-          SEMI@[3583; 3584) ";"
+          SEMICOLON@[3583; 3584) ";"
         WHITESPACE@[3584; 3589) "\n    "
         EXPR_STMT@[3589; 3597)
           CALL_EXPR@[3589; 3596)
@@ -2165,7 +2165,7 @@ SOURCE_FILE@[0; 3813)
             ARG_LIST@[3594; 3596)
               L_PAREN@[3594; 3595) "("
               R_PAREN@[3595; 3596) ")"
-          SEMI@[3596; 3597) ";"
+          SEMICOLON@[3596; 3597) ";"
         WHITESPACE@[3597; 3602) "\n    "
         EXPR_STMT@[3602; 3609)
           CALL_EXPR@[3602; 3608)
@@ -2177,7 +2177,7 @@ SOURCE_FILE@[0; 3813)
             ARG_LIST@[3606; 3608)
               L_PAREN@[3606; 3607) "("
               R_PAREN@[3607; 3608) ")"
-          SEMI@[3608; 3609) ";"
+          SEMICOLON@[3608; 3609) ";"
         WHITESPACE@[3609; 3614) "\n    "
         EXPR_STMT@[3614; 3628)
           CALL_EXPR@[3614; 3627)
@@ -2189,7 +2189,7 @@ SOURCE_FILE@[0; 3813)
             ARG_LIST@[3625; 3627)
               L_PAREN@[3625; 3626) "("
               R_PAREN@[3626; 3627) ")"
-          SEMI@[3627; 3628) ";"
+          SEMICOLON@[3627; 3628) ";"
         WHITESPACE@[3628; 3633) "\n    "
         EXPR_STMT@[3633; 3643)
           CALL_EXPR@[3633; 3642)
@@ -2201,7 +2201,7 @@ SOURCE_FILE@[0; 3813)
             ARG_LIST@[3640; 3642)
               L_PAREN@[3640; 3641) "("
               R_PAREN@[3641; 3642) ")"
-          SEMI@[3642; 3643) ";"
+          SEMICOLON@[3642; 3643) ";"
         WHITESPACE@[3643; 3648) "\n    "
         EXPR_STMT@[3648; 3664)
           CALL_EXPR@[3648; 3663)
@@ -2213,7 +2213,7 @@ SOURCE_FILE@[0; 3813)
             ARG_LIST@[3661; 3663)
               L_PAREN@[3661; 3662) "("
               R_PAREN@[3662; 3663) ")"
-          SEMI@[3663; 3664) ";"
+          SEMICOLON@[3663; 3664) ";"
         WHITESPACE@[3664; 3669) "\n    "
         EXPR_STMT@[3669; 3681)
           CALL_EXPR@[3669; 3680)
@@ -2225,7 +2225,7 @@ SOURCE_FILE@[0; 3813)
             ARG_LIST@[3678; 3680)
               L_PAREN@[3678; 3679) "("
               R_PAREN@[3679; 3680) ")"
-          SEMI@[3680; 3681) ";"
+          SEMICOLON@[3680; 3681) ";"
         WHITESPACE@[3681; 3686) "\n    "
         EXPR_STMT@[3686; 3701)
           CALL_EXPR@[3686; 3700)
@@ -2237,7 +2237,7 @@ SOURCE_FILE@[0; 3813)
             ARG_LIST@[3698; 3700)
               L_PAREN@[3698; 3699) "("
               R_PAREN@[3699; 3700) ")"
-          SEMI@[3700; 3701) ";"
+          SEMICOLON@[3700; 3701) ";"
         WHITESPACE@[3701; 3706) "\n    "
         EXPR_STMT@[3706; 3713)
           CALL_EXPR@[3706; 3712)
@@ -2249,7 +2249,7 @@ SOURCE_FILE@[0; 3813)
             ARG_LIST@[3710; 3712)
               L_PAREN@[3710; 3711) "("
               R_PAREN@[3711; 3712) ")"
-          SEMI@[3712; 3713) ";"
+          SEMICOLON@[3712; 3713) ";"
         WHITESPACE@[3713; 3718) "\n    "
         EXPR_STMT@[3718; 3726)
           CALL_EXPR@[3718; 3725)
@@ -2263,7 +2263,7 @@ SOURCE_FILE@[0; 3813)
               LITERAL@[3721; 3724)
                 INT_NUMBER@[3721; 3724) "8u8"
               R_PAREN@[3724; 3725) ")"
-          SEMI@[3725; 3726) ";"
+          SEMICOLON@[3725; 3726) ";"
         WHITESPACE@[3726; 3731) "\n    "
         EXPR_STMT@[3731; 3739)
           CALL_EXPR@[3731; 3738)
@@ -2275,7 +2275,7 @@ SOURCE_FILE@[0; 3813)
             ARG_LIST@[3736; 3738)
               L_PAREN@[3736; 3737) "("
               R_PAREN@[3737; 3738) ")"
-          SEMI@[3738; 3739) ";"
+          SEMICOLON@[3738; 3739) ";"
         WHITESPACE@[3739; 3744) "\n    "
         EXPR_STMT@[3744; 3752)
           CALL_EXPR@[3744; 3751)
@@ -2287,7 +2287,7 @@ SOURCE_FILE@[0; 3813)
             ARG_LIST@[3749; 3751)
               L_PAREN@[3749; 3750) "("
               R_PAREN@[3750; 3751) ")"
-          SEMI@[3751; 3752) ";"
+          SEMICOLON@[3751; 3752) ";"
         WHITESPACE@[3752; 3757) "\n    "
         EXPR_STMT@[3757; 3778)
           CALL_EXPR@[3757; 3777)
@@ -2299,7 +2299,7 @@ SOURCE_FILE@[0; 3813)
             ARG_LIST@[3775; 3777)
               L_PAREN@[3775; 3776) "("
               R_PAREN@[3776; 3777) ")"
-          SEMI@[3777; 3778) ";"
+          SEMICOLON@[3777; 3778) ";"
         WHITESPACE@[3778; 3783) "\n    "
         EXPR_STMT@[3783; 3796)
           CALL_EXPR@[3783; 3795)
@@ -2311,7 +2311,7 @@ SOURCE_FILE@[0; 3813)
             ARG_LIST@[3793; 3795)
               L_PAREN@[3793; 3794) "("
               R_PAREN@[3794; 3795) ")"
-          SEMI@[3795; 3796) ";"
+          SEMICOLON@[3795; 3796) ";"
         WHITESPACE@[3796; 3801) "\n    "
         EXPR_STMT@[3801; 3810)
           CALL_EXPR@[3801; 3809)
@@ -2323,7 +2323,7 @@ SOURCE_FILE@[0; 3813)
             ARG_LIST@[3807; 3809)
               L_PAREN@[3807; 3808) "("
               R_PAREN@[3808; 3809) ")"
-          SEMI@[3809; 3810) ";"
+          SEMICOLON@[3809; 3810) ";"
         WHITESPACE@[3810; 3811) "\n"
         R_CURLY@[3811; 3812) "}"
   WHITESPACE@[3812; 3813) "\n"
diff --git a/crates/ra_syntax/test_data/parser/ok/0036_fully_qualified.rast b/crates/ra_syntax/test_data/parser/ok/0036_fully_qualified.rast
index ac5444087..4df6703f4 100644
--- a/crates/ra_syntax/test_data/parser/ok/0036_fully_qualified.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0036_fully_qualified.rast
@@ -60,7 +60,7 @@ SOURCE_FILE@[0; 157)
                       NAME_REF@[114; 122)
                         IDENT@[114; 122) "Iterator"
                 R_ANGLE@[122; 123) ">"
-            COLONCOLON@[123; 125) "::"
+            COLON2@[123; 125) "::"
             PATH_SEGMENT@[125; 129)
               NAME_REF@[125; 129)
                 IDENT@[125; 129) "Item"
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 64c70e196..825518eda 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
@@ -23,7 +23,7 @@ SOURCE_FILE@[0; 59)
           WHITESPACE@[25; 26) " "
           LITERAL@[26; 28)
             INT_NUMBER@[26; 28) "92"
-          SEMI@[28; 29) ";"
+          SEMICOLON@[28; 29) ";"
         WHITESPACE@[29; 30) " "
         LET_STMT@[30; 57)
           LET_KW@[30; 33) "let"
@@ -45,6 +45,6 @@ SOURCE_FILE@[0; 59)
             WHITESPACE@[54; 55) " "
             LITERAL@[55; 56)
               INT_NUMBER@[55; 56) "2"
-          SEMI@[56; 57) ";"
+          SEMICOLON@[56; 57) ";"
         WHITESPACE@[57; 58) " "
         R_CURLY@[58; 59) "}"
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 341e02704..420a62639 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
@@ -6,7 +6,7 @@ SOURCE_FILE@[0; 199)
     WHITESPACE@[68; 69) " "
     NAME@[69; 72)
       IDENT@[69; 72) "Foo"
-    SEMI@[72; 73) ";"
+    SEMICOLON@[72; 73) ";"
   WHITESPACE@[73; 75) "\n\n"
   IMPL_DEF@[75; 141)
     IMPL_KW@[75; 79) "impl"
@@ -47,7 +47,7 @@ SOURCE_FILE@[0; 199)
                 PATH_SEGMENT@[117; 130)
                   NAME_REF@[117; 130)
                     IDENT@[117; 130) "unimplemented"
-              EXCL@[130; 131) "!"
+              BANG@[130; 131) "!"
               TOKEN_TREE@[131; 133)
                 L_PAREN@[131; 132) "("
                 R_PAREN@[132; 133) ")"
@@ -113,7 +113,7 @@ SOURCE_FILE@[0; 199)
                             NAME_REF@[184; 187)
                               IDENT@[184; 187) "Foo"
                       R_ANGLE@[187; 188) ">"
-                  COLONCOLON@[188; 190) "::"
+                  COLON2@[188; 190) "::"
                   PATH_SEGMENT@[190; 193)
                     NAME_REF@[190; 193)
                       IDENT@[190; 193) "bar"
diff --git a/crates/ra_syntax/test_data/parser/ok/0043_complex_assignment.rast b/crates/ra_syntax/test_data/parser/ok/0043_complex_assignment.rast
index c5821afd0..3bc0ddbde 100644
--- a/crates/ra_syntax/test_data/parser/ok/0043_complex_assignment.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0043_complex_assignment.rast
@@ -22,7 +22,7 @@ SOURCE_FILE@[0; 160)
               PATH_SEGMENT@[82; 84)
                 NAME_REF@[82; 84)
                   IDENT@[82; 84) "u8"
-          SEMI@[84; 85) ";"
+          SEMICOLON@[84; 85) ";"
           WHITESPACE@[85; 86) " "
           LITERAL@[86; 87)
             INT_NUMBER@[86; 87) "1"
@@ -80,7 +80,7 @@ SOURCE_FILE@[0; 160)
             WHITESPACE@[133; 134) " "
             LITERAL@[134; 135)
               INT_NUMBER@[134; 135) "0"
-          SEMI@[135; 136) ";"
+          SEMICOLON@[135; 136) ";"
         WHITESPACE@[136; 141) "\n    "
         EXPR_STMT@[141; 157)
           CALL_EXPR@[141; 156)
@@ -104,7 +104,7 @@ SOURCE_FILE@[0; 160)
             ARG_LIST@[154; 156)
               L_PAREN@[154; 155) "("
               R_PAREN@[155; 156) ")"
-          SEMI@[156; 157) ";"
+          SEMICOLON@[156; 157) ";"
         WHITESPACE@[157; 158) "\n"
         R_CURLY@[158; 159) "}"
   WHITESPACE@[159; 160) "\n"
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 bfc793dc1..4b2593147 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
@@ -47,7 +47,7 @@ SOURCE_FILE@[0; 166)
                   PATH_SEGMENT@[127; 132)
                     NAME_REF@[127; 132)
                       IDENT@[127; 132) "panic"
-                COLONCOLON@[132; 134) "::"
+                COLON2@[132; 134) "::"
                 PATH_SEGMENT@[134; 146)
                   NAME_REF@[134; 146)
                     IDENT@[134; 146) "catch_unwind"
@@ -70,7 +70,7 @@ SOURCE_FILE@[0; 166)
                     L_PAREN@[159; 160) "("
                     R_PAREN@[160; 161) ")"
               R_PAREN@[161; 162) ")"
-          SEMI@[162; 163) ";"
+          SEMICOLON@[162; 163) ";"
         WHITESPACE@[163; 164) "\n"
         R_CURLY@[164; 165) "}"
   WHITESPACE@[165; 166) "\n"
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 e15447ca7..954b3bc2a 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
@@ -14,7 +14,7 @@ SOURCE_FILE@[0; 686)
         WHITESPACE@[12; 17) "\n    "
         ATTR@[17; 57)
           POUND@[17; 18) "#"
-          EXCL@[18; 19) "!"
+          BANG@[18; 19) "!"
           L_BRACK@[19; 20) "["
           PATH@[20; 23)
             PATH_SEGMENT@[20; 23)
@@ -35,7 +35,7 @@ SOURCE_FILE@[0; 686)
               WHITESPACE@[103; 112) "\n        "
               ATTR@[112; 180)
                 POUND@[112; 113) "#"
-                EXCL@[113; 114) "!"
+                BANG@[113; 114) "!"
                 L_BRACK@[114; 115) "["
                 PATH@[115; 118)
                   PATH_SEGMENT@[115; 118)
@@ -49,7 +49,7 @@ SOURCE_FILE@[0; 686)
               WHITESPACE@[180; 189) "\n        "
               ATTR@[189; 244)
                 POUND@[189; 190) "#"
-                EXCL@[190; 191) "!"
+                BANG@[190; 191) "!"
                 L_BRACK@[191; 192) "["
                 PATH@[192; 195)
                   PATH_SEGMENT@[192; 195)
@@ -64,7 +64,7 @@ SOURCE_FILE@[0; 686)
               COMMENT@[253; 288) "//! As are ModuleDoc  ..."
               WHITESPACE@[288; 293) "\n    "
               R_CURLY@[293; 294) "}"
-          SEMI@[294; 295) ";"
+          SEMICOLON@[294; 295) ";"
         WHITESPACE@[295; 300) "\n    "
         BLOCK_EXPR@[300; 459)
           BLOCK@[300; 459)
@@ -72,7 +72,7 @@ SOURCE_FILE@[0; 686)
             WHITESPACE@[301; 310) "\n        "
             ATTR@[310; 409)
               POUND@[310; 311) "#"
-              EXCL@[311; 312) "!"
+              BANG@[311; 312) "!"
               L_BRACK@[312; 313) "["
               PATH@[313; 316)
                 PATH_SEGMENT@[313; 316)
@@ -161,7 +161,7 @@ SOURCE_FILE@[0; 686)
             WHITESPACE@[603; 612) "\n        "
             ATTR@[612; 639)
               POUND@[612; 613) "#"
-              EXCL@[613; 614) "!"
+              BANG@[613; 614) "!"
               L_BRACK@[614; 615) "["
               PATH@[615; 620)
                 PATH_SEGMENT@[615; 620)
diff --git a/crates/ra_syntax/test_data/parser/ok/0046_extern_inner_attributes.rast b/crates/ra_syntax/test_data/parser/ok/0046_extern_inner_attributes.rast
index 8f192124b..92c8df2d6 100644
--- a/crates/ra_syntax/test_data/parser/ok/0046_extern_inner_attributes.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0046_extern_inner_attributes.rast
@@ -12,7 +12,7 @@ SOURCE_FILE@[0; 87)
       WHITESPACE@[42; 47) "\n    "
       ATTR@[47; 84)
         POUND@[47; 48) "#"
-        EXCL@[48; 49) "!"
+        BANG@[48; 49) "!"
         L_BRACK@[49; 50) "["
         PATH@[50; 53)
           PATH_SEGMENT@[50; 53)
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 07a5fbf2d..de703328a 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
@@ -151,7 +151,7 @@ SOURCE_FILE@[0; 395)
                     PATH_SEGMENT@[234; 235)
                       NAME_REF@[234; 235)
                         IDENT@[234; 235) "A"
-                  COLONCOLON@[235; 237) "::"
+                  COLON2@[235; 237) "::"
                   PATH_SEGMENT@[237; 238)
                     NAME_REF@[237; 238)
                       IDENT@[237; 238) "B"
@@ -179,7 +179,7 @@ SOURCE_FILE@[0; 395)
                       PATH_SEGMENT@[257; 258)
                         NAME_REF@[257; 258)
                           IDENT@[257; 258) "A"
-                    COLONCOLON@[258; 260) "::"
+                    COLON2@[258; 260) "::"
                     PATH_SEGMENT@[260; 261)
                       NAME_REF@[260; 261)
                         IDENT@[260; 261) "B"
@@ -303,7 +303,7 @@ SOURCE_FILE@[0; 395)
             MINUS@[376; 377) "-"
             LITERAL@[377; 380)
               INT_NUMBER@[377; 380) "128"
-          DOTDOTEQ@[380; 383) "..="
+          DOT2EQ@[380; 383) "..="
           LITERAL_PAT@[383; 386)
             LITERAL@[383; 386)
               INT_NUMBER@[383; 386) "127"
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 c9cf84ffd..849d8a445 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
@@ -27,7 +27,7 @@ SOURCE_FILE@[0; 257)
           WHITESPACE@[102; 103) " "
           LITERAL@[103; 104)
             INT_NUMBER@[103; 104) "0"
-          SEMI@[104; 105) ";"
+          SEMICOLON@[104; 105) ";"
         WHITESPACE@[105; 110) "\n    "
         EXPR_STMT@[110; 117)
           BIN_EXPR@[110; 116)
@@ -41,7 +41,7 @@ SOURCE_FILE@[0; 257)
             WHITESPACE@[114; 115) " "
             LITERAL@[115; 116)
               INT_NUMBER@[115; 116) "1"
-          SEMI@[116; 117) ";"
+          SEMICOLON@[116; 117) ";"
         WHITESPACE@[117; 122) "\n    "
         EXPR_STMT@[122; 129)
           BIN_EXPR@[122; 128)
@@ -55,7 +55,7 @@ SOURCE_FILE@[0; 257)
             WHITESPACE@[126; 127) " "
             LITERAL@[127; 128)
               INT_NUMBER@[127; 128) "2"
-          SEMI@[128; 129) ";"
+          SEMICOLON@[128; 129) ";"
         WHITESPACE@[129; 134) "\n    "
         EXPR_STMT@[134; 141)
           BIN_EXPR@[134; 140)
@@ -69,7 +69,7 @@ SOURCE_FILE@[0; 257)
             WHITESPACE@[138; 139) " "
             LITERAL@[139; 140)
               INT_NUMBER@[139; 140) "3"
-          SEMI@[140; 141) ";"
+          SEMICOLON@[140; 141) ";"
         WHITESPACE@[141; 146) "\n    "
         EXPR_STMT@[146; 153)
           BIN_EXPR@[146; 152)
@@ -83,7 +83,7 @@ SOURCE_FILE@[0; 257)
             WHITESPACE@[150; 151) " "
             LITERAL@[151; 152)
               INT_NUMBER@[151; 152) "4"
-          SEMI@[152; 153) ";"
+          SEMICOLON@[152; 153) ";"
         WHITESPACE@[153; 158) "\n    "
         EXPR_STMT@[158; 165)
           BIN_EXPR@[158; 164)
@@ -97,7 +97,7 @@ SOURCE_FILE@[0; 257)
             WHITESPACE@[162; 163) " "
             LITERAL@[163; 164)
               INT_NUMBER@[163; 164) "5"
-          SEMI@[164; 165) ";"
+          SEMICOLON@[164; 165) ";"
         WHITESPACE@[165; 170) "\n    "
         EXPR_STMT@[170; 177)
           BIN_EXPR@[170; 176)
@@ -111,7 +111,7 @@ SOURCE_FILE@[0; 257)
             WHITESPACE@[174; 175) " "
             LITERAL@[175; 176)
               INT_NUMBER@[175; 176) "6"
-          SEMI@[176; 177) ";"
+          SEMICOLON@[176; 177) ";"
         WHITESPACE@[177; 182) "\n    "
         EXPR_STMT@[182; 189)
           BIN_EXPR@[182; 188)
@@ -125,7 +125,7 @@ SOURCE_FILE@[0; 257)
             WHITESPACE@[186; 187) " "
             LITERAL@[187; 188)
               INT_NUMBER@[187; 188) "7"
-          SEMI@[188; 189) ";"
+          SEMICOLON@[188; 189) ";"
         WHITESPACE@[189; 194) "\n    "
         EXPR_STMT@[194; 201)
           BIN_EXPR@[194; 200)
@@ -139,7 +139,7 @@ SOURCE_FILE@[0; 257)
             WHITESPACE@[198; 199) " "
             LITERAL@[199; 200)
               INT_NUMBER@[199; 200) "8"
-          SEMI@[200; 201) ";"
+          SEMICOLON@[200; 201) ";"
         WHITESPACE@[201; 206) "\n    "
         EXPR_STMT@[206; 213)
           BIN_EXPR@[206; 212)
@@ -153,7 +153,7 @@ SOURCE_FILE@[0; 257)
             WHITESPACE@[210; 211) " "
             LITERAL@[211; 212)
               INT_NUMBER@[211; 212) "9"
-          SEMI@[212; 213) ";"
+          SEMICOLON@[212; 213) ";"
         WHITESPACE@[213; 218) "\n    "
         EXPR_STMT@[218; 226)
           BIN_EXPR@[218; 225)
@@ -167,7 +167,7 @@ SOURCE_FILE@[0; 257)
             WHITESPACE@[222; 223) " "
             LITERAL@[223; 225)
               INT_NUMBER@[223; 225) "10"
-          SEMI@[225; 226) ";"
+          SEMICOLON@[225; 226) ";"
         WHITESPACE@[226; 231) "\n    "
         EXPR_STMT@[231; 240)
           BIN_EXPR@[231; 239)
@@ -181,7 +181,7 @@ SOURCE_FILE@[0; 257)
             WHITESPACE@[236; 237) " "
             LITERAL@[237; 239)
               INT_NUMBER@[237; 239) "11"
-          SEMI@[239; 240) ";"
+          SEMICOLON@[239; 240) ";"
         WHITESPACE@[240; 245) "\n    "
         EXPR_STMT@[245; 254)
           BIN_EXPR@[245; 253)
@@ -195,7 +195,7 @@ SOURCE_FILE@[0; 257)
             WHITESPACE@[250; 251) " "
             LITERAL@[251; 253)
               INT_NUMBER@[251; 253) "12"
-          SEMI@[253; 254) ";"
+          SEMICOLON@[253; 254) ";"
         WHITESPACE@[254; 255) "\n"
         R_CURLY@[255; 256) "}"
   WHITESPACE@[256; 257) "\n"
diff --git a/crates/ra_syntax/test_data/parser/ok/0049_async_block.rast b/crates/ra_syntax/test_data/parser/ok/0049_async_block.rast
index aa6daff7d..0d32f0115 100644
--- a/crates/ra_syntax/test_data/parser/ok/0049_async_block.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0049_async_block.rast
@@ -19,7 +19,7 @@ SOURCE_FILE@[0; 47)
             BLOCK@[21; 23)
               L_CURLY@[21; 22) "{"
               R_CURLY@[22; 23) "}"
-          SEMI@[23; 24) ";"
+          SEMICOLON@[23; 24) ";"
         WHITESPACE@[24; 29) "\n    "
         EXPR_STMT@[29; 43)
           BLOCK_EXPR@[29; 42)
@@ -30,7 +30,7 @@ SOURCE_FILE@[0; 47)
             BLOCK@[40; 42)
               L_CURLY@[40; 41) "{"
               R_CURLY@[41; 42) "}"
-          SEMI@[42; 43) ";"
+          SEMICOLON@[42; 43) ";"
         WHITESPACE@[43; 44) "\n"
         R_CURLY@[44; 45) "}"
   WHITESPACE@[45; 47) "\n\n"
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 435f27970..17591d99f 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
@@ -24,11 +24,11 @@ SOURCE_FILE@[0; 95)
                       PATH_SEGMENT@[15; 18)
                         NAME_REF@[15; 18)
                           IDENT@[15; 18) "std"
-                    COLONCOLON@[18; 20) "::"
+                    COLON2@[18; 20) "::"
                     PATH_SEGMENT@[20; 26)
                       NAME_REF@[20; 26)
                         IDENT@[20; 26) "future"
-                  COLONCOLON@[26; 28) "::"
+                  COLON2@[26; 28) "::"
                   PATH_SEGMENT@[28; 48)
                     NAME_REF@[28; 34)
                       IDENT@[28; 34) "Future"
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 254eafc36..8fd28427c 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
@@ -119,7 +119,7 @@ SOURCE_FILE@[0; 519)
             R_BRACK@[112; 113) "]"
           WHITESPACE@[113; 114) " "
           PARAM@[114; 117)
-            DOTDOTDOT@[114; 117) "..."
+            DOT3@[114; 117) "..."
           R_PAREN@[117; 118) ")"
         WHITESPACE@[118; 119) " "
         RET_TYPE@[119; 125)
@@ -130,7 +130,7 @@ SOURCE_FILE@[0; 519)
               PATH_SEGMENT@[122; 125)
                 NAME_REF@[122; 125)
                   IDENT@[122; 125) "i32"
-        SEMI@[125; 126) ";"
+        SEMICOLON@[125; 126) ";"
       WHITESPACE@[126; 127) " "
       R_CURLY@[127; 128) "}"
   WHITESPACE@[128; 130) "\n\n"
@@ -250,7 +250,7 @@ SOURCE_FILE@[0; 519)
                   NAME_REF@[229; 232)
                     IDENT@[229; 232) "i32"
           R_PAREN@[232; 233) ")"
-        SEMI@[233; 234) ";"
+        SEMICOLON@[233; 234) ";"
       WHITESPACE@[234; 235) "\n"
       R_CURLY@[235; 236) "}"
   WHITESPACE@[236; 238) "\n\n"
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 374c58670..473966cd4 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
@@ -25,7 +25,7 @@ SOURCE_FILE@[0; 80)
             LITERAL@[24; 25)
               INT_NUMBER@[24; 25) "0"
             WHITESPACE@[25; 26) " "
-            DOTDOT@[26; 28) ".."
+            DOT2@[26; 28) ".."
             WHITESPACE@[28; 29) " "
             METHOD_CALL_EXPR@[29; 56)
               PAREN_EXPR@[29; 43)
@@ -34,7 +34,7 @@ SOURCE_FILE@[0; 80)
                   LITERAL@[30; 31)
                     INT_NUMBER@[30; 31) "0"
                   WHITESPACE@[31; 32) " "
-                  DOTDOT@[32; 34) ".."
+                  DOT2@[32; 34) ".."
                   WHITESPACE@[34; 35) " "
                   BLOCK_EXPR@[35; 42)
                     BLOCK@[35; 42)
@@ -53,7 +53,7 @@ SOURCE_FILE@[0; 80)
               NAME_REF@[44; 47)
                 IDENT@[44; 47) "sum"
               TYPE_ARG_LIST@[47; 54)
-                COLONCOLON@[47; 49) "::"
+                COLON2@[47; 49) "::"
                 L_ANGLE@[49; 50) "<"
                 TYPE_ARG@[50; 53)
                   PATH_TYPE@[50; 53)
@@ -73,7 +73,7 @@ SOURCE_FILE@[0; 80)
               EXPR_STMT@[66; 72)
                 BREAK_EXPR@[66; 71)
                   BREAK_KW@[66; 71) "break"
-                SEMI@[71; 72) ";"
+                SEMICOLON@[71; 72) ";"
               WHITESPACE@[72; 76) "\n   "
               R_CURLY@[76; 77) "}"
         WHITESPACE@[77; 78) "\n"
diff --git a/crates/ra_syntax/test_data/parser/ok/0053_outer_attribute_on_macro_rules.rast b/crates/ra_syntax/test_data/parser/ok/0053_outer_attribute_on_macro_rules.rast
index 04ff0e2ff..60a491853 100644
--- a/crates/ra_syntax/test_data/parser/ok/0053_outer_attribute_on_macro_rules.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0053_outer_attribute_on_macro_rules.rast
@@ -15,7 +15,7 @@ SOURCE_FILE@[0; 65)
       PATH_SEGMENT@[30; 41)
         NAME_REF@[30; 41)
           IDENT@[30; 41) "macro_rules"
-    EXCL@[41; 42) "!"
+    BANG@[41; 42) "!"
     WHITESPACE@[42; 43) " "
     NAME@[43; 46)
       IDENT@[43; 46) "foo"
@@ -33,7 +33,7 @@ SOURCE_FILE@[0; 65)
       TOKEN_TREE@[59; 61)
         L_CURLY@[59; 60) "{"
         R_CURLY@[60; 61) "}"
-      SEMI@[61; 62) ";"
+      SEMICOLON@[61; 62) ";"
       WHITESPACE@[62; 63) "\n"
       R_CURLY@[63; 64) "}"
   WHITESPACE@[64; 65) "\n"
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 7e1af254c..fabf88e8f 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
@@ -25,7 +25,7 @@ SOURCE_FILE@[0; 88)
                       PATH_SEGMENT@[14; 17)
                         NAME_REF@[14; 17)
                           IDENT@[14; 17) "bar"
-                    COLONCOLON@[17; 19) "::"
+                    COLON2@[17; 19) "::"
                     PATH_SEGMENT@[19; 22)
                       NAME_REF@[19; 22)
                         IDENT@[19; 22) "Baz"
@@ -67,7 +67,7 @@ SOURCE_FILE@[0; 88)
                               PATH_SEGMENT@[47; 48)
                                 NAME_REF@[47; 48)
                                   IDENT@[47; 48) "x"
-                            COLONCOLON@[48; 50) "::"
+                            COLON2@[48; 50) "::"
                             PATH_SEGMENT@[50; 51)
                               NAME_REF@[50; 51)
                                 IDENT@[50; 51) "Y"
@@ -112,7 +112,7 @@ SOURCE_FILE@[0; 88)
                                 PATH_SEGMENT@[78; 79)
                                   NAME_REF@[78; 79)
                                     IDENT@[78; 79) "x"
-                              COLONCOLON@[79; 81) "::"
+                              COLON2@[79; 81) "::"
                               PATH_SEGMENT@[81; 82)
                                 NAME_REF@[81; 82)
                                   IDENT@[81; 82) "Y"
diff --git a/crates/ra_syntax/test_data/parser/ok/0055_dot_dot_dot.rast b/crates/ra_syntax/test_data/parser/ok/0055_dot_dot_dot.rast
index d656e74b1..6ac3f1458 100644
--- a/crates/ra_syntax/test_data/parser/ok/0055_dot_dot_dot.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0055_dot_dot_dot.rast
@@ -10,7 +10,7 @@ SOURCE_FILE@[0; 49)
     TUPLE_TYPE@[9; 11)
       L_PAREN@[9; 10) "("
       R_PAREN@[10; 11) ")"
-    SEMI@[11; 12) ";"
+    SEMICOLON@[11; 12) ";"
   WHITESPACE@[12; 14) "\n\n"
   FN_DEF@[14; 48)
     FN_KW@[14; 16) "fn"
@@ -35,7 +35,7 @@ SOURCE_FILE@[0; 49)
           PATH_TYPE@[37; 40)
             PATH@[37; 40)
               PATH_SEGMENT@[37; 40)
-                COLONCOLON@[37; 39) "::"
+                COLON2@[37; 39) "::"
                 NAME_REF@[39; 40)
                   IDENT@[39; 40) "X"
           WHITESPACE@[40; 41) " "
@@ -44,7 +44,7 @@ SOURCE_FILE@[0; 49)
           TUPLE_EXPR@[43; 45)
             L_PAREN@[43; 44) "("
             R_PAREN@[44; 45) ")"
-          SEMI@[45; 46) ";"
+          SEMICOLON@[45; 46) ";"
         WHITESPACE@[46; 47) "\n"
         R_CURLY@[47; 48) "}"
   WHITESPACE@[48; 49) "\n"
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 cc8c3f7ec..2c07bde43 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
@@ -54,6 +54,6 @@ SOURCE_FILE@[0; 50)
                     L_CURLY@[44; 45) "{"
                     R_CURLY@[45; 46) "}"
               R_PAREN@[46; 47) ")"
-          SEMI@[47; 48) ";"
+          SEMICOLON@[47; 48) ";"
         WHITESPACE@[48; 49) "\n"
         R_CURLY@[49; 50) "}"
diff --git a/crates/ra_syntax/test_data/parser/ok/0058_unary_expr_precedence.rast b/crates/ra_syntax/test_data/parser/ok/0058_unary_expr_precedence.rast
index d30cb63ff..9de9efbad 100644
--- a/crates/ra_syntax/test_data/parser/ok/0058_unary_expr_precedence.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0058_unary_expr_precedence.rast
@@ -31,7 +31,7 @@ SOURCE_FILE@[0; 79)
             WHITESPACE@[24; 25) " "
             LITERAL@[25; 26)
               INT_NUMBER@[25; 26) "3"
-          SEMI@[26; 27) ";"
+          SEMICOLON@[26; 27) ";"
         WHITESPACE@[27; 32) "\n    "
         EXPR_STMT@[32; 43)
           CAST_EXPR@[32; 42)
@@ -49,7 +49,7 @@ SOURCE_FILE@[0; 79)
                 PATH_SEGMENT@[39; 42)
                   NAME_REF@[39; 42)
                     IDENT@[39; 42) "u64"
-          SEMI@[42; 43) ";"
+          SEMICOLON@[42; 43) ";"
         WHITESPACE@[43; 48) "\n    "
         EXPR_STMT@[48; 54)
           PREFIX_EXPR@[48; 53)
@@ -65,7 +65,7 @@ SOURCE_FILE@[0; 79)
                 LITERAL@[51; 52)
                   INT_NUMBER@[51; 52) "1"
                 R_PAREN@[52; 53) ")"
-          SEMI@[53; 54) ";"
+          SEMICOLON@[53; 54) ";"
         WHITESPACE@[54; 59) "\n    "
         EXPR_STMT@[59; 65)
           REF_EXPR@[59; 64)
@@ -80,7 +80,7 @@ SOURCE_FILE@[0; 79)
               LITERAL@[62; 63)
                 INT_NUMBER@[62; 63) "1"
               R_BRACK@[63; 64) "]"
-          SEMI@[64; 65) ";"
+          SEMICOLON@[64; 65) ";"
         WHITESPACE@[65; 70) "\n    "
         EXPR_STMT@[70; 76)
           RANGE_EXPR@[70; 75)
@@ -88,10 +88,10 @@ SOURCE_FILE@[0; 79)
               MINUS@[70; 71) "-"
               LITERAL@[71; 72)
                 INT_NUMBER@[71; 72) "1"
-            DOTDOT@[72; 74) ".."
+            DOT2@[72; 74) ".."
             LITERAL@[74; 75)
               INT_NUMBER@[74; 75) "2"
-          SEMI@[75; 76) ";"
+          SEMICOLON@[75; 76) ";"
         WHITESPACE@[76; 77) "\n"
         R_CURLY@[77; 78) "}"
   WHITESPACE@[78; 79) "\n"
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 c011187ea..101478ce1 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
@@ -47,7 +47,7 @@ SOURCE_FILE@[0; 105)
                     L_CURLY@[46; 47) "{"
                     R_CURLY@[47; 48) "}"
               R_PAREN@[48; 49) ")"
-          SEMI@[49; 50) ";"
+          SEMICOLON@[49; 50) ";"
         WHITESPACE@[50; 55) "\n    "
         EXPR_STMT@[55; 77)
           CALL_EXPR@[55; 76)
@@ -68,11 +68,11 @@ SOURCE_FILE@[0; 105)
                     EXPR_STMT@[67; 73)
                       BREAK_EXPR@[67; 72)
                         BREAK_KW@[67; 72) "break"
-                      SEMI@[72; 73) ";"
+                      SEMICOLON@[72; 73) ";"
                     WHITESPACE@[73; 74) " "
                     R_CURLY@[74; 75) "}"
               R_PAREN@[75; 76) ")"
-          SEMI@[76; 77) ";"
+          SEMICOLON@[76; 77) ";"
         WHITESPACE@[77; 82) "\n    "
         EXPR_STMT@[82; 102)
           CALL_EXPR@[82; 101)
@@ -95,7 +95,7 @@ SOURCE_FILE@[0; 105)
                     L_CURLY@[98; 99) "{"
                     R_CURLY@[99; 100) "}"
               R_PAREN@[100; 101) ")"
-          SEMI@[101; 102) ";"
+          SEMICOLON@[101; 102) ";"
         WHITESPACE@[102; 103) "\n"
         R_CURLY@[103; 104) "}"
   WHITESPACE@[104; 105) "\n"
diff --git a/crates/ra_syntax/test_data/parser/ok/0060_as_range.rast b/crates/ra_syntax/test_data/parser/ok/0060_as_range.rast
index ad0c4a3fe..6bff57505 100644
--- a/crates/ra_syntax/test_data/parser/ok/0060_as_range.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0060_as_range.rast
@@ -26,8 +26,8 @@ SOURCE_FILE@[0; 56)
                     NAME_REF@[21; 26)
                       IDENT@[21; 26) "usize"
             WHITESPACE@[26; 27) " "
-            DOTDOT@[27; 29) ".."
-          SEMI@[29; 30) ";"
+            DOT2@[27; 29) ".."
+          SEMICOLON@[29; 30) ";"
         WHITESPACE@[30; 35) "\n    "
         EXPR_STMT@[35; 53)
           RANGE_EXPR@[35; 52)
@@ -49,8 +49,8 @@ SOURCE_FILE@[0; 56)
                       NAME_REF@[44; 49)
                         IDENT@[44; 49) "usize"
             WHITESPACE@[49; 50) " "
-            DOTDOT@[50; 52) ".."
-          SEMI@[52; 53) ";"
+            DOT2@[50; 52) ".."
+          SEMICOLON@[52; 53) ";"
         WHITESPACE@[53; 54) "\n"
         R_CURLY@[54; 55) "}"
   WHITESPACE@[55; 56) "\n"
diff --git a/crates/ra_syntax/test_data/parser/ok/0061_match_full_range.rast b/crates/ra_syntax/test_data/parser/ok/0061_match_full_range.rast
index bdfac9b76..be6774199 100644
--- a/crates/ra_syntax/test_data/parser/ok/0061_match_full_range.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0061_match_full_range.rast
@@ -16,7 +16,7 @@ SOURCE_FILE@[0; 35)
           MATCH_KW@[16; 21) "match"
           WHITESPACE@[21; 22) " "
           RANGE_EXPR@[22; 24)
-            DOTDOT@[22; 24) ".."
+            DOT2@[22; 24) ".."
           WHITESPACE@[24; 25) " "
           MATCH_ARM_LIST@[25; 32)
             L_CURLY@[25; 26) "{"
diff --git a/crates/ra_syntax/test_data/parser/ok/0062_macro_2.0.rast b/crates/ra_syntax/test_data/parser/ok/0062_macro_2.0.rast
index 2be523fc3..f89d7c0d9 100644
--- a/crates/ra_syntax/test_data/parser/ok/0062_macro_2.0.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0062_macro_2.0.rast
@@ -30,7 +30,7 @@ SOURCE_FILE@[0; 349)
         L_CURLY@[42; 43) "{"
         WHITESPACE@[43; 48) "\n    "
         IDENT@[48; 51) "vec"
-        EXCL@[51; 52) "!"
+        BANG@[51; 52) "!"
         TOKEN_TREE@[52; 91)
           L_BRACK@[52; 53) "["
           WHITESPACE@[53; 62) "\n        "
@@ -129,7 +129,7 @@ SOURCE_FILE@[0; 349)
               L_CURLY@[204; 205) "{"
               WHITESPACE@[205; 214) "\n        "
               IDENT@[214; 223) "assert_eq"
-              EXCL@[223; 224) "!"
+              BANG@[223; 224) "!"
               TOKEN_TREE@[224; 339)
                 L_PAREN@[224; 225) "("
                 WHITESPACE@[225; 238) "\n            "
@@ -137,7 +137,7 @@ SOURCE_FILE@[0; 349)
                 TOKEN_TREE@[253; 284)
                   L_PAREN@[253; 254) "("
                   IDENT@[254; 269) "parse_use_trees"
-                  EXCL@[269; 270) "!"
+                  BANG@[269; 270) "!"
                   TOKEN_TREE@[270; 283)
                     L_PAREN@[270; 271) "("
                     DOLLAR@[271; 272) "$"
@@ -153,7 +153,7 @@ SOURCE_FILE@[0; 349)
                 COMMA@[284; 285) ","
                 WHITESPACE@[285; 298) "\n            "
                 IDENT@[298; 313) "parse_use_trees"
-                EXCL@[313; 314) "!"
+                BANG@[313; 314) "!"
                 TOKEN_TREE@[314; 328)
                   L_PAREN@[314; 315) "("
                   DOLLAR@[315; 316) "$"
@@ -168,7 +168,7 @@ SOURCE_FILE@[0; 349)
                 COMMA@[328; 329) ","
                 WHITESPACE@[329; 338) "\n        "
                 R_PAREN@[338; 339) ")"
-              SEMI@[339; 340) ";"
+              SEMICOLON@[339; 340) ";"
               WHITESPACE@[340; 345) "\n    "
               R_CURLY@[345; 346) "}"
         WHITESPACE@[346; 347) "\n"
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 eb2e3a503..9b5954ebd 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
@@ -190,7 +190,7 @@ SOURCE_FILE@[0; 170)
                   NAME_REF@[162; 165)
                     IDENT@[162; 165) "i32"
           R_PAREN@[165; 166) ")"
-        SEMI@[166; 167) ";"
+        SEMICOLON@[166; 167) ";"
       WHITESPACE@[167; 168) "\n"
       R_CURLY@[168; 169) "}"
   WHITESPACE@[169; 170) "\n"
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 186f03626..17b08197b 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
@@ -32,10 +32,10 @@ SOURCE_FILE@[0; 126)
           COMMA@[32; 33) ","
           WHITESPACE@[33; 34) " "
           PARAM@[34; 37)
-            DOTDOTDOT@[34; 37) "..."
+            DOT3@[34; 37) "..."
           COMMA@[37; 38) ","
           R_PAREN@[38; 39) ")"
-        SEMI@[39; 40) ";"
+        SEMICOLON@[39; 40) ";"
       WHITESPACE@[40; 45) "\n    "
       FN_DEF@[45; 70)
         FN_KW@[45; 47) "fn"
@@ -65,9 +65,9 @@ SOURCE_FILE@[0; 126)
               UNDERSCORE@[62; 63) "_"
             COLON@[63; 64) ":"
             WHITESPACE@[64; 65) " "
-            DOTDOTDOT@[65; 68) "..."
+            DOT3@[65; 68) "..."
           R_PAREN@[68; 69) ")"
-        SEMI@[69; 70) ";"
+        SEMICOLON@[69; 70) ";"
       WHITESPACE@[70; 75) "\n    "
       FN_DEF@[75; 123)
         FN_KW@[75; 77) "fn"
@@ -124,10 +124,10 @@ SOURCE_FILE@[0; 126)
               R_BRACK@[114; 115) "]"
             COLON@[115; 116) ":"
             WHITESPACE@[116; 117) " "
-            DOTDOTDOT@[117; 120) "..."
+            DOT3@[117; 120) "..."
           COMMA@[120; 121) ","
           R_PAREN@[121; 122) ")"
-        SEMI@[122; 123) ";"
+        SEMICOLON@[122; 123) ";"
       WHITESPACE@[123; 124) "\n"
       R_CURLY@[124; 125) "}"
   WHITESPACE@[125; 126) "\n"
diff --git a/crates/ra_tt/src/lib.rs b/crates/ra_tt/src/lib.rs
index bd484aa30..5248e026c 100644
--- a/crates/ra_tt/src/lib.rs
+++ b/crates/ra_tt/src/lib.rs
@@ -57,7 +57,7 @@ pub enum Leaf {
 }
 impl_froms!(Leaf: Literal, Punct, Ident);
 
-#[derive(Debug, Clone, PartialEq, Eq, Hash, Default)]
+#[derive(Clone, PartialEq, Eq, Hash, Default)]
 pub struct Subtree {
     pub delimiter: Option<Delimiter>,
     pub token_trees: Vec<TokenTree>,
@@ -101,6 +101,61 @@ pub struct Ident {
     pub id: TokenId,
 }
 
+fn print_debug_subtree(f: &mut fmt::Formatter<'_>, subtree: &Subtree, level: usize) -> fmt::Result {
+    let align = std::iter::repeat("  ").take(level).collect::<String>();
+
+    let aux = match subtree.delimiter.map(|it| (it.kind, it.id.0)) {
+        None => "$".to_string(),
+        Some((DelimiterKind::Parenthesis, id)) => format!("() {}", id),
+        Some((DelimiterKind::Brace, id)) => format!("{{}} {}", id),
+        Some((DelimiterKind::Bracket, id)) => format!("[] {}", id),
+    };
+
+    if subtree.token_trees.is_empty() {
+        write!(f, "{}SUBTREE {}", align, aux)?;
+    } else {
+        writeln!(f, "{}SUBTREE {}", align, aux)?;
+        for (idx, child) in subtree.token_trees.iter().enumerate() {
+            print_debug_token(f, child, level + 1)?;
+            if idx != subtree.token_trees.len() - 1 {
+                writeln!(f, "")?;
+            }
+        }
+    }
+
+    Ok(())
+}
+
+fn print_debug_token(f: &mut fmt::Formatter<'_>, tkn: &TokenTree, level: usize) -> fmt::Result {
+    let align = std::iter::repeat("  ").take(level).collect::<String>();
+
+    match tkn {
+        TokenTree::Leaf(leaf) => match leaf {
+            Leaf::Literal(lit) => write!(f, "{}LITERAL {} {}", align, lit.text, lit.id.0)?,
+            Leaf::Punct(punct) => write!(
+                f,
+                "{}PUNCH   {} [{}] {}",
+                align,
+                punct.char,
+                if punct.spacing == Spacing::Alone { "alone" } else { "joint" },
+                punct.id.0
+            )?,
+            Leaf::Ident(ident) => write!(f, "{}IDENT   {} {}", align, ident.text, ident.id.0)?,
+        },
+        TokenTree::Subtree(subtree) => {
+            print_debug_subtree(f, subtree, level)?;
+        }
+    }
+
+    Ok(())
+}
+
+impl Debug for Subtree {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        print_debug_subtree(f, self, 0)
+    }
+}
+
 impl fmt::Display for TokenTree {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
         match self {
diff --git a/crates/rust-analyzer/src/cli/analysis_stats.rs b/crates/rust-analyzer/src/cli/analysis_stats.rs
index 75cf2dae5..e9ee0b888 100644
--- a/crates/rust-analyzer/src/cli/analysis_stats.rs
+++ b/crates/rust-analyzer/src/cli/analysis_stats.rs
@@ -163,10 +163,7 @@ pub fn analysis_stats(
                 if let Ok(src) = src {
                     let original_file = src.file_id.original_file(db);
                     let line_index = host.analysis().file_line_index(original_file).unwrap();
-                    let text_range = src.value.either(
-                        |it| it.syntax_node_ptr().range(),
-                        |it| it.syntax_node_ptr().range(),
-                    );
+                    let text_range = src.value.syntax_node_ptr().range();
                     let (start, end) = (
                         line_index.line_col(text_range.start()),
                         line_index.line_col(text_range.end()),
@@ -192,12 +189,7 @@ pub fn analysis_stats(
                         // FIXME: it might be nice to have a function (on Analysis?) that goes from Source<T> -> (LineCol, LineCol) directly
                         // But also, we should just turn the type mismatches into diagnostics and provide these
                         let root = db.parse_or_expand(src.file_id).unwrap();
-                        let node = src.map(|e| {
-                            e.either(
-                                |p| p.to_node(&root).syntax().clone(),
-                                |p| p.to_node(&root).syntax().clone(),
-                            )
-                        });
+                        let node = src.map(|e| e.to_node(&root).syntax().clone());
                         let original_range = original_range(db, node.as_ref());
                         let path = db.file_relative_path(original_range.file_id);
                         let line_index =
diff --git a/crates/rust-analyzer/src/cli/load_cargo.rs b/crates/rust-analyzer/src/cli/load_cargo.rs
index 69133e4e4..43062ea10 100644
--- a/crates/rust-analyzer/src/cli/load_cargo.rs
+++ b/crates/rust-analyzer/src/cli/load_cargo.rs
@@ -152,7 +152,9 @@ pub(crate) fn load(
         &extern_source_roots,
         proc_macro_client,
         &mut |path: &Path| {
-            let vfs_file = vfs.load(path);
+            // Some path from metadata will be non canonicalized, e.g. /foo/../bar/lib.rs
+            let path = path.canonicalize().ok()?;
+            let vfs_file = vfs.load(&path);
             log::debug!("vfs file {:?} -> {:?}", path, vfs_file);
             vfs_file.map(vfs_file_to_id)
         },
diff --git a/crates/rust-analyzer/src/world.rs b/crates/rust-analyzer/src/world.rs
index 365f57d8c..6c42e1d76 100644
--- a/crates/rust-analyzer/src/world.rs
+++ b/crates/rust-analyzer/src/world.rs
@@ -139,7 +139,9 @@ impl WorldState {
         // Create crate graph from all the workspaces
         let mut crate_graph = CrateGraph::default();
         let mut load = |path: &std::path::Path| {
-            let vfs_file = vfs.load(path);
+            // Some path from metadata will be non canonicalized, e.g. /foo/../bar/lib.rs
+            let path = path.canonicalize().ok()?;
+            let vfs_file = vfs.load(&path);
             vfs_file.map(|f| FileId(f.0))
         };
 
diff --git a/crates/stdx/src/lib.rs b/crates/stdx/src/lib.rs
index 401a568bd..01cdf452c 100644
--- a/crates/stdx/src/lib.rs
+++ b/crates/stdx/src/lib.rs
@@ -1,6 +1,6 @@
 //! Missing batteries for standard libraries.
 
-use std::{cell::Cell, fmt};
+use std::{cell::Cell, fmt, time::Instant};
 
 #[inline(always)]
 pub fn is_ci() -> bool {
@@ -88,3 +88,17 @@ where
         Ok(())
     }
 }
+pub fn timeit(label: &'static str) -> impl Drop {
+    struct Guard {
+        label: &'static str,
+        start: Instant,
+    }
+
+    impl Drop for Guard {
+        fn drop(&mut self) {
+            eprintln!("{}: {:?}", self.label, self.start.elapsed())
+        }
+    }
+
+    Guard { label, start: Instant::now() }
+}
diff --git a/docs/user/assists.md b/docs/user/assists.md
index 754131f6f..1d9510423 100644
--- a/docs/user/assists.md
+++ b/docs/user/assists.md
@@ -175,7 +175,7 @@ trait Trait<T> {
 }
 
 impl Trait<u32> for () {
-    fn foo(&self) -> u32 { unimplemented!() }
+    fn foo(&self) -> u32 { todo!() }
 
 }
 ```
@@ -582,6 +582,21 @@ impl Walrus {
 }
 ```
 
+## `reorder_fields`
+
+Reorder the fields of record literals and record patterns in the same order as in
+the definition.
+
+```rust
+// BEFORE
+struct Foo {foo: i32, bar: i32};
+const test: Foo = ┃Foo {bar: 0, foo: 1}
+
+// AFTER
+struct Foo {foo: i32, bar: i32};
+const test: Foo = Foo {foo: 1, bar: 0}
+```
+
 ## `replace_if_let_with_match`
 
 Replaces `if let` with an else branch with a `match` expression.
diff --git a/editors/code/src/config.ts b/editors/code/src/config.ts
index 21c1c9f23..35a05131c 100644
--- a/editors/code/src/config.ts
+++ b/editors/code/src/config.ts
@@ -66,23 +66,44 @@ export class Config {
         return vscode.workspace.getConfiguration(this.rootSection);
     }
 
-    get serverPath() { return this.cfg.get<null | string>("serverPath")!; }
-    get channel() { return this.cfg.get<UpdatesChannel>("updates.channel")!; }
-    get askBeforeDownload() { return this.cfg.get<boolean>("updates.askBeforeDownload")!; }
-    get traceExtension() { return this.cfg.get<boolean>("trace.extension")!; }
+    /**
+     * Beware that postfix `!` operator erases both `null` and `undefined`.
+     * This is why the following doesn't work as expected:
+     *
+     * ```ts
+     * const nullableNum = vscode
+     *  .workspace
+     *  .getConfiguration
+     *  .getConfiguration("rust-analyer")
+     *  .get<number | null>(path)!;
+     *
+     * // What happens is that type of `nullableNum` is `number` but not `null | number`:
+     * const fullFledgedNum: number = nullableNum;
+     * ```
+     * So this getter handles this quirk by not requiring the caller to use postfix `!`
+     */
+    private get<T>(path: string): T {
+        return this.cfg.get<T>(path)!;
+    }
+
+    get serverPath() { return this.get<null | string>("serverPath"); }
+    get channel() { return this.get<UpdatesChannel>("updates.channel"); }
+    get askBeforeDownload() { return this.get<boolean>("updates.askBeforeDownload"); }
+    get traceExtension() { return this.get<boolean>("trace.extension"); }
+
 
     get inlayHints() {
         return {
-            typeHints: this.cfg.get<boolean>("inlayHints.typeHints")!,
-            parameterHints: this.cfg.get<boolean>("inlayHints.parameterHints")!,
-            chainingHints: this.cfg.get<boolean>("inlayHints.chainingHints")!,
-            maxLength: this.cfg.get<null | number>("inlayHints.maxLength")!,
+            typeHints: this.get<boolean>("inlayHints.typeHints"),
+            parameterHints: this.get<boolean>("inlayHints.parameterHints"),
+            chainingHints: this.get<boolean>("inlayHints.chainingHints"),
+            maxLength: this.get<null | number>("inlayHints.maxLength"),
         };
     }
 
     get checkOnSave() {
         return {
-            command: this.cfg.get<string>("checkOnSave.command")!,
+            command: this.get<string>("checkOnSave.command"),
         };
     }
 }
diff --git a/editors/code/src/inlay_hints.ts b/editors/code/src/inlay_hints.ts
index 6a8bd942e..da74f03d2 100644
--- a/editors/code/src/inlay_hints.ts
+++ b/editors/code/src/inlay_hints.ts
@@ -229,13 +229,13 @@ interface InlaysDecorations {
 }
 
 interface RustSourceFile {
-    /*
-    * Source of the token to cancel in-flight inlay hints request if any.
-    */
+    /**
+     * Source of the token to cancel in-flight inlay hints request if any.
+     */
     inlaysRequest: null | vscode.CancellationTokenSource;
     /**
-    * Last applied decorations.
-    */
+     * Last applied decorations.
+     */
     cachedDecorations: null | InlaysDecorations;
 
     document: RustDocument;
diff --git a/xtask/src/ast_src.rs b/xtask/src/ast_src.rs
index eba66ff4d..69cba9168 100644
--- a/xtask/src/ast_src.rs
+++ b/xtask/src/ast_src.rs
@@ -11,7 +11,7 @@ pub(crate) struct KindsSrc<'a> {
 
 pub(crate) const KINDS_SRC: KindsSrc = KindsSrc {
     punct: &[
-        (";", "SEMI"),
+        (";", "SEMICOLON"),
         (",", "COMMA"),
         ("(", "L_PAREN"),
         (")", "R_PAREN"),
@@ -35,15 +35,15 @@ pub(crate) const KINDS_SRC: KindsSrc = KindsSrc {
         ("%", "PERCENT"),
         ("_", "UNDERSCORE"),
         (".", "DOT"),
-        ("..", "DOTDOT"),
-        ("...", "DOTDOTDOT"),
-        ("..=", "DOTDOTEQ"),
+        ("..", "DOT2"),
+        ("...", "DOT3"),
+        ("..=", "DOT2EQ"),
         (":", "COLON"),
-        ("::", "COLONCOLON"),
+        ("::", "COLON2"),
         ("=", "EQ"),
-        ("==", "EQEQ"),
+        ("==", "EQ2"),
         ("=>", "FAT_ARROW"),
-        ("!", "EXCL"),
+        ("!", "BANG"),
         ("!=", "NEQ"),
         ("-", "MINUS"),
         ("->", "THIN_ARROW"),
@@ -57,8 +57,8 @@ pub(crate) const KINDS_SRC: KindsSrc = KindsSrc {
         ("/=", "SLASHEQ"),
         ("*=", "STAREQ"),
         ("%=", "PERCENTEQ"),
-        ("&&", "AMPAMP"),
-        ("||", "PIPEPIPE"),
+        ("&&", "AMP2"),
+        ("||", "PIPE2"),
         ("<<", "SHL"),
         (">>", "SHR"),
         ("<<=", "SHLEQ"),
@@ -225,21 +225,26 @@ pub(crate) const KINDS_SRC: KindsSrc = KindsSrc {
 };
 
 pub(crate) struct AstSrc<'a> {
+    pub(crate) tokens: &'a [&'a str],
     pub(crate) nodes: &'a [AstNodeSrc<'a>],
     pub(crate) enums: &'a [AstEnumSrc<'a>],
-    pub(crate) token_enums: &'a [AstEnumSrc<'a>],
 }
 
 pub(crate) struct AstNodeSrc<'a> {
     pub(crate) name: &'a str,
     pub(crate) traits: &'a [&'a str],
-    pub(crate) fields: &'a [(&'a str, FieldSrc<&'a str>)],
+    pub(crate) fields: &'a [Field<'a>],
+}
+
+pub(crate) enum Field<'a> {
+    Token(&'a str),
+    Node { name: &'a str, src: FieldSrc<'a> },
 }
 
-pub(crate) enum FieldSrc<T> {
+pub(crate) enum FieldSrc<'a> {
     Shorthand,
-    Optional(T),
-    Many(T),
+    Optional(&'a str),
+    Many(&'a str),
 }
 
 pub(crate) struct AstEnumSrc<'a> {
@@ -251,31 +256,34 @@ pub(crate) struct AstEnumSrc<'a> {
 macro_rules! ast_nodes {
     ($(
         struct $name:ident$(: $($trait:ident),*)? {
-            $($field_name:ident $(: $ty:tt)?),*$(,)?
+            $($field_name:ident $(![$token:tt])? $(: $ty:tt)?),*$(,)?
         }
     )*) => {
         [$(
             AstNodeSrc {
                 name: stringify!($name),
                 traits: &[$($(stringify!($trait)),*)?],
-                fields: &[$(
-                    (stringify!($field_name), field_ty!($field_name $($ty)?))
-                ),*],
+                fields: &[
+                    $(field!($(T![$token])? $field_name $($ty)?)),*
+                ],
 
             }
         ),*]
     };
 }
 
-macro_rules! field_ty {
+macro_rules! field {
+    (T![$token:tt] T) => {
+        Field::Token(stringify!($token))
+    };
     ($field_name:ident) => {
-        FieldSrc::Shorthand
+        Field::Node { name: stringify!($field_name), src: FieldSrc::Shorthand }
     };
     ($field_name:ident [$ty:ident]) => {
-        FieldSrc::Many(stringify!($ty))
+        Field::Node { name: stringify!($field_name), src: FieldSrc::Many(stringify!($ty)) }
     };
     ($field_name:ident $ty:ident) => {
-        FieldSrc::Optional(stringify!($ty))
+        Field::Node { name: stringify!($field_name), src: FieldSrc::Optional(stringify!($ty)) }
     };
 }
 
@@ -290,330 +298,331 @@ macro_rules! ast_enums {
                 name: stringify!($name),
                 traits: &[$($(stringify!($trait)),*)?],
                 variants: &[$(stringify!($variant)),*],
-
             }
         ),*]
     };
 }
 
 pub(crate) const AST_SRC: AstSrc = AstSrc {
+    tokens: &["Whitespace", "Comment", "String", "RawString"],
     nodes: &ast_nodes! {
-        struct SourceFile: ModuleItemOwner, FnDefOwner, AttrsOwner {
+        struct SourceFile: ModuleItemOwner, AttrsOwner {
             modules: [Module],
         }
 
         struct FnDef: VisibilityOwner, NameOwner, TypeParamsOwner, DocCommentsOwner, AttrsOwner {
             Abi,
-            ConstKw,
-            DefaultKw,
-            AsyncKw,
-            UnsafeKw,
-            FnKw,
+            T![const],
+            T![default],
+            T![async],
+            T![unsafe],
+            T![fn],
             ParamList,
             RetType,
             body: BlockExpr,
-            Semi
+            T![;]
         }
 
-        struct RetType { ThinArrow, TypeRef }
+        struct RetType { T![->], TypeRef }
 
         struct StructDef: VisibilityOwner, NameOwner, TypeParamsOwner, AttrsOwner, DocCommentsOwner {
-            StructKw,
+            T![struct],
             FieldDefList,
-            Semi
+            T![;]
         }
 
         struct UnionDef: VisibilityOwner, NameOwner, TypeParamsOwner, AttrsOwner, DocCommentsOwner {
-            UnionKw,
+            T![union],
             RecordFieldDefList,
         }
 
-        struct RecordFieldDefList { LCurly, fields: [RecordFieldDef], RCurly }
+        struct RecordFieldDefList { T!['{'], fields: [RecordFieldDef], T!['}'] }
         struct RecordFieldDef: VisibilityOwner, NameOwner, AttrsOwner, DocCommentsOwner, TypeAscriptionOwner { }
 
-        struct TupleFieldDefList { LParen, fields: [TupleFieldDef], RParen }
+        struct TupleFieldDefList { T!['('], fields: [TupleFieldDef], T![')'] }
         struct TupleFieldDef: VisibilityOwner, AttrsOwner {
             TypeRef,
         }
 
         struct EnumDef: VisibilityOwner, NameOwner, TypeParamsOwner, AttrsOwner, DocCommentsOwner {
-            EnumKw,
+            T![enum],
             variant_list: EnumVariantList,
         }
         struct EnumVariantList {
-            LCurly,
+            T!['{'],
             variants: [EnumVariant],
-            RCurly
+            T!['}']
         }
         struct EnumVariant: VisibilityOwner, NameOwner, DocCommentsOwner, AttrsOwner {
             FieldDefList,
-            Eq,
+            T![=],
             Expr
         }
 
         struct TraitDef: VisibilityOwner, NameOwner, AttrsOwner, DocCommentsOwner, TypeParamsOwner, TypeBoundsOwner {
-            UnsafeKw,
-            AutoKw,
-            TraitKw,
+            T![unsafe],
+            T![auto],
+            T![trait],
             ItemList,
         }
 
         struct Module: VisibilityOwner, NameOwner, AttrsOwner, DocCommentsOwner {
-            ModKw,
+            T![mod],
             ItemList,
-            Semi
+            T![;]
         }
 
-        struct ItemList: FnDefOwner, ModuleItemOwner {
-            LCurly,
+        struct ItemList: ModuleItemOwner {
+            T!['{'],
             impl_items: [ImplItem],
-            RCurly
+            T!['}']
         }
 
         struct ConstDef: VisibilityOwner, NameOwner, TypeParamsOwner, AttrsOwner, DocCommentsOwner, TypeAscriptionOwner {
-            DefaultKw,
-            ConstKw,
-            Eq,
+            T![default],
+            T![const],
+            T![=],
             body: Expr,
-            Semi
+            T![;]
         }
 
         struct StaticDef: VisibilityOwner, NameOwner, TypeParamsOwner, AttrsOwner, DocCommentsOwner, TypeAscriptionOwner {
-            StaticKw,
-            MutKw,
-            Eq,
+            T![static],
+            T![mut],
+            T![=],
             body: Expr,
-            Semi
+            T![;]
         }
 
         struct TypeAliasDef: VisibilityOwner, NameOwner, TypeParamsOwner, AttrsOwner, DocCommentsOwner, TypeBoundsOwner {
-            DefaultKw,
-            TypeKw,
-            Eq,
+            T![default],
+            T![type],
+            T![=],
             TypeRef,
-            Semi
+            T![;]
         }
 
         struct ImplDef: TypeParamsOwner, AttrsOwner {
-            DefaultKw,
-            ConstKw,
-            UnsafeKw,
-            ImplKw,
-            Excl,
-            ForKw,
+            T![default],
+            T![const],
+            T![unsafe],
+            T![impl],
+            T![!],
+            T![for],
             ItemList,
         }
 
-        struct ParenType { LParen, TypeRef, RParen }
-        struct TupleType { LParen, fields: [TypeRef], RParen }
-        struct NeverType { Excl }
+        struct ParenType { T!['('], TypeRef, T![')'] }
+        struct TupleType { T!['('], fields: [TypeRef], T![')'] }
+        struct NeverType { T![!] }
         struct PathType { Path }
-        struct PointerType { Star, ConstKw, TypeRef }
-        struct ArrayType { LBrack, TypeRef, Semi, Expr, RBrack }
-        struct SliceType { LBrack, TypeRef, RBrack }
-        struct ReferenceType { Amp, Lifetime, MutKw, TypeRef }
-        struct PlaceholderType { Underscore }
-        struct FnPointerType { Abi, UnsafeKw, FnKw, ParamList, RetType }
-        struct ForType { ForKw, TypeParamList, TypeRef }
-        struct ImplTraitType: TypeBoundsOwner { ImplKw }
-        struct DynTraitType: TypeBoundsOwner { DynKw }
-
-        struct TupleExpr: AttrsOwner { LParen, exprs: [Expr], RParen }
-        struct ArrayExpr: AttrsOwner { LBrack, exprs: [Expr], Semi, RBrack }
-        struct ParenExpr: AttrsOwner { LParen, Expr, RParen }
+        struct PointerType { T![*], T![const], T![mut], TypeRef }
+        struct ArrayType { T!['['], TypeRef, T![;], Expr, T![']'] }
+        struct SliceType { T!['['], TypeRef, T![']'] }
+        struct ReferenceType { T![&], T![lifetime], T![mut], TypeRef }
+        struct PlaceholderType { T![_] }
+        struct FnPointerType { Abi, T![unsafe], T![fn], ParamList, RetType }
+        struct ForType { T![for], TypeParamList, TypeRef }
+        struct ImplTraitType: TypeBoundsOwner { T![impl] }
+        struct DynTraitType: TypeBoundsOwner { T![dyn] }
+
+        struct TupleExpr: AttrsOwner { T!['('], exprs: [Expr], T![')'] }
+        struct ArrayExpr: AttrsOwner { T!['['], exprs: [Expr], T![;], T![']'] }
+        struct ParenExpr: AttrsOwner { T!['('], Expr, T![')'] }
         struct PathExpr  { Path }
         struct LambdaExpr: AttrsOwner {
-            StaticKw,
-            AsyncKw,
-            MoveKw,
+            T![static],
+            T![async],
+            T![move],
             ParamList,
             RetType,
             body: Expr,
         }
-        struct IfExpr: AttrsOwner { IfKw, Condition }
-        struct LoopExpr: AttrsOwner, LoopBodyOwner { LoopKw }
-        struct TryBlockExpr: AttrsOwner { TryKw, body: BlockExpr }
+        struct IfExpr: AttrsOwner { T![if], Condition }
+        struct LoopExpr: AttrsOwner, LoopBodyOwner { T![loop] }
+        struct TryBlockExpr: AttrsOwner { T![try], body: BlockExpr }
         struct ForExpr: AttrsOwner, LoopBodyOwner {
-            ForKw,
+            T![for],
             Pat,
-            InKw,
+            T![in],
             iterable: Expr,
         }
-        struct WhileExpr: AttrsOwner, LoopBodyOwner { WhileKw, Condition }
-        struct ContinueExpr: AttrsOwner { ContinueKw, Lifetime }
-        struct BreakExpr: AttrsOwner { BreakKw, Lifetime, Expr }
-        struct Label { Lifetime }
-        struct BlockExpr: AttrsOwner { Label, UnsafeKw, Block  }
+        struct WhileExpr: AttrsOwner, LoopBodyOwner { T![while], Condition }
+        struct ContinueExpr: AttrsOwner { T![continue], T![lifetime] }
+        struct BreakExpr: AttrsOwner { T![break], T![lifetime], Expr }
+        struct Label { T![lifetime] }
+        struct BlockExpr: AttrsOwner { Label, T![unsafe], Block  }
         struct ReturnExpr: AttrsOwner { Expr }
         struct CallExpr: ArgListOwner { Expr }
         struct MethodCallExpr: AttrsOwner, ArgListOwner {
-            Expr, Dot, NameRef, TypeArgList,
-        }
-        struct IndexExpr: AttrsOwner { LBrack, RBrack }
-        struct FieldExpr: AttrsOwner { Expr, Dot, NameRef }
-        struct AwaitExpr: AttrsOwner { Expr, Dot, AwaitKw }
-        struct TryExpr: AttrsOwner { TryKw, Expr }
-        struct CastExpr: AttrsOwner { Expr, AsKw, TypeRef }
-        struct RefExpr: AttrsOwner { Amp, RawKw, MutKw, Expr }
-        struct PrefixExpr: AttrsOwner { PrefixOp, Expr }
-        struct BoxExpr: AttrsOwner { BoxKw, Expr }
-        struct RangeExpr: AttrsOwner { RangeOp }
-        struct BinExpr: AttrsOwner { BinOp }
-        struct Literal { LiteralToken }
-
-        struct MatchExpr: AttrsOwner { MatchKw, Expr, MatchArmList }
-        struct MatchArmList: AttrsOwner { LCurly, arms: [MatchArm], RCurly }
+            Expr, T![.], NameRef, TypeArgList,
+        }
+        struct IndexExpr: AttrsOwner { T!['['], T![']'] }
+        struct FieldExpr: AttrsOwner { Expr, T![.], NameRef }
+        struct AwaitExpr: AttrsOwner { Expr, T![.], T![await] }
+        struct TryExpr: AttrsOwner { T![try], Expr }
+        struct CastExpr: AttrsOwner { Expr, T![as], TypeRef }
+        struct RefExpr: AttrsOwner { T![&], T![raw], T![mut], Expr }
+        struct PrefixExpr: AttrsOwner { /*PrefixOp,*/ Expr }
+        struct BoxExpr: AttrsOwner { T![box], Expr }
+        struct RangeExpr: AttrsOwner { /*RangeOp*/ }
+        struct BinExpr: AttrsOwner { /*BinOp*/ }
+        struct Literal { /*LiteralToken*/ }
+
+        struct MatchExpr: AttrsOwner { T![match], Expr, MatchArmList }
+        struct MatchArmList: AttrsOwner { T!['{'], arms: [MatchArm], T!['}'] }
         struct MatchArm: AttrsOwner {
             pat: Pat,
             guard: MatchGuard,
-            FatArrow,
+            T![=>],
             Expr,
         }
-        struct MatchGuard { IfKw, Expr }
+        struct MatchGuard { T![if], Expr }
 
         struct RecordLit { Path, RecordFieldList}
         struct RecordFieldList {
-            LCurly,
+            T!['{'],
             fields: [RecordField],
-            Dotdot,
+            T![..],
             spread: Expr,
-            RCurly
+            T!['}']
         }
-        struct RecordField: AttrsOwner { NameRef, Colon, Expr }
+        struct RecordField: AttrsOwner { NameRef, T![:], Expr }
 
         struct OrPat { pats: [Pat] }
-        struct ParenPat { LParen, Pat, RParen }
-        struct RefPat { Amp, MutKw, Pat }
-        struct BoxPat { BoxKw, Pat }
-        struct BindPat: AttrsOwner, NameOwner { RefKw, MutKw, Pat }
-        struct PlaceholderPat { Underscore }
-        struct DotDotPat { Dotdot }
+        struct ParenPat { T!['('], Pat, T![')'] }
+        struct RefPat { T![&], T![mut], Pat }
+        struct BoxPat { T![box], Pat }
+        struct BindPat: AttrsOwner, NameOwner { T![ref], T![mut], T![@], Pat }
+        struct PlaceholderPat { T![_] }
+        struct DotDotPat { T![..] }
         struct PathPat { Path }
-        struct SlicePat { LBrack, args: [Pat], RBrack }
-        struct RangePat { RangeSeparator }
+        struct SlicePat { T!['['], args: [Pat], T![']'] }
+        struct RangePat { /*RangeSeparator*/ }
         struct LiteralPat { Literal }
         struct MacroPat { MacroCall }
 
         struct RecordPat { RecordFieldPatList, Path }
         struct RecordFieldPatList {
-            LCurly,
+            T!['{'],
             pats: [RecordInnerPat],
             record_field_pats: [RecordFieldPat],
             bind_pats: [BindPat],
-            Dotdot,
-            RCurly
+            T![..],
+            T!['}']
         }
-        struct RecordFieldPat: AttrsOwner, NameOwner { Colon, Pat }
+        struct RecordFieldPat: AttrsOwner, NameOwner { T![:], Pat }
 
-        struct TupleStructPat { Path, LParen, args: [Pat], RParen }
-        struct TuplePat { LParen, args: [Pat], RParen }
+        struct TupleStructPat { Path, T!['('], args: [Pat], T![')'] }
+        struct TuplePat { T!['('], args: [Pat], T![')'] }
 
-        struct Visibility { PubKw, SuperKw, SelfKw, CrateKw }
-        struct Name { Ident }
-        struct NameRef { NameRefToken }
+        struct Visibility { T![pub], T![super], T![self], T![crate] }
+        struct Name { T![ident] }
+        struct NameRef { /*NameRefToken*/ }
 
         struct MacroCall: NameOwner, AttrsOwner,DocCommentsOwner {
-            Path, Excl, TokenTree, Semi
+            Path, T![!], TokenTree, T![;]
         }
-        struct Attr { Pound, Excl, LBrack, Path, Eq, input: AttrInput, RBrack }
+        struct Attr { T![#], T![!], T!['['], Path, T![=], input: AttrInput, T![']'] }
         struct TokenTree {}
         struct TypeParamList {
-            LAngle,
+            T![<],
             generic_params: [GenericParam],
             type_params: [TypeParam],
             lifetime_params: [LifetimeParam],
             const_params: [ConstParam],
-            RAngle
+            T![>]
         }
         struct TypeParam: NameOwner, AttrsOwner, TypeBoundsOwner {
-            Eq,
+            T![=],
             default_type: TypeRef,
         }
         struct ConstParam: NameOwner, AttrsOwner, TypeAscriptionOwner {
-            Eq,
+            T![=],
             default_val: Expr,
         }
-        struct LifetimeParam: AttrsOwner { Lifetime}
-        struct TypeBound { Lifetime, /* Question,  */ ConstKw, /* Question,  */ TypeRef}
+        struct LifetimeParam: AttrsOwner { T![lifetime] }
+        struct TypeBound { T![lifetime], /* Question,  */ T![const], /* Question,  */ TypeRef}
         struct TypeBoundList { bounds: [TypeBound] }
-        struct WherePred: TypeBoundsOwner { Lifetime, TypeRef }
-        struct WhereClause { WhereKw, predicates: [WherePred] }
-        struct Abi { String }
-        struct ExprStmt: AttrsOwner { Expr, Semi }
+        struct WherePred: TypeBoundsOwner { T![lifetime], TypeRef }
+        struct WhereClause { T![where], predicates: [WherePred] }
+        struct Abi { /*String*/ }
+        struct ExprStmt: AttrsOwner { Expr, T![;] }
         struct LetStmt: AttrsOwner, TypeAscriptionOwner {
-            LetKw,
+            T![let],
             Pat,
-            Eq,
+            T![=],
             initializer: Expr,
+            T![;],
         }
-        struct Condition { LetKw, Pat, Eq, Expr }
+        struct Condition { T![let], Pat, T![=], Expr }
         struct Block: AttrsOwner, ModuleItemOwner {
-            LCurly,
+            T!['{'],
             statements: [Stmt],
             Expr,
-            RCurly,
+            T!['}'],
         }
         struct ParamList {
-            LParen,
+            T!['('],
             SelfParam,
             params: [Param],
-            RParen
+            T![')']
         }
-        struct SelfParam: TypeAscriptionOwner, AttrsOwner { Amp, Lifetime, SelfKw }
+        struct SelfParam: TypeAscriptionOwner, AttrsOwner { T![&], T![mut], T![lifetime], T![self] }
         struct Param: TypeAscriptionOwner, AttrsOwner {
             Pat,
-            Dotdotdot
+            T![...]
         }
         struct UseItem: AttrsOwner, VisibilityOwner {
-            UseKw,
+            T![use],
             UseTree,
         }
         struct UseTree {
-            Path, Star, UseTreeList, Alias
+            Path, T![*], UseTreeList, Alias
         }
-        struct Alias: NameOwner { AsKw }
-        struct UseTreeList { LCurly, use_trees: [UseTree], RCurly }
+        struct Alias: NameOwner { T![as] }
+        struct UseTreeList { T!['{'], use_trees: [UseTree], T!['}'] }
         struct ExternCrateItem: AttrsOwner, VisibilityOwner {
-            ExternKw, CrateKw, NameRef, Alias,
+            T![extern], T![crate], NameRef, Alias,
         }
         struct ArgList {
-            LParen,
+            T!['('],
             args: [Expr],
-            RParen
+            T![')']
         }
         struct Path {
             segment: PathSegment,
             qualifier: Path,
         }
         struct PathSegment {
-            Coloncolon, LAngle, NameRef, TypeArgList, ParamList, RetType, PathType, RAngle
+            T![::], T![<], NameRef, TypeArgList, ParamList, RetType, PathType, T![>]
         }
         struct TypeArgList {
-            Coloncolon,
-            LAngle,
+            T![::],
+            T![<],
             generic_args: [GenericArg],
             type_args: [TypeArg],
             lifetime_args: [LifetimeArg],
             assoc_type_args: [AssocTypeArg],
             const_args: [ConstArg],
-            RAngle
+            T![>]
         }
         struct TypeArg { TypeRef }
-        struct AssocTypeArg : TypeBoundsOwner { NameRef, Eq, TypeRef }
-        struct LifetimeArg { Lifetime }
-        struct ConstArg { Literal, Eq, BlockExpr }
+        struct AssocTypeArg : TypeBoundsOwner { NameRef, T![=], TypeRef }
+        struct LifetimeArg { T![lifetime] }
+        struct ConstArg { Literal, T![=], BlockExpr }
 
-        struct MacroItems: ModuleItemOwner, FnDefOwner { }
+        struct MacroItems: ModuleItemOwner{ }
 
         struct MacroStmts {
             statements: [Stmt],
             Expr,
         }
 
-        struct ExternItemList: FnDefOwner, ModuleItemOwner {
-            LCurly,
+        struct ExternItemList: ModuleItemOwner {
+            T!['{'],
             extern_items: [ExternItem],
-            RCurly
+            T!['}']
         }
 
         struct ExternBlock {
@@ -622,7 +631,7 @@ pub(crate) const AST_SRC: AstSrc = AstSrc {
         }
 
         struct MetaItem {
-            Path, Eq, AttrInput, nested_meta_items: [MetaItem]
+            Path, T![=], AttrInput, nested_meta_items: [MetaItem]
         }
 
         struct MacroDef {
@@ -759,71 +768,4 @@ pub(crate) const AST_SRC: AstSrc = AstSrc {
             TupleFieldDefList,
         }
     },
-
-    token_enums: &ast_enums! {
-        enum LeftDelimiter { LParen, LBrack, LCurly }
-        enum RightDelimiter { RParen, RBrack, RCurly }
-        enum RangeSeparator { Dotdot, Dotdotdot, Dotdoteq}
-
-        enum BinOp {
-            Pipepipe,
-            Ampamp,
-            Eqeq,
-            Neq,
-            Lteq,
-            Gteq,
-            LAngle,
-            RAngle,
-            Plus,
-            Star,
-            Minus,
-            Slash,
-            Percent,
-            Shl,
-            Shr,
-            Caret,
-            Pipe,
-            Amp,
-            Eq,
-            Pluseq,
-            Slasheq,
-            Stareq,
-            Percenteq,
-            Shreq,
-            Shleq,
-            Minuseq,
-            Pipeeq,
-            Ampeq,
-            Careteq,
-        }
-
-        enum PrefixOp {
-            Minus,
-            Excl,
-            Star
-        }
-
-        enum RangeOp {
-            Dotdot,
-            Dotdoteq
-        }
-
-        enum LiteralToken {
-            IntNumber,
-            FloatNumber,
-            String,
-            RawString,
-            TrueKw,
-            FalseKw,
-            ByteString,
-            RawByteString,
-            Char,
-            Byte
-        }
-
-        enum NameRefToken {
-            Ident,
-            IntNumber
-        }
-    },
 };
diff --git a/xtask/src/codegen/gen_syntax.rs b/xtask/src/codegen/gen_syntax.rs
index 6657c9fc5..ec1f6ad8a 100644
--- a/xtask/src/codegen/gen_syntax.rs
+++ b/xtask/src/codegen/gen_syntax.rs
@@ -3,16 +3,13 @@
 //! Specifically, it generates the `SyntaxKind` enum and a number of newtype
 //! wrappers around `SyntaxNode` which implement `ra_syntax::AstNode`.
 
-use std::{
-    borrow::Cow,
-    collections::{BTreeSet, HashSet},
-};
+use std::collections::HashSet;
 
 use proc_macro2::{Punct, Spacing};
 use quote::{format_ident, quote};
 
 use crate::{
-    ast_src::{AstSrc, FieldSrc, KindsSrc, AST_SRC, KINDS_SRC},
+    ast_src::{AstSrc, Field, FieldSrc, KindsSrc, AST_SRC, KINDS_SRC},
     codegen::{self, update, Mode},
     project_root, Result,
 };
@@ -22,58 +19,31 @@ pub fn generate_syntax(mode: Mode) -> Result<()> {
     let syntax_kinds = generate_syntax_kinds(KINDS_SRC)?;
     update(syntax_kinds_file.as_path(), &syntax_kinds, mode)?;
 
+    let ast_tokens_file = project_root().join(codegen::AST_TOKENS);
+    let contents = generate_tokens(AST_SRC)?;
+    update(ast_tokens_file.as_path(), &contents, mode)?;
+
     let ast_nodes_file = project_root().join(codegen::AST_NODES);
     let contents = generate_nodes(KINDS_SRC, AST_SRC)?;
     update(ast_nodes_file.as_path(), &contents, mode)?;
 
-    let ast_tokens_file = project_root().join(codegen::AST_TOKENS);
-    let contents = generate_tokens(KINDS_SRC, AST_SRC)?;
-    update(ast_tokens_file.as_path(), &contents, mode)?;
-
     Ok(())
 }
 
-#[derive(Debug, Default, Clone)]
-struct ElementKinds {
-    kinds: BTreeSet<proc_macro2::Ident>,
-    has_nodes: bool,
-    has_tokens: bool,
-}
-
-fn generate_tokens(kinds: KindsSrc<'_>, grammar: AstSrc<'_>) -> Result<String> {
-    let all_token_kinds: Vec<_> = kinds
-        .punct
-        .into_iter()
-        .map(|(_, kind)| kind)
-        .copied()
-        .map(|x| x.into())
-        .chain(
-            kinds
-                .keywords
-                .into_iter()
-                .chain(kinds.contextual_keywords.into_iter())
-                .map(|name| Cow::Owned(format!("{}_KW", to_upper_snake_case(&name)))),
-        )
-        .chain(kinds.literals.into_iter().copied().map(|x| x.into()))
-        .chain(kinds.tokens.into_iter().copied().map(|x| x.into()))
-        .collect();
-
-    let tokens = all_token_kinds.iter().map(|kind_str| {
-        let kind_str = &**kind_str;
-        let kind = format_ident!("{}", kind_str);
-        let name = format_ident!("{}", to_pascal_case(kind_str));
+fn generate_tokens(grammar: AstSrc<'_>) -> Result<String> {
+    let tokens = grammar.tokens.iter().map(|token| {
+        let name = format_ident!("{}", token);
+        let kind = format_ident!("{}", to_upper_snake_case(token));
         quote! {
             #[derive(Debug, Clone, PartialEq, Eq, Hash)]
             pub struct #name {
                 pub(crate) syntax: SyntaxToken,
             }
-
             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 AstToken for #name {
                 fn can_cast(kind: SyntaxKind) -> bool { kind == #kind }
                 fn cast(syntax: SyntaxToken) -> Option<Self> {
@@ -84,99 +54,15 @@ fn generate_tokens(kinds: KindsSrc<'_>, grammar: AstSrc<'_>) -> Result<String> {
         }
     });
 
-    let enums = grammar.token_enums.iter().map(|en| {
-        let variants = en.variants.iter().map(|var| format_ident!("{}", var)).collect::<Vec<_>>();
-        let name = format_ident!("{}", en.name);
-        let kinds = variants
-            .iter()
-            .map(|name| format_ident!("{}", to_upper_snake_case(&name.to_string())))
-            .collect::<Vec<_>>();
-        assert!(en.traits.is_empty());
-
-        quote! {
-                #[derive(Debug, Clone, PartialEq, Eq, Hash)]
-                pub enum #name {
-                    #(#variants(#variants),)*
-                }
-
-                #(
-                impl From<#variants> for #name {
-                    fn from(node: #variants) -> #name {
-                        #name::#variants(node)
-                    }
-                }
-                )*
-
-                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 AstToken for #name {
-                    fn can_cast(kind: SyntaxKind) -> bool {
-                        match kind {
-                            #(#kinds)|* => true,
-                            _ => false,
-                        }
-                    }
-                    fn cast(syntax: SyntaxToken) -> Option<Self> {
-                        let res = match syntax.kind() {
-                            #(
-                            #kinds => #name::#variants(#variants { syntax }),
-                            )*
-                            _ => return None,
-                        };
-                        Some(res)
-                    }
-                    fn syntax(&self) -> &SyntaxToken {
-                        match self {
-                            #(
-                            #name::#variants(it) => &it.syntax,
-                            )*
-                        }
-                    }
-                }
-        }
-    });
-
-    crate::reformat(quote! {
-        use crate::{SyntaxToken, SyntaxKind::{self, *}, ast::AstToken};
-
+    let pretty = crate::reformat(quote! {
+        use crate::{SyntaxKind::{self, *}, SyntaxToken, ast::AstToken};
         #(#tokens)*
-        #(#enums)*
-    })
+    })?
+    .replace("#[derive", "\n#[derive");
+    Ok(pretty)
 }
 
 fn generate_nodes(kinds: KindsSrc<'_>, grammar: AstSrc<'_>) -> Result<String> {
-    let all_token_kinds: Vec<_> = kinds
-        .punct
-        .into_iter()
-        .map(|(_, kind)| kind)
-        .copied()
-        .map(|x| x.into())
-        .chain(
-            kinds
-                .keywords
-                .into_iter()
-                .chain(kinds.contextual_keywords.into_iter())
-                .map(|name| Cow::Owned(format!("{}_KW", to_upper_snake_case(&name)))),
-        )
-        .chain(kinds.literals.into_iter().copied().map(|x| x.into()))
-        .chain(kinds.tokens.into_iter().copied().map(|x| x.into()))
-        .collect();
-
-    let mut token_kinds = HashSet::new();
-    for kind in &all_token_kinds {
-        let kind = &**kind;
-        let name = to_pascal_case(kind);
-        token_kinds.insert(name);
-    }
-
-    for en in grammar.token_enums {
-        token_kinds.insert(en.name.to_string());
-    }
-
     let nodes = grammar.nodes.iter().map(|node| {
         let name = format_ident!("{}", node.name);
         let kind = format_ident!("{}", to_upper_snake_case(&name.to_string()));
@@ -185,39 +71,27 @@ fn generate_nodes(kinds: KindsSrc<'_>, grammar: AstSrc<'_>) -> Result<String> {
             quote!(impl ast::#trait_name for #name {})
         });
 
-        let methods = node.fields.iter().map(|(name, field)| {
-            let method_name = match field {
-                FieldSrc::Shorthand => format_ident!("{}", to_lower_snake_case(&name)),
-                _ => format_ident!("{}", name),
-            };
-            let ty = match field {
-                FieldSrc::Optional(ty) | FieldSrc::Many(ty) => ty,
-                FieldSrc::Shorthand => name,
-            };
+        let methods = node.fields.iter().map(|field| {
+            let method_name = field.method_name();
+            let ty = field.ty();
 
-            let ty = format_ident!("{}", ty);
-
-            match field {
-                FieldSrc::Many(_) => {
-                    quote! {
-                        pub fn #method_name(&self) -> AstChildren<#ty> {
-                            support::children(&self.syntax)
-                        }
+            if field.is_many() {
+                quote! {
+                    pub fn #method_name(&self) -> AstChildren<#ty> {
+                        support::children(&self.syntax)
                     }
                 }
-                FieldSrc::Optional(_) | FieldSrc::Shorthand => {
-                    let is_token = token_kinds.contains(&ty.to_string());
-                    if is_token {
-                        quote! {
-                            pub fn #method_name(&self) -> Option<#ty> {
-                                support::token(&self.syntax)
-                            }
+            } else {
+                if let Some(token_kind) = field.token_kind() {
+                    quote! {
+                        pub fn #method_name(&self) -> Option<#ty> {
+                            support::token(&self.syntax, #token_kind)
                         }
-                    } else {
-                        quote! {
-                            pub fn #method_name(&self) -> Option<#ty> {
-                                support::child(&self.syntax)
-                            }
+                    }
+                } else {
+                    quote! {
+                        pub fn #method_name(&self) -> Option<#ty> {
+                            support::child(&self.syntax)
                         }
                     }
                 }
@@ -331,18 +205,18 @@ fn generate_nodes(kinds: KindsSrc<'_>, grammar: AstSrc<'_>) -> Result<String> {
 
     let ast = quote! {
         use crate::{
-            SyntaxNode, SyntaxKind::{self, *},
+            SyntaxNode, SyntaxToken, SyntaxKind::{self, *},
             ast::{self, AstNode, AstChildren, support},
+            T,
         };
 
-        use super::tokens::*;
-
         #(#nodes)*
         #(#enums)*
         #(#displays)*
     };
 
-    let pretty = crate::reformat(ast)?;
+    let ast = ast.to_string().replace("T ! [ ", "T![").replace(" ] )", "])");
+    let pretty = crate::reformat(ast)?.replace("#[derive", "\n#[derive");
     Ok(pretty)
 }
 
@@ -450,8 +324,10 @@ fn generate_syntax_kinds(grammar: KindsSrc<'_>) -> Result<String> {
 
         #[macro_export]
         macro_rules! T {
-            #((#punctuation_values) => { $crate::SyntaxKind::#punctuation };)*
-            #((#all_keywords_idents) => { $crate::SyntaxKind::#all_keywords };)*
+            #([#punctuation_values] => { $crate::SyntaxKind::#punctuation };)*
+            #([#all_keywords_idents] => { $crate::SyntaxKind::#all_keywords };)*
+            [lifetime] => { $crate::SyntaxKind::LIFETIME };
+            [ident] => { $crate::SyntaxKind::IDENT };
         }
     };
 
@@ -501,3 +377,68 @@ fn to_pascal_case(s: &str) -> String {
     }
     buf
 }
+
+impl Field<'_> {
+    fn is_many(&self) -> bool {
+        match self {
+            Field::Node { src: FieldSrc::Many(_), .. } => true,
+            _ => false,
+        }
+    }
+    fn token_kind(&self) -> Option<proc_macro2::TokenStream> {
+        let res = match self {
+            Field::Token(token) => {
+                let token: proc_macro2::TokenStream = token.parse().unwrap();
+                quote! { T![#token] }
+            }
+            _ => return None,
+        };
+        Some(res)
+    }
+    fn method_name(&self) -> proc_macro2::Ident {
+        match self {
+            Field::Token(name) => {
+                let name = match *name {
+                    ";" => "semicolon",
+                    "->" => "thin_arrow",
+                    "'{'" => "l_curly",
+                    "'}'" => "r_curly",
+                    "'('" => "l_paren",
+                    "')'" => "r_paren",
+                    "'['" => "l_brack",
+                    "']'" => "r_brack",
+                    "<" => "l_angle",
+                    ">" => "r_angle",
+                    "=" => "eq",
+                    "!" => "excl",
+                    "*" => "star",
+                    "&" => "amp",
+                    "_" => "underscore",
+                    "." => "dot",
+                    ".." => "dotdot",
+                    "..." => "dotdotdot",
+                    "=>" => "fat_arrow",
+                    "@" => "at",
+                    ":" => "colon",
+                    "::" => "coloncolon",
+                    "#" => "pound",
+                    _ => name,
+                };
+                format_ident!("{}_token", name)
+            }
+            Field::Node { name, src } => match src {
+                FieldSrc::Shorthand => format_ident!("{}", to_lower_snake_case(name)),
+                _ => format_ident!("{}", name),
+            },
+        }
+    }
+    fn ty(&self) -> proc_macro2::Ident {
+        match self {
+            Field::Token(_) => format_ident!("SyntaxToken"),
+            Field::Node { name, src } => match src {
+                FieldSrc::Optional(ty) | FieldSrc::Many(ty) => format_ident!("{}", ty),
+                FieldSrc::Shorthand => format_ident!("{}", name),
+            },
+        }
+    }
+}
diff --git a/xtask/tests/tidy-tests/main.rs b/xtask/tests/tidy-tests/main.rs
index 80911a68e..e5247854a 100644
--- a/xtask/tests/tidy-tests/main.rs
+++ b/xtask/tests/tidy-tests/main.rs
@@ -20,7 +20,16 @@ fn rust_files_are_tidy() {
 }
 
 fn check_todo(path: &Path, text: &str) {
-    if path.ends_with("tests/cli.rs") {
+    let whitelist = &[
+        // This file itself is whitelisted since this test itself contains matches.
+        "tests/cli.rs",
+        // Some of our assists generate `todo!()` so those files are whitelisted.
+        "doc_tests/generated.rs",
+        "handlers/add_missing_impl_members.rs",
+        // To support generating `todo!()` in assists, we have `expr_todo()` in ast::make.
+        "ast/make.rs",
+    ];
+    if whitelist.iter().any(|p| path.ends_with(p)) {
         return;
     }
     if text.contains("TODO") || text.contains("TOOD") || text.contains("todo!") {
@@ -37,9 +46,9 @@ fn check_trailing_ws(path: &Path, text: &str) {
     if is_exclude_dir(path, &["test_data"]) {
         return;
     }
-    for line in text.lines() {
+    for (line_number, line) in text.lines().enumerate() {
         if line.chars().last().map(char::is_whitespace) == Some(true) {
-            panic!("Trailing whitespace in {}", path.display())
+            panic!("Trailing whitespace in {} at line {}", path.display(), line_number)
         }
     }
 }