376 files changed, 27 insertions, 145 deletions

diff --git a/Cargo.toml b/Cargo.toml
index 55dd9165c..8b7cd6a6b 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,21 +1,2 @@
-[package]
-name = "libsyntax2"
-version = "0.1.0"
-authors = ["Aleksey Kladov <[email protected]>"]
-license = "MIT OR Apache-2.0"
-
 [workspace]
-members = [ "tools", "cli", "libeditor", "libanalysis", "codeless/server" ]
-
-[dependencies]
-unicode-xid = "0.1.0"
-text_unit = "0.1.2"
-itertools = "0.7.5"
-drop_bomb = "0.1.4"
-parking_lot = "0.6.0"
-
-[dev-dependencies]
-testutils = { path = "./tests/testutils" }
-
-[profile.release]
-debug = true
+members = [ "crates/*" ]
diff --git a/code/native/Cargo.toml b/code/native/Cargo.toml
deleted file mode 100644
index 3a27051b2..000000000
--- a/code/native/Cargo.toml
+++ /dev/null
@@ -1,19 +0,0 @@
-[package]
-name = "backend"
-version = "0.1.0"
-authors = ["Aleksey Kladov <[email protected]>"]
-license = "MIT"
-build = "build.rs"
-exclude = ["artifacts.json", "index.node"]
-[workspace]
-
-[lib]
-name = "backend"
-crate-type = ["dylib"]
-
-[build-dependencies]
-neon-build = "0.2.0"
-
-[dependencies]
-neon = "0.2.0"
-libeditor = { path = "../../libeditor" }
diff --git a/code/native/build.rs b/code/native/build.rs
deleted file mode 100644
index 687a66194..000000000
--- a/code/native/build.rs
+++ /dev/null
@@ -1,7 +0,0 @@
-extern crate neon_build;
-
-fn main() {
-    neon_build::setup(); // must be called in build.rs
-
-    // add project-specific build logic here...
-}
diff --git a/code/native/src/lib.rs b/code/native/src/lib.rs
deleted file mode 100644
index cb304a141..000000000
--- a/code/native/src/lib.rs
+++ /dev/null
@@ -1,88 +0,0 @@
-#[macro_use]
-extern crate neon;
-extern crate libeditor;
-
-use neon::prelude::*;
-use libeditor::TextRange;
-
-pub struct Wrapper {
-    inner: libeditor::File,
-}
-
-declare_types! {
-    /// A class for generating greeting strings.
-    pub class RustFile for Wrapper {
-        init(mut cx) {
-            let text = cx.argument::<JsString>(0)?.value();
-            Ok(Wrapper {
-                inner: libeditor::File::new(&text)
-            })
-        }
-
-        method syntaxTree(mut cx) {
-            let tree = {
-            let this = cx.this();
-                let guard = cx.lock();
-                let wrapper = this.borrow(&guard);
-                wrapper.inner.syntax_tree()
-            };
-            Ok(cx.string(tree.as_str()).upcast())
-        }
-
-        method highlight(mut cx) {
-            let highlights = {
-                let this = cx.this();
-                let guard = cx.lock();
-                let wrapper = this.borrow(&guard);
-                wrapper.inner.highlight()
-            };
-            let res = cx.empty_array();
-            for (i, hl) in highlights.into_iter().enumerate() {
-                let start: u32 = hl.range.start().into();
-                let end: u32 = hl.range.end().into();
-                let start = cx.number(start);
-                let end = cx.number(end);
-                let tag = cx.string(hl.tag);
-                let hl = cx.empty_array();
-                hl.set(&mut cx, 0, start)?;
-                hl.set(&mut cx, 1, end)?;
-                hl.set(&mut cx, 2, tag)?;
-                res.set(&mut cx, i as u32, hl)?;
-            }
-
-            Ok(res.upcast())
-        }
-
-        method extendSelection(mut cx) {
-            let from_offset = cx.argument::<JsNumber>(0)?.value() as u32;
-            let to_offset = cx.argument::<JsNumber>(1)?.value() as u32;
-            let text_range = TextRange::from_to(from_offset.into(), to_offset.into());
-            let extended_range = {
-                let this = cx.this();
-                let guard = cx.lock();
-                let wrapper = this.borrow(&guard);
-                wrapper.inner.extend_selection(text_range)
-            };
-
-            match extended_range {
-                None => Ok(cx.null().upcast()),
-                Some(range) => {
-                    let start: u32 = range.start().into();
-                    let end: u32 = range.end().into();
-                    let start = cx.number(start);
-                    let end = cx.number(end);
-                    let arr = cx.empty_array();
-                    arr.set(&mut cx, 0, start)?;
-                    arr.set(&mut cx, 1, end)?;
-                    Ok(arr.upcast())
-                }
-            }
-
-        }
-    }
-
-}
-
-register_module!(mut cx, {
-    cx.export_class::<RustFile>("RustFile")
-});
diff --git a/cli/Cargo.toml b/crates/cli/Cargo.toml
index ac89a48d3..ac89a48d3 100644
--- a/cli/Cargo.toml
+++ b/crates/cli/Cargo.toml
diff --git a/cli/src/main.rs b/crates/cli/src/main.rs
index 45e0a1e4f..45e0a1e4f 100644
--- a/cli/src/main.rs
+++ b/crates/cli/src/main.rs
diff --git a/libanalysis/Cargo.toml b/crates/libanalysis/Cargo.toml
index 2beea5640..c773f4211 100644
--- a/libanalysis/Cargo.toml
+++ b/crates/libanalysis/Cargo.toml
@@ -8,5 +8,5 @@ log = "0.4.2"
 failure = "0.1.2"
 parking_lot = "0.6.3"
 once_cell = "0.1.4"
-libsyntax2 = { path = "../" }
+libsyntax2 = { path = "../libsyntax2" }
 libeditor = { path = "../libeditor" }
diff --git a/libanalysis/src/lib.rs b/crates/libanalysis/src/lib.rs
index 6a946a0b0..6a946a0b0 100644
--- a/libanalysis/src/lib.rs
+++ b/crates/libanalysis/src/lib.rs
diff --git a/libeditor/Cargo.toml b/crates/libeditor/Cargo.toml
index fedcf790a..d6423979b 100644
--- a/libeditor/Cargo.toml
+++ b/crates/libeditor/Cargo.toml
@@ -7,4 +7,4 @@ publish = false
 [dependencies]
 itertools = "0.7.8"
 superslice = "0.1.0"
-libsyntax2 = { path = "../" }
+libsyntax2 = { path = "../libsyntax2" }
diff --git a/libeditor/src/extend_selection.rs b/crates/libeditor/src/extend_selection.rs
index 16d4bc084..16d4bc084 100644
--- a/libeditor/src/extend_selection.rs
+++ b/crates/libeditor/src/extend_selection.rs
diff --git a/libeditor/src/lib.rs b/crates/libeditor/src/lib.rs
index f77647338..f77647338 100644
--- a/libeditor/src/lib.rs
+++ b/crates/libeditor/src/lib.rs
diff --git a/libeditor/src/line_index.rs b/crates/libeditor/src/line_index.rs
index 801726aa5..801726aa5 100644
--- a/libeditor/src/line_index.rs
+++ b/crates/libeditor/src/line_index.rs
diff --git a/libeditor/tests/test.rs b/crates/libeditor/tests/test.rs
index 2a84c5080..2a84c5080 100644
--- a/libeditor/tests/test.rs
+++ b/crates/libeditor/tests/test.rs
diff --git a/crates/libsyntax2/Cargo.toml b/crates/libsyntax2/Cargo.toml
new file mode 100644
index 000000000..f67735540
--- /dev/null
+++ b/crates/libsyntax2/Cargo.toml
@@ -0,0 +1,15 @@
+[package]
+name = "libsyntax2"
+version = "0.1.0"
+authors = ["Aleksey Kladov <[email protected]>"]
+license = "MIT OR Apache-2.0"
+
+[dependencies]
+unicode-xid = "0.1.0"
+text_unit = "0.1.2"
+itertools = "0.7.5"
+drop_bomb = "0.1.4"
+parking_lot = "0.6.0"
+
+[dev-dependencies]
+testutils = { path = "./tests/testutils" }
diff --git a/src/algo/mod.rs b/crates/libsyntax2/src/algo/mod.rs
index d2de70fd4..d2de70fd4 100644
--- a/src/algo/mod.rs
+++ b/crates/libsyntax2/src/algo/mod.rs
diff --git a/src/algo/search.rs b/crates/libsyntax2/src/algo/search.rs
index 46404f537..46404f537 100644
--- a/src/algo/search.rs
+++ b/crates/libsyntax2/src/algo/search.rs
diff --git a/src/algo/walk.rs b/crates/libsyntax2/src/algo/walk.rs
index a50ec2a09..a50ec2a09 100644
--- a/src/algo/walk.rs
+++ b/crates/libsyntax2/src/algo/walk.rs
diff --git a/src/ast/generated.rs b/crates/libsyntax2/src/ast/generated.rs
index 2f813050a..2f813050a 100644
--- a/src/ast/generated.rs
+++ b/crates/libsyntax2/src/ast/generated.rs
diff --git a/src/ast/generated.rs.tera b/crates/libsyntax2/src/ast/generated.rs.tera
index 242837801..242837801 100644
--- a/src/ast/generated.rs.tera
+++ b/crates/libsyntax2/src/ast/generated.rs.tera
diff --git a/src/ast/mod.rs b/crates/libsyntax2/src/ast/mod.rs
index eeb7ae6f6..eeb7ae6f6 100644
--- a/src/ast/mod.rs
+++ b/crates/libsyntax2/src/ast/mod.rs
diff --git a/src/grammar.ron b/crates/libsyntax2/src/grammar.ron
index bcc79843a..bcc79843a 100644
--- a/src/grammar.ron
+++ b/crates/libsyntax2/src/grammar.ron
diff --git a/src/grammar/attributes.rs b/crates/libsyntax2/src/grammar/attributes.rs
index c411d4d7f..c411d4d7f 100644
--- a/src/grammar/attributes.rs
+++ b/crates/libsyntax2/src/grammar/attributes.rs
diff --git a/src/grammar/expressions/atom.rs b/crates/libsyntax2/src/grammar/expressions/atom.rs
index af9f47c5e..af9f47c5e 100644
--- a/src/grammar/expressions/atom.rs
+++ b/crates/libsyntax2/src/grammar/expressions/atom.rs
diff --git a/src/grammar/expressions/mod.rs b/crates/libsyntax2/src/grammar/expressions/mod.rs
index dcbb1e2a8..dcbb1e2a8 100644
--- a/src/grammar/expressions/mod.rs
+++ b/crates/libsyntax2/src/grammar/expressions/mod.rs
diff --git a/src/grammar/items/consts.rs b/crates/libsyntax2/src/grammar/items/consts.rs
index b11949b49..b11949b49 100644
--- a/src/grammar/items/consts.rs
+++ b/crates/libsyntax2/src/grammar/items/consts.rs
diff --git a/src/grammar/items/mod.rs b/crates/libsyntax2/src/grammar/items/mod.rs
index 3bf906f85..3bf906f85 100644
--- a/src/grammar/items/mod.rs
+++ b/crates/libsyntax2/src/grammar/items/mod.rs
diff --git a/src/grammar/items/structs.rs b/crates/libsyntax2/src/grammar/items/structs.rs
index 67616eaad..67616eaad 100644
--- a/src/grammar/items/structs.rs
+++ b/crates/libsyntax2/src/grammar/items/structs.rs
diff --git a/src/grammar/items/traits.rs b/crates/libsyntax2/src/grammar/items/traits.rs
index 0b9fb2b0b..0b9fb2b0b 100644
--- a/src/grammar/items/traits.rs
+++ b/crates/libsyntax2/src/grammar/items/traits.rs
diff --git a/src/grammar/items/use_item.rs b/crates/libsyntax2/src/grammar/items/use_item.rs
index a3f7f0da8..a3f7f0da8 100644
--- a/src/grammar/items/use_item.rs
+++ b/crates/libsyntax2/src/grammar/items/use_item.rs
diff --git a/src/grammar/mod.rs b/crates/libsyntax2/src/grammar/mod.rs
index e1329044d..e1329044d 100644
--- a/src/grammar/mod.rs
+++ b/crates/libsyntax2/src/grammar/mod.rs
diff --git a/src/grammar/params.rs b/crates/libsyntax2/src/grammar/params.rs
index 32e905cb2..32e905cb2 100644
--- a/src/grammar/params.rs
+++ b/crates/libsyntax2/src/grammar/params.rs
diff --git a/src/grammar/paths.rs b/crates/libsyntax2/src/grammar/paths.rs
index c277e2a6b..c277e2a6b 100644
--- a/src/grammar/paths.rs
+++ b/crates/libsyntax2/src/grammar/paths.rs
diff --git a/src/grammar/patterns.rs b/crates/libsyntax2/src/grammar/patterns.rs
index 436f3b26d..436f3b26d 100644
--- a/src/grammar/patterns.rs
+++ b/crates/libsyntax2/src/grammar/patterns.rs
diff --git a/src/grammar/type_args.rs b/crates/libsyntax2/src/grammar/type_args.rs
index 5b960f10b..5b960f10b 100644
--- a/src/grammar/type_args.rs
+++ b/crates/libsyntax2/src/grammar/type_args.rs
diff --git a/src/grammar/type_params.rs b/crates/libsyntax2/src/grammar/type_params.rs
index 0a3e8fd07..0a3e8fd07 100644
--- a/src/grammar/type_params.rs
+++ b/crates/libsyntax2/src/grammar/type_params.rs
diff --git a/src/grammar/types.rs b/crates/libsyntax2/src/grammar/types.rs
index 0d8c6bfba..0d8c6bfba 100644
--- a/src/grammar/types.rs
+++ b/crates/libsyntax2/src/grammar/types.rs
diff --git a/src/lexer/classes.rs b/crates/libsyntax2/src/lexer/classes.rs
index 4235d2648..4235d2648 100644
--- a/src/lexer/classes.rs
+++ b/crates/libsyntax2/src/lexer/classes.rs
diff --git a/src/lexer/comments.rs b/crates/libsyntax2/src/lexer/comments.rs
index 01acb6515..01acb6515 100644
--- a/src/lexer/comments.rs
+++ b/crates/libsyntax2/src/lexer/comments.rs
diff --git a/src/lexer/mod.rs b/crates/libsyntax2/src/lexer/mod.rs
index f8fdc41ac..f8fdc41ac 100644
--- a/src/lexer/mod.rs
+++ b/crates/libsyntax2/src/lexer/mod.rs
diff --git a/src/lexer/numbers.rs b/crates/libsyntax2/src/lexer/numbers.rs
index 5c4641a2d..5c4641a2d 100644
--- a/src/lexer/numbers.rs
+++ b/crates/libsyntax2/src/lexer/numbers.rs
diff --git a/src/lexer/ptr.rs b/crates/libsyntax2/src/lexer/ptr.rs
index d1391fd5f..d1391fd5f 100644
--- a/src/lexer/ptr.rs
+++ b/crates/libsyntax2/src/lexer/ptr.rs
diff --git a/src/lexer/strings.rs b/crates/libsyntax2/src/lexer/strings.rs
index e3704fbb3..e3704fbb3 100644
--- a/src/lexer/strings.rs
+++ b/crates/libsyntax2/src/lexer/strings.rs
diff --git a/src/lib.rs b/crates/libsyntax2/src/lib.rs
index ca33618a0..ca33618a0 100644
--- a/src/lib.rs
+++ b/crates/libsyntax2/src/lib.rs
diff --git a/src/parser_api.rs b/crates/libsyntax2/src/parser_api.rs
index c78c6e43a..c78c6e43a 100644
--- a/src/parser_api.rs
+++ b/crates/libsyntax2/src/parser_api.rs
diff --git a/src/parser_impl/event.rs b/crates/libsyntax2/src/parser_impl/event.rs
index 9fd56b996..9fd56b996 100644
--- a/src/parser_impl/event.rs
+++ b/crates/libsyntax2/src/parser_impl/event.rs
diff --git a/src/parser_impl/input.rs b/crates/libsyntax2/src/parser_impl/input.rs
index c0fe4d488..c0fe4d488 100644
--- a/src/parser_impl/input.rs
+++ b/crates/libsyntax2/src/parser_impl/input.rs
diff --git a/src/parser_impl/mod.rs b/crates/libsyntax2/src/parser_impl/mod.rs
index 06c16cdb4..06c16cdb4 100644
--- a/src/parser_impl/mod.rs
+++ b/crates/libsyntax2/src/parser_impl/mod.rs
diff --git a/src/smol_str.rs b/crates/libsyntax2/src/smol_str.rs
index abf69dce7..abf69dce7 100644
--- a/src/smol_str.rs
+++ b/crates/libsyntax2/src/smol_str.rs
diff --git a/src/syntax_kinds/generated.rs b/crates/libsyntax2/src/syntax_kinds/generated.rs
index de2807ba6..de2807ba6 100644
--- a/src/syntax_kinds/generated.rs
+++ b/crates/libsyntax2/src/syntax_kinds/generated.rs
diff --git a/src/syntax_kinds/generated.rs.tera b/crates/libsyntax2/src/syntax_kinds/generated.rs.tera
index 90618721a..90618721a 100644
--- a/src/syntax_kinds/generated.rs.tera
+++ b/crates/libsyntax2/src/syntax_kinds/generated.rs.tera
diff --git a/src/syntax_kinds/mod.rs b/crates/libsyntax2/src/syntax_kinds/mod.rs
index ed4fa5d4d..ed4fa5d4d 100644
--- a/src/syntax_kinds/mod.rs
+++ b/crates/libsyntax2/src/syntax_kinds/mod.rs
diff --git a/src/utils.rs b/crates/libsyntax2/src/utils.rs
index 1fbb872a5..1fbb872a5 100644
--- a/src/utils.rs
+++ b/crates/libsyntax2/src/utils.rs
diff --git a/src/yellow/builder.rs b/crates/libsyntax2/src/yellow/builder.rs
index 5e94e5055..5e94e5055 100644
--- a/src/yellow/builder.rs
+++ b/crates/libsyntax2/src/yellow/builder.rs
diff --git a/src/yellow/green.rs b/crates/libsyntax2/src/yellow/green.rs
index f505b26d7..f505b26d7 100644
--- a/src/yellow/green.rs
+++ b/crates/libsyntax2/src/yellow/green.rs
diff --git a/src/yellow/mod.rs b/crates/libsyntax2/src/yellow/mod.rs
index ff3bb221b..ff3bb221b 100644
--- a/src/yellow/mod.rs
+++ b/crates/libsyntax2/src/yellow/mod.rs
diff --git a/src/yellow/red.rs b/crates/libsyntax2/src/yellow/red.rs
index 13ad44c65..13ad44c65 100644
--- a/src/yellow/red.rs
+++ b/crates/libsyntax2/src/yellow/red.rs
diff --git a/src/yellow/syntax.rs b/crates/libsyntax2/src/yellow/syntax.rs
index 6e33310f1..6e33310f1 100644
--- a/src/yellow/syntax.rs
+++ b/crates/libsyntax2/src/yellow/syntax.rs
diff --git a/tests/data/lexer/00012_block_comment.rs b/crates/libsyntax2/tests/data/lexer/00012_block_comment.rs
index 708aac197..708aac197 100644
--- a/tests/data/lexer/00012_block_comment.rs
+++ b/crates/libsyntax2/tests/data/lexer/00012_block_comment.rs
diff --git a/tests/data/lexer/00012_block_comment.txt b/crates/libsyntax2/tests/data/lexer/00012_block_comment.txt
index 9958b2518..9958b2518 100644
--- a/tests/data/lexer/00012_block_comment.txt
+++ b/crates/libsyntax2/tests/data/lexer/00012_block_comment.txt
diff --git a/tests/data/lexer/0001_hello.rs b/crates/libsyntax2/tests/data/lexer/0001_hello.rs
index 95d09f2b1..95d09f2b1 100644
--- a/tests/data/lexer/0001_hello.rs
+++ b/crates/libsyntax2/tests/data/lexer/0001_hello.rs
diff --git a/tests/data/lexer/0001_hello.txt b/crates/libsyntax2/tests/data/lexer/0001_hello.txt
index 27a5940a9..27a5940a9 100644
--- a/tests/data/lexer/0001_hello.txt
+++ b/crates/libsyntax2/tests/data/lexer/0001_hello.txt
diff --git a/tests/data/lexer/0002_whitespace.rs b/crates/libsyntax2/tests/data/lexer/0002_whitespace.rs
index 08fce1418..08fce1418 100644
--- a/tests/data/lexer/0002_whitespace.rs
+++ b/crates/libsyntax2/tests/data/lexer/0002_whitespace.rs
diff --git a/tests/data/lexer/0002_whitespace.txt b/crates/libsyntax2/tests/data/lexer/0002_whitespace.txt
index 01d260918..01d260918 100644
--- a/tests/data/lexer/0002_whitespace.txt
+++ b/crates/libsyntax2/tests/data/lexer/0002_whitespace.txt
diff --git a/tests/data/lexer/0003_ident.rs b/crates/libsyntax2/tests/data/lexer/0003_ident.rs
index c05c9c009..c05c9c009 100644
--- a/tests/data/lexer/0003_ident.rs
+++ b/crates/libsyntax2/tests/data/lexer/0003_ident.rs
diff --git a/tests/data/lexer/0003_ident.txt b/crates/libsyntax2/tests/data/lexer/0003_ident.txt
index 4a0d5c053..4a0d5c053 100644
--- a/tests/data/lexer/0003_ident.txt
+++ b/crates/libsyntax2/tests/data/lexer/0003_ident.txt
diff --git a/tests/data/lexer/0004_numbers.rs b/crates/libsyntax2/tests/data/lexer/0004_numbers.rs
index dc974b553..dc974b553 100644
--- a/tests/data/lexer/0004_numbers.rs
+++ b/crates/libsyntax2/tests/data/lexer/0004_numbers.rs
diff --git a/tests/data/lexer/0004_numbers.txt b/crates/libsyntax2/tests/data/lexer/0004_numbers.txt
index 4b5fd9f71..4b5fd9f71 100644
--- a/tests/data/lexer/0004_numbers.txt
+++ b/crates/libsyntax2/tests/data/lexer/0004_numbers.txt
diff --git a/tests/data/lexer/0005_symbols.rs b/crates/libsyntax2/tests/data/lexer/0005_symbols.rs
index 487569b5a..487569b5a 100644
--- a/tests/data/lexer/0005_symbols.rs
+++ b/crates/libsyntax2/tests/data/lexer/0005_symbols.rs
diff --git a/tests/data/lexer/0005_symbols.txt b/crates/libsyntax2/tests/data/lexer/0005_symbols.txt
index a6bc83a6f..a6bc83a6f 100644
--- a/tests/data/lexer/0005_symbols.txt
+++ b/crates/libsyntax2/tests/data/lexer/0005_symbols.txt
diff --git a/tests/data/lexer/0006_chars.rs b/crates/libsyntax2/tests/data/lexer/0006_chars.rs
index 03598d908..03598d908 100644
--- a/tests/data/lexer/0006_chars.rs
+++ b/crates/libsyntax2/tests/data/lexer/0006_chars.rs
diff --git a/tests/data/lexer/0006_chars.txt b/crates/libsyntax2/tests/data/lexer/0006_chars.txt
index ecaf22355..ecaf22355 100644
--- a/tests/data/lexer/0006_chars.txt
+++ b/crates/libsyntax2/tests/data/lexer/0006_chars.txt
diff --git a/tests/data/lexer/0007_lifetimes.rs b/crates/libsyntax2/tests/data/lexer/0007_lifetimes.rs
index b764f1dce..b764f1dce 100644
--- a/tests/data/lexer/0007_lifetimes.rs
+++ b/crates/libsyntax2/tests/data/lexer/0007_lifetimes.rs
diff --git a/tests/data/lexer/0007_lifetimes.txt b/crates/libsyntax2/tests/data/lexer/0007_lifetimes.txt
index 005c29100..005c29100 100644
--- a/tests/data/lexer/0007_lifetimes.txt
+++ b/crates/libsyntax2/tests/data/lexer/0007_lifetimes.txt
diff --git a/tests/data/lexer/0008_byte_strings.rs b/crates/libsyntax2/tests/data/lexer/0008_byte_strings.rs
index 9dd1570de..9dd1570de 100644
--- a/tests/data/lexer/0008_byte_strings.rs
+++ b/crates/libsyntax2/tests/data/lexer/0008_byte_strings.rs
diff --git a/tests/data/lexer/0008_byte_strings.txt b/crates/libsyntax2/tests/data/lexer/0008_byte_strings.txt
index ed8cd4bab..ed8cd4bab 100644
--- a/tests/data/lexer/0008_byte_strings.txt
+++ b/crates/libsyntax2/tests/data/lexer/0008_byte_strings.txt
diff --git a/tests/data/lexer/0009_strings.rs b/crates/libsyntax2/tests/data/lexer/0009_strings.rs
index 7b7faa5d8..7b7faa5d8 100644
--- a/tests/data/lexer/0009_strings.rs
+++ b/crates/libsyntax2/tests/data/lexer/0009_strings.rs
diff --git a/tests/data/lexer/0009_strings.txt b/crates/libsyntax2/tests/data/lexer/0009_strings.txt
index 7fb6b7b36..7fb6b7b36 100644
--- a/tests/data/lexer/0009_strings.txt
+++ b/crates/libsyntax2/tests/data/lexer/0009_strings.txt
diff --git a/tests/data/lexer/0010_comments.rs b/crates/libsyntax2/tests/data/lexer/0010_comments.rs
index 71bdd1f9c..71bdd1f9c 100644
--- a/tests/data/lexer/0010_comments.rs
+++ b/crates/libsyntax2/tests/data/lexer/0010_comments.rs
diff --git a/tests/data/lexer/0010_comments.txt b/crates/libsyntax2/tests/data/lexer/0010_comments.txt
index 3c997de3f..3c997de3f 100644
--- a/tests/data/lexer/0010_comments.txt
+++ b/crates/libsyntax2/tests/data/lexer/0010_comments.txt
diff --git a/tests/data/lexer/0011_keywords.rs b/crates/libsyntax2/tests/data/lexer/0011_keywords.rs
index e6bf64d4d..e6bf64d4d 100644
--- a/tests/data/lexer/0011_keywords.rs
+++ b/crates/libsyntax2/tests/data/lexer/0011_keywords.rs
diff --git a/tests/data/lexer/0011_keywords.txt b/crates/libsyntax2/tests/data/lexer/0011_keywords.txt
index d6a1abe8a..d6a1abe8a 100644
--- a/tests/data/lexer/0011_keywords.txt
+++ b/crates/libsyntax2/tests/data/lexer/0011_keywords.txt
diff --git a/tests/data/parser/err/0000_struct_field_missing_comma.rs b/crates/libsyntax2/tests/data/parser/err/0000_struct_field_missing_comma.rs
index fe5030d89..fe5030d89 100644
--- a/tests/data/parser/err/0000_struct_field_missing_comma.rs
+++ b/crates/libsyntax2/tests/data/parser/err/0000_struct_field_missing_comma.rs
diff --git a/tests/data/parser/err/0000_struct_field_missing_comma.txt b/crates/libsyntax2/tests/data/parser/err/0000_struct_field_missing_comma.txt
index 1b5d722f8..1b5d722f8 100644
--- a/tests/data/parser/err/0000_struct_field_missing_comma.txt
+++ b/crates/libsyntax2/tests/data/parser/err/0000_struct_field_missing_comma.txt
diff --git a/tests/data/parser/err/0001_item_recovery_in_file.rs b/crates/libsyntax2/tests/data/parser/err/0001_item_recovery_in_file.rs
index 98f23de1f..98f23de1f 100644
--- a/tests/data/parser/err/0001_item_recovery_in_file.rs
+++ b/crates/libsyntax2/tests/data/parser/err/0001_item_recovery_in_file.rs
diff --git a/tests/data/parser/err/0001_item_recovery_in_file.txt b/crates/libsyntax2/tests/data/parser/err/0001_item_recovery_in_file.txt
index 1aaf07625..1aaf07625 100644
--- a/tests/data/parser/err/0001_item_recovery_in_file.txt
+++ b/crates/libsyntax2/tests/data/parser/err/0001_item_recovery_in_file.txt
diff --git a/tests/data/parser/err/0002_duplicate_shebang.rs b/crates/libsyntax2/tests/data/parser/err/0002_duplicate_shebang.rs
index 48a3a3980..48a3a3980 100644
--- a/tests/data/parser/err/0002_duplicate_shebang.rs
+++ b/crates/libsyntax2/tests/data/parser/err/0002_duplicate_shebang.rs
diff --git a/tests/data/parser/err/0002_duplicate_shebang.txt b/crates/libsyntax2/tests/data/parser/err/0002_duplicate_shebang.txt
index 0b6aa26eb..0b6aa26eb 100644
--- a/tests/data/parser/err/0002_duplicate_shebang.txt
+++ b/crates/libsyntax2/tests/data/parser/err/0002_duplicate_shebang.txt
diff --git a/tests/data/parser/err/0003_C++_semicolon.rs b/crates/libsyntax2/tests/data/parser/err/0003_C++_semicolon.rs
index 009312270..009312270 100644
--- a/tests/data/parser/err/0003_C++_semicolon.rs
+++ b/crates/libsyntax2/tests/data/parser/err/0003_C++_semicolon.rs
diff --git a/tests/data/parser/err/0003_C++_semicolon.txt b/crates/libsyntax2/tests/data/parser/err/0003_C++_semicolon.txt
index 81777fec0..81777fec0 100644
--- a/tests/data/parser/err/0003_C++_semicolon.txt
+++ b/crates/libsyntax2/tests/data/parser/err/0003_C++_semicolon.txt
diff --git a/tests/data/parser/err/0004_use_path_bad_segment.rs b/crates/libsyntax2/tests/data/parser/err/0004_use_path_bad_segment.rs
index 060e65d06..060e65d06 100644
--- a/tests/data/parser/err/0004_use_path_bad_segment.rs
+++ b/crates/libsyntax2/tests/data/parser/err/0004_use_path_bad_segment.rs
diff --git a/tests/data/parser/err/0004_use_path_bad_segment.txt b/crates/libsyntax2/tests/data/parser/err/0004_use_path_bad_segment.txt
index c6ae68103..c6ae68103 100644
--- a/tests/data/parser/err/0004_use_path_bad_segment.txt
+++ b/crates/libsyntax2/tests/data/parser/err/0004_use_path_bad_segment.txt
diff --git a/tests/data/parser/err/0005_attribute_recover.rs b/crates/libsyntax2/tests/data/parser/err/0005_attribute_recover.rs
index de7f81628..de7f81628 100644
--- a/tests/data/parser/err/0005_attribute_recover.rs
+++ b/crates/libsyntax2/tests/data/parser/err/0005_attribute_recover.rs
diff --git a/tests/data/parser/err/0005_attribute_recover.txt b/crates/libsyntax2/tests/data/parser/err/0005_attribute_recover.txt
index 079b0d1f6..079b0d1f6 100644
--- a/tests/data/parser/err/0005_attribute_recover.txt
+++ b/crates/libsyntax2/tests/data/parser/err/0005_attribute_recover.txt
diff --git a/tests/data/parser/err/0006_named_field_recovery.rs b/crates/libsyntax2/tests/data/parser/err/0006_named_field_recovery.rs
index 8069c111b..8069c111b 100644
--- a/tests/data/parser/err/0006_named_field_recovery.rs
+++ b/crates/libsyntax2/tests/data/parser/err/0006_named_field_recovery.rs
diff --git a/tests/data/parser/err/0006_named_field_recovery.txt b/crates/libsyntax2/tests/data/parser/err/0006_named_field_recovery.txt
index 009b307b1..009b307b1 100644
--- a/tests/data/parser/err/0006_named_field_recovery.txt
+++ b/crates/libsyntax2/tests/data/parser/err/0006_named_field_recovery.txt
diff --git a/tests/data/parser/err/0007_stray_curly_in_file.rs b/crates/libsyntax2/tests/data/parser/err/0007_stray_curly_in_file.rs
index dc869fb78..dc869fb78 100644
--- a/tests/data/parser/err/0007_stray_curly_in_file.rs
+++ b/crates/libsyntax2/tests/data/parser/err/0007_stray_curly_in_file.rs
diff --git a/tests/data/parser/err/0007_stray_curly_in_file.txt b/crates/libsyntax2/tests/data/parser/err/0007_stray_curly_in_file.txt
index b36decb46..b36decb46 100644
--- a/tests/data/parser/err/0007_stray_curly_in_file.txt
+++ b/crates/libsyntax2/tests/data/parser/err/0007_stray_curly_in_file.txt
diff --git a/tests/data/parser/err/0008_item_block_recovery.rs b/crates/libsyntax2/tests/data/parser/err/0008_item_block_recovery.rs
index 9fcac19b5..9fcac19b5 100644
--- a/tests/data/parser/err/0008_item_block_recovery.rs
+++ b/crates/libsyntax2/tests/data/parser/err/0008_item_block_recovery.rs
diff --git a/tests/data/parser/err/0008_item_block_recovery.txt b/crates/libsyntax2/tests/data/parser/err/0008_item_block_recovery.txt
index f2a503cec..f2a503cec 100644
--- a/tests/data/parser/err/0008_item_block_recovery.txt
+++ b/crates/libsyntax2/tests/data/parser/err/0008_item_block_recovery.txt
diff --git a/tests/data/parser/err/0009_broken_struct_type_parameter.rs b/crates/libsyntax2/tests/data/parser/err/0009_broken_struct_type_parameter.rs
index 0dd30d0bd..0dd30d0bd 100644
--- a/tests/data/parser/err/0009_broken_struct_type_parameter.rs
+++ b/crates/libsyntax2/tests/data/parser/err/0009_broken_struct_type_parameter.rs
diff --git a/tests/data/parser/err/0009_broken_struct_type_parameter.txt b/crates/libsyntax2/tests/data/parser/err/0009_broken_struct_type_parameter.txt
index fc736f0e9..fc736f0e9 100644
--- a/tests/data/parser/err/0009_broken_struct_type_parameter.txt
+++ b/crates/libsyntax2/tests/data/parser/err/0009_broken_struct_type_parameter.txt
diff --git a/tests/data/parser/err/0010_unsafe_lambda_block.rs b/crates/libsyntax2/tests/data/parser/err/0010_unsafe_lambda_block.rs
index 985775282..985775282 100644
--- a/tests/data/parser/err/0010_unsafe_lambda_block.rs
+++ b/crates/libsyntax2/tests/data/parser/err/0010_unsafe_lambda_block.rs
diff --git a/tests/data/parser/err/0010_unsafe_lambda_block.txt b/crates/libsyntax2/tests/data/parser/err/0010_unsafe_lambda_block.txt
index 95d4af424..95d4af424 100644
--- a/tests/data/parser/err/0010_unsafe_lambda_block.txt
+++ b/crates/libsyntax2/tests/data/parser/err/0010_unsafe_lambda_block.txt
diff --git a/tests/data/parser/err/0011_extern_struct.rs b/crates/libsyntax2/tests/data/parser/err/0011_extern_struct.rs
index c1bd0a2d1..c1bd0a2d1 100644
--- a/tests/data/parser/err/0011_extern_struct.rs
+++ b/crates/libsyntax2/tests/data/parser/err/0011_extern_struct.rs
diff --git a/tests/data/parser/err/0011_extern_struct.txt b/crates/libsyntax2/tests/data/parser/err/0011_extern_struct.txt
index 3c5b678a1..3c5b678a1 100644
--- a/tests/data/parser/err/0011_extern_struct.txt
+++ b/crates/libsyntax2/tests/data/parser/err/0011_extern_struct.txt
diff --git a/tests/data/parser/err/0012_broken_lambda.rs b/crates/libsyntax2/tests/data/parser/err/0012_broken_lambda.rs
index ad0d8eb4c..ad0d8eb4c 100644
--- a/tests/data/parser/err/0012_broken_lambda.rs
+++ b/crates/libsyntax2/tests/data/parser/err/0012_broken_lambda.rs
diff --git a/tests/data/parser/err/0012_broken_lambda.txt b/crates/libsyntax2/tests/data/parser/err/0012_broken_lambda.txt
index cf6e68a78..cf6e68a78 100644
--- a/tests/data/parser/err/0012_broken_lambda.txt
+++ b/crates/libsyntax2/tests/data/parser/err/0012_broken_lambda.txt
diff --git a/tests/data/parser/inline/0001_const_unsafe_fn.rs b/crates/libsyntax2/tests/data/parser/inline/0001_const_unsafe_fn.rs
index 31a1e435f..31a1e435f 100644
--- a/tests/data/parser/inline/0001_const_unsafe_fn.rs
+++ b/crates/libsyntax2/tests/data/parser/inline/0001_const_unsafe_fn.rs
diff --git a/tests/data/parser/inline/0001_const_unsafe_fn.txt b/crates/libsyntax2/tests/data/parser/inline/0001_const_unsafe_fn.txt
index 3932d033c..3932d033c 100644
--- a/tests/data/parser/inline/0001_const_unsafe_fn.txt
+++ b/crates/libsyntax2/tests/data/parser/inline/0001_const_unsafe_fn.txt
diff --git a/tests/data/parser/inline/0002_const_fn.rs b/crates/libsyntax2/tests/data/parser/inline/0002_const_fn.rs
index 8c84d9cd7..8c84d9cd7 100644
--- a/tests/data/parser/inline/0002_const_fn.rs
+++ b/crates/libsyntax2/tests/data/parser/inline/0002_const_fn.rs
diff --git a/tests/data/parser/inline/0002_const_fn.txt b/crates/libsyntax2/tests/data/parser/inline/0002_const_fn.txt
index bc72ab235..bc72ab235 100644
--- a/tests/data/parser/inline/0002_const_fn.txt
+++ b/crates/libsyntax2/tests/data/parser/inline/0002_const_fn.txt
diff --git a/tests/data/parser/inline/0003_extern_block.rs b/crates/libsyntax2/tests/data/parser/inline/0003_extern_block.rs
index 26a9ccd1e..26a9ccd1e 100644
--- a/tests/data/parser/inline/0003_extern_block.rs
+++ b/crates/libsyntax2/tests/data/parser/inline/0003_extern_block.rs
diff --git a/tests/data/parser/inline/0003_extern_block.txt b/crates/libsyntax2/tests/data/parser/inline/0003_extern_block.txt
index cbe9a1ebc..cbe9a1ebc 100644
--- a/tests/data/parser/inline/0003_extern_block.txt
+++ b/crates/libsyntax2/tests/data/parser/inline/0003_extern_block.txt
diff --git a/tests/data/parser/inline/0004_extern_fn.rs b/crates/libsyntax2/tests/data/parser/inline/0004_extern_fn.rs
index 394a049f0..394a049f0 100644
--- a/tests/data/parser/inline/0004_extern_fn.rs
+++ b/crates/libsyntax2/tests/data/parser/inline/0004_extern_fn.rs
diff --git a/tests/data/parser/inline/0004_extern_fn.txt b/crates/libsyntax2/tests/data/parser/inline/0004_extern_fn.txt
index e7787d4ab..e7787d4ab 100644
--- a/tests/data/parser/inline/0004_extern_fn.txt
+++ b/crates/libsyntax2/tests/data/parser/inline/0004_extern_fn.txt
diff --git a/tests/data/parser/inline/0005_extern_crate.rs b/crates/libsyntax2/tests/data/parser/inline/0005_extern_crate.rs
index 49af74e1b..49af74e1b 100644
--- a/tests/data/parser/inline/0005_extern_crate.rs
+++ b/crates/libsyntax2/tests/data/parser/inline/0005_extern_crate.rs
diff --git a/tests/data/parser/inline/0005_extern_crate.txt b/crates/libsyntax2/tests/data/parser/inline/0005_extern_crate.txt
index eac8656ac..eac8656ac 100644
--- a/tests/data/parser/inline/0005_extern_crate.txt
+++ b/crates/libsyntax2/tests/data/parser/inline/0005_extern_crate.txt
diff --git a/tests/data/parser/inline/0007_unsafe_trait.rs b/crates/libsyntax2/tests/data/parser/inline/0007_unsafe_trait.rs
index 04e021550..04e021550 100644
--- a/tests/data/parser/inline/0007_unsafe_trait.rs
+++ b/crates/libsyntax2/tests/data/parser/inline/0007_unsafe_trait.rs
diff --git a/tests/data/parser/inline/0007_unsafe_trait.txt b/crates/libsyntax2/tests/data/parser/inline/0007_unsafe_trait.txt
index afa6637d3..afa6637d3 100644
--- a/tests/data/parser/inline/0007_unsafe_trait.txt
+++ b/crates/libsyntax2/tests/data/parser/inline/0007_unsafe_trait.txt
diff --git a/tests/data/parser/inline/0008_unsafe_impl.rs b/crates/libsyntax2/tests/data/parser/inline/0008_unsafe_impl.rs
index 41055f41d..41055f41d 100644
--- a/tests/data/parser/inline/0008_unsafe_impl.rs
+++ b/crates/libsyntax2/tests/data/parser/inline/0008_unsafe_impl.rs
diff --git a/tests/data/parser/inline/0008_unsafe_impl.txt b/crates/libsyntax2/tests/data/parser/inline/0008_unsafe_impl.txt
index 6fd3f868f..6fd3f868f 100644
--- a/tests/data/parser/inline/0008_unsafe_impl.txt
+++ b/crates/libsyntax2/tests/data/parser/inline/0008_unsafe_impl.txt
diff --git a/tests/data/parser/inline/0009_unsafe_auto_trait.rs b/crates/libsyntax2/tests/data/parser/inline/0009_unsafe_auto_trait.rs
index 03d29f324..03d29f324 100644
--- a/tests/data/parser/inline/0009_unsafe_auto_trait.rs
+++ b/crates/libsyntax2/tests/data/parser/inline/0009_unsafe_auto_trait.rs
diff --git a/tests/data/parser/inline/0009_unsafe_auto_trait.txt b/crates/libsyntax2/tests/data/parser/inline/0009_unsafe_auto_trait.txt
index 825a56f17..825a56f17 100644
--- a/tests/data/parser/inline/0009_unsafe_auto_trait.txt
+++ b/crates/libsyntax2/tests/data/parser/inline/0009_unsafe_auto_trait.txt
diff --git a/tests/data/parser/inline/0010_unsafe_default_impl.rs b/crates/libsyntax2/tests/data/parser/inline/0010_unsafe_default_impl.rs
index 9cd6c57bd..9cd6c57bd 100644
--- a/tests/data/parser/inline/0010_unsafe_default_impl.rs
+++ b/crates/libsyntax2/tests/data/parser/inline/0010_unsafe_default_impl.rs
diff --git a/tests/data/parser/inline/0010_unsafe_default_impl.txt b/crates/libsyntax2/tests/data/parser/inline/0010_unsafe_default_impl.txt
index ab12d5fc0..ab12d5fc0 100644
--- a/tests/data/parser/inline/0010_unsafe_default_impl.txt
+++ b/crates/libsyntax2/tests/data/parser/inline/0010_unsafe_default_impl.txt
diff --git a/tests/data/parser/inline/0011_unsafe_fn.rs b/crates/libsyntax2/tests/data/parser/inline/0011_unsafe_fn.rs
index 33cfc4cd7..33cfc4cd7 100644
--- a/tests/data/parser/inline/0011_unsafe_fn.rs
+++ b/crates/libsyntax2/tests/data/parser/inline/0011_unsafe_fn.rs
diff --git a/tests/data/parser/inline/0011_unsafe_fn.txt b/crates/libsyntax2/tests/data/parser/inline/0011_unsafe_fn.txt
index 9e5dcafa6..9e5dcafa6 100644
--- a/tests/data/parser/inline/0011_unsafe_fn.txt
+++ b/crates/libsyntax2/tests/data/parser/inline/0011_unsafe_fn.txt
diff --git a/tests/data/parser/inline/0012_unsafe_extern_fn.rs b/crates/libsyntax2/tests/data/parser/inline/0012_unsafe_extern_fn.rs
index 1295c2cd2..1295c2cd2 100644
--- a/tests/data/parser/inline/0012_unsafe_extern_fn.rs
+++ b/crates/libsyntax2/tests/data/parser/inline/0012_unsafe_extern_fn.rs
diff --git a/tests/data/parser/inline/0012_unsafe_extern_fn.txt b/crates/libsyntax2/tests/data/parser/inline/0012_unsafe_extern_fn.txt
index 7ed4d42c1..7ed4d42c1 100644
--- a/tests/data/parser/inline/0012_unsafe_extern_fn.txt
+++ b/crates/libsyntax2/tests/data/parser/inline/0012_unsafe_extern_fn.txt
diff --git a/tests/data/parser/inline/0013_unsafe_block_in_mod.rs b/crates/libsyntax2/tests/data/parser/inline/0013_unsafe_block_in_mod.rs
index 26141e904..26141e904 100644
--- a/tests/data/parser/inline/0013_unsafe_block_in_mod.rs
+++ b/crates/libsyntax2/tests/data/parser/inline/0013_unsafe_block_in_mod.rs
diff --git a/tests/data/parser/inline/0013_unsafe_block_in_mod.txt b/crates/libsyntax2/tests/data/parser/inline/0013_unsafe_block_in_mod.txt
index d1bcffe77..d1bcffe77 100644
--- a/tests/data/parser/inline/0013_unsafe_block_in_mod.txt
+++ b/crates/libsyntax2/tests/data/parser/inline/0013_unsafe_block_in_mod.txt
diff --git a/tests/data/parser/inline/0014_type_item_type_params.rs b/crates/libsyntax2/tests/data/parser/inline/0014_type_item_type_params.rs
index defd110c4..defd110c4 100644
--- a/tests/data/parser/inline/0014_type_item_type_params.rs
+++ b/crates/libsyntax2/tests/data/parser/inline/0014_type_item_type_params.rs
diff --git a/tests/data/parser/inline/0014_type_item_type_params.txt b/crates/libsyntax2/tests/data/parser/inline/0014_type_item_type_params.txt
index e39e57889..e39e57889 100644
--- a/tests/data/parser/inline/0014_type_item_type_params.txt
+++ b/crates/libsyntax2/tests/data/parser/inline/0014_type_item_type_params.txt
diff --git a/tests/data/parser/inline/0015_type_item.rs b/crates/libsyntax2/tests/data/parser/inline/0015_type_item.rs
index 04c0344fa..04c0344fa 100644
--- a/tests/data/parser/inline/0015_type_item.rs
+++ b/crates/libsyntax2/tests/data/parser/inline/0015_type_item.rs
diff --git a/tests/data/parser/inline/0015_type_item.txt b/crates/libsyntax2/tests/data/parser/inline/0015_type_item.txt
index 964071aa1..964071aa1 100644
--- a/tests/data/parser/inline/0015_type_item.txt
+++ b/crates/libsyntax2/tests/data/parser/inline/0015_type_item.txt
diff --git a/tests/data/parser/inline/0016_type_item_where_clause.rs b/crates/libsyntax2/tests/data/parser/inline/0016_type_item_where_clause.rs
index a602d07f0..a602d07f0 100644
--- a/tests/data/parser/inline/0016_type_item_where_clause.rs
+++ b/crates/libsyntax2/tests/data/parser/inline/0016_type_item_where_clause.rs
diff --git a/tests/data/parser/inline/0016_type_item_where_clause.txt b/crates/libsyntax2/tests/data/parser/inline/0016_type_item_where_clause.txt
index 2f3c52960..2f3c52960 100644
--- a/tests/data/parser/inline/0016_type_item_where_clause.txt
+++ b/crates/libsyntax2/tests/data/parser/inline/0016_type_item_where_clause.txt
diff --git a/tests/data/parser/inline/0017_paren_type.rs b/crates/libsyntax2/tests/data/parser/inline/0017_paren_type.rs
index 6e1b25101..6e1b25101 100644
--- a/tests/data/parser/inline/0017_paren_type.rs
+++ b/crates/libsyntax2/tests/data/parser/inline/0017_paren_type.rs
diff --git a/tests/data/parser/inline/0017_paren_type.txt b/crates/libsyntax2/tests/data/parser/inline/0017_paren_type.txt
index 1194fb02c..1194fb02c 100644
--- a/tests/data/parser/inline/0017_paren_type.txt
+++ b/crates/libsyntax2/tests/data/parser/inline/0017_paren_type.txt
diff --git a/tests/data/parser/inline/0018_unit_type.rs b/crates/libsyntax2/tests/data/parser/inline/0018_unit_type.rs
index c039cf7d3..c039cf7d3 100644
--- a/tests/data/parser/inline/0018_unit_type.rs
+++ b/crates/libsyntax2/tests/data/parser/inline/0018_unit_type.rs
diff --git a/tests/data/parser/inline/0018_unit_type.txt b/crates/libsyntax2/tests/data/parser/inline/0018_unit_type.txt
index e52af7b1e..e52af7b1e 100644
--- a/tests/data/parser/inline/0018_unit_type.txt
+++ b/crates/libsyntax2/tests/data/parser/inline/0018_unit_type.txt
diff --git a/tests/data/parser/inline/0019_singleton_tuple_type.rs b/crates/libsyntax2/tests/data/parser/inline/0019_singleton_tuple_type.rs
index cb66bad24..cb66bad24 100644
--- a/tests/data/parser/inline/0019_singleton_tuple_type.rs
+++ b/crates/libsyntax2/tests/data/parser/inline/0019_singleton_tuple_type.rs
diff --git a/tests/data/parser/inline/0019_singleton_tuple_type.txt b/crates/libsyntax2/tests/data/parser/inline/0019_singleton_tuple_type.txt
index 7b8e06c25..7b8e06c25 100644
--- a/tests/data/parser/inline/0019_singleton_tuple_type.txt
+++ b/crates/libsyntax2/tests/data/parser/inline/0019_singleton_tuple_type.txt
diff --git a/tests/data/parser/inline/0020_never_type.rs b/crates/libsyntax2/tests/data/parser/inline/0020_never_type.rs
index de399fcf4..de399fcf4 100644
--- a/tests/data/parser/inline/0020_never_type.rs
+++ b/crates/libsyntax2/tests/data/parser/inline/0020_never_type.rs
diff --git a/tests/data/parser/inline/0020_never_type.txt b/crates/libsyntax2/tests/data/parser/inline/0020_never_type.txt
index 89f8a9eea..89f8a9eea 100644
--- a/tests/data/parser/inline/0020_never_type.txt
+++ b/crates/libsyntax2/tests/data/parser/inline/0020_never_type.txt
diff --git a/tests/data/parser/inline/0021_pointer_type_no_mutability.rs b/crates/libsyntax2/tests/data/parser/inline/0021_pointer_type_no_mutability.rs
index fae705131..fae705131 100644
--- a/tests/data/parser/inline/0021_pointer_type_no_mutability.rs
+++ b/crates/libsyntax2/tests/data/parser/inline/0021_pointer_type_no_mutability.rs
diff --git a/tests/data/parser/inline/0021_pointer_type_no_mutability.txt b/crates/libsyntax2/tests/data/parser/inline/0021_pointer_type_no_mutability.txt
index d86fc6388..d86fc6388 100644
--- a/tests/data/parser/inline/0021_pointer_type_no_mutability.txt
+++ b/crates/libsyntax2/tests/data/parser/inline/0021_pointer_type_no_mutability.txt
diff --git a/tests/data/parser/inline/0022_pointer_type_mut.rs b/crates/libsyntax2/tests/data/parser/inline/0022_pointer_type_mut.rs
index 04b2bb9ba..04b2bb9ba 100644
--- a/tests/data/parser/inline/0022_pointer_type_mut.rs
+++ b/crates/libsyntax2/tests/data/parser/inline/0022_pointer_type_mut.rs
diff --git a/tests/data/parser/inline/0022_pointer_type_mut.txt b/crates/libsyntax2/tests/data/parser/inline/0022_pointer_type_mut.txt
index fbeba506e..fbeba506e 100644
--- a/tests/data/parser/inline/0022_pointer_type_mut.txt
+++ b/crates/libsyntax2/tests/data/parser/inline/0022_pointer_type_mut.txt
diff --git a/tests/data/parser/inline/0023_array_type_missing_semi.rs b/crates/libsyntax2/tests/data/parser/inline/0023_array_type_missing_semi.rs
index a94851443..a94851443 100644
--- a/tests/data/parser/inline/0023_array_type_missing_semi.rs
+++ b/crates/libsyntax2/tests/data/parser/inline/0023_array_type_missing_semi.rs
diff --git a/tests/data/parser/inline/0023_array_type_missing_semi.txt b/crates/libsyntax2/tests/data/parser/inline/0023_array_type_missing_semi.txt
index 4d90d52c7..4d90d52c7 100644
--- a/tests/data/parser/inline/0023_array_type_missing_semi.txt
+++ b/crates/libsyntax2/tests/data/parser/inline/0023_array_type_missing_semi.txt
diff --git a/tests/data/parser/inline/0024_array_type.rs b/crates/libsyntax2/tests/data/parser/inline/0024_array_type.rs
index 27eb22f22..27eb22f22 100644
--- a/tests/data/parser/inline/0024_array_type.rs
+++ b/crates/libsyntax2/tests/data/parser/inline/0024_array_type.rs
diff --git a/tests/data/parser/inline/0024_array_type.txt b/crates/libsyntax2/tests/data/parser/inline/0024_array_type.txt
index 5a6b76904..5a6b76904 100644
--- a/tests/data/parser/inline/0024_array_type.txt
+++ b/crates/libsyntax2/tests/data/parser/inline/0024_array_type.txt
diff --git a/tests/data/parser/inline/0025_slice_type.rs b/crates/libsyntax2/tests/data/parser/inline/0025_slice_type.rs
index 4da1af827..4da1af827 100644
--- a/tests/data/parser/inline/0025_slice_type.rs
+++ b/crates/libsyntax2/tests/data/parser/inline/0025_slice_type.rs
diff --git a/tests/data/parser/inline/0025_slice_type.txt b/crates/libsyntax2/tests/data/parser/inline/0025_slice_type.txt
index 52508cda4..52508cda4 100644
--- a/tests/data/parser/inline/0025_slice_type.txt
+++ b/crates/libsyntax2/tests/data/parser/inline/0025_slice_type.txt
diff --git a/tests/data/parser/inline/0026_reference_type;.rs b/crates/libsyntax2/tests/data/parser/inline/0026_reference_type;.rs
index 3ac0badab..3ac0badab 100644
--- a/tests/data/parser/inline/0026_reference_type;.rs
+++ b/crates/libsyntax2/tests/data/parser/inline/0026_reference_type;.rs
diff --git a/tests/data/parser/inline/0026_reference_type;.txt b/crates/libsyntax2/tests/data/parser/inline/0026_reference_type;.txt
index b6bd6a48c..b6bd6a48c 100644
--- a/tests/data/parser/inline/0026_reference_type;.txt
+++ b/crates/libsyntax2/tests/data/parser/inline/0026_reference_type;.txt
diff --git a/tests/data/parser/inline/0027_placeholder_type.rs b/crates/libsyntax2/tests/data/parser/inline/0027_placeholder_type.rs
index 7952dbd57..7952dbd57 100644
--- a/tests/data/parser/inline/0027_placeholder_type.rs
+++ b/crates/libsyntax2/tests/data/parser/inline/0027_placeholder_type.rs
diff --git a/tests/data/parser/inline/0027_placeholder_type.txt b/crates/libsyntax2/tests/data/parser/inline/0027_placeholder_type.txt
index 5e6e6c397..5e6e6c397 100644
--- a/tests/data/parser/inline/0027_placeholder_type.txt
+++ b/crates/libsyntax2/tests/data/parser/inline/0027_placeholder_type.txt
diff --git a/tests/data/parser/inline/0028_fn_pointer_type.rs b/crates/libsyntax2/tests/data/parser/inline/0028_fn_pointer_type.rs
index c9bf3bdb4..c9bf3bdb4 100644
--- a/tests/data/parser/inline/0028_fn_pointer_type.rs
+++ b/crates/libsyntax2/tests/data/parser/inline/0028_fn_pointer_type.rs
diff --git a/tests/data/parser/inline/0028_fn_pointer_type.txt b/crates/libsyntax2/tests/data/parser/inline/0028_fn_pointer_type.txt
index 31818365a..31818365a 100644
--- a/tests/data/parser/inline/0028_fn_pointer_type.txt
+++ b/crates/libsyntax2/tests/data/parser/inline/0028_fn_pointer_type.txt
diff --git a/tests/data/parser/inline/0029_fn_pointer_type_missing_fn.rs b/crates/libsyntax2/tests/data/parser/inline/0029_fn_pointer_type_missing_fn.rs
index f014914ff..f014914ff 100644
--- a/tests/data/parser/inline/0029_fn_pointer_type_missing_fn.rs
+++ b/crates/libsyntax2/tests/data/parser/inline/0029_fn_pointer_type_missing_fn.rs
diff --git a/tests/data/parser/inline/0029_fn_pointer_type_missing_fn.txt b/crates/libsyntax2/tests/data/parser/inline/0029_fn_pointer_type_missing_fn.txt
index ddec1b866..ddec1b866 100644
--- a/tests/data/parser/inline/0029_fn_pointer_type_missing_fn.txt
+++ b/crates/libsyntax2/tests/data/parser/inline/0029_fn_pointer_type_missing_fn.txt
diff --git a/tests/data/parser/inline/0030_fn_pointer_type_with_ret.rs b/crates/libsyntax2/tests/data/parser/inline/0030_fn_pointer_type_with_ret.rs
index e3ba5e87f..e3ba5e87f 100644
--- a/tests/data/parser/inline/0030_fn_pointer_type_with_ret.rs
+++ b/crates/libsyntax2/tests/data/parser/inline/0030_fn_pointer_type_with_ret.rs
diff --git a/tests/data/parser/inline/0030_fn_pointer_type_with_ret.txt b/crates/libsyntax2/tests/data/parser/inline/0030_fn_pointer_type_with_ret.txt
index 447b1ed3f..447b1ed3f 100644
--- a/tests/data/parser/inline/0030_fn_pointer_type_with_ret.txt
+++ b/crates/libsyntax2/tests/data/parser/inline/0030_fn_pointer_type_with_ret.txt
diff --git a/tests/data/parser/inline/0031_for_type.rs b/crates/libsyntax2/tests/data/parser/inline/0031_for_type.rs
index 4d6a18c6b..4d6a18c6b 100644
--- a/tests/data/parser/inline/0031_for_type.rs
+++ b/crates/libsyntax2/tests/data/parser/inline/0031_for_type.rs
diff --git a/tests/data/parser/inline/0031_for_type.txt b/crates/libsyntax2/tests/data/parser/inline/0031_for_type.txt
index 65753a702..65753a702 100644
--- a/tests/data/parser/inline/0031_for_type.txt
+++ b/crates/libsyntax2/tests/data/parser/inline/0031_for_type.txt
diff --git a/tests/data/parser/inline/0032_path_type.rs b/crates/libsyntax2/tests/data/parser/inline/0032_path_type.rs
index bf94f32e1..bf94f32e1 100644
--- a/tests/data/parser/inline/0032_path_type.rs
+++ b/crates/libsyntax2/tests/data/parser/inline/0032_path_type.rs
diff --git a/tests/data/parser/inline/0032_path_type.txt b/crates/libsyntax2/tests/data/parser/inline/0032_path_type.txt
index d9085118a..d9085118a 100644
--- a/tests/data/parser/inline/0032_path_type.txt
+++ b/crates/libsyntax2/tests/data/parser/inline/0032_path_type.txt
diff --git a/tests/data/parser/inline/0034_bind_pat.rs b/crates/libsyntax2/tests/data/parser/inline/0034_bind_pat.rs
index 820a9e72c..820a9e72c 100644
--- a/tests/data/parser/inline/0034_bind_pat.rs
+++ b/crates/libsyntax2/tests/data/parser/inline/0034_bind_pat.rs
diff --git a/tests/data/parser/inline/0034_bind_pat.txt b/crates/libsyntax2/tests/data/parser/inline/0034_bind_pat.txt
index e8e4e4c2b..e8e4e4c2b 100644
--- a/tests/data/parser/inline/0034_bind_pat.txt
+++ b/crates/libsyntax2/tests/data/parser/inline/0034_bind_pat.txt
diff --git a/tests/data/parser/inline/0035_ref_pat.rs b/crates/libsyntax2/tests/data/parser/inline/0035_ref_pat.rs
index de41f5cae..de41f5cae 100644
--- a/tests/data/parser/inline/0035_ref_pat.rs
+++ b/crates/libsyntax2/tests/data/parser/inline/0035_ref_pat.rs
diff --git a/tests/data/parser/inline/0035_ref_pat.txt b/crates/libsyntax2/tests/data/parser/inline/0035_ref_pat.txt
index 6fbffd8b7..6fbffd8b7 100644
--- a/tests/data/parser/inline/0035_ref_pat.txt
+++ b/crates/libsyntax2/tests/data/parser/inline/0035_ref_pat.txt
diff --git a/tests/data/parser/inline/0036_placeholder_pat.rs b/crates/libsyntax2/tests/data/parser/inline/0036_placeholder_pat.rs
index 4d719c433..4d719c433 100644
--- a/tests/data/parser/inline/0036_placeholder_pat.rs
+++ b/crates/libsyntax2/tests/data/parser/inline/0036_placeholder_pat.rs
diff --git a/tests/data/parser/inline/0036_placeholder_pat.txt b/crates/libsyntax2/tests/data/parser/inline/0036_placeholder_pat.txt
index 8c63cdfae..8c63cdfae 100644
--- a/tests/data/parser/inline/0036_placeholder_pat.txt
+++ b/crates/libsyntax2/tests/data/parser/inline/0036_placeholder_pat.txt
diff --git a/tests/data/parser/inline/0037_crate_visibility.rs b/crates/libsyntax2/tests/data/parser/inline/0037_crate_visibility.rs
index faeefde94..faeefde94 100644
--- a/tests/data/parser/inline/0037_crate_visibility.rs
+++ b/crates/libsyntax2/tests/data/parser/inline/0037_crate_visibility.rs
diff --git a/tests/data/parser/inline/0037_crate_visibility.txt b/crates/libsyntax2/tests/data/parser/inline/0037_crate_visibility.txt
index 113ac59e2..113ac59e2 100644
--- a/tests/data/parser/inline/0037_crate_visibility.txt
+++ b/crates/libsyntax2/tests/data/parser/inline/0037_crate_visibility.txt
diff --git a/tests/data/parser/inline/0038_function_ret_type.rs b/crates/libsyntax2/tests/data/parser/inline/0038_function_ret_type.rs
index d22d8cada..d22d8cada 100644
--- a/tests/data/parser/inline/0038_function_ret_type.rs
+++ b/crates/libsyntax2/tests/data/parser/inline/0038_function_ret_type.rs
diff --git a/tests/data/parser/inline/0038_function_ret_type.txt b/crates/libsyntax2/tests/data/parser/inline/0038_function_ret_type.txt
index 58583eefe..58583eefe 100644
--- a/tests/data/parser/inline/0038_function_ret_type.txt
+++ b/crates/libsyntax2/tests/data/parser/inline/0038_function_ret_type.txt
diff --git a/tests/data/parser/inline/0039_path_expr.rs b/crates/libsyntax2/tests/data/parser/inline/0039_path_expr.rs
index 333ebabef..333ebabef 100644
--- a/tests/data/parser/inline/0039_path_expr.rs
+++ b/crates/libsyntax2/tests/data/parser/inline/0039_path_expr.rs
diff --git a/tests/data/parser/inline/0039_path_expr.txt b/crates/libsyntax2/tests/data/parser/inline/0039_path_expr.txt
index 8b505774f..8b505774f 100644
--- a/tests/data/parser/inline/0039_path_expr.txt
+++ b/crates/libsyntax2/tests/data/parser/inline/0039_path_expr.txt
diff --git a/tests/data/parser/inline/0040_expr_literals.rs b/crates/libsyntax2/tests/data/parser/inline/0040_expr_literals.rs
index 2e11a5a6e..2e11a5a6e 100644
--- a/tests/data/parser/inline/0040_expr_literals.rs
+++ b/crates/libsyntax2/tests/data/parser/inline/0040_expr_literals.rs
diff --git a/tests/data/parser/inline/0040_expr_literals.txt b/crates/libsyntax2/tests/data/parser/inline/0040_expr_literals.txt
index 192b62211..192b62211 100644
--- a/tests/data/parser/inline/0040_expr_literals.txt
+++ b/crates/libsyntax2/tests/data/parser/inline/0040_expr_literals.txt
diff --git a/tests/data/parser/inline/0041_type_param_bounds.rs b/crates/libsyntax2/tests/data/parser/inline/0041_type_param_bounds.rs
index 919bde0ee..919bde0ee 100644
--- a/tests/data/parser/inline/0041_type_param_bounds.rs
+++ b/crates/libsyntax2/tests/data/parser/inline/0041_type_param_bounds.rs
diff --git a/tests/data/parser/inline/0041_type_param_bounds.txt b/crates/libsyntax2/tests/data/parser/inline/0041_type_param_bounds.txt
index 4996d6ace..4996d6ace 100644
--- a/tests/data/parser/inline/0041_type_param_bounds.txt
+++ b/crates/libsyntax2/tests/data/parser/inline/0041_type_param_bounds.txt
diff --git a/tests/data/parser/inline/0042_type_param_default.rs b/crates/libsyntax2/tests/data/parser/inline/0042_type_param_default.rs
index 540eacb02..540eacb02 100644
--- a/tests/data/parser/inline/0042_type_param_default.rs
+++ b/crates/libsyntax2/tests/data/parser/inline/0042_type_param_default.rs
diff --git a/tests/data/parser/inline/0042_type_param_default.txt b/crates/libsyntax2/tests/data/parser/inline/0042_type_param_default.txt
index ec875e9a2..ec875e9a2 100644
--- a/tests/data/parser/inline/0042_type_param_default.txt
+++ b/crates/libsyntax2/tests/data/parser/inline/0042_type_param_default.txt
diff --git a/tests/data/parser/inline/0043_call_expr.rs b/crates/libsyntax2/tests/data/parser/inline/0043_call_expr.rs
index 0c9a20718..0c9a20718 100644
--- a/tests/data/parser/inline/0043_call_expr.rs
+++ b/crates/libsyntax2/tests/data/parser/inline/0043_call_expr.rs
diff --git a/tests/data/parser/inline/0043_call_expr.txt b/crates/libsyntax2/tests/data/parser/inline/0043_call_expr.txt
index f4789d2d9..f4789d2d9 100644
--- a/tests/data/parser/inline/0043_call_expr.txt
+++ b/crates/libsyntax2/tests/data/parser/inline/0043_call_expr.txt
diff --git a/tests/data/parser/inline/0044_ref_expr.rs b/crates/libsyntax2/tests/data/parser/inline/0044_ref_expr.rs
index 2dac6be95..2dac6be95 100644
--- a/tests/data/parser/inline/0044_ref_expr.rs
+++ b/crates/libsyntax2/tests/data/parser/inline/0044_ref_expr.rs
diff --git a/tests/data/parser/inline/0044_ref_expr.txt b/crates/libsyntax2/tests/data/parser/inline/0044_ref_expr.txt
index 05f6c015a..05f6c015a 100644
--- a/tests/data/parser/inline/0044_ref_expr.txt
+++ b/crates/libsyntax2/tests/data/parser/inline/0044_ref_expr.txt
diff --git a/tests/data/parser/inline/0045_block.rs b/crates/libsyntax2/tests/data/parser/inline/0045_block.rs
index 81f44c533..81f44c533 100644
--- a/tests/data/parser/inline/0045_block.rs
+++ b/crates/libsyntax2/tests/data/parser/inline/0045_block.rs
diff --git a/tests/data/parser/inline/0045_block.txt b/crates/libsyntax2/tests/data/parser/inline/0045_block.txt
index 8519101c3..8519101c3 100644
--- a/tests/data/parser/inline/0045_block.txt
+++ b/crates/libsyntax2/tests/data/parser/inline/0045_block.txt
diff --git a/tests/data/parser/inline/0046_default_impl.rs b/crates/libsyntax2/tests/data/parser/inline/0046_default_impl.rs
index ef6aa84a2..ef6aa84a2 100644
--- a/tests/data/parser/inline/0046_default_impl.rs
+++ b/crates/libsyntax2/tests/data/parser/inline/0046_default_impl.rs
diff --git a/tests/data/parser/inline/0046_default_impl.txt b/crates/libsyntax2/tests/data/parser/inline/0046_default_impl.txt
index d5a27baf7..d5a27baf7 100644
--- a/tests/data/parser/inline/0046_default_impl.txt
+++ b/crates/libsyntax2/tests/data/parser/inline/0046_default_impl.txt
diff --git a/tests/data/parser/inline/0047_impl_item.rs b/crates/libsyntax2/tests/data/parser/inline/0047_impl_item.rs
index d6337f6b3..d6337f6b3 100644
--- a/tests/data/parser/inline/0047_impl_item.rs
+++ b/crates/libsyntax2/tests/data/parser/inline/0047_impl_item.rs
diff --git a/tests/data/parser/inline/0047_impl_item.txt b/crates/libsyntax2/tests/data/parser/inline/0047_impl_item.txt
index 76b29f95d..76b29f95d 100644
--- a/tests/data/parser/inline/0047_impl_item.txt
+++ b/crates/libsyntax2/tests/data/parser/inline/0047_impl_item.txt
diff --git a/tests/data/parser/inline/0048_impl_item_neg.rs b/crates/libsyntax2/tests/data/parser/inline/0048_impl_item_neg.rs
index b7527c870..b7527c870 100644
--- a/tests/data/parser/inline/0048_impl_item_neg.rs
+++ b/crates/libsyntax2/tests/data/parser/inline/0048_impl_item_neg.rs
diff --git a/tests/data/parser/inline/0048_impl_item_neg.txt b/crates/libsyntax2/tests/data/parser/inline/0048_impl_item_neg.txt
index 2d01419c0..2d01419c0 100644
--- a/tests/data/parser/inline/0048_impl_item_neg.txt
+++ b/crates/libsyntax2/tests/data/parser/inline/0048_impl_item_neg.txt
diff --git a/tests/data/parser/inline/0050_let_stmt;.rs b/crates/libsyntax2/tests/data/parser/inline/0050_let_stmt;.rs
index 0a9af907f..0a9af907f 100644
--- a/tests/data/parser/inline/0050_let_stmt;.rs
+++ b/crates/libsyntax2/tests/data/parser/inline/0050_let_stmt;.rs
diff --git a/tests/data/parser/inline/0050_let_stmt;.txt b/crates/libsyntax2/tests/data/parser/inline/0050_let_stmt;.txt
index 44e357092..44e357092 100644
--- a/tests/data/parser/inline/0050_let_stmt;.txt
+++ b/crates/libsyntax2/tests/data/parser/inline/0050_let_stmt;.txt
diff --git a/tests/data/parser/inline/0051_method_call_expr.rs b/crates/libsyntax2/tests/data/parser/inline/0051_method_call_expr.rs
index 1a3aa35ae..1a3aa35ae 100644
--- a/tests/data/parser/inline/0051_method_call_expr.rs
+++ b/crates/libsyntax2/tests/data/parser/inline/0051_method_call_expr.rs
diff --git a/tests/data/parser/inline/0051_method_call_expr.txt b/crates/libsyntax2/tests/data/parser/inline/0051_method_call_expr.txt
index aafb2d5f1..aafb2d5f1 100644
--- a/tests/data/parser/inline/0051_method_call_expr.txt
+++ b/crates/libsyntax2/tests/data/parser/inline/0051_method_call_expr.txt
diff --git a/tests/data/parser/inline/0052_field_expr.rs b/crates/libsyntax2/tests/data/parser/inline/0052_field_expr.rs
index 3e69538e5..3e69538e5 100644
--- a/tests/data/parser/inline/0052_field_expr.rs
+++ b/crates/libsyntax2/tests/data/parser/inline/0052_field_expr.rs
diff --git a/tests/data/parser/inline/0052_field_expr.txt b/crates/libsyntax2/tests/data/parser/inline/0052_field_expr.txt
index 213884f90..213884f90 100644
--- a/tests/data/parser/inline/0052_field_expr.txt
+++ b/crates/libsyntax2/tests/data/parser/inline/0052_field_expr.txt
diff --git a/tests/data/parser/inline/0053_block_items.rs b/crates/libsyntax2/tests/data/parser/inline/0053_block_items.rs
index d9868718c..d9868718c 100644
--- a/tests/data/parser/inline/0053_block_items.rs
+++ b/crates/libsyntax2/tests/data/parser/inline/0053_block_items.rs
diff --git a/tests/data/parser/inline/0053_block_items.txt b/crates/libsyntax2/tests/data/parser/inline/0053_block_items.txt
index c5498532b..c5498532b 100644
--- a/tests/data/parser/inline/0053_block_items.txt
+++ b/crates/libsyntax2/tests/data/parser/inline/0053_block_items.txt
diff --git a/tests/data/parser/inline/0054_impl_item_items.rs b/crates/libsyntax2/tests/data/parser/inline/0054_impl_item_items.rs
index f10851487..f10851487 100644
--- a/tests/data/parser/inline/0054_impl_item_items.rs
+++ b/crates/libsyntax2/tests/data/parser/inline/0054_impl_item_items.rs
diff --git a/tests/data/parser/inline/0054_impl_item_items.txt b/crates/libsyntax2/tests/data/parser/inline/0054_impl_item_items.txt
index 739ecbbcd..739ecbbcd 100644
--- a/tests/data/parser/inline/0054_impl_item_items.txt
+++ b/crates/libsyntax2/tests/data/parser/inline/0054_impl_item_items.txt
diff --git a/tests/data/parser/inline/0055_self_param.rs b/crates/libsyntax2/tests/data/parser/inline/0055_self_param.rs
index 7bb1ca50c..7bb1ca50c 100644
--- a/tests/data/parser/inline/0055_self_param.rs
+++ b/crates/libsyntax2/tests/data/parser/inline/0055_self_param.rs
diff --git a/tests/data/parser/inline/0055_self_param.txt b/crates/libsyntax2/tests/data/parser/inline/0055_self_param.txt
index 1275fb8b1..1275fb8b1 100644
--- a/tests/data/parser/inline/0055_self_param.txt
+++ b/crates/libsyntax2/tests/data/parser/inline/0055_self_param.txt
diff --git a/tests/data/parser/inline/0056_trait_item.rs b/crates/libsyntax2/tests/data/parser/inline/0056_trait_item.rs
index 4385afca9..4385afca9 100644
--- a/tests/data/parser/inline/0056_trait_item.rs
+++ b/crates/libsyntax2/tests/data/parser/inline/0056_trait_item.rs
diff --git a/tests/data/parser/inline/0056_trait_item.txt b/crates/libsyntax2/tests/data/parser/inline/0056_trait_item.txt
index ba4e0ebc8..ba4e0ebc8 100644
--- a/tests/data/parser/inline/0056_trait_item.txt
+++ b/crates/libsyntax2/tests/data/parser/inline/0056_trait_item.txt
diff --git a/tests/data/parser/inline/0057_auto_trait.rs b/crates/libsyntax2/tests/data/parser/inline/0057_auto_trait.rs
index 72adf6035..72adf6035 100644
--- a/tests/data/parser/inline/0057_auto_trait.rs
+++ b/crates/libsyntax2/tests/data/parser/inline/0057_auto_trait.rs
diff --git a/tests/data/parser/inline/0057_auto_trait.txt b/crates/libsyntax2/tests/data/parser/inline/0057_auto_trait.txt
index 6bb4ffdba..6bb4ffdba 100644
--- a/tests/data/parser/inline/0057_auto_trait.txt
+++ b/crates/libsyntax2/tests/data/parser/inline/0057_auto_trait.txt
diff --git a/tests/data/parser/inline/0058_type_arg.rs b/crates/libsyntax2/tests/data/parser/inline/0058_type_arg.rs
index f0c8cc3a8..f0c8cc3a8 100644
--- a/tests/data/parser/inline/0058_type_arg.rs
+++ b/crates/libsyntax2/tests/data/parser/inline/0058_type_arg.rs
diff --git a/tests/data/parser/inline/0058_type_arg.txt b/crates/libsyntax2/tests/data/parser/inline/0058_type_arg.txt
index f69ce4738..f69ce4738 100644
--- a/tests/data/parser/inline/0058_type_arg.txt
+++ b/crates/libsyntax2/tests/data/parser/inline/0058_type_arg.txt
diff --git a/tests/data/parser/inline/0059_function_where_clause.rs b/crates/libsyntax2/tests/data/parser/inline/0059_function_where_clause.rs
index f0920b2a8..f0920b2a8 100644
--- a/tests/data/parser/inline/0059_function_where_clause.rs
+++ b/crates/libsyntax2/tests/data/parser/inline/0059_function_where_clause.rs
diff --git a/tests/data/parser/inline/0059_function_where_clause.txt b/crates/libsyntax2/tests/data/parser/inline/0059_function_where_clause.txt
index 065b0fd21..065b0fd21 100644
--- a/tests/data/parser/inline/0059_function_where_clause.txt
+++ b/crates/libsyntax2/tests/data/parser/inline/0059_function_where_clause.txt
diff --git a/tests/data/parser/inline/0060_function_type_params.rs b/crates/libsyntax2/tests/data/parser/inline/0060_function_type_params.rs
index 9df40ed39..9df40ed39 100644
--- a/tests/data/parser/inline/0060_function_type_params.rs
+++ b/crates/libsyntax2/tests/data/parser/inline/0060_function_type_params.rs
diff --git a/tests/data/parser/inline/0060_function_type_params.txt b/crates/libsyntax2/tests/data/parser/inline/0060_function_type_params.txt
index 8809ebc04..8809ebc04 100644
--- a/tests/data/parser/inline/0060_function_type_params.txt
+++ b/crates/libsyntax2/tests/data/parser/inline/0060_function_type_params.txt
diff --git a/tests/data/parser/inline/0061_struct_lit.rs b/crates/libsyntax2/tests/data/parser/inline/0061_struct_lit.rs
index eb711f68a..eb711f68a 100644
--- a/tests/data/parser/inline/0061_struct_lit.rs
+++ b/crates/libsyntax2/tests/data/parser/inline/0061_struct_lit.rs
diff --git a/tests/data/parser/inline/0061_struct_lit.txt b/crates/libsyntax2/tests/data/parser/inline/0061_struct_lit.txt
index 1d048c5ba..1d048c5ba 100644
--- a/tests/data/parser/inline/0061_struct_lit.txt
+++ b/crates/libsyntax2/tests/data/parser/inline/0061_struct_lit.txt
diff --git a/tests/data/parser/inline/0063_impl_trait_type.rs b/crates/libsyntax2/tests/data/parser/inline/0063_impl_trait_type.rs
index 54c5a7c46..54c5a7c46 100644
--- a/tests/data/parser/inline/0063_impl_trait_type.rs
+++ b/crates/libsyntax2/tests/data/parser/inline/0063_impl_trait_type.rs
diff --git a/tests/data/parser/inline/0063_impl_trait_type.txt b/crates/libsyntax2/tests/data/parser/inline/0063_impl_trait_type.txt
index bbebf1086..bbebf1086 100644
--- a/tests/data/parser/inline/0063_impl_trait_type.txt
+++ b/crates/libsyntax2/tests/data/parser/inline/0063_impl_trait_type.txt
diff --git a/tests/data/parser/inline/0063_lambda_expr.txt b/crates/libsyntax2/tests/data/parser/inline/0063_lambda_expr.txt
index 122a99e52..122a99e52 100644
--- a/tests/data/parser/inline/0063_lambda_expr.txt
+++ b/crates/libsyntax2/tests/data/parser/inline/0063_lambda_expr.txt
diff --git a/tests/data/parser/inline/0064_param_list.rs b/crates/libsyntax2/tests/data/parser/inline/0064_param_list.rs
index 9d55bedbb..9d55bedbb 100644
--- a/tests/data/parser/inline/0064_param_list.rs
+++ b/crates/libsyntax2/tests/data/parser/inline/0064_param_list.rs
diff --git a/tests/data/parser/inline/0064_param_list.txt b/crates/libsyntax2/tests/data/parser/inline/0064_param_list.txt
index 14db495b9..14db495b9 100644
--- a/tests/data/parser/inline/0064_param_list.txt
+++ b/crates/libsyntax2/tests/data/parser/inline/0064_param_list.txt
diff --git a/tests/data/parser/inline/0065_if_expr.rs b/crates/libsyntax2/tests/data/parser/inline/0065_if_expr.rs
index 4b0d9af89..4b0d9af89 100644
--- a/tests/data/parser/inline/0065_if_expr.rs
+++ b/crates/libsyntax2/tests/data/parser/inline/0065_if_expr.rs
diff --git a/tests/data/parser/inline/0065_if_expr.txt b/crates/libsyntax2/tests/data/parser/inline/0065_if_expr.txt
index 6ed53264a..6ed53264a 100644
--- a/tests/data/parser/inline/0065_if_expr.txt
+++ b/crates/libsyntax2/tests/data/parser/inline/0065_if_expr.txt
diff --git a/tests/data/parser/inline/0066_lambda_expr.rs b/crates/libsyntax2/tests/data/parser/inline/0066_lambda_expr.rs
index c20d29751..c20d29751 100644
--- a/tests/data/parser/inline/0066_lambda_expr.rs
+++ b/crates/libsyntax2/tests/data/parser/inline/0066_lambda_expr.rs
diff --git a/tests/data/parser/inline/0066_lambda_expr.txt b/crates/libsyntax2/tests/data/parser/inline/0066_lambda_expr.txt
index 6d9aeb331..6d9aeb331 100644
--- a/tests/data/parser/inline/0066_lambda_expr.txt
+++ b/crates/libsyntax2/tests/data/parser/inline/0066_lambda_expr.txt
diff --git a/tests/data/parser/inline/0067_block_expr.rs b/crates/libsyntax2/tests/data/parser/inline/0067_block_expr.rs
index ec3780a04..ec3780a04 100644
--- a/tests/data/parser/inline/0067_block_expr.rs
+++ b/crates/libsyntax2/tests/data/parser/inline/0067_block_expr.rs
diff --git a/tests/data/parser/inline/0067_block_expr.txt b/crates/libsyntax2/tests/data/parser/inline/0067_block_expr.txt
index 981f39e6e..981f39e6e 100644
--- a/tests/data/parser/inline/0067_block_expr.txt
+++ b/crates/libsyntax2/tests/data/parser/inline/0067_block_expr.txt
diff --git a/tests/data/parser/inline/0068_pub_expr.rs b/crates/libsyntax2/tests/data/parser/inline/0068_pub_expr.rs
index d9d99d2d3..d9d99d2d3 100644
--- a/tests/data/parser/inline/0068_pub_expr.rs
+++ b/crates/libsyntax2/tests/data/parser/inline/0068_pub_expr.rs
diff --git a/tests/data/parser/inline/0068_pub_expr.txt b/crates/libsyntax2/tests/data/parser/inline/0068_pub_expr.txt
index 92e58938b..92e58938b 100644
--- a/tests/data/parser/inline/0068_pub_expr.txt
+++ b/crates/libsyntax2/tests/data/parser/inline/0068_pub_expr.txt
diff --git a/tests/data/parser/inline/0068_return_expr.rs b/crates/libsyntax2/tests/data/parser/inline/0068_return_expr.rs
index 5733666b6..5733666b6 100644
--- a/tests/data/parser/inline/0068_return_expr.rs
+++ b/crates/libsyntax2/tests/data/parser/inline/0068_return_expr.rs
diff --git a/tests/data/parser/inline/0068_return_expr.txt b/crates/libsyntax2/tests/data/parser/inline/0068_return_expr.txt
index 4e4ec85b6..4e4ec85b6 100644
--- a/tests/data/parser/inline/0068_return_expr.txt
+++ b/crates/libsyntax2/tests/data/parser/inline/0068_return_expr.txt
diff --git a/tests/data/parser/inline/0069_match_arm.rs b/crates/libsyntax2/tests/data/parser/inline/0069_match_arm.rs
index 2c0e88414..2c0e88414 100644
--- a/tests/data/parser/inline/0069_match_arm.rs
+++ b/crates/libsyntax2/tests/data/parser/inline/0069_match_arm.rs
diff --git a/tests/data/parser/inline/0069_match_arm.txt b/crates/libsyntax2/tests/data/parser/inline/0069_match_arm.txt
index 3377e8342..3377e8342 100644
--- a/tests/data/parser/inline/0069_match_arm.txt
+++ b/crates/libsyntax2/tests/data/parser/inline/0069_match_arm.txt
diff --git a/tests/data/parser/inline/0070_match_expr.rs b/crates/libsyntax2/tests/data/parser/inline/0070_match_expr.rs
index c9205dfa3..c9205dfa3 100644
--- a/tests/data/parser/inline/0070_match_expr.rs
+++ b/crates/libsyntax2/tests/data/parser/inline/0070_match_expr.rs
diff --git a/tests/data/parser/inline/0070_match_expr.txt b/crates/libsyntax2/tests/data/parser/inline/0070_match_expr.txt
index f9ba54486..f9ba54486 100644
--- a/tests/data/parser/inline/0070_match_expr.txt
+++ b/crates/libsyntax2/tests/data/parser/inline/0070_match_expr.txt
diff --git a/tests/data/parser/inline/0071_tuple_pat_fields.rs b/crates/libsyntax2/tests/data/parser/inline/0071_tuple_pat_fields.rs
index 0dfe63629..0dfe63629 100644
--- a/tests/data/parser/inline/0071_tuple_pat_fields.rs
+++ b/crates/libsyntax2/tests/data/parser/inline/0071_tuple_pat_fields.rs
diff --git a/tests/data/parser/inline/0071_tuple_pat_fields.txt b/crates/libsyntax2/tests/data/parser/inline/0071_tuple_pat_fields.txt
index f54835277..f54835277 100644
--- a/tests/data/parser/inline/0071_tuple_pat_fields.txt
+++ b/crates/libsyntax2/tests/data/parser/inline/0071_tuple_pat_fields.txt
diff --git a/tests/data/parser/inline/0072_path_part.rs b/crates/libsyntax2/tests/data/parser/inline/0072_path_part.rs
index f6e32c7c1..f6e32c7c1 100644
--- a/tests/data/parser/inline/0072_path_part.rs
+++ b/crates/libsyntax2/tests/data/parser/inline/0072_path_part.rs
diff --git a/tests/data/parser/inline/0072_path_part.txt b/crates/libsyntax2/tests/data/parser/inline/0072_path_part.txt
index 20da5de86..20da5de86 100644
--- a/tests/data/parser/inline/0072_path_part.txt
+++ b/crates/libsyntax2/tests/data/parser/inline/0072_path_part.txt
diff --git a/tests/data/parser/inline/0073_struct_pat_fields.rs b/crates/libsyntax2/tests/data/parser/inline/0073_struct_pat_fields.rs
index da3412fa8..da3412fa8 100644
--- a/tests/data/parser/inline/0073_struct_pat_fields.rs
+++ b/crates/libsyntax2/tests/data/parser/inline/0073_struct_pat_fields.rs
diff --git a/tests/data/parser/inline/0073_struct_pat_fields.txt b/crates/libsyntax2/tests/data/parser/inline/0073_struct_pat_fields.txt
index fc0d44f7a..fc0d44f7a 100644
--- a/tests/data/parser/inline/0073_struct_pat_fields.txt
+++ b/crates/libsyntax2/tests/data/parser/inline/0073_struct_pat_fields.txt
diff --git a/tests/data/parser/inline/0074_unary_expr.rs b/crates/libsyntax2/tests/data/parser/inline/0074_unary_expr.rs
index f1c3f7118..f1c3f7118 100644
--- a/tests/data/parser/inline/0074_unary_expr.rs
+++ b/crates/libsyntax2/tests/data/parser/inline/0074_unary_expr.rs
diff --git a/tests/data/parser/inline/0074_unary_expr.txt b/crates/libsyntax2/tests/data/parser/inline/0074_unary_expr.txt
index e0b4ff964..e0b4ff964 100644
--- a/tests/data/parser/inline/0074_unary_expr.txt
+++ b/crates/libsyntax2/tests/data/parser/inline/0074_unary_expr.txt
diff --git a/tests/data/parser/inline/0075_try_expr.rs b/crates/libsyntax2/tests/data/parser/inline/0075_try_expr.rs
index 8b74f7bc8..8b74f7bc8 100644
--- a/tests/data/parser/inline/0075_try_expr.rs
+++ b/crates/libsyntax2/tests/data/parser/inline/0075_try_expr.rs
diff --git a/tests/data/parser/inline/0075_try_expr.txt b/crates/libsyntax2/tests/data/parser/inline/0075_try_expr.txt
index f7b86f269..f7b86f269 100644
--- a/tests/data/parser/inline/0075_try_expr.txt
+++ b/crates/libsyntax2/tests/data/parser/inline/0075_try_expr.txt
diff --git a/tests/data/parser/inline/0076_cond.rs b/crates/libsyntax2/tests/data/parser/inline/0076_cond.rs
index fdb37ee6f..fdb37ee6f 100644
--- a/tests/data/parser/inline/0076_cond.rs
+++ b/crates/libsyntax2/tests/data/parser/inline/0076_cond.rs
diff --git a/tests/data/parser/inline/0076_cond.txt b/crates/libsyntax2/tests/data/parser/inline/0076_cond.txt
index 0cde88a90..0cde88a90 100644
--- a/tests/data/parser/inline/0076_cond.txt
+++ b/crates/libsyntax2/tests/data/parser/inline/0076_cond.txt
diff --git a/tests/data/parser/inline/0077_while_expr.rs b/crates/libsyntax2/tests/data/parser/inline/0077_while_expr.rs
index 293046a04..293046a04 100644
--- a/tests/data/parser/inline/0077_while_expr.rs
+++ b/crates/libsyntax2/tests/data/parser/inline/0077_while_expr.rs
diff --git a/tests/data/parser/inline/0077_while_expr.txt b/crates/libsyntax2/tests/data/parser/inline/0077_while_expr.txt
index 82e63fd46..82e63fd46 100644
--- a/tests/data/parser/inline/0077_while_expr.txt
+++ b/crates/libsyntax2/tests/data/parser/inline/0077_while_expr.txt
diff --git a/tests/data/parser/inline/0078_mod_contents.rs b/crates/libsyntax2/tests/data/parser/inline/0078_mod_contents.rs
index 24a15c5c5..24a15c5c5 100644
--- a/tests/data/parser/inline/0078_mod_contents.rs
+++ b/crates/libsyntax2/tests/data/parser/inline/0078_mod_contents.rs
diff --git a/tests/data/parser/inline/0078_mod_contents.txt b/crates/libsyntax2/tests/data/parser/inline/0078_mod_contents.txt
index c003d24e1..c003d24e1 100644
--- a/tests/data/parser/inline/0078_mod_contents.txt
+++ b/crates/libsyntax2/tests/data/parser/inline/0078_mod_contents.txt
diff --git a/tests/data/parser/inline/0079_cast_expr.rs b/crates/libsyntax2/tests/data/parser/inline/0079_cast_expr.rs
index 3e53d56d6..3e53d56d6 100644
--- a/tests/data/parser/inline/0079_cast_expr.rs
+++ b/crates/libsyntax2/tests/data/parser/inline/0079_cast_expr.rs
diff --git a/tests/data/parser/inline/0079_cast_expr.txt b/crates/libsyntax2/tests/data/parser/inline/0079_cast_expr.txt
index 642557e15..642557e15 100644
--- a/tests/data/parser/inline/0079_cast_expr.txt
+++ b/crates/libsyntax2/tests/data/parser/inline/0079_cast_expr.txt
diff --git a/tests/data/parser/inline/0080_tuple_expr.rs b/crates/libsyntax2/tests/data/parser/inline/0080_tuple_expr.rs
index e4f774280..e4f774280 100644
--- a/tests/data/parser/inline/0080_tuple_expr.rs
+++ b/crates/libsyntax2/tests/data/parser/inline/0080_tuple_expr.rs
diff --git a/tests/data/parser/inline/0080_tuple_expr.txt b/crates/libsyntax2/tests/data/parser/inline/0080_tuple_expr.txt
index 728ba6ec7..728ba6ec7 100644
--- a/tests/data/parser/inline/0080_tuple_expr.txt
+++ b/crates/libsyntax2/tests/data/parser/inline/0080_tuple_expr.txt
diff --git a/tests/data/parser/inline/0081_index_expr.rs b/crates/libsyntax2/tests/data/parser/inline/0081_index_expr.rs
index b9ba78a6c..b9ba78a6c 100644
--- a/tests/data/parser/inline/0081_index_expr.rs
+++ b/crates/libsyntax2/tests/data/parser/inline/0081_index_expr.rs
diff --git a/tests/data/parser/inline/0081_index_expr.txt b/crates/libsyntax2/tests/data/parser/inline/0081_index_expr.txt
index 80af4caed..80af4caed 100644
--- a/tests/data/parser/inline/0081_index_expr.txt
+++ b/crates/libsyntax2/tests/data/parser/inline/0081_index_expr.txt
diff --git a/tests/data/parser/inline/0082_tuple_pat.rs b/crates/libsyntax2/tests/data/parser/inline/0082_tuple_pat.rs
index f785acd36..f785acd36 100644
--- a/tests/data/parser/inline/0082_tuple_pat.rs
+++ b/crates/libsyntax2/tests/data/parser/inline/0082_tuple_pat.rs
diff --git a/tests/data/parser/inline/0082_tuple_pat.txt b/crates/libsyntax2/tests/data/parser/inline/0082_tuple_pat.txt
index d8314b5d8..d8314b5d8 100644
--- a/tests/data/parser/inline/0082_tuple_pat.txt
+++ b/crates/libsyntax2/tests/data/parser/inline/0082_tuple_pat.txt
diff --git a/tests/data/parser/inline/0083_postfix_range.rs b/crates/libsyntax2/tests/data/parser/inline/0083_postfix_range.rs
index c39fe8e68..c39fe8e68 100644
--- a/tests/data/parser/inline/0083_postfix_range.rs
+++ b/crates/libsyntax2/tests/data/parser/inline/0083_postfix_range.rs
diff --git a/tests/data/parser/inline/0083_postfix_range.txt b/crates/libsyntax2/tests/data/parser/inline/0083_postfix_range.txt
index bf9b2c695..bf9b2c695 100644
--- a/tests/data/parser/inline/0083_postfix_range.txt
+++ b/crates/libsyntax2/tests/data/parser/inline/0083_postfix_range.txt
diff --git a/tests/data/parser/inline/0084_loop_expr.rs b/crates/libsyntax2/tests/data/parser/inline/0084_loop_expr.rs
index 9f078fa48..9f078fa48 100644
--- a/tests/data/parser/inline/0084_loop_expr.rs
+++ b/crates/libsyntax2/tests/data/parser/inline/0084_loop_expr.rs
diff --git a/tests/data/parser/inline/0084_loop_expr.txt b/crates/libsyntax2/tests/data/parser/inline/0084_loop_expr.txt
index 5e0de55d4..5e0de55d4 100644
--- a/tests/data/parser/inline/0084_loop_expr.txt
+++ b/crates/libsyntax2/tests/data/parser/inline/0084_loop_expr.txt
diff --git a/tests/data/parser/inline/0085_for_expr.rs b/crates/libsyntax2/tests/data/parser/inline/0085_for_expr.rs
index 972197d2a..972197d2a 100644
--- a/tests/data/parser/inline/0085_for_expr.rs
+++ b/crates/libsyntax2/tests/data/parser/inline/0085_for_expr.rs
diff --git a/tests/data/parser/inline/0085_for_expr.txt b/crates/libsyntax2/tests/data/parser/inline/0085_for_expr.txt
index 3a378cfcf..3a378cfcf 100644
--- a/tests/data/parser/inline/0085_for_expr.txt
+++ b/crates/libsyntax2/tests/data/parser/inline/0085_for_expr.txt
diff --git a/tests/data/parser/inline/0085_match_arms_commas.rs b/crates/libsyntax2/tests/data/parser/inline/0085_match_arms_commas.rs
index 1f25d577a..1f25d577a 100644
--- a/tests/data/parser/inline/0085_match_arms_commas.rs
+++ b/crates/libsyntax2/tests/data/parser/inline/0085_match_arms_commas.rs
diff --git a/tests/data/parser/inline/0085_match_arms_commas.txt b/crates/libsyntax2/tests/data/parser/inline/0085_match_arms_commas.txt
index 5465a3797..5465a3797 100644
--- a/tests/data/parser/inline/0085_match_arms_commas.txt
+++ b/crates/libsyntax2/tests/data/parser/inline/0085_match_arms_commas.txt
diff --git a/tests/data/parser/inline/0086_array_expr.rs b/crates/libsyntax2/tests/data/parser/inline/0086_array_expr.rs
index 4dc1999d1..4dc1999d1 100644
--- a/tests/data/parser/inline/0086_array_expr.rs
+++ b/crates/libsyntax2/tests/data/parser/inline/0086_array_expr.rs
diff --git a/tests/data/parser/inline/0086_array_expr.txt b/crates/libsyntax2/tests/data/parser/inline/0086_array_expr.txt
index 9a5f56edf..9a5f56edf 100644
--- a/tests/data/parser/inline/0086_array_expr.txt
+++ b/crates/libsyntax2/tests/data/parser/inline/0086_array_expr.txt
diff --git a/tests/data/parser/inline/0086_no_semi_after_block.rs b/crates/libsyntax2/tests/data/parser/inline/0086_no_semi_after_block.rs
index d769da43d..d769da43d 100644
--- a/tests/data/parser/inline/0086_no_semi_after_block.rs
+++ b/crates/libsyntax2/tests/data/parser/inline/0086_no_semi_after_block.rs
diff --git a/tests/data/parser/inline/0086_no_semi_after_block.txt b/crates/libsyntax2/tests/data/parser/inline/0086_no_semi_after_block.txt
index d19a270ac..d19a270ac 100644
--- a/tests/data/parser/inline/0086_no_semi_after_block.txt
+++ b/crates/libsyntax2/tests/data/parser/inline/0086_no_semi_after_block.txt
diff --git a/tests/data/parser/inline/0087_stmt_postfix_expr_ambiguity.rs b/crates/libsyntax2/tests/data/parser/inline/0087_stmt_postfix_expr_ambiguity.rs
index 2edd578f9..2edd578f9 100644
--- a/tests/data/parser/inline/0087_stmt_postfix_expr_ambiguity.rs
+++ b/crates/libsyntax2/tests/data/parser/inline/0087_stmt_postfix_expr_ambiguity.rs
diff --git a/tests/data/parser/inline/0087_stmt_postfix_expr_ambiguity.txt b/crates/libsyntax2/tests/data/parser/inline/0087_stmt_postfix_expr_ambiguity.txt
index e83b6d183..e83b6d183 100644
--- a/tests/data/parser/inline/0087_stmt_postfix_expr_ambiguity.txt
+++ b/crates/libsyntax2/tests/data/parser/inline/0087_stmt_postfix_expr_ambiguity.txt
diff --git a/tests/data/parser/inline/0088_stmt_bin_expr_ambiguity.rs b/crates/libsyntax2/tests/data/parser/inline/0088_stmt_bin_expr_ambiguity.rs
index 37b843742..37b843742 100644
--- a/tests/data/parser/inline/0088_stmt_bin_expr_ambiguity.rs
+++ b/crates/libsyntax2/tests/data/parser/inline/0088_stmt_bin_expr_ambiguity.rs
diff --git a/tests/data/parser/inline/0088_stmt_bin_expr_ambiguity.txt b/crates/libsyntax2/tests/data/parser/inline/0088_stmt_bin_expr_ambiguity.txt
index df4c20b0e..df4c20b0e 100644
--- a/tests/data/parser/inline/0088_stmt_bin_expr_ambiguity.txt
+++ b/crates/libsyntax2/tests/data/parser/inline/0088_stmt_bin_expr_ambiguity.txt
diff --git a/tests/data/parser/inline/0089_slice_pat.rs b/crates/libsyntax2/tests/data/parser/inline/0089_slice_pat.rs
index 7955973b9..7955973b9 100644
--- a/tests/data/parser/inline/0089_slice_pat.rs
+++ b/crates/libsyntax2/tests/data/parser/inline/0089_slice_pat.rs
diff --git a/tests/data/parser/inline/0089_slice_pat.txt b/crates/libsyntax2/tests/data/parser/inline/0089_slice_pat.txt
index 8379df33b..8379df33b 100644
--- a/tests/data/parser/inline/0089_slice_pat.txt
+++ b/crates/libsyntax2/tests/data/parser/inline/0089_slice_pat.txt
diff --git a/tests/data/parser/inline/0090_trait_item_items.rs b/crates/libsyntax2/tests/data/parser/inline/0090_trait_item_items.rs
index a5ec3239f..a5ec3239f 100644
--- a/tests/data/parser/inline/0090_trait_item_items.rs
+++ b/crates/libsyntax2/tests/data/parser/inline/0090_trait_item_items.rs
diff --git a/tests/data/parser/inline/0090_trait_item_items.txt b/crates/libsyntax2/tests/data/parser/inline/0090_trait_item_items.txt
index c04c48588..c04c48588 100644
--- a/tests/data/parser/inline/0090_trait_item_items.txt
+++ b/crates/libsyntax2/tests/data/parser/inline/0090_trait_item_items.txt
diff --git a/tests/data/parser/inline/0091_fn_decl.rs b/crates/libsyntax2/tests/data/parser/inline/0091_fn_decl.rs
index c9f74f7f5..c9f74f7f5 100644
--- a/tests/data/parser/inline/0091_fn_decl.rs
+++ b/crates/libsyntax2/tests/data/parser/inline/0091_fn_decl.rs
diff --git a/tests/data/parser/inline/0091_fn_decl.txt b/crates/libsyntax2/tests/data/parser/inline/0091_fn_decl.txt
index 5a76af652..5a76af652 100644
--- a/tests/data/parser/inline/0091_fn_decl.txt
+++ b/crates/libsyntax2/tests/data/parser/inline/0091_fn_decl.txt
diff --git a/tests/data/parser/inline/0092_literal_pattern.rs b/crates/libsyntax2/tests/data/parser/inline/0092_literal_pattern.rs
index 16f674d9d..16f674d9d 100644
--- a/tests/data/parser/inline/0092_literal_pattern.rs
+++ b/crates/libsyntax2/tests/data/parser/inline/0092_literal_pattern.rs
diff --git a/tests/data/parser/inline/0092_literal_pattern.txt b/crates/libsyntax2/tests/data/parser/inline/0092_literal_pattern.txt
index a2f985408..a2f985408 100644
--- a/tests/data/parser/inline/0092_literal_pattern.txt
+++ b/crates/libsyntax2/tests/data/parser/inline/0092_literal_pattern.txt
diff --git a/tests/data/parser/inline/0093_path_fn_trait_args.rs b/crates/libsyntax2/tests/data/parser/inline/0093_path_fn_trait_args.rs
index aef45e561..aef45e561 100644
--- a/tests/data/parser/inline/0093_path_fn_trait_args.rs
+++ b/crates/libsyntax2/tests/data/parser/inline/0093_path_fn_trait_args.rs
diff --git a/tests/data/parser/inline/0093_path_fn_trait_args.txt b/crates/libsyntax2/tests/data/parser/inline/0093_path_fn_trait_args.txt
index 800a4ac14..800a4ac14 100644
--- a/tests/data/parser/inline/0093_path_fn_trait_args.txt
+++ b/crates/libsyntax2/tests/data/parser/inline/0093_path_fn_trait_args.txt
diff --git a/tests/data/parser/inline/0094_range_pat.rs b/crates/libsyntax2/tests/data/parser/inline/0094_range_pat.rs
index 657467e75..657467e75 100644
--- a/tests/data/parser/inline/0094_range_pat.rs
+++ b/crates/libsyntax2/tests/data/parser/inline/0094_range_pat.rs
diff --git a/tests/data/parser/inline/0094_range_pat.txt b/crates/libsyntax2/tests/data/parser/inline/0094_range_pat.txt
index cb858044a..cb858044a 100644
--- a/tests/data/parser/inline/0094_range_pat.txt
+++ b/crates/libsyntax2/tests/data/parser/inline/0094_range_pat.txt
diff --git a/tests/data/parser/inline/0095_path_type_with_bounds.rs b/crates/libsyntax2/tests/data/parser/inline/0095_path_type_with_bounds.rs
index 215210e27..215210e27 100644
--- a/tests/data/parser/inline/0095_path_type_with_bounds.rs
+++ b/crates/libsyntax2/tests/data/parser/inline/0095_path_type_with_bounds.rs
diff --git a/tests/data/parser/inline/0095_path_type_with_bounds.txt b/crates/libsyntax2/tests/data/parser/inline/0095_path_type_with_bounds.txt
index 57c38e7ee..57c38e7ee 100644
--- a/tests/data/parser/inline/0095_path_type_with_bounds.txt
+++ b/crates/libsyntax2/tests/data/parser/inline/0095_path_type_with_bounds.txt
diff --git a/tests/data/parser/inline/0096_value_parameters_no_patterns.rs b/crates/libsyntax2/tests/data/parser/inline/0096_value_parameters_no_patterns.rs
index d8c23c76a..d8c23c76a 100644
--- a/tests/data/parser/inline/0096_value_parameters_no_patterns.rs
+++ b/crates/libsyntax2/tests/data/parser/inline/0096_value_parameters_no_patterns.rs
diff --git a/tests/data/parser/inline/0096_value_parameters_no_patterns.txt b/crates/libsyntax2/tests/data/parser/inline/0096_value_parameters_no_patterns.txt
index c3f9bf685..c3f9bf685 100644
--- a/tests/data/parser/inline/0096_value_parameters_no_patterns.txt
+++ b/crates/libsyntax2/tests/data/parser/inline/0096_value_parameters_no_patterns.txt
diff --git a/tests/data/parser/inline/0097_param_list_opt_patterns.rs b/crates/libsyntax2/tests/data/parser/inline/0097_param_list_opt_patterns.rs
index 9b93442c0..9b93442c0 100644
--- a/tests/data/parser/inline/0097_param_list_opt_patterns.rs
+++ b/crates/libsyntax2/tests/data/parser/inline/0097_param_list_opt_patterns.rs
diff --git a/tests/data/parser/inline/0097_param_list_opt_patterns.txt b/crates/libsyntax2/tests/data/parser/inline/0097_param_list_opt_patterns.txt
index 4cb3bdac5..4cb3bdac5 100644
--- a/tests/data/parser/inline/0097_param_list_opt_patterns.txt
+++ b/crates/libsyntax2/tests/data/parser/inline/0097_param_list_opt_patterns.txt
diff --git a/tests/data/parser/inline/0098_where_clause.rs b/crates/libsyntax2/tests/data/parser/inline/0098_where_clause.rs
index 592a005f9..592a005f9 100644
--- a/tests/data/parser/inline/0098_where_clause.rs
+++ b/crates/libsyntax2/tests/data/parser/inline/0098_where_clause.rs
diff --git a/tests/data/parser/inline/0098_where_clause.txt b/crates/libsyntax2/tests/data/parser/inline/0098_where_clause.txt
index 150f125a7..150f125a7 100644
--- a/tests/data/parser/inline/0098_where_clause.txt
+++ b/crates/libsyntax2/tests/data/parser/inline/0098_where_clause.txt
diff --git a/tests/data/parser/inline/0099_crate_keyword_vis.rs b/crates/libsyntax2/tests/data/parser/inline/0099_crate_keyword_vis.rs
index 660d927cf..660d927cf 100644
--- a/tests/data/parser/inline/0099_crate_keyword_vis.rs
+++ b/crates/libsyntax2/tests/data/parser/inline/0099_crate_keyword_vis.rs
diff --git a/tests/data/parser/inline/0099_crate_keyword_vis.txt b/crates/libsyntax2/tests/data/parser/inline/0099_crate_keyword_vis.txt
index a830d99d9..a830d99d9 100644
--- a/tests/data/parser/inline/0099_crate_keyword_vis.txt
+++ b/crates/libsyntax2/tests/data/parser/inline/0099_crate_keyword_vis.txt
diff --git a/tests/data/parser/ok/0000_empty.rs b/crates/libsyntax2/tests/data/parser/ok/0000_empty.rs
index e69de29bb..e69de29bb 100644
--- a/tests/data/parser/ok/0000_empty.rs
+++ b/crates/libsyntax2/tests/data/parser/ok/0000_empty.rs
diff --git a/tests/data/parser/ok/0000_empty.txt b/crates/libsyntax2/tests/data/parser/ok/0000_empty.txt
index 54be3e7bc..54be3e7bc 100644
--- a/tests/data/parser/ok/0000_empty.txt
+++ b/crates/libsyntax2/tests/data/parser/ok/0000_empty.txt
diff --git a/tests/data/parser/ok/0001_struct_item.rs b/crates/libsyntax2/tests/data/parser/ok/0001_struct_item.rs
index d3a8c1d23..d3a8c1d23 100644
--- a/tests/data/parser/ok/0001_struct_item.rs
+++ b/crates/libsyntax2/tests/data/parser/ok/0001_struct_item.rs
diff --git a/tests/data/parser/ok/0001_struct_item.txt b/crates/libsyntax2/tests/data/parser/ok/0001_struct_item.txt
index 3d5b5cb7f..3d5b5cb7f 100644
--- a/tests/data/parser/ok/0001_struct_item.txt
+++ b/crates/libsyntax2/tests/data/parser/ok/0001_struct_item.txt
diff --git a/tests/data/parser/ok/0002_struct_item_field.rs b/crates/libsyntax2/tests/data/parser/ok/0002_struct_item_field.rs
index cc3866d25..cc3866d25 100644
--- a/tests/data/parser/ok/0002_struct_item_field.rs
+++ b/crates/libsyntax2/tests/data/parser/ok/0002_struct_item_field.rs
diff --git a/tests/data/parser/ok/0002_struct_item_field.txt b/crates/libsyntax2/tests/data/parser/ok/0002_struct_item_field.txt
index 1129ce39e..1129ce39e 100644
--- a/tests/data/parser/ok/0002_struct_item_field.txt
+++ b/crates/libsyntax2/tests/data/parser/ok/0002_struct_item_field.txt
diff --git a/tests/data/parser/ok/0004_file_shebang.rs b/crates/libsyntax2/tests/data/parser/ok/0004_file_shebang.rs
index 53dc9e617..53dc9e617 100644
--- a/tests/data/parser/ok/0004_file_shebang.rs
+++ b/crates/libsyntax2/tests/data/parser/ok/0004_file_shebang.rs
diff --git a/tests/data/parser/ok/0004_file_shebang.txt b/crates/libsyntax2/tests/data/parser/ok/0004_file_shebang.txt
index 33055cf3d..33055cf3d 100644
--- a/tests/data/parser/ok/0004_file_shebang.txt
+++ b/crates/libsyntax2/tests/data/parser/ok/0004_file_shebang.txt
diff --git a/tests/data/parser/ok/0005_fn_item.rs b/crates/libsyntax2/tests/data/parser/ok/0005_fn_item.rs
index 03210551c..03210551c 100644
--- a/tests/data/parser/ok/0005_fn_item.rs
+++ b/crates/libsyntax2/tests/data/parser/ok/0005_fn_item.rs
diff --git a/tests/data/parser/ok/0005_fn_item.txt b/crates/libsyntax2/tests/data/parser/ok/0005_fn_item.txt
index 4ab93d408..4ab93d408 100644
--- a/tests/data/parser/ok/0005_fn_item.txt
+++ b/crates/libsyntax2/tests/data/parser/ok/0005_fn_item.txt
diff --git a/tests/data/parser/ok/0006_inner_attributes.rs b/crates/libsyntax2/tests/data/parser/ok/0006_inner_attributes.rs
index e81f8b1e8..e81f8b1e8 100644
--- a/tests/data/parser/ok/0006_inner_attributes.rs
+++ b/crates/libsyntax2/tests/data/parser/ok/0006_inner_attributes.rs
diff --git a/tests/data/parser/ok/0006_inner_attributes.txt b/crates/libsyntax2/tests/data/parser/ok/0006_inner_attributes.txt
index 562c8d917..562c8d917 100644
--- a/tests/data/parser/ok/0006_inner_attributes.txt
+++ b/crates/libsyntax2/tests/data/parser/ok/0006_inner_attributes.txt
diff --git a/tests/data/parser/ok/0007_extern_crate.rs b/crates/libsyntax2/tests/data/parser/ok/0007_extern_crate.rs
index 3ce336676..3ce336676 100644
--- a/tests/data/parser/ok/0007_extern_crate.rs
+++ b/crates/libsyntax2/tests/data/parser/ok/0007_extern_crate.rs
diff --git a/tests/data/parser/ok/0007_extern_crate.txt b/crates/libsyntax2/tests/data/parser/ok/0007_extern_crate.txt
index 533af33c4..533af33c4 100644
--- a/tests/data/parser/ok/0007_extern_crate.txt
+++ b/crates/libsyntax2/tests/data/parser/ok/0007_extern_crate.txt
diff --git a/tests/data/parser/ok/0008_mod_item.rs b/crates/libsyntax2/tests/data/parser/ok/0008_mod_item.rs
index d22993bc1..d22993bc1 100644
--- a/tests/data/parser/ok/0008_mod_item.rs
+++ b/crates/libsyntax2/tests/data/parser/ok/0008_mod_item.rs
diff --git a/tests/data/parser/ok/0008_mod_item.txt b/crates/libsyntax2/tests/data/parser/ok/0008_mod_item.txt
index 1dcaaedce..1dcaaedce 100644
--- a/tests/data/parser/ok/0008_mod_item.txt
+++ b/crates/libsyntax2/tests/data/parser/ok/0008_mod_item.txt
diff --git a/tests/data/parser/ok/0009_use_item.rs b/crates/libsyntax2/tests/data/parser/ok/0009_use_item.rs
index 05a6aff83..05a6aff83 100644
--- a/tests/data/parser/ok/0009_use_item.rs
+++ b/crates/libsyntax2/tests/data/parser/ok/0009_use_item.rs
diff --git a/tests/data/parser/ok/0009_use_item.txt b/crates/libsyntax2/tests/data/parser/ok/0009_use_item.txt
index 8f850cd1c..8f850cd1c 100644
--- a/tests/data/parser/ok/0009_use_item.txt
+++ b/crates/libsyntax2/tests/data/parser/ok/0009_use_item.txt
diff --git a/tests/data/parser/ok/0010_use_path_segments.rs b/crates/libsyntax2/tests/data/parser/ok/0010_use_path_segments.rs
index 1e71b7a6c..1e71b7a6c 100644
--- a/tests/data/parser/ok/0010_use_path_segments.rs
+++ b/crates/libsyntax2/tests/data/parser/ok/0010_use_path_segments.rs
diff --git a/tests/data/parser/ok/0010_use_path_segments.txt b/crates/libsyntax2/tests/data/parser/ok/0010_use_path_segments.txt
index 03ec342c2..03ec342c2 100644
--- a/tests/data/parser/ok/0010_use_path_segments.txt
+++ b/crates/libsyntax2/tests/data/parser/ok/0010_use_path_segments.txt
diff --git a/tests/data/parser/ok/0011_outer_attribute.rs b/crates/libsyntax2/tests/data/parser/ok/0011_outer_attribute.rs
index 8b80c0d90..8b80c0d90 100644
--- a/tests/data/parser/ok/0011_outer_attribute.rs
+++ b/crates/libsyntax2/tests/data/parser/ok/0011_outer_attribute.rs
diff --git a/tests/data/parser/ok/0011_outer_attribute.txt b/crates/libsyntax2/tests/data/parser/ok/0011_outer_attribute.txt
index 9824c9083..9824c9083 100644
--- a/tests/data/parser/ok/0011_outer_attribute.txt
+++ b/crates/libsyntax2/tests/data/parser/ok/0011_outer_attribute.txt
diff --git a/tests/data/parser/ok/0012_visibility.rs b/crates/libsyntax2/tests/data/parser/ok/0012_visibility.rs
index 75b1db121..75b1db121 100644
--- a/tests/data/parser/ok/0012_visibility.rs
+++ b/crates/libsyntax2/tests/data/parser/ok/0012_visibility.rs
diff --git a/tests/data/parser/ok/0012_visibility.txt b/crates/libsyntax2/tests/data/parser/ok/0012_visibility.txt
index af0c59543..af0c59543 100644
--- a/tests/data/parser/ok/0012_visibility.txt
+++ b/crates/libsyntax2/tests/data/parser/ok/0012_visibility.txt
diff --git a/tests/data/parser/ok/0013_use_path_self_super.rs b/crates/libsyntax2/tests/data/parser/ok/0013_use_path_self_super.rs
index faf6a42c7..faf6a42c7 100644
--- a/tests/data/parser/ok/0013_use_path_self_super.rs
+++ b/crates/libsyntax2/tests/data/parser/ok/0013_use_path_self_super.rs
diff --git a/tests/data/parser/ok/0013_use_path_self_super.txt b/crates/libsyntax2/tests/data/parser/ok/0013_use_path_self_super.txt
index 5ed27ca37..5ed27ca37 100644
--- a/tests/data/parser/ok/0013_use_path_self_super.txt
+++ b/crates/libsyntax2/tests/data/parser/ok/0013_use_path_self_super.txt
diff --git a/tests/data/parser/ok/0014_use_tree.rs b/crates/libsyntax2/tests/data/parser/ok/0014_use_tree.rs
index 5e4aa3a33..5e4aa3a33 100644
--- a/tests/data/parser/ok/0014_use_tree.rs
+++ b/crates/libsyntax2/tests/data/parser/ok/0014_use_tree.rs
diff --git a/tests/data/parser/ok/0014_use_tree.txt b/crates/libsyntax2/tests/data/parser/ok/0014_use_tree.txt
index 730d5539b..730d5539b 100644
--- a/tests/data/parser/ok/0014_use_tree.txt
+++ b/crates/libsyntax2/tests/data/parser/ok/0014_use_tree.txt
diff --git a/tests/data/parser/ok/0015_use_tree.rs b/crates/libsyntax2/tests/data/parser/ok/0015_use_tree.rs
index 46a0783a2..46a0783a2 100644
--- a/tests/data/parser/ok/0015_use_tree.rs
+++ b/crates/libsyntax2/tests/data/parser/ok/0015_use_tree.rs
diff --git a/tests/data/parser/ok/0015_use_tree.txt b/crates/libsyntax2/tests/data/parser/ok/0015_use_tree.txt
index 4438e417b..4438e417b 100644
--- a/tests/data/parser/ok/0015_use_tree.txt
+++ b/crates/libsyntax2/tests/data/parser/ok/0015_use_tree.txt
diff --git a/tests/data/parser/ok/0016_struct_flavors.rs b/crates/libsyntax2/tests/data/parser/ok/0016_struct_flavors.rs
index 69638350c..69638350c 100644
--- a/tests/data/parser/ok/0016_struct_flavors.rs
+++ b/crates/libsyntax2/tests/data/parser/ok/0016_struct_flavors.rs
diff --git a/tests/data/parser/ok/0016_struct_flavors.txt b/crates/libsyntax2/tests/data/parser/ok/0016_struct_flavors.txt
index 5dd480d1b..5dd480d1b 100644
--- a/tests/data/parser/ok/0016_struct_flavors.txt
+++ b/crates/libsyntax2/tests/data/parser/ok/0016_struct_flavors.txt
diff --git a/tests/data/parser/ok/0017_attr_trailing_comma.rs b/crates/libsyntax2/tests/data/parser/ok/0017_attr_trailing_comma.rs
index fe0a7bb97..fe0a7bb97 100644
--- a/tests/data/parser/ok/0017_attr_trailing_comma.rs
+++ b/crates/libsyntax2/tests/data/parser/ok/0017_attr_trailing_comma.rs
diff --git a/tests/data/parser/ok/0017_attr_trailing_comma.txt b/crates/libsyntax2/tests/data/parser/ok/0017_attr_trailing_comma.txt
index 69724cdc8..69724cdc8 100644
--- a/tests/data/parser/ok/0017_attr_trailing_comma.txt
+++ b/crates/libsyntax2/tests/data/parser/ok/0017_attr_trailing_comma.txt
diff --git a/tests/data/parser/ok/0018_struct_type_params.rs b/crates/libsyntax2/tests/data/parser/ok/0018_struct_type_params.rs
index 88c544923..88c544923 100644
--- a/tests/data/parser/ok/0018_struct_type_params.rs
+++ b/crates/libsyntax2/tests/data/parser/ok/0018_struct_type_params.rs
diff --git a/tests/data/parser/ok/0018_struct_type_params.txt b/crates/libsyntax2/tests/data/parser/ok/0018_struct_type_params.txt
index 6457c2639..6457c2639 100644
--- a/tests/data/parser/ok/0018_struct_type_params.txt
+++ b/crates/libsyntax2/tests/data/parser/ok/0018_struct_type_params.txt
diff --git a/tests/data/parser/ok/0019_enums.rs b/crates/libsyntax2/tests/data/parser/ok/0019_enums.rs
index 7a1afa0e6..7a1afa0e6 100644
--- a/tests/data/parser/ok/0019_enums.rs
+++ b/crates/libsyntax2/tests/data/parser/ok/0019_enums.rs
diff --git a/tests/data/parser/ok/0019_enums.txt b/crates/libsyntax2/tests/data/parser/ok/0019_enums.txt
index 8650381cd..8650381cd 100644
--- a/tests/data/parser/ok/0019_enums.txt
+++ b/crates/libsyntax2/tests/data/parser/ok/0019_enums.txt
diff --git a/tests/data/parser/ok/0020_type_param_bounds.rs b/crates/libsyntax2/tests/data/parser/ok/0020_type_param_bounds.rs
index a1b9f00a4..a1b9f00a4 100644
--- a/tests/data/parser/ok/0020_type_param_bounds.rs
+++ b/crates/libsyntax2/tests/data/parser/ok/0020_type_param_bounds.rs
diff --git a/tests/data/parser/ok/0020_type_param_bounds.txt b/crates/libsyntax2/tests/data/parser/ok/0020_type_param_bounds.txt
index fe12cbb94..fe12cbb94 100644
--- a/tests/data/parser/ok/0020_type_param_bounds.txt
+++ b/crates/libsyntax2/tests/data/parser/ok/0020_type_param_bounds.txt
diff --git a/tests/data/parser/ok/0021_extern_fn.rs b/crates/libsyntax2/tests/data/parser/ok/0021_extern_fn.rs
index e929eef74..e929eef74 100644
--- a/tests/data/parser/ok/0021_extern_fn.rs
+++ b/crates/libsyntax2/tests/data/parser/ok/0021_extern_fn.rs
diff --git a/tests/data/parser/ok/0021_extern_fn.txt b/crates/libsyntax2/tests/data/parser/ok/0021_extern_fn.txt
index 07d5cc157..07d5cc157 100644
--- a/tests/data/parser/ok/0021_extern_fn.txt
+++ b/crates/libsyntax2/tests/data/parser/ok/0021_extern_fn.txt
diff --git a/tests/data/parser/ok/0022_empty_extern_block.rs b/crates/libsyntax2/tests/data/parser/ok/0022_empty_extern_block.rs
index f5fe0e6ef..f5fe0e6ef 100644
--- a/tests/data/parser/ok/0022_empty_extern_block.rs
+++ b/crates/libsyntax2/tests/data/parser/ok/0022_empty_extern_block.rs
diff --git a/tests/data/parser/ok/0022_empty_extern_block.txt b/crates/libsyntax2/tests/data/parser/ok/0022_empty_extern_block.txt
index 81b92d394..81b92d394 100644
--- a/tests/data/parser/ok/0022_empty_extern_block.txt
+++ b/crates/libsyntax2/tests/data/parser/ok/0022_empty_extern_block.txt
diff --git a/tests/data/parser/ok/0023_static_items.rs b/crates/libsyntax2/tests/data/parser/ok/0023_static_items.rs
index 5fb92ce33..5fb92ce33 100644
--- a/tests/data/parser/ok/0023_static_items.rs
+++ b/crates/libsyntax2/tests/data/parser/ok/0023_static_items.rs
diff --git a/tests/data/parser/ok/0023_static_items.txt b/crates/libsyntax2/tests/data/parser/ok/0023_static_items.txt
index b8dfdd251..b8dfdd251 100644
--- a/tests/data/parser/ok/0023_static_items.txt
+++ b/crates/libsyntax2/tests/data/parser/ok/0023_static_items.txt
diff --git a/tests/data/parser/ok/0024_const_item.rs b/crates/libsyntax2/tests/data/parser/ok/0024_const_item.rs
index 7446859b5..7446859b5 100644
--- a/tests/data/parser/ok/0024_const_item.rs
+++ b/crates/libsyntax2/tests/data/parser/ok/0024_const_item.rs
diff --git a/tests/data/parser/ok/0024_const_item.txt b/crates/libsyntax2/tests/data/parser/ok/0024_const_item.txt
index 85083e9c1..85083e9c1 100644
--- a/tests/data/parser/ok/0024_const_item.txt
+++ b/crates/libsyntax2/tests/data/parser/ok/0024_const_item.txt
diff --git a/tests/data/parser/ok/0025_extern_fn_in_block.rs b/crates/libsyntax2/tests/data/parser/ok/0025_extern_fn_in_block.rs
index 289809809..289809809 100644
--- a/tests/data/parser/ok/0025_extern_fn_in_block.rs
+++ b/crates/libsyntax2/tests/data/parser/ok/0025_extern_fn_in_block.rs
diff --git a/tests/data/parser/ok/0025_extern_fn_in_block.txt b/crates/libsyntax2/tests/data/parser/ok/0025_extern_fn_in_block.txt
index 46fb177b2..46fb177b2 100644
--- a/tests/data/parser/ok/0025_extern_fn_in_block.txt
+++ b/crates/libsyntax2/tests/data/parser/ok/0025_extern_fn_in_block.txt
diff --git a/tests/data/parser/ok/0026_const_fn_in_block.rs b/crates/libsyntax2/tests/data/parser/ok/0026_const_fn_in_block.rs
index 7641a3d28..7641a3d28 100644
--- a/tests/data/parser/ok/0026_const_fn_in_block.rs
+++ b/crates/libsyntax2/tests/data/parser/ok/0026_const_fn_in_block.rs
diff --git a/tests/data/parser/ok/0026_const_fn_in_block.txt b/crates/libsyntax2/tests/data/parser/ok/0026_const_fn_in_block.txt
index a450762a8..a450762a8 100644
--- a/tests/data/parser/ok/0026_const_fn_in_block.txt
+++ b/crates/libsyntax2/tests/data/parser/ok/0026_const_fn_in_block.txt
diff --git a/tests/data/parser/ok/0027_unsafe_fn_in_block.rs b/crates/libsyntax2/tests/data/parser/ok/0027_unsafe_fn_in_block.rs
index f3c5ff938..f3c5ff938 100644
--- a/tests/data/parser/ok/0027_unsafe_fn_in_block.rs
+++ b/crates/libsyntax2/tests/data/parser/ok/0027_unsafe_fn_in_block.rs
diff --git a/tests/data/parser/ok/0027_unsafe_fn_in_block.txt b/crates/libsyntax2/tests/data/parser/ok/0027_unsafe_fn_in_block.txt
index 28cd7ad3d..28cd7ad3d 100644
--- a/tests/data/parser/ok/0027_unsafe_fn_in_block.txt
+++ b/crates/libsyntax2/tests/data/parser/ok/0027_unsafe_fn_in_block.txt
diff --git a/tests/data/parser/ok/0028_operator_binding_power.rs b/crates/libsyntax2/tests/data/parser/ok/0028_operator_binding_power.rs
index cc9598470..cc9598470 100644
--- a/tests/data/parser/ok/0028_operator_binding_power.rs
+++ b/crates/libsyntax2/tests/data/parser/ok/0028_operator_binding_power.rs
diff --git a/tests/data/parser/ok/0028_operator_binding_power.txt b/crates/libsyntax2/tests/data/parser/ok/0028_operator_binding_power.txt
index 3fb1ae811..3fb1ae811 100644
--- a/tests/data/parser/ok/0028_operator_binding_power.txt
+++ b/crates/libsyntax2/tests/data/parser/ok/0028_operator_binding_power.txt
diff --git a/tests/data/parser/ok/0029_range_forms.rs b/crates/libsyntax2/tests/data/parser/ok/0029_range_forms.rs
index 03f4ae7b2..03f4ae7b2 100644
--- a/tests/data/parser/ok/0029_range_forms.rs
+++ b/crates/libsyntax2/tests/data/parser/ok/0029_range_forms.rs
diff --git a/tests/data/parser/ok/0029_range_forms.txt b/crates/libsyntax2/tests/data/parser/ok/0029_range_forms.txt
index 91d5e5bba..91d5e5bba 100644
--- a/tests/data/parser/ok/0029_range_forms.txt
+++ b/crates/libsyntax2/tests/data/parser/ok/0029_range_forms.txt
diff --git a/tests/lexer.rs b/crates/libsyntax2/tests/lexer.rs
index 46ac9fedd..46ac9fedd 100644
--- a/tests/lexer.rs
+++ b/crates/libsyntax2/tests/lexer.rs
diff --git a/tests/parser.rs b/crates/libsyntax2/tests/parser.rs
index af2ae11bb..af2ae11bb 100644
--- a/tests/parser.rs
+++ b/crates/libsyntax2/tests/parser.rs
diff --git a/tests/testutils/Cargo.toml b/crates/libsyntax2/tests/testutils/Cargo.toml
index 53b20f17b..53b20f17b 100644
--- a/tests/testutils/Cargo.toml
+++ b/crates/libsyntax2/tests/testutils/Cargo.toml
diff --git a/tests/testutils/src/lib.rs b/crates/libsyntax2/tests/testutils/src/lib.rs
index 39c821661..39c821661 100644
--- a/tests/testutils/src/lib.rs
+++ b/crates/libsyntax2/tests/testutils/src/lib.rs
diff --git a/codeless/server/Cargo.toml b/crates/server/Cargo.toml
index f5c32b878..e6d1b18c3 100644
--- a/codeless/server/Cargo.toml
+++ b/crates/server/Cargo.toml
@@ -14,5 +14,5 @@ crossbeam-channel = "0.2.4"
 threadpool = "1.7.1"
 flexi_logger = "0.9.0"
 log = "0.4.3"
-libeditor = { path = "../../libeditor" }
-libanalysis = { path = "../../libanalysis" }
+libeditor = { path = "../libeditor" }
+libanalysis = { path = "../libanalysis" }
diff --git a/codeless/server/src/caps.rs b/crates/server/src/caps.rs
index 3d89c64a9..3d89c64a9 100644
--- a/codeless/server/src/caps.rs
+++ b/crates/server/src/caps.rs
diff --git a/codeless/server/src/dispatch.rs b/crates/server/src/dispatch.rs
index 2da0996e3..2da0996e3 100644
--- a/codeless/server/src/dispatch.rs
+++ b/crates/server/src/dispatch.rs
diff --git a/codeless/server/src/handlers.rs b/crates/server/src/handlers.rs
index 5ee87a4dd..5ee87a4dd 100644
--- a/codeless/server/src/handlers.rs
+++ b/crates/server/src/handlers.rs
diff --git a/codeless/server/src/io.rs b/crates/server/src/io.rs
index 5eafc6942..5eafc6942 100644
--- a/codeless/server/src/io.rs
+++ b/crates/server/src/io.rs
diff --git a/codeless/server/src/main.rs b/crates/server/src/main.rs
index 116abce1c..116abce1c 100644
--- a/codeless/server/src/main.rs
+++ b/crates/server/src/main.rs
diff --git a/codeless/server/src/req.rs b/crates/server/src/req.rs
index 4e588159b..4e588159b 100644
--- a/codeless/server/src/req.rs
+++ b/crates/server/src/req.rs
diff --git a/tools/Cargo.toml b/crates/tools/Cargo.toml
index f9fee16f9..f9fee16f9 100644
--- a/tools/Cargo.toml
+++ b/crates/tools/Cargo.toml
diff --git a/tools/src/lib.rs b/crates/tools/src/lib.rs
index 97a56a31f..97a56a31f 100644
--- a/tools/src/lib.rs
+++ b/crates/tools/src/lib.rs
diff --git a/tools/src/main.rs b/crates/tools/src/main.rs
index b5c966f74..d42d3ecb7 100644
--- a/tools/src/main.rs
+++ b/crates/tools/src/main.rs
@@ -18,13 +18,13 @@ use tools::{collect_tests, Test};
 
 type Result<T> = ::std::result::Result<T, failure::Error>;
 
-const GRAMMAR_DIR: &str = "./src/grammar";
-const INLINE_TESTS_DIR: &str = "tests/data/parser/inline";
-const GRAMMAR: &str = "./src/grammar.ron";
-const SYNTAX_KINDS: &str = "./src/syntax_kinds/generated.rs";
-const SYNTAX_KINDS_TEMPLATE: &str = "./src/syntax_kinds/generated.rs.tera";
-const AST: &str = "./src/ast/generated.rs";
-const AST_TEMPLATE: &str = "./src/ast/generated.rs.tera";
+const GRAMMAR_DIR: &str = "./crates/libsyntax2/src/grammar";
+const INLINE_TESTS_DIR: &str = "./crates/libsyntax2/tests/data/parser/inline";
+const GRAMMAR: &str = "./crates/libsyntax2/src/grammar.ron";
+const SYNTAX_KINDS: &str = "./crates/libsyntax2/src/syntax_kinds/generated.rs";
+const SYNTAX_KINDS_TEMPLATE: &str = "./crates/libsyntax2/src/syntax_kinds/generated.rs.tera";
+const AST: &str = "./crates/libsyntax2/src/ast/generated.rs";
+const AST_TEMPLATE: &str = "./crates/libsyntax2/src/ast/generated.rs.tera";
 
 fn main() -> Result<()> {
     let matches = App::new("tasks")