478 files changed, 219 insertions, 204 deletions

diff --git a/.cargo/config b/.cargo/config
index 0e9e0f387..767045bdb 100644
--- a/.cargo/config
+++ b/.cargo/config
@@ -1,7 +1,7 @@
 [alias]
-gen-kinds = "run --package tools -- gen-kinds"
-gen-tests = "run --package tools -- gen-tests"
+gen-kinds =    "run --package tools -- gen-kinds"
+gen-tests =    "run --package tools -- gen-tests"
 install-code = "run --package tools -- install-code"
 
-render-test = "run --package cli -- render-test"
-parse = "run --package cli -- parse"
+render-test = "run --package ra_cli -- render-test"
+parse =       "run --package ra_cli -- parse"
diff --git a/crates/gen_lsp_server/Cargo.toml b/crates/gen_lsp_server/Cargo.toml
index b31884802..4eb508fc0 100644
--- a/crates/gen_lsp_server/Cargo.toml
+++ b/crates/gen_lsp_server/Cargo.toml
@@ -4,7 +4,7 @@ version = "0.1.0"
 authors = ["Aleksey Kladov <[email protected]>"]
 
 [dependencies]
-languageserver-types = "0.49.0"
+languageserver-types = "0.50.0"
 log = "0.4.3"
 
 failure = "0.1.2"
diff --git a/crates/libeditor/scope.rs b/crates/libeditor/scope.rs
deleted file mode 100644
index e69de29bb..000000000
--- a/crates/libeditor/scope.rs
+++ /dev/null
diff --git a/crates/libanalysis/Cargo.toml b/crates/ra_analysis/Cargo.toml
index 88f29d7c8..a30cdfc9c 100644
--- a/crates/libanalysis/Cargo.toml
+++ b/crates/ra_analysis/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "libanalysis"
+name = "ra_analysis"
 version = "0.1.0"
 authors = ["Aleksey Kladov <[email protected]>"]
 
@@ -12,8 +12,8 @@ once_cell = "0.1.5"
 rayon = "1.0.2"
 fst = "0.3.1"
 im = "12.0.0"
-libsyntax2 = { path = "../libsyntax2" }
-libeditor = { path = "../libeditor" }
+ra_syntax = { path = "../ra_syntax" }
+ra_editor = { path = "../ra_editor" }
 salsa = { path = "../salsa" }
 
 [dev-dependencies]
diff --git a/crates/libanalysis/src/db/imp.rs b/crates/ra_analysis/src/db/imp.rs
index f26be1046..f26be1046 100644
--- a/crates/libanalysis/src/db/imp.rs
+++ b/crates/ra_analysis/src/db/imp.rs
diff --git a/crates/libanalysis/src/db/mod.rs b/crates/ra_analysis/src/db/mod.rs
index 22769d112..22769d112 100644
--- a/crates/libanalysis/src/db/mod.rs
+++ b/crates/ra_analysis/src/db/mod.rs
diff --git a/crates/libanalysis/src/descriptors.rs b/crates/ra_analysis/src/descriptors.rs
index 93a4158e4..0731b5572 100644
--- a/crates/libanalysis/src/descriptors.rs
+++ b/crates/ra_analysis/src/descriptors.rs
@@ -2,7 +2,7 @@ use std::{
     collections::BTreeMap,
 };
 use relative_path::RelativePathBuf;
-use libsyntax2::{
+use ra_syntax::{
     SmolStr,
     ast::{self, NameOwner},
 };
diff --git a/crates/libanalysis/src/imp.rs b/crates/ra_analysis/src/imp.rs
index 6f3191fe7..90184a4b9 100644
--- a/crates/libanalysis/src/imp.rs
+++ b/crates/ra_analysis/src/imp.rs
@@ -9,8 +9,8 @@ use std::{
 };
 
 use relative_path::RelativePath;
-use libeditor::{self, FileSymbol, LineIndex, find_node_at_offset, LocalEdit};
-use libsyntax2::{
+use ra_editor::{self, FileSymbol, LineIndex, find_node_at_offset, LocalEdit};
+use ra_syntax::{
     TextUnit, TextRange, SmolStr, File, AstNode,
     SyntaxKind::*,
     ast::{self, NameOwner},
@@ -228,7 +228,7 @@ impl AnalysisImpl {
         let module_tree  = root.module_tree();
         let syntax = root.syntax(file_id);
 
-        let mut res = libeditor::diagnostics(&syntax)
+        let mut res = ra_editor::diagnostics(&syntax)
             .into_iter()
             .map(|d| Diagnostic { range: d.range, message: d.msg, fix: None })
             .collect::<Vec<_>>();
@@ -277,10 +277,10 @@ impl AnalysisImpl {
         let file = self.file_syntax(file_id);
         let offset = range.start();
         let actions = vec![
-            ("flip comma", libeditor::flip_comma(&file, offset).map(|f| f())),
-            ("add `#[derive]`", libeditor::add_derive(&file, offset).map(|f| f())),
-            ("add impl", libeditor::add_impl(&file, offset).map(|f| f())),
-            ("introduce variable", libeditor::introduce_variable(&file, range).map(|f| f())),
+            ("flip comma", ra_editor::flip_comma(&file, offset).map(|f| f())),
+            ("add `#[derive]`", ra_editor::add_derive(&file, offset).map(|f| f())),
+            ("add impl", ra_editor::add_impl(&file, offset).map(|f| f())),
+            ("introduce variable", ra_editor::introduce_variable(&file, range).map(|f| f())),
         ];
         actions.into_iter()
             .filter_map(|(name, local_edit)| {
diff --git a/crates/libanalysis/src/job.rs b/crates/ra_analysis/src/job.rs
index ea1652a26..ea1652a26 100644
--- a/crates/libanalysis/src/job.rs
+++ b/crates/ra_analysis/src/job.rs
diff --git a/crates/libanalysis/src/lib.rs b/crates/ra_analysis/src/lib.rs
index b4b7a6a30..4da55ab26 100644
--- a/crates/libanalysis/src/lib.rs
+++ b/crates/ra_analysis/src/lib.rs
@@ -2,8 +2,8 @@ extern crate parking_lot;
 #[macro_use]
 extern crate log;
 extern crate once_cell;
-extern crate libsyntax2;
-extern crate libeditor;
+extern crate ra_syntax;
+extern crate ra_editor;
 extern crate fst;
 extern crate rayon;
 extern crate relative_path;
@@ -28,10 +28,10 @@ use std::{
 };
 
 use relative_path::{RelativePath, RelativePathBuf};
-use libsyntax2::{File, TextRange, TextUnit, AtomEdit};
+use ra_syntax::{File, TextRange, TextUnit, AtomEdit};
 use imp::{AnalysisImpl, AnalysisHostImpl, FileResolverImp};
 
-pub use libeditor::{
+pub use ra_editor::{
     StructureNode, LineIndex, FileSymbol,
     Runnable, RunnableKind, HighlightedRange, CompletionItem,
 };
@@ -170,26 +170,26 @@ impl Analysis {
         self.imp.file_line_index(file_id)
     }
     pub fn extend_selection(&self, file: &File, range: TextRange) -> TextRange {
-        libeditor::extend_selection(file, range).unwrap_or(range)
+        ra_editor::extend_selection(file, range).unwrap_or(range)
     }
     pub fn matching_brace(&self, file: &File, offset: TextUnit) -> Option<TextUnit> {
-        libeditor::matching_brace(file, offset)
+        ra_editor::matching_brace(file, offset)
     }
     pub fn syntax_tree(&self, file_id: FileId) -> String {
         let file = self.imp.file_syntax(file_id);
-        libeditor::syntax_tree(&file)
+        ra_editor::syntax_tree(&file)
     }
     pub fn join_lines(&self, file_id: FileId, range: TextRange) -> SourceChange {
         let file = self.imp.file_syntax(file_id);
-        SourceChange::from_local_edit(file_id, "join lines", libeditor::join_lines(&file, range))
+        SourceChange::from_local_edit(file_id, "join lines", ra_editor::join_lines(&file, range))
     }
     pub fn on_eq_typed(&self, file_id: FileId, offset: TextUnit) -> Option<SourceChange> {
         let file = self.imp.file_syntax(file_id);
-        Some(SourceChange::from_local_edit(file_id, "add semicolon", libeditor::on_eq_typed(&file, offset)?))
+        Some(SourceChange::from_local_edit(file_id, "add semicolon", ra_editor::on_eq_typed(&file, offset)?))
     }
     pub fn file_structure(&self, file_id: FileId) -> Vec<StructureNode> {
         let file = self.imp.file_syntax(file_id);
-        libeditor::file_structure(&file)
+        ra_editor::file_structure(&file)
     }
     pub fn symbol_search(&self, query: Query, token: &JobToken) -> Vec<(FileId, FileSymbol)> {
         self.imp.world_symbols(query, token)
@@ -208,15 +208,15 @@ impl Analysis {
     }
     pub fn runnables(&self, file_id: FileId) -> Vec<Runnable> {
         let file = self.imp.file_syntax(file_id);
-        libeditor::runnables(&file)
+        ra_editor::runnables(&file)
     }
     pub fn highlight(&self, file_id: FileId) -> Vec<HighlightedRange> {
         let file = self.imp.file_syntax(file_id);
-        libeditor::highlight(&file)
+        ra_editor::highlight(&file)
     }
     pub fn completions(&self, file_id: FileId, offset: TextUnit) -> Option<Vec<CompletionItem>> {
         let file = self.imp.file_syntax(file_id);
-        libeditor::scope_completion(&file, offset)
+        ra_editor::scope_completion(&file, offset)
     }
     pub fn assists(&self, file_id: FileId, range: TextRange) -> Vec<SourceChange> {
         self.imp.assists(file_id, range)
diff --git a/crates/libanalysis/src/module_map.rs b/crates/ra_analysis/src/module_map.rs
index a21f55fff..a21f55fff 100644
--- a/crates/libanalysis/src/module_map.rs
+++ b/crates/ra_analysis/src/module_map.rs
diff --git a/crates/libanalysis/src/queries.rs b/crates/ra_analysis/src/queries.rs
index 0b60316e6..062a2f420 100644
--- a/crates/libanalysis/src/queries.rs
+++ b/crates/ra_analysis/src/queries.rs
@@ -1,6 +1,6 @@
 use std::sync::Arc;
-use libsyntax2::File;
-use libeditor::LineIndex;
+use ra_syntax::File;
+use ra_editor::LineIndex;
 use {
     FileId,
     db::{Query, QueryCtx, QueryRegistry},
diff --git a/crates/libanalysis/src/roots.rs b/crates/ra_analysis/src/roots.rs
index 191d0d821..1835a9b25 100644
--- a/crates/libanalysis/src/roots.rs
+++ b/crates/ra_analysis/src/roots.rs
@@ -6,8 +6,8 @@ use std::{
 
 use once_cell::sync::OnceCell;
 use rayon::prelude::*;
-use libeditor::LineIndex;
-use libsyntax2::File;
+use ra_editor::LineIndex;
+use ra_syntax::File;
 
 use {
     FileId,
diff --git a/crates/libanalysis/src/symbol_index.rs b/crates/ra_analysis/src/symbol_index.rs
index d22187ac0..ffbb6a29f 100644
--- a/crates/libanalysis/src/symbol_index.rs
+++ b/crates/ra_analysis/src/symbol_index.rs
@@ -2,8 +2,8 @@ use std::{
     sync::Arc,
     hash::{Hash, Hasher},
 };
-use libeditor::{FileSymbol, file_symbols};
-use libsyntax2::{
+use ra_editor::{FileSymbol, file_symbols};
+use ra_syntax::{
     File,
     SyntaxKind::{self, *},
 };
diff --git a/crates/libanalysis/tests/tests.rs b/crates/ra_analysis/tests/tests.rs
index 547f85958..334dc5e48 100644
--- a/crates/libanalysis/tests/tests.rs
+++ b/crates/ra_analysis/tests/tests.rs
@@ -1,5 +1,5 @@
-extern crate libanalysis;
 extern crate relative_path;
+extern crate ra_analysis;
 extern crate test_utils;
 
 use std::{
@@ -8,7 +8,7 @@ use std::{
 };
 
 use relative_path::{RelativePath, RelativePathBuf};
-use libanalysis::{Analysis, AnalysisHost, FileId, FileResolver, JobHandle, CrateGraph, CrateId};
+use ra_analysis::{Analysis, AnalysisHost, FileId, FileResolver, JobHandle, CrateGraph, CrateId};
 use test_utils::assert_eq_dbg;
 
 #[derive(Debug)]
diff --git a/crates/cli/Cargo.toml b/crates/ra_cli/Cargo.toml
index 7dbbe3f4e..17011e063 100644
--- a/crates/cli/Cargo.toml
+++ b/crates/ra_cli/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "cli"
+name = "ra_cli"
 version = "0.1.0"
 authors = ["Aleksey Kladov <[email protected]>"]
 publish = false
@@ -7,6 +7,6 @@ publish = false
 [dependencies]
 clap = "2.32.0"
 failure = "0.1.1"
-libsyntax2 = { path = "../libsyntax2" }
-libeditor = { path = "../libeditor" }
+ra_syntax = { path = "../ra_syntax" }
+ra_editor = { path = "../ra_editor" }
 tools = { path = "../tools" }
diff --git a/crates/cli/src/main.rs b/crates/ra_cli/src/main.rs
index 68a531f93..96e5b718c 100644
--- a/crates/cli/src/main.rs
+++ b/crates/ra_cli/src/main.rs
@@ -1,8 +1,8 @@
 extern crate clap;
 #[macro_use]
 extern crate failure;
-extern crate libsyntax2;
-extern crate libeditor;
+extern crate ra_syntax;
+extern crate ra_editor;
 extern crate tools;
 
 use std::{
@@ -11,13 +11,13 @@ use std::{
 };
 use clap::{App, Arg, SubCommand};
 use tools::collect_tests;
-use libsyntax2::File;
-use libeditor::{syntax_tree, file_structure};
+use ra_syntax::File;
+use ra_editor::{syntax_tree, file_structure};
 
 type Result<T> = ::std::result::Result<T, failure::Error>;
 
 fn main() -> Result<()> {
-    let matches = App::new("libsyntax2-cli")
+    let matches = App::new("ra-cli")
         .setting(clap::AppSettings::SubcommandRequiredElseHelp)
         .subcommand(
             SubCommand::with_name("render-test")
diff --git a/crates/libeditor/Cargo.toml b/crates/ra_editor/Cargo.toml
index b04da1abe..40e3254ff 100644
--- a/crates/libeditor/Cargo.toml
+++ b/crates/ra_editor/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "libeditor"
+name = "ra_editor"
 version = "0.1.0"
 authors = ["Aleksey Kladov <[email protected]>"]
 publish = false
@@ -9,7 +9,7 @@ itertools = "0.7.8"
 superslice = "0.1.0"
 join_to_string = "0.1.1"
 
-libsyntax2 = { path = "../libsyntax2" }
+ra_syntax = { path = "../ra_syntax" }
 
 [dev-dependencies]
 test_utils = { path = "../test_utils" }
diff --git a/crates/libeditor/src/code_actions.rs b/crates/ra_editor/src/code_actions.rs
index 4a07d1bc9..83f7956d2 100644
--- a/crates/libeditor/src/code_actions.rs
+++ b/crates/ra_editor/src/code_actions.rs
@@ -1,6 +1,6 @@
 use join_to_string::join;
 
-use libsyntax2::{
+use ra_syntax::{
     File, TextUnit, TextRange,
     ast::{self, AstNode, AttrsOwner, TypeParamsOwner, NameOwner},
     SyntaxKind::{COMMA, WHITESPACE},
diff --git a/crates/libeditor/src/completion.rs b/crates/ra_editor/src/completion.rs
index 52df6fd10..5000b32a0 100644
--- a/crates/libeditor/src/completion.rs
+++ b/crates/ra_editor/src/completion.rs
@@ -1,6 +1,6 @@
 use std::collections::{HashSet, HashMap};
 
-use libsyntax2::{
+use ra_syntax::{
     File, TextUnit, AstNode, SyntaxNodeRef, SyntaxKind::*,
     ast::{self, LoopBodyOwner, ModuleItemOwner},
     algo::{
diff --git a/crates/libeditor/src/edit.rs b/crates/ra_editor/src/edit.rs
index 09cf2bd00..2839ac20a 100644
--- a/crates/libeditor/src/edit.rs
+++ b/crates/ra_editor/src/edit.rs
@@ -1,5 +1,5 @@
 use {TextRange, TextUnit};
-use libsyntax2::{
+use ra_syntax::{
     AtomEdit,
     text_utils::contains_offset_nonstrict,
 };
diff --git a/crates/libeditor/src/extend_selection.rs b/crates/ra_editor/src/extend_selection.rs
index 9dc59e254..5fd1ca4fc 100644
--- a/crates/libeditor/src/extend_selection.rs
+++ b/crates/ra_editor/src/extend_selection.rs
@@ -1,4 +1,4 @@
-use libsyntax2::{
+use ra_syntax::{
     File, TextRange, SyntaxNodeRef, TextUnit,
     SyntaxKind::*,
     algo::{find_leaf_at_offset, LeafAtOffset, find_covering_node, ancestors, Direction, siblings},
diff --git a/crates/libeditor/src/lib.rs b/crates/ra_editor/src/lib.rs
index b3cf2ef55..78ed34c7c 100644
--- a/crates/libeditor/src/lib.rs
+++ b/crates/ra_editor/src/lib.rs
@@ -1,4 +1,4 @@
-extern crate libsyntax2;
+extern crate ra_syntax;
 extern crate superslice;
 extern crate itertools;
 extern crate join_to_string;
@@ -17,13 +17,13 @@ mod scope;
 #[cfg(test)]
 mod test_utils;
 
-use libsyntax2::{
+use ra_syntax::{
     File, TextUnit, TextRange, SyntaxNodeRef,
     ast::{self, AstNode, NameOwner},
     algo::{walk, find_leaf_at_offset, ancestors},
     SyntaxKind::{self, *},
 };
-pub use libsyntax2::AtomEdit;
+pub use ra_syntax::AtomEdit;
 pub use self::{
     line_index::{LineIndex, LineCol},
     extend_selection::extend_selection,
@@ -124,7 +124,7 @@ pub fn diagnostics(file: &File) -> Vec<Diagnostic> {
 }
 
 pub fn syntax_tree(file: &File) -> String {
-    ::libsyntax2::utils::dump_tree(file.syntax())
+    ::ra_syntax::utils::dump_tree(file.syntax())
 }
 
 pub fn runnables(file: &File) -> Vec<Runnable> {
diff --git a/crates/libeditor/src/line_index.rs b/crates/ra_editor/src/line_index.rs
index 9cd8da3a8..9cd8da3a8 100644
--- a/crates/libeditor/src/line_index.rs
+++ b/crates/ra_editor/src/line_index.rs
diff --git a/crates/libeditor/src/scope/fn_scope.rs b/crates/ra_editor/src/scope/fn_scope.rs
index 60b8ce919..3ae5276a2 100644
--- a/crates/libeditor/src/scope/fn_scope.rs
+++ b/crates/ra_editor/src/scope/fn_scope.rs
@@ -3,7 +3,7 @@ use std::{
     collections::HashMap,
 };
 
-use libsyntax2::{
+use ra_syntax::{
     SyntaxNodeRef, SyntaxNode, SmolStr, AstNode,
     ast::{self, NameOwner, LoopBodyOwner, ArgListOwner},
     algo::{ancestors, generate, walk::preorder}
@@ -244,7 +244,7 @@ struct ScopeData {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use libsyntax2::File;
+    use ra_syntax::File;
     use {find_node_at_offset, test_utils::extract_offset};
 
     fn do_check(code: &str, expected: &[&str]) {
diff --git a/crates/libeditor/src/scope/mod.rs b/crates/ra_editor/src/scope/mod.rs
index 2f25230f8..2f25230f8 100644
--- a/crates/libeditor/src/scope/mod.rs
+++ b/crates/ra_editor/src/scope/mod.rs
diff --git a/crates/libeditor/src/scope/mod_scope.rs b/crates/ra_editor/src/scope/mod_scope.rs
index 0ec56a206..d2a3e7c58 100644
--- a/crates/libeditor/src/scope/mod_scope.rs
+++ b/crates/ra_editor/src/scope/mod_scope.rs
@@ -1,4 +1,4 @@
-use libsyntax2::{
+use ra_syntax::{
     AstNode, SyntaxNode, SyntaxNodeRef, SmolStr,
     ast::{self, AstChildren},
 };
@@ -86,7 +86,7 @@ fn collect_imports(tree: ast::UseTree, acc: &mut Vec<Entry>) {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use libsyntax2::{File, ast::ModuleItemOwner};
+    use ra_syntax::{File, ast::ModuleItemOwner};
 
     fn do_check(code: &str, expected: &[&str]) {
         let file = File::parse(&code);
diff --git a/crates/libeditor/src/symbols.rs b/crates/ra_editor/src/symbols.rs
index 2f9cc9233..917984177 100644
--- a/crates/libeditor/src/symbols.rs
+++ b/crates/ra_editor/src/symbols.rs
@@ -1,4 +1,4 @@
-use libsyntax2::{
+use ra_syntax::{
     SyntaxKind, SyntaxNodeRef, AstNode, File, SmolStr,
     ast::{self, NameOwner},
     algo::{
diff --git a/crates/libeditor/src/test_utils.rs b/crates/ra_editor/src/test_utils.rs
index 9c1279991..c4ea4db6c 100644
--- a/crates/libeditor/src/test_utils.rs
+++ b/crates/ra_editor/src/test_utils.rs
@@ -1,4 +1,4 @@
-use libsyntax2::{File, TextUnit, TextRange};
+use ra_syntax::{File, TextUnit, TextRange};
 pub use _test_utils::*;
 use LocalEdit;
 
diff --git a/crates/libeditor/src/typing.rs b/crates/ra_editor/src/typing.rs
index 826b16181..0f4e7e0d0 100644
--- a/crates/libeditor/src/typing.rs
+++ b/crates/ra_editor/src/typing.rs
@@ -1,6 +1,6 @@
 use std::mem;
 
-use libsyntax2::{
+use ra_syntax::{
     TextUnit, TextRange, SyntaxNodeRef, File, AstNode, SyntaxKind,
     ast,
     algo::{
diff --git a/crates/server/Cargo.toml b/crates/ra_lsp_server/Cargo.toml
index fc20730b8..b851f70e1 100644
--- a/crates/server/Cargo.toml
+++ b/crates/ra_lsp_server/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "m"
+name = "ra_lsp_server"
 version = "0.1.0"
 authors = ["Aleksey Kladov <[email protected]>"]
 
@@ -15,16 +15,16 @@ crossbeam-channel = "0.2.4"
 flexi_logger = "0.9.1"
 log = "0.4.3"
 url_serde = "0.2.0"
-languageserver-types = "0.49.0"
+languageserver-types = "0.50.0"
 walkdir = "2.2.0"
 im = "12.0.0"
 cargo_metadata = "0.6.0"
 text_unit = { version = "0.1.2", features = ["serde"] }
 smol_str = { version = "0.1.5", features = ["serde"] }
 
-libsyntax2 = { path = "../libsyntax2" }
-libeditor = { path = "../libeditor" }
-libanalysis = { path = "../libanalysis" }
+ra_syntax = { path = "../ra_syntax" }
+ra_editor = { path = "../ra_editor" }
+ra_analysis = { path = "../ra_analysis" }
 gen_lsp_server = { path = "../gen_lsp_server" }
 
 [dev-dependencies]
diff --git a/crates/server/src/caps.rs b/crates/ra_lsp_server/src/caps.rs
index 7456aea8a..7456aea8a 100644
--- a/crates/server/src/caps.rs
+++ b/crates/ra_lsp_server/src/caps.rs
diff --git a/crates/server/src/conv.rs b/crates/ra_lsp_server/src/conv.rs
index a59308c3f..759e5e914 100644
--- a/crates/server/src/conv.rs
+++ b/crates/ra_lsp_server/src/conv.rs
@@ -3,9 +3,9 @@ use languageserver_types::{
     TextDocumentIdentifier, VersionedTextDocumentIdentifier, TextDocumentItem,
     TextDocumentPositionParams, TextDocumentEdit,
 };
-use libeditor::{LineIndex, LineCol, Edit, AtomEdit};
-use libsyntax2::{SyntaxKind, TextUnit, TextRange};
-use libanalysis::{FileId, SourceChange, SourceFileEdit, FileSystemEdit};
+use ra_editor::{LineIndex, LineCol, Edit, AtomEdit};
+use ra_syntax::{SyntaxKind, TextUnit, TextRange};
+use ra_analysis::{FileId, SourceChange, SourceFileEdit, FileSystemEdit};
 
 use {
     Result,
diff --git a/crates/server/src/lib.rs b/crates/ra_lsp_server/src/lib.rs
index c8aebc59c..d2f76972f 100644
--- a/crates/server/src/lib.rs
+++ b/crates/ra_lsp_server/src/lib.rs
@@ -18,9 +18,9 @@ extern crate relative_path;
 extern crate cargo_metadata;
 
 extern crate gen_lsp_server;
-extern crate libeditor;
-extern crate libanalysis;
-extern crate libsyntax2;
+extern crate ra_editor;
+extern crate ra_analysis;
+extern crate ra_syntax;
 
 mod caps;
 pub mod req;
diff --git a/crates/server/src/main.rs b/crates/ra_lsp_server/src/main.rs
index 968b3b87a..c547764f6 100644
--- a/crates/server/src/main.rs
+++ b/crates/ra_lsp_server/src/main.rs
@@ -4,11 +4,11 @@ extern crate log;
 extern crate failure;
 extern crate flexi_logger;
 extern crate gen_lsp_server;
-extern crate m;
+extern crate ra_lsp_server;
 
 use flexi_logger::{Logger, Duplicate};
 use gen_lsp_server::{run_server, stdio_transport};
-use m::Result;
+use ra_lsp_server::Result;
 
 fn main() -> Result<()> {
     ::std::env::set_var("RUST_BACKTRACE", "short");
@@ -34,12 +34,12 @@ fn main_inner() -> Result<()> {
     let (receiver, sender, threads) = stdio_transport();
     let cwd = ::std::env::current_dir()?;
     run_server(
-        m::server_capabilities(),
+        ra_lsp_server::server_capabilities(),
         |params, r, s| {
             let root = params.root_uri
                 .and_then(|it| it.to_file_path().ok())
                 .unwrap_or(cwd);
-            m::main_loop(false, root, r, s)
+            ra_lsp_server::main_loop(false, root, r, s)
         },
         receiver,
         sender,
diff --git a/crates/server/src/main_loop/handlers.rs b/crates/ra_lsp_server/src/main_loop/handlers.rs
index 3e02227d5..568f5344c 100644
--- a/crates/server/src/main_loop/handlers.rs
+++ b/crates/ra_lsp_server/src/main_loop/handlers.rs
@@ -7,8 +7,8 @@ use languageserver_types::{
     CompletionItem, InsertTextFormat, CompletionItemKind,
 };
 use serde_json::to_value;
-use libanalysis::{Query, FileId, RunnableKind, JobToken};
-use libsyntax2::{
+use ra_analysis::{Query, FileId, RunnableKind, JobToken};
+use ra_syntax::{
     text_utils::contains_offset_nonstrict,
 };
 
diff --git a/crates/server/src/main_loop/mod.rs b/crates/ra_lsp_server/src/main_loop/mod.rs
index f3b2744bf..2b2279e97 100644
--- a/crates/server/src/main_loop/mod.rs
+++ b/crates/ra_lsp_server/src/main_loop/mod.rs
@@ -10,7 +10,7 @@ use serde::{Serialize, de::DeserializeOwned};
 use crossbeam_channel::{unbounded, Sender, Receiver};
 use rayon::{self, ThreadPool};
 use languageserver_types::{NumberOrString};
-use libanalysis::{FileId, JobHandle, JobToken, LibraryData};
+use ra_analysis::{FileId, JobHandle, JobToken, LibraryData};
 use gen_lsp_server::{
     RawRequest, RawNotification, RawMessage, RawResponse, ErrorCode,
     handle_shutdown,
diff --git a/crates/server/src/main_loop/subscriptions.rs b/crates/ra_lsp_server/src/main_loop/subscriptions.rs
index 963096aef..27f92cc9a 100644
--- a/crates/server/src/main_loop/subscriptions.rs
+++ b/crates/ra_lsp_server/src/main_loop/subscriptions.rs
@@ -1,5 +1,5 @@
 use std::collections::HashSet;
-use libanalysis::FileId;
+use ra_analysis::FileId;
 
 pub struct Subscriptions {
     subs: HashSet<FileId>,
diff --git a/crates/server/src/path_map.rs b/crates/ra_lsp_server/src/path_map.rs
index 282a03271..19c3b1d3b 100644
--- a/crates/server/src/path_map.rs
+++ b/crates/ra_lsp_server/src/path_map.rs
@@ -1,7 +1,7 @@
 use std::path::{PathBuf, Path, Component};
 use im;
 use relative_path::RelativePath;
-use libanalysis::{FileId, FileResolver};
+use ra_analysis::{FileId, FileResolver};
 
 #[derive(Debug, Clone, Copy, PartialEq, Eq)]
 pub enum Root {
diff --git a/crates/server/src/project_model.rs b/crates/ra_lsp_server/src/project_model.rs
index 359cf787d..5db34e3e5 100644
--- a/crates/server/src/project_model.rs
+++ b/crates/ra_lsp_server/src/project_model.rs
@@ -3,7 +3,7 @@ use std::{
     path::{Path, PathBuf},
 };
 use cargo_metadata::{metadata_run, CargoOpt};
-use libsyntax2::SmolStr;
+use ra_syntax::SmolStr;
 
 use {
     Result,
diff --git a/crates/server/src/req.rs b/crates/ra_lsp_server/src/req.rs
index 4af61dbbd..4af61dbbd 100644
--- a/crates/server/src/req.rs
+++ b/crates/ra_lsp_server/src/req.rs
diff --git a/crates/server/src/server_world.rs b/crates/ra_lsp_server/src/server_world.rs
index 6853efc00..865f7c491 100644
--- a/crates/server/src/server_world.rs
+++ b/crates/ra_lsp_server/src/server_world.rs
@@ -6,7 +6,7 @@ use std::{
 };
 
 use languageserver_types::Url;
-use libanalysis::{FileId, AnalysisHost, Analysis, CrateGraph, CrateId, LibraryData, FileResolver};
+use ra_analysis::{FileId, AnalysisHost, Analysis, CrateGraph, CrateId, LibraryData, FileResolver};
 
 use {
     Result,
diff --git a/crates/server/src/thread_watcher.rs b/crates/ra_lsp_server/src/thread_watcher.rs
index 86a3a91e0..86a3a91e0 100644
--- a/crates/server/src/thread_watcher.rs
+++ b/crates/ra_lsp_server/src/thread_watcher.rs
diff --git a/crates/server/src/vfs.rs b/crates/ra_lsp_server/src/vfs.rs
index a1c1783f2..a1c1783f2 100644
--- a/crates/server/src/vfs.rs
+++ b/crates/ra_lsp_server/src/vfs.rs
diff --git a/crates/server/tests/heavy_tests/main.rs b/crates/ra_lsp_server/tests/heavy_tests/main.rs
index 50529f453..dced45f55 100644
--- a/crates/server/tests/heavy_tests/main.rs
+++ b/crates/ra_lsp_server/tests/heavy_tests/main.rs
@@ -6,11 +6,11 @@ extern crate serde;
 extern crate serde_json;
 extern crate gen_lsp_server;
 extern crate flexi_logger;
-extern crate m;
+extern crate ra_lsp_server;
 
 mod support;
 
-use m::req::{Runnables, RunnablesParams};
+use ra_lsp_server::req::{Runnables, RunnablesParams};
 
 use support::project;
 
diff --git a/crates/server/tests/heavy_tests/support.rs b/crates/ra_lsp_server/tests/heavy_tests/support.rs
index 355914033..8fe2aa816 100644
--- a/crates/server/tests/heavy_tests/support.rs
+++ b/crates/ra_lsp_server/tests/heavy_tests/support.rs
@@ -21,7 +21,7 @@ use serde::Serialize;
 use serde_json::{Value, from_str, to_string_pretty};
 use gen_lsp_server::{RawMessage, RawRequest, RawNotification};
 
-use m::{main_loop, req, thread_watcher::{ThreadWatcher, Worker}};
+use ra_lsp_server::{main_loop, req, thread_watcher::{ThreadWatcher, Worker}};
 
 pub fn project(fixture: &str) -> Server {
     static INIT: Once = Once::new();
diff --git a/crates/libsyntax2/Cargo.toml b/crates/ra_syntax/Cargo.toml
index 030cca201..a0fd633e0 100644
--- a/crates/libsyntax2/Cargo.toml
+++ b/crates/ra_syntax/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "libsyntax2"
+name = "ra_syntax"
 version = "0.1.0"
 authors = ["Aleksey Kladov <[email protected]>"]
 license = "MIT OR Apache-2.0"
diff --git a/crates/libsyntax2/fuzz/.gitignore b/crates/ra_syntax/fuzz/.gitignore
index 572e03bdf..572e03bdf 100644
--- a/crates/libsyntax2/fuzz/.gitignore
+++ b/crates/ra_syntax/fuzz/.gitignore
diff --git a/crates/libsyntax2/fuzz/Cargo.toml b/crates/ra_syntax/fuzz/Cargo.toml
index 916cd5b6f..65ded6a21 100644
--- a/crates/libsyntax2/fuzz/Cargo.toml
+++ b/crates/ra_syntax/fuzz/Cargo.toml
@@ -1,6 +1,6 @@
 
 [package]
-name = "libsyntax2-fuzz"
+name = "ra_syntax-fuzz"
 version = "0.0.1"
 authors = ["Automatically generated"]
 publish = false
@@ -8,7 +8,7 @@ publish = false
 [package.metadata]
 cargo-fuzz = true
 
-[dependencies.libsyntax2]
+[dependencies.ra_syntax]
 path = ".."
 [dependencies.libfuzzer-sys]
 git = "https://github.com/rust-fuzz/libfuzzer-sys.git"
diff --git a/crates/libsyntax2/fuzz/fuzz_targets/parser.rs b/crates/ra_syntax/fuzz/fuzz_targets/parser.rs
index da87180bb..396c0ecaf 100644
--- a/crates/libsyntax2/fuzz/fuzz_targets/parser.rs
+++ b/crates/ra_syntax/fuzz/fuzz_targets/parser.rs
@@ -1,9 +1,9 @@
 #![no_main]
 #[macro_use] extern crate libfuzzer_sys;
-extern crate libsyntax2;
+extern crate ra_syntax;
 
 fuzz_target!(|data: &[u8]| {
     if let Ok(text) = std::str::from_utf8(data) {
-        libsyntax2::utils::check_fuzz_invariants(text)
+        ra_syntax::utils::check_fuzz_invariants(text)
     }
 });
diff --git a/crates/libsyntax2/src/algo/mod.rs b/crates/ra_syntax/src/algo/mod.rs
index 7287f5bb2..7287f5bb2 100644
--- a/crates/libsyntax2/src/algo/mod.rs
+++ b/crates/ra_syntax/src/algo/mod.rs
diff --git a/crates/libsyntax2/src/algo/visit.rs b/crates/ra_syntax/src/algo/visit.rs
index 9f1c127c7..9f1c127c7 100644
--- a/crates/libsyntax2/src/algo/visit.rs
+++ b/crates/ra_syntax/src/algo/visit.rs
diff --git a/crates/libsyntax2/src/algo/walk.rs b/crates/ra_syntax/src/algo/walk.rs
index 536ee705f..536ee705f 100644
--- a/crates/libsyntax2/src/algo/walk.rs
+++ b/crates/ra_syntax/src/algo/walk.rs
diff --git a/crates/libsyntax2/src/ast/generated.rs b/crates/ra_syntax/src/ast/generated.rs
index c945c094a..c945c094a 100644
--- a/crates/libsyntax2/src/ast/generated.rs
+++ b/crates/ra_syntax/src/ast/generated.rs
diff --git a/crates/libsyntax2/src/ast/generated.rs.tera b/crates/ra_syntax/src/ast/generated.rs.tera
index a72e9b732..a72e9b732 100644
--- a/crates/libsyntax2/src/ast/generated.rs.tera
+++ b/crates/ra_syntax/src/ast/generated.rs.tera
diff --git a/crates/libsyntax2/src/ast/mod.rs b/crates/ra_syntax/src/ast/mod.rs
index a6da82957..a6da82957 100644
--- a/crates/libsyntax2/src/ast/mod.rs
+++ b/crates/ra_syntax/src/ast/mod.rs
diff --git a/crates/libsyntax2/src/grammar.ron b/crates/ra_syntax/src/grammar.ron
index 77ae4c7db..77ae4c7db 100644
--- a/crates/libsyntax2/src/grammar.ron
+++ b/crates/ra_syntax/src/grammar.ron
diff --git a/crates/libsyntax2/src/grammar/attributes.rs b/crates/ra_syntax/src/grammar/attributes.rs
index cd30e8a45..cd30e8a45 100644
--- a/crates/libsyntax2/src/grammar/attributes.rs
+++ b/crates/ra_syntax/src/grammar/attributes.rs
diff --git a/crates/libsyntax2/src/grammar/expressions/atom.rs b/crates/ra_syntax/src/grammar/expressions/atom.rs
index f01df56bc..f01df56bc 100644
--- a/crates/libsyntax2/src/grammar/expressions/atom.rs
+++ b/crates/ra_syntax/src/grammar/expressions/atom.rs
diff --git a/crates/libsyntax2/src/grammar/expressions/mod.rs b/crates/ra_syntax/src/grammar/expressions/mod.rs
index 20e0fa328..20e0fa328 100644
--- a/crates/libsyntax2/src/grammar/expressions/mod.rs
+++ b/crates/ra_syntax/src/grammar/expressions/mod.rs
diff --git a/crates/libsyntax2/src/grammar/items/consts.rs b/crates/ra_syntax/src/grammar/items/consts.rs
index 5a5852f83..5a5852f83 100644
--- a/crates/libsyntax2/src/grammar/items/consts.rs
+++ b/crates/ra_syntax/src/grammar/items/consts.rs
diff --git a/crates/libsyntax2/src/grammar/items/mod.rs b/crates/ra_syntax/src/grammar/items/mod.rs
index 2567313ab..2567313ab 100644
--- a/crates/libsyntax2/src/grammar/items/mod.rs
+++ b/crates/ra_syntax/src/grammar/items/mod.rs
diff --git a/crates/libsyntax2/src/grammar/items/nominal.rs b/crates/ra_syntax/src/grammar/items/nominal.rs
index 8d02ad555..8d02ad555 100644
--- a/crates/libsyntax2/src/grammar/items/nominal.rs
+++ b/crates/ra_syntax/src/grammar/items/nominal.rs
diff --git a/crates/libsyntax2/src/grammar/items/traits.rs b/crates/ra_syntax/src/grammar/items/traits.rs
index c21cfb1a9..c21cfb1a9 100644
--- a/crates/libsyntax2/src/grammar/items/traits.rs
+++ b/crates/ra_syntax/src/grammar/items/traits.rs
diff --git a/crates/libsyntax2/src/grammar/items/use_item.rs b/crates/ra_syntax/src/grammar/items/use_item.rs
index 1ee4349fd..1ee4349fd 100644
--- a/crates/libsyntax2/src/grammar/items/use_item.rs
+++ b/crates/ra_syntax/src/grammar/items/use_item.rs
diff --git a/crates/libsyntax2/src/grammar/mod.rs b/crates/ra_syntax/src/grammar/mod.rs
index 2cb11dc1e..2cb11dc1e 100644
--- a/crates/libsyntax2/src/grammar/mod.rs
+++ b/crates/ra_syntax/src/grammar/mod.rs
diff --git a/crates/libsyntax2/src/grammar/params.rs b/crates/ra_syntax/src/grammar/params.rs
index 903c25939..903c25939 100644
--- a/crates/libsyntax2/src/grammar/params.rs
+++ b/crates/ra_syntax/src/grammar/params.rs
diff --git a/crates/libsyntax2/src/grammar/paths.rs b/crates/ra_syntax/src/grammar/paths.rs
index 7c9fb8be2..7c9fb8be2 100644
--- a/crates/libsyntax2/src/grammar/paths.rs
+++ b/crates/ra_syntax/src/grammar/paths.rs
diff --git a/crates/libsyntax2/src/grammar/patterns.rs b/crates/ra_syntax/src/grammar/patterns.rs
index 420bae7a7..420bae7a7 100644
--- a/crates/libsyntax2/src/grammar/patterns.rs
+++ b/crates/ra_syntax/src/grammar/patterns.rs
diff --git a/crates/libsyntax2/src/grammar/type_args.rs b/crates/ra_syntax/src/grammar/type_args.rs
index 29ff6e534..29ff6e534 100644
--- a/crates/libsyntax2/src/grammar/type_args.rs
+++ b/crates/ra_syntax/src/grammar/type_args.rs
diff --git a/crates/libsyntax2/src/grammar/type_params.rs b/crates/ra_syntax/src/grammar/type_params.rs
index 79bc95ce4..79bc95ce4 100644
--- a/crates/libsyntax2/src/grammar/type_params.rs
+++ b/crates/ra_syntax/src/grammar/type_params.rs
diff --git a/crates/libsyntax2/src/grammar/types.rs b/crates/ra_syntax/src/grammar/types.rs
index 27e5b086e..27e5b086e 100644
--- a/crates/libsyntax2/src/grammar/types.rs
+++ b/crates/ra_syntax/src/grammar/types.rs
diff --git a/crates/libsyntax2/src/lexer/classes.rs b/crates/ra_syntax/src/lexer/classes.rs
index 4235d2648..4235d2648 100644
--- a/crates/libsyntax2/src/lexer/classes.rs
+++ b/crates/ra_syntax/src/lexer/classes.rs
diff --git a/crates/libsyntax2/src/lexer/comments.rs b/crates/ra_syntax/src/lexer/comments.rs
index eb417c2dc..eb417c2dc 100644
--- a/crates/libsyntax2/src/lexer/comments.rs
+++ b/crates/ra_syntax/src/lexer/comments.rs
diff --git a/crates/libsyntax2/src/lexer/mod.rs b/crates/ra_syntax/src/lexer/mod.rs
index 3e11db88b..3e11db88b 100644
--- a/crates/libsyntax2/src/lexer/mod.rs
+++ b/crates/ra_syntax/src/lexer/mod.rs
diff --git a/crates/libsyntax2/src/lexer/numbers.rs b/crates/ra_syntax/src/lexer/numbers.rs
index 22e7d4e99..22e7d4e99 100644
--- a/crates/libsyntax2/src/lexer/numbers.rs
+++ b/crates/ra_syntax/src/lexer/numbers.rs
diff --git a/crates/libsyntax2/src/lexer/ptr.rs b/crates/ra_syntax/src/lexer/ptr.rs
index c9a5354ea..c9a5354ea 100644
--- a/crates/libsyntax2/src/lexer/ptr.rs
+++ b/crates/ra_syntax/src/lexer/ptr.rs
diff --git a/crates/libsyntax2/src/lexer/strings.rs b/crates/ra_syntax/src/lexer/strings.rs
index 5ff483d14..5ff483d14 100644
--- a/crates/libsyntax2/src/lexer/strings.rs
+++ b/crates/ra_syntax/src/lexer/strings.rs
diff --git a/crates/libsyntax2/src/lib.rs b/crates/ra_syntax/src/lib.rs
index eb271762e..eb271762e 100644
--- a/crates/libsyntax2/src/lib.rs
+++ b/crates/ra_syntax/src/lib.rs
diff --git a/crates/libsyntax2/src/parser_api.rs b/crates/ra_syntax/src/parser_api.rs
index 772d753af..772d753af 100644
--- a/crates/libsyntax2/src/parser_api.rs
+++ b/crates/ra_syntax/src/parser_api.rs
diff --git a/crates/libsyntax2/src/parser_impl/event.rs b/crates/ra_syntax/src/parser_impl/event.rs
index 9fd56b996..9fd56b996 100644
--- a/crates/libsyntax2/src/parser_impl/event.rs
+++ b/crates/ra_syntax/src/parser_impl/event.rs
diff --git a/crates/libsyntax2/src/parser_impl/input.rs b/crates/ra_syntax/src/parser_impl/input.rs
index c0fe4d488..c0fe4d488 100644
--- a/crates/libsyntax2/src/parser_impl/input.rs
+++ b/crates/ra_syntax/src/parser_impl/input.rs
diff --git a/crates/libsyntax2/src/parser_impl/mod.rs b/crates/ra_syntax/src/parser_impl/mod.rs
index b343b404f..b343b404f 100644
--- a/crates/libsyntax2/src/parser_impl/mod.rs
+++ b/crates/ra_syntax/src/parser_impl/mod.rs
diff --git a/crates/libsyntax2/src/reparsing.rs b/crates/ra_syntax/src/reparsing.rs
index da44913c5..da44913c5 100644
--- a/crates/libsyntax2/src/reparsing.rs
+++ b/crates/ra_syntax/src/reparsing.rs
diff --git a/crates/libsyntax2/src/syntax_kinds/generated.rs b/crates/ra_syntax/src/syntax_kinds/generated.rs
index 7882bded9..7882bded9 100644
--- a/crates/libsyntax2/src/syntax_kinds/generated.rs
+++ b/crates/ra_syntax/src/syntax_kinds/generated.rs
diff --git a/crates/libsyntax2/src/syntax_kinds/generated.rs.tera b/crates/ra_syntax/src/syntax_kinds/generated.rs.tera
index 90618721a..90618721a 100644
--- a/crates/libsyntax2/src/syntax_kinds/generated.rs.tera
+++ b/crates/ra_syntax/src/syntax_kinds/generated.rs.tera
diff --git a/crates/libsyntax2/src/syntax_kinds/mod.rs b/crates/ra_syntax/src/syntax_kinds/mod.rs
index 332cd13ac..332cd13ac 100644
--- a/crates/libsyntax2/src/syntax_kinds/mod.rs
+++ b/crates/ra_syntax/src/syntax_kinds/mod.rs
diff --git a/crates/libsyntax2/src/text_utils.rs b/crates/ra_syntax/src/text_utils.rs
index 58ae1e43e..58ae1e43e 100644
--- a/crates/libsyntax2/src/text_utils.rs
+++ b/crates/ra_syntax/src/text_utils.rs
diff --git a/crates/libsyntax2/src/token_set.rs b/crates/ra_syntax/src/token_set.rs
index c83fba81b..c83fba81b 100644
--- a/crates/libsyntax2/src/token_set.rs
+++ b/crates/ra_syntax/src/token_set.rs
diff --git a/crates/libsyntax2/src/utils.rs b/crates/ra_syntax/src/utils.rs
index 671dd7afa..671dd7afa 100644
--- a/crates/libsyntax2/src/utils.rs
+++ b/crates/ra_syntax/src/utils.rs
diff --git a/crates/libsyntax2/src/yellow/builder.rs b/crates/ra_syntax/src/yellow/builder.rs
index e4ab37899..e4ab37899 100644
--- a/crates/libsyntax2/src/yellow/builder.rs
+++ b/crates/ra_syntax/src/yellow/builder.rs
diff --git a/crates/libsyntax2/src/yellow/green.rs b/crates/ra_syntax/src/yellow/green.rs
index 8fb691643..8fb691643 100644
--- a/crates/libsyntax2/src/yellow/green.rs
+++ b/crates/ra_syntax/src/yellow/green.rs
diff --git a/crates/libsyntax2/src/yellow/mod.rs b/crates/ra_syntax/src/yellow/mod.rs
index 0596e702f..0596e702f 100644
--- a/crates/libsyntax2/src/yellow/mod.rs
+++ b/crates/ra_syntax/src/yellow/mod.rs
diff --git a/crates/libsyntax2/src/yellow/red.rs b/crates/ra_syntax/src/yellow/red.rs
index 84cfe4fba..84cfe4fba 100644
--- a/crates/libsyntax2/src/yellow/red.rs
+++ b/crates/ra_syntax/src/yellow/red.rs
diff --git a/crates/libsyntax2/src/yellow/syntax.rs b/crates/ra_syntax/src/yellow/syntax.rs
index 1d99cab4a..1d99cab4a 100644
--- a/crates/libsyntax2/src/yellow/syntax.rs
+++ b/crates/ra_syntax/src/yellow/syntax.rs
diff --git a/crates/libsyntax2/src/yellow/syntax_text.rs b/crates/ra_syntax/src/yellow/syntax_text.rs
index 280bedd78..280bedd78 100644
--- a/crates/libsyntax2/src/yellow/syntax_text.rs
+++ b/crates/ra_syntax/src/yellow/syntax_text.rs
diff --git a/crates/libsyntax2/tests/data/lexer/00012_block_comment.rs b/crates/ra_syntax/tests/data/lexer/00012_block_comment.rs
index 708aac197..708aac197 100644
--- a/crates/libsyntax2/tests/data/lexer/00012_block_comment.rs
+++ b/crates/ra_syntax/tests/data/lexer/00012_block_comment.rs
diff --git a/crates/libsyntax2/tests/data/lexer/00012_block_comment.txt b/crates/ra_syntax/tests/data/lexer/00012_block_comment.txt
index 9958b2518..9958b2518 100644
--- a/crates/libsyntax2/tests/data/lexer/00012_block_comment.txt
+++ b/crates/ra_syntax/tests/data/lexer/00012_block_comment.txt
diff --git a/crates/libsyntax2/tests/data/lexer/0001_hello.rs b/crates/ra_syntax/tests/data/lexer/0001_hello.rs
index 95d09f2b1..95d09f2b1 100644
--- a/crates/libsyntax2/tests/data/lexer/0001_hello.rs
+++ b/crates/ra_syntax/tests/data/lexer/0001_hello.rs
diff --git a/crates/libsyntax2/tests/data/lexer/0001_hello.txt b/crates/ra_syntax/tests/data/lexer/0001_hello.txt
index 27a5940a9..27a5940a9 100644
--- a/crates/libsyntax2/tests/data/lexer/0001_hello.txt
+++ b/crates/ra_syntax/tests/data/lexer/0001_hello.txt
diff --git a/crates/libsyntax2/tests/data/lexer/0002_whitespace.rs b/crates/ra_syntax/tests/data/lexer/0002_whitespace.rs
index 08fce1418..08fce1418 100644
--- a/crates/libsyntax2/tests/data/lexer/0002_whitespace.rs
+++ b/crates/ra_syntax/tests/data/lexer/0002_whitespace.rs
diff --git a/crates/libsyntax2/tests/data/lexer/0002_whitespace.txt b/crates/ra_syntax/tests/data/lexer/0002_whitespace.txt
index 01d260918..01d260918 100644
--- a/crates/libsyntax2/tests/data/lexer/0002_whitespace.txt
+++ b/crates/ra_syntax/tests/data/lexer/0002_whitespace.txt
diff --git a/crates/libsyntax2/tests/data/lexer/0003_ident.rs b/crates/ra_syntax/tests/data/lexer/0003_ident.rs
index c05c9c009..c05c9c009 100644
--- a/crates/libsyntax2/tests/data/lexer/0003_ident.rs
+++ b/crates/ra_syntax/tests/data/lexer/0003_ident.rs
diff --git a/crates/libsyntax2/tests/data/lexer/0003_ident.txt b/crates/ra_syntax/tests/data/lexer/0003_ident.txt
index 4a0d5c053..4a0d5c053 100644
--- a/crates/libsyntax2/tests/data/lexer/0003_ident.txt
+++ b/crates/ra_syntax/tests/data/lexer/0003_ident.txt
diff --git a/crates/libsyntax2/tests/data/lexer/0004_numbers.rs b/crates/ra_syntax/tests/data/lexer/0004_numbers.rs
index dc974b553..dc974b553 100644
--- a/crates/libsyntax2/tests/data/lexer/0004_numbers.rs
+++ b/crates/ra_syntax/tests/data/lexer/0004_numbers.rs
diff --git a/crates/libsyntax2/tests/data/lexer/0004_numbers.txt b/crates/ra_syntax/tests/data/lexer/0004_numbers.txt
index 4b5fd9f71..4b5fd9f71 100644
--- a/crates/libsyntax2/tests/data/lexer/0004_numbers.txt
+++ b/crates/ra_syntax/tests/data/lexer/0004_numbers.txt
diff --git a/crates/libsyntax2/tests/data/lexer/0005_symbols.rs b/crates/ra_syntax/tests/data/lexer/0005_symbols.rs
index 487569b5a..487569b5a 100644
--- a/crates/libsyntax2/tests/data/lexer/0005_symbols.rs
+++ b/crates/ra_syntax/tests/data/lexer/0005_symbols.rs
diff --git a/crates/libsyntax2/tests/data/lexer/0005_symbols.txt b/crates/ra_syntax/tests/data/lexer/0005_symbols.txt
index a6bc83a6f..a6bc83a6f 100644
--- a/crates/libsyntax2/tests/data/lexer/0005_symbols.txt
+++ b/crates/ra_syntax/tests/data/lexer/0005_symbols.txt
diff --git a/crates/libsyntax2/tests/data/lexer/0006_chars.rs b/crates/ra_syntax/tests/data/lexer/0006_chars.rs
index 454ee0a5f..454ee0a5f 100644
--- a/crates/libsyntax2/tests/data/lexer/0006_chars.rs
+++ b/crates/ra_syntax/tests/data/lexer/0006_chars.rs
diff --git a/crates/libsyntax2/tests/data/lexer/0006_chars.txt b/crates/ra_syntax/tests/data/lexer/0006_chars.txt
index 950954fbc..950954fbc 100644
--- a/crates/libsyntax2/tests/data/lexer/0006_chars.txt
+++ b/crates/ra_syntax/tests/data/lexer/0006_chars.txt
diff --git a/crates/libsyntax2/tests/data/lexer/0007_lifetimes.rs b/crates/ra_syntax/tests/data/lexer/0007_lifetimes.rs
index b764f1dce..b764f1dce 100644
--- a/crates/libsyntax2/tests/data/lexer/0007_lifetimes.rs
+++ b/crates/ra_syntax/tests/data/lexer/0007_lifetimes.rs
diff --git a/crates/libsyntax2/tests/data/lexer/0007_lifetimes.txt b/crates/ra_syntax/tests/data/lexer/0007_lifetimes.txt
index 005c29100..005c29100 100644
--- a/crates/libsyntax2/tests/data/lexer/0007_lifetimes.txt
+++ b/crates/ra_syntax/tests/data/lexer/0007_lifetimes.txt
diff --git a/crates/libsyntax2/tests/data/lexer/0008_byte_strings.rs b/crates/ra_syntax/tests/data/lexer/0008_byte_strings.rs
index b54930f5e..b54930f5e 100644
--- a/crates/libsyntax2/tests/data/lexer/0008_byte_strings.rs
+++ b/crates/ra_syntax/tests/data/lexer/0008_byte_strings.rs
diff --git a/crates/libsyntax2/tests/data/lexer/0008_byte_strings.txt b/crates/ra_syntax/tests/data/lexer/0008_byte_strings.txt
index bc03b51a8..bc03b51a8 100644
--- a/crates/libsyntax2/tests/data/lexer/0008_byte_strings.txt
+++ b/crates/ra_syntax/tests/data/lexer/0008_byte_strings.txt
diff --git a/crates/libsyntax2/tests/data/lexer/0009_strings.rs b/crates/ra_syntax/tests/data/lexer/0009_strings.rs
index 4ddb5bffc..4ddb5bffc 100644
--- a/crates/libsyntax2/tests/data/lexer/0009_strings.rs
+++ b/crates/ra_syntax/tests/data/lexer/0009_strings.rs
diff --git a/crates/libsyntax2/tests/data/lexer/0009_strings.txt b/crates/ra_syntax/tests/data/lexer/0009_strings.txt
index 4cb4d711d..4cb4d711d 100644
--- a/crates/libsyntax2/tests/data/lexer/0009_strings.txt
+++ b/crates/ra_syntax/tests/data/lexer/0009_strings.txt
diff --git a/crates/libsyntax2/tests/data/lexer/0010_comments.rs b/crates/ra_syntax/tests/data/lexer/0010_comments.rs
index 71bdd1f9c..71bdd1f9c 100644
--- a/crates/libsyntax2/tests/data/lexer/0010_comments.rs
+++ b/crates/ra_syntax/tests/data/lexer/0010_comments.rs
diff --git a/crates/libsyntax2/tests/data/lexer/0010_comments.txt b/crates/ra_syntax/tests/data/lexer/0010_comments.txt
index 3c997de3f..3c997de3f 100644
--- a/crates/libsyntax2/tests/data/lexer/0010_comments.txt
+++ b/crates/ra_syntax/tests/data/lexer/0010_comments.txt
diff --git a/crates/libsyntax2/tests/data/lexer/0011_keywords.rs b/crates/ra_syntax/tests/data/lexer/0011_keywords.rs
index e6bf64d4d..e6bf64d4d 100644
--- a/crates/libsyntax2/tests/data/lexer/0011_keywords.rs
+++ b/crates/ra_syntax/tests/data/lexer/0011_keywords.rs
diff --git a/crates/libsyntax2/tests/data/lexer/0011_keywords.txt b/crates/ra_syntax/tests/data/lexer/0011_keywords.txt
index d6a1abe8a..d6a1abe8a 100644
--- a/crates/libsyntax2/tests/data/lexer/0011_keywords.txt
+++ b/crates/ra_syntax/tests/data/lexer/0011_keywords.txt
diff --git a/crates/libsyntax2/tests/data/lexer/0013_raw_strings.rs b/crates/ra_syntax/tests/data/lexer/0013_raw_strings.rs
index e5ed0b693..e5ed0b693 100644
--- a/crates/libsyntax2/tests/data/lexer/0013_raw_strings.rs
+++ b/crates/ra_syntax/tests/data/lexer/0013_raw_strings.rs
diff --git a/crates/libsyntax2/tests/data/lexer/0013_raw_strings.txt b/crates/ra_syntax/tests/data/lexer/0013_raw_strings.txt
index 9cf0957d1..9cf0957d1 100644
--- a/crates/libsyntax2/tests/data/lexer/0013_raw_strings.txt
+++ b/crates/ra_syntax/tests/data/lexer/0013_raw_strings.txt
diff --git a/crates/libsyntax2/tests/data/lexer/0014_unclosed_char.rs b/crates/ra_syntax/tests/data/lexer/0014_unclosed_char.rs
index 9c0007077..9c0007077 100644
--- a/crates/libsyntax2/tests/data/lexer/0014_unclosed_char.rs
+++ b/crates/ra_syntax/tests/data/lexer/0014_unclosed_char.rs
diff --git a/crates/libsyntax2/tests/data/lexer/0014_unclosed_char.txt b/crates/ra_syntax/tests/data/lexer/0014_unclosed_char.txt
index 812dfbc18..812dfbc18 100644
--- a/crates/libsyntax2/tests/data/lexer/0014_unclosed_char.txt
+++ b/crates/ra_syntax/tests/data/lexer/0014_unclosed_char.txt
diff --git a/crates/libsyntax2/tests/data/lexer/0015_unclosed_string.rs b/crates/ra_syntax/tests/data/lexer/0015_unclosed_string.rs
index d771a26d4..d771a26d4 100644
--- a/crates/libsyntax2/tests/data/lexer/0015_unclosed_string.rs
+++ b/crates/ra_syntax/tests/data/lexer/0015_unclosed_string.rs
diff --git a/crates/libsyntax2/tests/data/lexer/0015_unclosed_string.txt b/crates/ra_syntax/tests/data/lexer/0015_unclosed_string.txt
index 728c40b66..728c40b66 100644
--- a/crates/libsyntax2/tests/data/lexer/0015_unclosed_string.txt
+++ b/crates/ra_syntax/tests/data/lexer/0015_unclosed_string.txt
diff --git a/crates/libsyntax2/tests/data/parser/err/0000_struct_field_missing_comma.rs b/crates/ra_syntax/tests/data/parser/err/0000_struct_field_missing_comma.rs
index fe5030d89..fe5030d89 100644
--- a/crates/libsyntax2/tests/data/parser/err/0000_struct_field_missing_comma.rs
+++ b/crates/ra_syntax/tests/data/parser/err/0000_struct_field_missing_comma.rs
diff --git a/crates/libsyntax2/tests/data/parser/err/0000_struct_field_missing_comma.txt b/crates/ra_syntax/tests/data/parser/err/0000_struct_field_missing_comma.txt
index aa375fe8a..aa375fe8a 100644
--- a/crates/libsyntax2/tests/data/parser/err/0000_struct_field_missing_comma.txt
+++ b/crates/ra_syntax/tests/data/parser/err/0000_struct_field_missing_comma.txt
diff --git a/crates/libsyntax2/tests/data/parser/err/0001_item_recovery_in_file.rs b/crates/ra_syntax/tests/data/parser/err/0001_item_recovery_in_file.rs
index 98f23de1f..98f23de1f 100644
--- a/crates/libsyntax2/tests/data/parser/err/0001_item_recovery_in_file.rs
+++ b/crates/ra_syntax/tests/data/parser/err/0001_item_recovery_in_file.rs
diff --git a/crates/libsyntax2/tests/data/parser/err/0001_item_recovery_in_file.txt b/crates/ra_syntax/tests/data/parser/err/0001_item_recovery_in_file.txt
index 771d6e1ef..771d6e1ef 100644
--- a/crates/libsyntax2/tests/data/parser/err/0001_item_recovery_in_file.txt
+++ b/crates/ra_syntax/tests/data/parser/err/0001_item_recovery_in_file.txt
diff --git a/crates/libsyntax2/tests/data/parser/err/0002_duplicate_shebang.rs b/crates/ra_syntax/tests/data/parser/err/0002_duplicate_shebang.rs
index 48a3a3980..48a3a3980 100644
--- a/crates/libsyntax2/tests/data/parser/err/0002_duplicate_shebang.rs
+++ b/crates/ra_syntax/tests/data/parser/err/0002_duplicate_shebang.rs
diff --git a/crates/libsyntax2/tests/data/parser/err/0002_duplicate_shebang.txt b/crates/ra_syntax/tests/data/parser/err/0002_duplicate_shebang.txt
index 57fb48420..57fb48420 100644
--- a/crates/libsyntax2/tests/data/parser/err/0002_duplicate_shebang.txt
+++ b/crates/ra_syntax/tests/data/parser/err/0002_duplicate_shebang.txt
diff --git a/crates/libsyntax2/tests/data/parser/err/0003_C++_semicolon.rs b/crates/ra_syntax/tests/data/parser/err/0003_C++_semicolon.rs
index 009312270..009312270 100644
--- a/crates/libsyntax2/tests/data/parser/err/0003_C++_semicolon.rs
+++ b/crates/ra_syntax/tests/data/parser/err/0003_C++_semicolon.rs
diff --git a/crates/libsyntax2/tests/data/parser/err/0003_C++_semicolon.txt b/crates/ra_syntax/tests/data/parser/err/0003_C++_semicolon.txt
index b51c0573a..b51c0573a 100644
--- a/crates/libsyntax2/tests/data/parser/err/0003_C++_semicolon.txt
+++ b/crates/ra_syntax/tests/data/parser/err/0003_C++_semicolon.txt
diff --git a/crates/libsyntax2/tests/data/parser/err/0004_use_path_bad_segment.rs b/crates/ra_syntax/tests/data/parser/err/0004_use_path_bad_segment.rs
index 060e65d06..060e65d06 100644
--- a/crates/libsyntax2/tests/data/parser/err/0004_use_path_bad_segment.rs
+++ b/crates/ra_syntax/tests/data/parser/err/0004_use_path_bad_segment.rs
diff --git a/crates/libsyntax2/tests/data/parser/err/0004_use_path_bad_segment.txt b/crates/ra_syntax/tests/data/parser/err/0004_use_path_bad_segment.txt
index 646c84534..646c84534 100644
--- a/crates/libsyntax2/tests/data/parser/err/0004_use_path_bad_segment.txt
+++ b/crates/ra_syntax/tests/data/parser/err/0004_use_path_bad_segment.txt
diff --git a/crates/libsyntax2/tests/data/parser/err/0005_attribute_recover.rs b/crates/ra_syntax/tests/data/parser/err/0005_attribute_recover.rs
index de7f81628..de7f81628 100644
--- a/crates/libsyntax2/tests/data/parser/err/0005_attribute_recover.rs
+++ b/crates/ra_syntax/tests/data/parser/err/0005_attribute_recover.rs
diff --git a/crates/libsyntax2/tests/data/parser/err/0005_attribute_recover.txt b/crates/ra_syntax/tests/data/parser/err/0005_attribute_recover.txt
index b3cf9b889..b3cf9b889 100644
--- a/crates/libsyntax2/tests/data/parser/err/0005_attribute_recover.txt
+++ b/crates/ra_syntax/tests/data/parser/err/0005_attribute_recover.txt
diff --git a/crates/libsyntax2/tests/data/parser/err/0006_named_field_recovery.rs b/crates/ra_syntax/tests/data/parser/err/0006_named_field_recovery.rs
index 8069c111b..8069c111b 100644
--- a/crates/libsyntax2/tests/data/parser/err/0006_named_field_recovery.rs
+++ b/crates/ra_syntax/tests/data/parser/err/0006_named_field_recovery.rs
diff --git a/crates/libsyntax2/tests/data/parser/err/0006_named_field_recovery.txt b/crates/ra_syntax/tests/data/parser/err/0006_named_field_recovery.txt
index 9abda7099..9abda7099 100644
--- a/crates/libsyntax2/tests/data/parser/err/0006_named_field_recovery.txt
+++ b/crates/ra_syntax/tests/data/parser/err/0006_named_field_recovery.txt
diff --git a/crates/libsyntax2/tests/data/parser/err/0007_stray_curly_in_file.rs b/crates/ra_syntax/tests/data/parser/err/0007_stray_curly_in_file.rs
index dc869fb78..dc869fb78 100644
--- a/crates/libsyntax2/tests/data/parser/err/0007_stray_curly_in_file.rs
+++ b/crates/ra_syntax/tests/data/parser/err/0007_stray_curly_in_file.rs
diff --git a/crates/libsyntax2/tests/data/parser/err/0007_stray_curly_in_file.txt b/crates/ra_syntax/tests/data/parser/err/0007_stray_curly_in_file.txt
index 802c69b31..802c69b31 100644
--- a/crates/libsyntax2/tests/data/parser/err/0007_stray_curly_in_file.txt
+++ b/crates/ra_syntax/tests/data/parser/err/0007_stray_curly_in_file.txt
diff --git a/crates/libsyntax2/tests/data/parser/err/0008_item_block_recovery.rs b/crates/ra_syntax/tests/data/parser/err/0008_item_block_recovery.rs
index 9fcac19b5..9fcac19b5 100644
--- a/crates/libsyntax2/tests/data/parser/err/0008_item_block_recovery.rs
+++ b/crates/ra_syntax/tests/data/parser/err/0008_item_block_recovery.rs
diff --git a/crates/libsyntax2/tests/data/parser/err/0008_item_block_recovery.txt b/crates/ra_syntax/tests/data/parser/err/0008_item_block_recovery.txt
index 95a34333b..95a34333b 100644
--- a/crates/libsyntax2/tests/data/parser/err/0008_item_block_recovery.txt
+++ b/crates/ra_syntax/tests/data/parser/err/0008_item_block_recovery.txt
diff --git a/crates/libsyntax2/tests/data/parser/err/0009_broken_struct_type_parameter.rs b/crates/ra_syntax/tests/data/parser/err/0009_broken_struct_type_parameter.rs
index 0dd30d0bd..0dd30d0bd 100644
--- a/crates/libsyntax2/tests/data/parser/err/0009_broken_struct_type_parameter.rs
+++ b/crates/ra_syntax/tests/data/parser/err/0009_broken_struct_type_parameter.rs
diff --git a/crates/libsyntax2/tests/data/parser/err/0009_broken_struct_type_parameter.txt b/crates/ra_syntax/tests/data/parser/err/0009_broken_struct_type_parameter.txt
index fa8adf881..fa8adf881 100644
--- a/crates/libsyntax2/tests/data/parser/err/0009_broken_struct_type_parameter.txt
+++ b/crates/ra_syntax/tests/data/parser/err/0009_broken_struct_type_parameter.txt
diff --git a/crates/libsyntax2/tests/data/parser/err/0010_unsafe_lambda_block.rs b/crates/ra_syntax/tests/data/parser/err/0010_unsafe_lambda_block.rs
index 985775282..985775282 100644
--- a/crates/libsyntax2/tests/data/parser/err/0010_unsafe_lambda_block.rs
+++ b/crates/ra_syntax/tests/data/parser/err/0010_unsafe_lambda_block.rs
diff --git a/crates/libsyntax2/tests/data/parser/err/0010_unsafe_lambda_block.txt b/crates/ra_syntax/tests/data/parser/err/0010_unsafe_lambda_block.txt
index 38667e030..38667e030 100644
--- a/crates/libsyntax2/tests/data/parser/err/0010_unsafe_lambda_block.txt
+++ b/crates/ra_syntax/tests/data/parser/err/0010_unsafe_lambda_block.txt
diff --git a/crates/libsyntax2/tests/data/parser/err/0011_extern_struct.rs b/crates/ra_syntax/tests/data/parser/err/0011_extern_struct.rs
index c1bd0a2d1..c1bd0a2d1 100644
--- a/crates/libsyntax2/tests/data/parser/err/0011_extern_struct.rs
+++ b/crates/ra_syntax/tests/data/parser/err/0011_extern_struct.rs
diff --git a/crates/libsyntax2/tests/data/parser/err/0011_extern_struct.txt b/crates/ra_syntax/tests/data/parser/err/0011_extern_struct.txt
index 0cb7447c4..0cb7447c4 100644
--- a/crates/libsyntax2/tests/data/parser/err/0011_extern_struct.txt
+++ b/crates/ra_syntax/tests/data/parser/err/0011_extern_struct.txt
diff --git a/crates/libsyntax2/tests/data/parser/err/0012_broken_lambda.txt b/crates/ra_syntax/tests/data/parser/err/0012_broken_lambda.txt
index a03aa05e3..a03aa05e3 100644
--- a/crates/libsyntax2/tests/data/parser/err/0012_broken_lambda.txt
+++ b/crates/ra_syntax/tests/data/parser/err/0012_broken_lambda.txt
diff --git a/crates/libsyntax2/tests/data/parser/err/0013_invalid_type.rs b/crates/ra_syntax/tests/data/parser/err/0013_invalid_type.rs
index 20dde3bc3..20dde3bc3 100644
--- a/crates/libsyntax2/tests/data/parser/err/0013_invalid_type.rs
+++ b/crates/ra_syntax/tests/data/parser/err/0013_invalid_type.rs
diff --git a/crates/libsyntax2/tests/data/parser/err/0013_invalid_type.txt b/crates/ra_syntax/tests/data/parser/err/0013_invalid_type.txt
index e1a6b6432..e1a6b6432 100644
--- a/crates/libsyntax2/tests/data/parser/err/0013_invalid_type.txt
+++ b/crates/ra_syntax/tests/data/parser/err/0013_invalid_type.txt
diff --git a/crates/libsyntax2/tests/data/parser/err/0014_where_no_bounds.rs b/crates/ra_syntax/tests/data/parser/err/0014_where_no_bounds.rs
index 75c1d2f98..75c1d2f98 100644
--- a/crates/libsyntax2/tests/data/parser/err/0014_where_no_bounds.rs
+++ b/crates/ra_syntax/tests/data/parser/err/0014_where_no_bounds.rs
diff --git a/crates/libsyntax2/tests/data/parser/err/0014_where_no_bounds.txt b/crates/ra_syntax/tests/data/parser/err/0014_where_no_bounds.txt
index 37826ce86..37826ce86 100644
--- a/crates/libsyntax2/tests/data/parser/err/0014_where_no_bounds.txt
+++ b/crates/ra_syntax/tests/data/parser/err/0014_where_no_bounds.txt
diff --git a/crates/libsyntax2/tests/data/parser/err/0015_curly_in_params.rs b/crates/ra_syntax/tests/data/parser/err/0015_curly_in_params.rs
index 156e70251..156e70251 100644
--- a/crates/libsyntax2/tests/data/parser/err/0015_curly_in_params.rs
+++ b/crates/ra_syntax/tests/data/parser/err/0015_curly_in_params.rs
diff --git a/crates/libsyntax2/tests/data/parser/err/0015_curly_in_params.txt b/crates/ra_syntax/tests/data/parser/err/0015_curly_in_params.txt
index 5f736a978..5f736a978 100644
--- a/crates/libsyntax2/tests/data/parser/err/0015_curly_in_params.txt
+++ b/crates/ra_syntax/tests/data/parser/err/0015_curly_in_params.txt
diff --git a/crates/libsyntax2/tests/data/parser/err/0016_missing_semi.rs b/crates/ra_syntax/tests/data/parser/err/0016_missing_semi.rs
index 9ae857686..9ae857686 100644
--- a/crates/libsyntax2/tests/data/parser/err/0016_missing_semi.rs
+++ b/crates/ra_syntax/tests/data/parser/err/0016_missing_semi.rs
diff --git a/crates/libsyntax2/tests/data/parser/err/0016_missing_semi.txt b/crates/ra_syntax/tests/data/parser/err/0016_missing_semi.txt
index a3163adcb..a3163adcb 100644
--- a/crates/libsyntax2/tests/data/parser/err/0016_missing_semi.txt
+++ b/crates/ra_syntax/tests/data/parser/err/0016_missing_semi.txt
diff --git a/crates/libsyntax2/tests/data/parser/err/0017_incomplete_binexpr.rs b/crates/ra_syntax/tests/data/parser/err/0017_incomplete_binexpr.rs
index 17bd49777..17bd49777 100644
--- a/crates/libsyntax2/tests/data/parser/err/0017_incomplete_binexpr.rs
+++ b/crates/ra_syntax/tests/data/parser/err/0017_incomplete_binexpr.rs
diff --git a/crates/libsyntax2/tests/data/parser/err/0017_incomplete_binexpr.txt b/crates/ra_syntax/tests/data/parser/err/0017_incomplete_binexpr.txt
index f0be287ad..f0be287ad 100644
--- a/crates/libsyntax2/tests/data/parser/err/0017_incomplete_binexpr.txt
+++ b/crates/ra_syntax/tests/data/parser/err/0017_incomplete_binexpr.txt
diff --git a/crates/libsyntax2/tests/data/parser/err/0018_incomplete_fn.rs b/crates/ra_syntax/tests/data/parser/err/0018_incomplete_fn.rs
index fe604006c..fe604006c 100644
--- a/crates/libsyntax2/tests/data/parser/err/0018_incomplete_fn.rs
+++ b/crates/ra_syntax/tests/data/parser/err/0018_incomplete_fn.rs
diff --git a/crates/libsyntax2/tests/data/parser/err/0018_incomplete_fn.txt b/crates/ra_syntax/tests/data/parser/err/0018_incomplete_fn.txt
index c4d9f5e7e..c4d9f5e7e 100644
--- a/crates/libsyntax2/tests/data/parser/err/0018_incomplete_fn.txt
+++ b/crates/ra_syntax/tests/data/parser/err/0018_incomplete_fn.txt
diff --git a/crates/libsyntax2/tests/data/parser/err/0019_let_recover.rs b/crates/ra_syntax/tests/data/parser/err/0019_let_recover.rs
index 48bf3d68b..48bf3d68b 100644
--- a/crates/libsyntax2/tests/data/parser/err/0019_let_recover.rs
+++ b/crates/ra_syntax/tests/data/parser/err/0019_let_recover.rs
diff --git a/crates/libsyntax2/tests/data/parser/err/0019_let_recover.txt b/crates/ra_syntax/tests/data/parser/err/0019_let_recover.txt
index 6e74771f1..6e74771f1 100644
--- a/crates/libsyntax2/tests/data/parser/err/0019_let_recover.txt
+++ b/crates/ra_syntax/tests/data/parser/err/0019_let_recover.txt
diff --git a/crates/libsyntax2/tests/data/parser/err/0020_fn_recover.rs b/crates/ra_syntax/tests/data/parser/err/0020_fn_recover.rs
index 3393b668b..3393b668b 100644
--- a/crates/libsyntax2/tests/data/parser/err/0020_fn_recover.rs
+++ b/crates/ra_syntax/tests/data/parser/err/0020_fn_recover.rs
diff --git a/crates/libsyntax2/tests/data/parser/err/0020_fn_recover.txt b/crates/ra_syntax/tests/data/parser/err/0020_fn_recover.txt
index b5218b0fa..b5218b0fa 100644
--- a/crates/libsyntax2/tests/data/parser/err/0020_fn_recover.txt
+++ b/crates/ra_syntax/tests/data/parser/err/0020_fn_recover.txt
diff --git a/crates/libsyntax2/tests/data/parser/err/0021_incomplete_param.rs b/crates/ra_syntax/tests/data/parser/err/0021_incomplete_param.rs
index 7a6c264f6..7a6c264f6 100644
--- a/crates/libsyntax2/tests/data/parser/err/0021_incomplete_param.rs
+++ b/crates/ra_syntax/tests/data/parser/err/0021_incomplete_param.rs
diff --git a/crates/libsyntax2/tests/data/parser/err/0021_incomplete_param.txt b/crates/ra_syntax/tests/data/parser/err/0021_incomplete_param.txt
index 8dcb58ae2..8dcb58ae2 100644
--- a/crates/libsyntax2/tests/data/parser/err/0021_incomplete_param.txt
+++ b/crates/ra_syntax/tests/data/parser/err/0021_incomplete_param.txt
diff --git a/crates/libsyntax2/tests/data/parser/err/0022_bad_exprs.rs b/crates/ra_syntax/tests/data/parser/err/0022_bad_exprs.rs
index cd2d493a1..cd2d493a1 100644
--- a/crates/libsyntax2/tests/data/parser/err/0022_bad_exprs.rs
+++ b/crates/ra_syntax/tests/data/parser/err/0022_bad_exprs.rs
diff --git a/crates/libsyntax2/tests/data/parser/err/0022_bad_exprs.txt b/crates/ra_syntax/tests/data/parser/err/0022_bad_exprs.txt
index 287e56ac4..287e56ac4 100644
--- a/crates/libsyntax2/tests/data/parser/err/0022_bad_exprs.txt
+++ b/crates/ra_syntax/tests/data/parser/err/0022_bad_exprs.txt
diff --git a/crates/libsyntax2/tests/data/parser/err/0023_mismatched_paren.rs b/crates/ra_syntax/tests/data/parser/err/0023_mismatched_paren.rs
index 0206d563e..0206d563e 100644
--- a/crates/libsyntax2/tests/data/parser/err/0023_mismatched_paren.rs
+++ b/crates/ra_syntax/tests/data/parser/err/0023_mismatched_paren.rs
diff --git a/crates/libsyntax2/tests/data/parser/err/0023_mismatched_paren.txt b/crates/ra_syntax/tests/data/parser/err/0023_mismatched_paren.txt
index 2df81b12b..2df81b12b 100644
--- a/crates/libsyntax2/tests/data/parser/err/0023_mismatched_paren.txt
+++ b/crates/ra_syntax/tests/data/parser/err/0023_mismatched_paren.txt
diff --git a/crates/libsyntax2/tests/data/parser/err/0024_many_type_parens.rs b/crates/ra_syntax/tests/data/parser/err/0024_many_type_parens.rs
index 6c2e95c02..6c2e95c02 100644
--- a/crates/libsyntax2/tests/data/parser/err/0024_many_type_parens.rs
+++ b/crates/ra_syntax/tests/data/parser/err/0024_many_type_parens.rs
diff --git a/crates/libsyntax2/tests/data/parser/err/0024_many_type_parens.txt b/crates/ra_syntax/tests/data/parser/err/0024_many_type_parens.txt
index 195c12e08..195c12e08 100644
--- a/crates/libsyntax2/tests/data/parser/err/0024_many_type_parens.txt
+++ b/crates/ra_syntax/tests/data/parser/err/0024_many_type_parens.txt
diff --git a/crates/libsyntax2/tests/data/parser/err/0025_nope.rs b/crates/ra_syntax/tests/data/parser/err/0025_nope.rs
index 28726ed51..28726ed51 100644
--- a/crates/libsyntax2/tests/data/parser/err/0025_nope.rs
+++ b/crates/ra_syntax/tests/data/parser/err/0025_nope.rs
diff --git a/crates/libsyntax2/tests/data/parser/err/0025_nope.txt b/crates/ra_syntax/tests/data/parser/err/0025_nope.txt
index c30b8585f..c30b8585f 100644
--- a/crates/libsyntax2/tests/data/parser/err/0025_nope.txt
+++ b/crates/ra_syntax/tests/data/parser/err/0025_nope.txt
diff --git a/crates/libsyntax2/tests/data/parser/fuzz-failures/0000.rs b/crates/ra_syntax/tests/data/parser/fuzz-failures/0000.rs
index 53c93d9e9..53c93d9e9 100644
--- a/crates/libsyntax2/tests/data/parser/fuzz-failures/0000.rs
+++ b/crates/ra_syntax/tests/data/parser/fuzz-failures/0000.rs
diff --git a/crates/libsyntax2/tests/data/parser/fuzz-failures/0001.rs b/crates/ra_syntax/tests/data/parser/fuzz-failures/0001.rs
index cf98cf7a7..099cc5f84 100644
--- a/crates/libsyntax2/tests/data/parser/fuzz-failures/0001.rs
+++ b/crates/ra_syntax/tests/data/parser/fuzz-failures/0001.rs
@@ -1,4 +1,4 @@
-use libsyntax2::{
+use ra_syntax::{
     File, TextRange, SyntaxNodeRef, TextUnit,
     SyntaxKind::*,
     algo::{find_leaf_at_offset, LeafAtOffset, find_covering_node, ancestors, Direction, siblings},
diff --git a/crates/libsyntax2/tests/data/parser/inline/0001_const_unsafe_fn.rs b/crates/ra_syntax/tests/data/parser/inline/0001_const_unsafe_fn.rs
index 31a1e435f..31a1e435f 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0001_const_unsafe_fn.rs
+++ b/crates/ra_syntax/tests/data/parser/inline/0001_const_unsafe_fn.rs
diff --git a/crates/libsyntax2/tests/data/parser/inline/0001_const_unsafe_fn.txt b/crates/ra_syntax/tests/data/parser/inline/0001_const_unsafe_fn.txt
index 956532981..956532981 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0001_const_unsafe_fn.txt
+++ b/crates/ra_syntax/tests/data/parser/inline/0001_const_unsafe_fn.txt
diff --git a/crates/libsyntax2/tests/data/parser/inline/0002_const_fn.rs b/crates/ra_syntax/tests/data/parser/inline/0002_const_fn.rs
index 8c84d9cd7..8c84d9cd7 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0002_const_fn.rs
+++ b/crates/ra_syntax/tests/data/parser/inline/0002_const_fn.rs
diff --git a/crates/libsyntax2/tests/data/parser/inline/0002_const_fn.txt b/crates/ra_syntax/tests/data/parser/inline/0002_const_fn.txt
index bda875fc5..bda875fc5 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0002_const_fn.txt
+++ b/crates/ra_syntax/tests/data/parser/inline/0002_const_fn.txt
diff --git a/crates/libsyntax2/tests/data/parser/inline/0003_extern_block.rs b/crates/ra_syntax/tests/data/parser/inline/0003_extern_block.rs
index 26a9ccd1e..26a9ccd1e 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0003_extern_block.rs
+++ b/crates/ra_syntax/tests/data/parser/inline/0003_extern_block.rs
diff --git a/crates/libsyntax2/tests/data/parser/inline/0003_extern_block.txt b/crates/ra_syntax/tests/data/parser/inline/0003_extern_block.txt
index 2c2bbd035..2c2bbd035 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0003_extern_block.txt
+++ b/crates/ra_syntax/tests/data/parser/inline/0003_extern_block.txt
diff --git a/crates/libsyntax2/tests/data/parser/inline/0004_extern_fn.rs b/crates/ra_syntax/tests/data/parser/inline/0004_extern_fn.rs
index 394a049f0..394a049f0 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0004_extern_fn.rs
+++ b/crates/ra_syntax/tests/data/parser/inline/0004_extern_fn.rs
diff --git a/crates/libsyntax2/tests/data/parser/inline/0004_extern_fn.txt b/crates/ra_syntax/tests/data/parser/inline/0004_extern_fn.txt
index f6e769475..f6e769475 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0004_extern_fn.txt
+++ b/crates/ra_syntax/tests/data/parser/inline/0004_extern_fn.txt
diff --git a/crates/libsyntax2/tests/data/parser/inline/0005_extern_crate.rs b/crates/ra_syntax/tests/data/parser/inline/0005_extern_crate.rs
index 49af74e1b..49af74e1b 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0005_extern_crate.rs
+++ b/crates/ra_syntax/tests/data/parser/inline/0005_extern_crate.rs
diff --git a/crates/libsyntax2/tests/data/parser/inline/0005_extern_crate.txt b/crates/ra_syntax/tests/data/parser/inline/0005_extern_crate.txt
index fc025b0f3..fc025b0f3 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0005_extern_crate.txt
+++ b/crates/ra_syntax/tests/data/parser/inline/0005_extern_crate.txt
diff --git a/crates/libsyntax2/tests/data/parser/inline/0007_unsafe_trait.rs b/crates/ra_syntax/tests/data/parser/inline/0007_unsafe_trait.rs
index 04e021550..04e021550 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0007_unsafe_trait.rs
+++ b/crates/ra_syntax/tests/data/parser/inline/0007_unsafe_trait.rs
diff --git a/crates/libsyntax2/tests/data/parser/inline/0007_unsafe_trait.txt b/crates/ra_syntax/tests/data/parser/inline/0007_unsafe_trait.txt
index fb97cc042..fb97cc042 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0007_unsafe_trait.txt
+++ b/crates/ra_syntax/tests/data/parser/inline/0007_unsafe_trait.txt
diff --git a/crates/libsyntax2/tests/data/parser/inline/0008_unsafe_impl.rs b/crates/ra_syntax/tests/data/parser/inline/0008_unsafe_impl.rs
index 41055f41d..41055f41d 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0008_unsafe_impl.rs
+++ b/crates/ra_syntax/tests/data/parser/inline/0008_unsafe_impl.rs
diff --git a/crates/libsyntax2/tests/data/parser/inline/0008_unsafe_impl.txt b/crates/ra_syntax/tests/data/parser/inline/0008_unsafe_impl.txt
index fa596394f..fa596394f 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0008_unsafe_impl.txt
+++ b/crates/ra_syntax/tests/data/parser/inline/0008_unsafe_impl.txt
diff --git a/crates/libsyntax2/tests/data/parser/inline/0009_unsafe_auto_trait.rs b/crates/ra_syntax/tests/data/parser/inline/0009_unsafe_auto_trait.rs
index 03d29f324..03d29f324 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0009_unsafe_auto_trait.rs
+++ b/crates/ra_syntax/tests/data/parser/inline/0009_unsafe_auto_trait.rs
diff --git a/crates/libsyntax2/tests/data/parser/inline/0009_unsafe_auto_trait.txt b/crates/ra_syntax/tests/data/parser/inline/0009_unsafe_auto_trait.txt
index e642bbf80..e642bbf80 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0009_unsafe_auto_trait.txt
+++ b/crates/ra_syntax/tests/data/parser/inline/0009_unsafe_auto_trait.txt
diff --git a/crates/libsyntax2/tests/data/parser/inline/0010_unsafe_default_impl.rs b/crates/ra_syntax/tests/data/parser/inline/0010_unsafe_default_impl.rs
index 9cd6c57bd..9cd6c57bd 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0010_unsafe_default_impl.rs
+++ b/crates/ra_syntax/tests/data/parser/inline/0010_unsafe_default_impl.rs
diff --git a/crates/libsyntax2/tests/data/parser/inline/0010_unsafe_default_impl.txt b/crates/ra_syntax/tests/data/parser/inline/0010_unsafe_default_impl.txt
index 99d33a902..99d33a902 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0010_unsafe_default_impl.txt
+++ b/crates/ra_syntax/tests/data/parser/inline/0010_unsafe_default_impl.txt
diff --git a/crates/libsyntax2/tests/data/parser/inline/0011_unsafe_fn.rs b/crates/ra_syntax/tests/data/parser/inline/0011_unsafe_fn.rs
index 33cfc4cd7..33cfc4cd7 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0011_unsafe_fn.rs
+++ b/crates/ra_syntax/tests/data/parser/inline/0011_unsafe_fn.rs
diff --git a/crates/libsyntax2/tests/data/parser/inline/0011_unsafe_fn.txt b/crates/ra_syntax/tests/data/parser/inline/0011_unsafe_fn.txt
index 39ec53b26..39ec53b26 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0011_unsafe_fn.txt
+++ b/crates/ra_syntax/tests/data/parser/inline/0011_unsafe_fn.txt
diff --git a/crates/libsyntax2/tests/data/parser/inline/0012_unsafe_extern_fn.rs b/crates/ra_syntax/tests/data/parser/inline/0012_unsafe_extern_fn.rs
index 1295c2cd2..1295c2cd2 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0012_unsafe_extern_fn.rs
+++ b/crates/ra_syntax/tests/data/parser/inline/0012_unsafe_extern_fn.rs
diff --git a/crates/libsyntax2/tests/data/parser/inline/0012_unsafe_extern_fn.txt b/crates/ra_syntax/tests/data/parser/inline/0012_unsafe_extern_fn.txt
index 54e296ed6..54e296ed6 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0012_unsafe_extern_fn.txt
+++ b/crates/ra_syntax/tests/data/parser/inline/0012_unsafe_extern_fn.txt
diff --git a/crates/libsyntax2/tests/data/parser/inline/0013_unsafe_block_in_mod.rs b/crates/ra_syntax/tests/data/parser/inline/0013_unsafe_block_in_mod.rs
index 26141e904..26141e904 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0013_unsafe_block_in_mod.rs
+++ b/crates/ra_syntax/tests/data/parser/inline/0013_unsafe_block_in_mod.rs
diff --git a/crates/libsyntax2/tests/data/parser/inline/0013_unsafe_block_in_mod.txt b/crates/ra_syntax/tests/data/parser/inline/0013_unsafe_block_in_mod.txt
index 9825e5ace..9825e5ace 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0013_unsafe_block_in_mod.txt
+++ b/crates/ra_syntax/tests/data/parser/inline/0013_unsafe_block_in_mod.txt
diff --git a/crates/libsyntax2/tests/data/parser/inline/0014_type_item_type_params.rs b/crates/ra_syntax/tests/data/parser/inline/0014_type_item_type_params.rs
index defd110c4..defd110c4 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0014_type_item_type_params.rs
+++ b/crates/ra_syntax/tests/data/parser/inline/0014_type_item_type_params.rs
diff --git a/crates/libsyntax2/tests/data/parser/inline/0014_type_item_type_params.txt b/crates/ra_syntax/tests/data/parser/inline/0014_type_item_type_params.txt
index bf65e8a37..bf65e8a37 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0014_type_item_type_params.txt
+++ b/crates/ra_syntax/tests/data/parser/inline/0014_type_item_type_params.txt
diff --git a/crates/libsyntax2/tests/data/parser/inline/0015_type_item.rs b/crates/ra_syntax/tests/data/parser/inline/0015_type_item.rs
index 04c0344fa..04c0344fa 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0015_type_item.rs
+++ b/crates/ra_syntax/tests/data/parser/inline/0015_type_item.rs
diff --git a/crates/libsyntax2/tests/data/parser/inline/0015_type_item.txt b/crates/ra_syntax/tests/data/parser/inline/0015_type_item.txt
index 71048bcc5..71048bcc5 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0015_type_item.txt
+++ b/crates/ra_syntax/tests/data/parser/inline/0015_type_item.txt
diff --git a/crates/libsyntax2/tests/data/parser/inline/0016_type_item_where_clause.rs b/crates/ra_syntax/tests/data/parser/inline/0016_type_item_where_clause.rs
index a602d07f0..a602d07f0 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0016_type_item_where_clause.rs
+++ b/crates/ra_syntax/tests/data/parser/inline/0016_type_item_where_clause.rs
diff --git a/crates/libsyntax2/tests/data/parser/inline/0016_type_item_where_clause.txt b/crates/ra_syntax/tests/data/parser/inline/0016_type_item_where_clause.txt
index c3fca013e..c3fca013e 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0016_type_item_where_clause.txt
+++ b/crates/ra_syntax/tests/data/parser/inline/0016_type_item_where_clause.txt
diff --git a/crates/libsyntax2/tests/data/parser/inline/0017_paren_type.rs b/crates/ra_syntax/tests/data/parser/inline/0017_paren_type.rs
index 6e1b25101..6e1b25101 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0017_paren_type.rs
+++ b/crates/ra_syntax/tests/data/parser/inline/0017_paren_type.rs
diff --git a/crates/libsyntax2/tests/data/parser/inline/0017_paren_type.txt b/crates/ra_syntax/tests/data/parser/inline/0017_paren_type.txt
index 97e73fea1..97e73fea1 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0017_paren_type.txt
+++ b/crates/ra_syntax/tests/data/parser/inline/0017_paren_type.txt
diff --git a/crates/libsyntax2/tests/data/parser/inline/0018_unit_type.rs b/crates/ra_syntax/tests/data/parser/inline/0018_unit_type.rs
index c039cf7d3..c039cf7d3 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0018_unit_type.rs
+++ b/crates/ra_syntax/tests/data/parser/inline/0018_unit_type.rs
diff --git a/crates/libsyntax2/tests/data/parser/inline/0018_unit_type.txt b/crates/ra_syntax/tests/data/parser/inline/0018_unit_type.txt
index 5d04d42fc..5d04d42fc 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0018_unit_type.txt
+++ b/crates/ra_syntax/tests/data/parser/inline/0018_unit_type.txt
diff --git a/crates/libsyntax2/tests/data/parser/inline/0019_singleton_tuple_type.rs b/crates/ra_syntax/tests/data/parser/inline/0019_singleton_tuple_type.rs
index cb66bad24..cb66bad24 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0019_singleton_tuple_type.rs
+++ b/crates/ra_syntax/tests/data/parser/inline/0019_singleton_tuple_type.rs
diff --git a/crates/libsyntax2/tests/data/parser/inline/0019_singleton_tuple_type.txt b/crates/ra_syntax/tests/data/parser/inline/0019_singleton_tuple_type.txt
index 2cd8be9ab..2cd8be9ab 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0019_singleton_tuple_type.txt
+++ b/crates/ra_syntax/tests/data/parser/inline/0019_singleton_tuple_type.txt
diff --git a/crates/libsyntax2/tests/data/parser/inline/0020_never_type.rs b/crates/ra_syntax/tests/data/parser/inline/0020_never_type.rs
index de399fcf4..de399fcf4 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0020_never_type.rs
+++ b/crates/ra_syntax/tests/data/parser/inline/0020_never_type.rs
diff --git a/crates/libsyntax2/tests/data/parser/inline/0020_never_type.txt b/crates/ra_syntax/tests/data/parser/inline/0020_never_type.txt
index 6205d9669..6205d9669 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0020_never_type.txt
+++ b/crates/ra_syntax/tests/data/parser/inline/0020_never_type.txt
diff --git a/crates/libsyntax2/tests/data/parser/inline/0021_pointer_type_no_mutability.rs b/crates/ra_syntax/tests/data/parser/inline/0021_pointer_type_no_mutability.rs
index fae705131..fae705131 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0021_pointer_type_no_mutability.rs
+++ b/crates/ra_syntax/tests/data/parser/inline/0021_pointer_type_no_mutability.rs
diff --git a/crates/libsyntax2/tests/data/parser/inline/0021_pointer_type_no_mutability.txt b/crates/ra_syntax/tests/data/parser/inline/0021_pointer_type_no_mutability.txt
index 23e68557a..23e68557a 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0021_pointer_type_no_mutability.txt
+++ b/crates/ra_syntax/tests/data/parser/inline/0021_pointer_type_no_mutability.txt
diff --git a/crates/libsyntax2/tests/data/parser/inline/0022_pointer_type_mut.rs b/crates/ra_syntax/tests/data/parser/inline/0022_pointer_type_mut.rs
index 04b2bb9ba..04b2bb9ba 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0022_pointer_type_mut.rs
+++ b/crates/ra_syntax/tests/data/parser/inline/0022_pointer_type_mut.rs
diff --git a/crates/libsyntax2/tests/data/parser/inline/0022_pointer_type_mut.txt b/crates/ra_syntax/tests/data/parser/inline/0022_pointer_type_mut.txt
index 33f5ad8b4..33f5ad8b4 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0022_pointer_type_mut.txt
+++ b/crates/ra_syntax/tests/data/parser/inline/0022_pointer_type_mut.txt
diff --git a/crates/libsyntax2/tests/data/parser/inline/0023_array_type_missing_semi.rs b/crates/ra_syntax/tests/data/parser/inline/0023_array_type_missing_semi.rs
index a94851443..a94851443 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0023_array_type_missing_semi.rs
+++ b/crates/ra_syntax/tests/data/parser/inline/0023_array_type_missing_semi.rs
diff --git a/crates/libsyntax2/tests/data/parser/inline/0023_array_type_missing_semi.txt b/crates/ra_syntax/tests/data/parser/inline/0023_array_type_missing_semi.txt
index 90bdc5d2e..90bdc5d2e 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0023_array_type_missing_semi.txt
+++ b/crates/ra_syntax/tests/data/parser/inline/0023_array_type_missing_semi.txt
diff --git a/crates/libsyntax2/tests/data/parser/inline/0024_array_type.rs b/crates/ra_syntax/tests/data/parser/inline/0024_array_type.rs
index 27eb22f22..27eb22f22 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0024_array_type.rs
+++ b/crates/ra_syntax/tests/data/parser/inline/0024_array_type.rs
diff --git a/crates/libsyntax2/tests/data/parser/inline/0024_array_type.txt b/crates/ra_syntax/tests/data/parser/inline/0024_array_type.txt
index 809c86974..809c86974 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0024_array_type.txt
+++ b/crates/ra_syntax/tests/data/parser/inline/0024_array_type.txt
diff --git a/crates/libsyntax2/tests/data/parser/inline/0025_slice_type.rs b/crates/ra_syntax/tests/data/parser/inline/0025_slice_type.rs
index 4da1af827..4da1af827 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0025_slice_type.rs
+++ b/crates/ra_syntax/tests/data/parser/inline/0025_slice_type.rs
diff --git a/crates/libsyntax2/tests/data/parser/inline/0025_slice_type.txt b/crates/ra_syntax/tests/data/parser/inline/0025_slice_type.txt
index 978530a6a..978530a6a 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0025_slice_type.txt
+++ b/crates/ra_syntax/tests/data/parser/inline/0025_slice_type.txt
diff --git a/crates/libsyntax2/tests/data/parser/inline/0026_reference_type;.rs b/crates/ra_syntax/tests/data/parser/inline/0026_reference_type;.rs
index 3ac0badab..3ac0badab 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0026_reference_type;.rs
+++ b/crates/ra_syntax/tests/data/parser/inline/0026_reference_type;.rs
diff --git a/crates/libsyntax2/tests/data/parser/inline/0026_reference_type;.txt b/crates/ra_syntax/tests/data/parser/inline/0026_reference_type;.txt
index ff27ce5dd..ff27ce5dd 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0026_reference_type;.txt
+++ b/crates/ra_syntax/tests/data/parser/inline/0026_reference_type;.txt
diff --git a/crates/libsyntax2/tests/data/parser/inline/0027_placeholder_type.rs b/crates/ra_syntax/tests/data/parser/inline/0027_placeholder_type.rs
index 7952dbd57..7952dbd57 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0027_placeholder_type.rs
+++ b/crates/ra_syntax/tests/data/parser/inline/0027_placeholder_type.rs
diff --git a/crates/libsyntax2/tests/data/parser/inline/0027_placeholder_type.txt b/crates/ra_syntax/tests/data/parser/inline/0027_placeholder_type.txt
index 538e4e69c..538e4e69c 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0027_placeholder_type.txt
+++ b/crates/ra_syntax/tests/data/parser/inline/0027_placeholder_type.txt
diff --git a/crates/libsyntax2/tests/data/parser/inline/0028_fn_pointer_type.rs b/crates/ra_syntax/tests/data/parser/inline/0028_fn_pointer_type.rs
index c9bf3bdb4..c9bf3bdb4 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0028_fn_pointer_type.rs
+++ b/crates/ra_syntax/tests/data/parser/inline/0028_fn_pointer_type.rs
diff --git a/crates/libsyntax2/tests/data/parser/inline/0028_fn_pointer_type.txt b/crates/ra_syntax/tests/data/parser/inline/0028_fn_pointer_type.txt
index 4dba83eb5..4dba83eb5 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0028_fn_pointer_type.txt
+++ b/crates/ra_syntax/tests/data/parser/inline/0028_fn_pointer_type.txt
diff --git a/crates/libsyntax2/tests/data/parser/inline/0029_fn_pointer_type_missing_fn.rs b/crates/ra_syntax/tests/data/parser/inline/0029_fn_pointer_type_missing_fn.rs
index f014914ff..f014914ff 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0029_fn_pointer_type_missing_fn.rs
+++ b/crates/ra_syntax/tests/data/parser/inline/0029_fn_pointer_type_missing_fn.rs
diff --git a/crates/libsyntax2/tests/data/parser/inline/0029_fn_pointer_type_missing_fn.txt b/crates/ra_syntax/tests/data/parser/inline/0029_fn_pointer_type_missing_fn.txt
index fa0771ab1..fa0771ab1 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0029_fn_pointer_type_missing_fn.txt
+++ b/crates/ra_syntax/tests/data/parser/inline/0029_fn_pointer_type_missing_fn.txt
diff --git a/crates/libsyntax2/tests/data/parser/inline/0030_fn_pointer_type_with_ret.rs b/crates/ra_syntax/tests/data/parser/inline/0030_fn_pointer_type_with_ret.rs
index e3ba5e87f..e3ba5e87f 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0030_fn_pointer_type_with_ret.rs
+++ b/crates/ra_syntax/tests/data/parser/inline/0030_fn_pointer_type_with_ret.rs
diff --git a/crates/libsyntax2/tests/data/parser/inline/0030_fn_pointer_type_with_ret.txt b/crates/ra_syntax/tests/data/parser/inline/0030_fn_pointer_type_with_ret.txt
index 203839636..203839636 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0030_fn_pointer_type_with_ret.txt
+++ b/crates/ra_syntax/tests/data/parser/inline/0030_fn_pointer_type_with_ret.txt
diff --git a/crates/libsyntax2/tests/data/parser/inline/0031_for_type.rs b/crates/ra_syntax/tests/data/parser/inline/0031_for_type.rs
index 4d6a18c6b..4d6a18c6b 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0031_for_type.rs
+++ b/crates/ra_syntax/tests/data/parser/inline/0031_for_type.rs
diff --git a/crates/libsyntax2/tests/data/parser/inline/0031_for_type.txt b/crates/ra_syntax/tests/data/parser/inline/0031_for_type.txt
index f6b962b2c..f6b962b2c 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0031_for_type.txt
+++ b/crates/ra_syntax/tests/data/parser/inline/0031_for_type.txt
diff --git a/crates/libsyntax2/tests/data/parser/inline/0032_path_type.rs b/crates/ra_syntax/tests/data/parser/inline/0032_path_type.rs
index bf94f32e1..bf94f32e1 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0032_path_type.rs
+++ b/crates/ra_syntax/tests/data/parser/inline/0032_path_type.rs
diff --git a/crates/libsyntax2/tests/data/parser/inline/0032_path_type.txt b/crates/ra_syntax/tests/data/parser/inline/0032_path_type.txt
index b0a110a2c..b0a110a2c 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0032_path_type.txt
+++ b/crates/ra_syntax/tests/data/parser/inline/0032_path_type.txt
diff --git a/crates/libsyntax2/tests/data/parser/inline/0034_bind_pat.rs b/crates/ra_syntax/tests/data/parser/inline/0034_bind_pat.rs
index 820a9e72c..820a9e72c 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0034_bind_pat.rs
+++ b/crates/ra_syntax/tests/data/parser/inline/0034_bind_pat.rs
diff --git a/crates/libsyntax2/tests/data/parser/inline/0034_bind_pat.txt b/crates/ra_syntax/tests/data/parser/inline/0034_bind_pat.txt
index 9adc89b7c..9adc89b7c 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0034_bind_pat.txt
+++ b/crates/ra_syntax/tests/data/parser/inline/0034_bind_pat.txt
diff --git a/crates/libsyntax2/tests/data/parser/inline/0035_ref_pat.rs b/crates/ra_syntax/tests/data/parser/inline/0035_ref_pat.rs
index de41f5cae..de41f5cae 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0035_ref_pat.rs
+++ b/crates/ra_syntax/tests/data/parser/inline/0035_ref_pat.rs
diff --git a/crates/libsyntax2/tests/data/parser/inline/0035_ref_pat.txt b/crates/ra_syntax/tests/data/parser/inline/0035_ref_pat.txt
index a625637cd..a625637cd 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0035_ref_pat.txt
+++ b/crates/ra_syntax/tests/data/parser/inline/0035_ref_pat.txt
diff --git a/crates/libsyntax2/tests/data/parser/inline/0036_placeholder_pat.rs b/crates/ra_syntax/tests/data/parser/inline/0036_placeholder_pat.rs
index 4d719c433..4d719c433 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0036_placeholder_pat.rs
+++ b/crates/ra_syntax/tests/data/parser/inline/0036_placeholder_pat.rs
diff --git a/crates/libsyntax2/tests/data/parser/inline/0036_placeholder_pat.txt b/crates/ra_syntax/tests/data/parser/inline/0036_placeholder_pat.txt
index e89ff4e7c..e89ff4e7c 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0036_placeholder_pat.txt
+++ b/crates/ra_syntax/tests/data/parser/inline/0036_placeholder_pat.txt
diff --git a/crates/libsyntax2/tests/data/parser/inline/0037_crate_visibility.rs b/crates/ra_syntax/tests/data/parser/inline/0037_crate_visibility.rs
index faeefde94..faeefde94 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0037_crate_visibility.rs
+++ b/crates/ra_syntax/tests/data/parser/inline/0037_crate_visibility.rs
diff --git a/crates/libsyntax2/tests/data/parser/inline/0037_crate_visibility.txt b/crates/ra_syntax/tests/data/parser/inline/0037_crate_visibility.txt
index 3b5fbf95d..3b5fbf95d 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0037_crate_visibility.txt
+++ b/crates/ra_syntax/tests/data/parser/inline/0037_crate_visibility.txt
diff --git a/crates/libsyntax2/tests/data/parser/inline/0038_function_ret_type.rs b/crates/ra_syntax/tests/data/parser/inline/0038_function_ret_type.rs
index d22d8cada..d22d8cada 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0038_function_ret_type.rs
+++ b/crates/ra_syntax/tests/data/parser/inline/0038_function_ret_type.rs
diff --git a/crates/libsyntax2/tests/data/parser/inline/0038_function_ret_type.txt b/crates/ra_syntax/tests/data/parser/inline/0038_function_ret_type.txt
index a3d235ce1..a3d235ce1 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0038_function_ret_type.txt
+++ b/crates/ra_syntax/tests/data/parser/inline/0038_function_ret_type.txt
diff --git a/crates/libsyntax2/tests/data/parser/inline/0039_path_expr.rs b/crates/ra_syntax/tests/data/parser/inline/0039_path_expr.rs
index 333ebabef..333ebabef 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0039_path_expr.rs
+++ b/crates/ra_syntax/tests/data/parser/inline/0039_path_expr.rs
diff --git a/crates/libsyntax2/tests/data/parser/inline/0039_path_expr.txt b/crates/ra_syntax/tests/data/parser/inline/0039_path_expr.txt
index 618afc0a9..618afc0a9 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0039_path_expr.txt
+++ b/crates/ra_syntax/tests/data/parser/inline/0039_path_expr.txt
diff --git a/crates/libsyntax2/tests/data/parser/inline/0040_expr_literals.rs b/crates/ra_syntax/tests/data/parser/inline/0040_expr_literals.rs
index 2e11a5a6e..2e11a5a6e 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0040_expr_literals.rs
+++ b/crates/ra_syntax/tests/data/parser/inline/0040_expr_literals.rs
diff --git a/crates/libsyntax2/tests/data/parser/inline/0040_expr_literals.txt b/crates/ra_syntax/tests/data/parser/inline/0040_expr_literals.txt
index 8105ee25a..8105ee25a 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0040_expr_literals.txt
+++ b/crates/ra_syntax/tests/data/parser/inline/0040_expr_literals.txt
diff --git a/crates/libsyntax2/tests/data/parser/inline/0041_type_param_bounds.rs b/crates/ra_syntax/tests/data/parser/inline/0041_type_param_bounds.rs
index 919bde0ee..919bde0ee 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0041_type_param_bounds.rs
+++ b/crates/ra_syntax/tests/data/parser/inline/0041_type_param_bounds.rs
diff --git a/crates/libsyntax2/tests/data/parser/inline/0041_type_param_bounds.txt b/crates/ra_syntax/tests/data/parser/inline/0041_type_param_bounds.txt
index 549b571c2..549b571c2 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0041_type_param_bounds.txt
+++ b/crates/ra_syntax/tests/data/parser/inline/0041_type_param_bounds.txt
diff --git a/crates/libsyntax2/tests/data/parser/inline/0042_type_param_default.rs b/crates/ra_syntax/tests/data/parser/inline/0042_type_param_default.rs
index 540eacb02..540eacb02 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0042_type_param_default.rs
+++ b/crates/ra_syntax/tests/data/parser/inline/0042_type_param_default.rs
diff --git a/crates/libsyntax2/tests/data/parser/inline/0042_type_param_default.txt b/crates/ra_syntax/tests/data/parser/inline/0042_type_param_default.txt
index a75b7ed0a..a75b7ed0a 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0042_type_param_default.txt
+++ b/crates/ra_syntax/tests/data/parser/inline/0042_type_param_default.txt
diff --git a/crates/libsyntax2/tests/data/parser/inline/0043_call_expr.rs b/crates/ra_syntax/tests/data/parser/inline/0043_call_expr.rs
index 0c9a20718..0c9a20718 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0043_call_expr.rs
+++ b/crates/ra_syntax/tests/data/parser/inline/0043_call_expr.rs
diff --git a/crates/libsyntax2/tests/data/parser/inline/0043_call_expr.txt b/crates/ra_syntax/tests/data/parser/inline/0043_call_expr.txt
index f8e31045a..f8e31045a 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0043_call_expr.txt
+++ b/crates/ra_syntax/tests/data/parser/inline/0043_call_expr.txt
diff --git a/crates/libsyntax2/tests/data/parser/inline/0044_ref_expr.rs b/crates/ra_syntax/tests/data/parser/inline/0044_ref_expr.rs
index 2dac6be95..2dac6be95 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0044_ref_expr.rs
+++ b/crates/ra_syntax/tests/data/parser/inline/0044_ref_expr.rs
diff --git a/crates/libsyntax2/tests/data/parser/inline/0044_ref_expr.txt b/crates/ra_syntax/tests/data/parser/inline/0044_ref_expr.txt
index 77f2ca22c..77f2ca22c 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0044_ref_expr.txt
+++ b/crates/ra_syntax/tests/data/parser/inline/0044_ref_expr.txt
diff --git a/crates/libsyntax2/tests/data/parser/inline/0045_block.rs b/crates/ra_syntax/tests/data/parser/inline/0045_block.rs
index 81f44c533..81f44c533 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0045_block.rs
+++ b/crates/ra_syntax/tests/data/parser/inline/0045_block.rs
diff --git a/crates/libsyntax2/tests/data/parser/inline/0045_block.txt b/crates/ra_syntax/tests/data/parser/inline/0045_block.txt
index e6c841f21..e6c841f21 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0045_block.txt
+++ b/crates/ra_syntax/tests/data/parser/inline/0045_block.txt
diff --git a/crates/libsyntax2/tests/data/parser/inline/0046_default_impl.rs b/crates/ra_syntax/tests/data/parser/inline/0046_default_impl.rs
index ef6aa84a2..ef6aa84a2 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0046_default_impl.rs
+++ b/crates/ra_syntax/tests/data/parser/inline/0046_default_impl.rs
diff --git a/crates/libsyntax2/tests/data/parser/inline/0046_default_impl.txt b/crates/ra_syntax/tests/data/parser/inline/0046_default_impl.txt
index 19fe5ca85..19fe5ca85 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0046_default_impl.txt
+++ b/crates/ra_syntax/tests/data/parser/inline/0046_default_impl.txt
diff --git a/crates/libsyntax2/tests/data/parser/inline/0047_impl_item.rs b/crates/ra_syntax/tests/data/parser/inline/0047_impl_item.rs
index d6337f6b3..d6337f6b3 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0047_impl_item.rs
+++ b/crates/ra_syntax/tests/data/parser/inline/0047_impl_item.rs
diff --git a/crates/libsyntax2/tests/data/parser/inline/0047_impl_item.txt b/crates/ra_syntax/tests/data/parser/inline/0047_impl_item.txt
index 6419243e2..6419243e2 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0047_impl_item.txt
+++ b/crates/ra_syntax/tests/data/parser/inline/0047_impl_item.txt
diff --git a/crates/libsyntax2/tests/data/parser/inline/0048_impl_item_neg.rs b/crates/ra_syntax/tests/data/parser/inline/0048_impl_item_neg.rs
index b7527c870..b7527c870 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0048_impl_item_neg.rs
+++ b/crates/ra_syntax/tests/data/parser/inline/0048_impl_item_neg.rs
diff --git a/crates/libsyntax2/tests/data/parser/inline/0048_impl_item_neg.txt b/crates/ra_syntax/tests/data/parser/inline/0048_impl_item_neg.txt
index 6739f9c55..6739f9c55 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0048_impl_item_neg.txt
+++ b/crates/ra_syntax/tests/data/parser/inline/0048_impl_item_neg.txt
diff --git a/crates/libsyntax2/tests/data/parser/inline/0049_trait_item_list.rs b/crates/ra_syntax/tests/data/parser/inline/0049_trait_item_list.rs
index a5ec3239f..a5ec3239f 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0049_trait_item_list.rs
+++ b/crates/ra_syntax/tests/data/parser/inline/0049_trait_item_list.rs
diff --git a/crates/libsyntax2/tests/data/parser/inline/0049_trait_item_list.txt b/crates/ra_syntax/tests/data/parser/inline/0049_trait_item_list.txt
index 72d9220e8..72d9220e8 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0049_trait_item_list.txt
+++ b/crates/ra_syntax/tests/data/parser/inline/0049_trait_item_list.txt
diff --git a/crates/libsyntax2/tests/data/parser/inline/0050_let_stmt;.rs b/crates/ra_syntax/tests/data/parser/inline/0050_let_stmt;.rs
index 0a9af907f..0a9af907f 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0050_let_stmt;.rs
+++ b/crates/ra_syntax/tests/data/parser/inline/0050_let_stmt;.rs
diff --git a/crates/libsyntax2/tests/data/parser/inline/0050_let_stmt;.txt b/crates/ra_syntax/tests/data/parser/inline/0050_let_stmt;.txt
index 30dc83454..30dc83454 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0050_let_stmt;.txt
+++ b/crates/ra_syntax/tests/data/parser/inline/0050_let_stmt;.txt
diff --git a/crates/libsyntax2/tests/data/parser/inline/0051_method_call_expr.rs b/crates/ra_syntax/tests/data/parser/inline/0051_method_call_expr.rs
index 1a3aa35ae..1a3aa35ae 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0051_method_call_expr.rs
+++ b/crates/ra_syntax/tests/data/parser/inline/0051_method_call_expr.rs
diff --git a/crates/libsyntax2/tests/data/parser/inline/0051_method_call_expr.txt b/crates/ra_syntax/tests/data/parser/inline/0051_method_call_expr.txt
index 530c80fa8..530c80fa8 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0051_method_call_expr.txt
+++ b/crates/ra_syntax/tests/data/parser/inline/0051_method_call_expr.txt
diff --git a/crates/libsyntax2/tests/data/parser/inline/0052_field_expr.rs b/crates/ra_syntax/tests/data/parser/inline/0052_field_expr.rs
index 3e69538e5..3e69538e5 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0052_field_expr.rs
+++ b/crates/ra_syntax/tests/data/parser/inline/0052_field_expr.rs
diff --git a/crates/libsyntax2/tests/data/parser/inline/0052_field_expr.txt b/crates/ra_syntax/tests/data/parser/inline/0052_field_expr.txt
index 9086219ca..9086219ca 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0052_field_expr.txt
+++ b/crates/ra_syntax/tests/data/parser/inline/0052_field_expr.txt
diff --git a/crates/libsyntax2/tests/data/parser/inline/0053_block_items.rs b/crates/ra_syntax/tests/data/parser/inline/0053_block_items.rs
index d9868718c..d9868718c 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0053_block_items.rs
+++ b/crates/ra_syntax/tests/data/parser/inline/0053_block_items.rs
diff --git a/crates/libsyntax2/tests/data/parser/inline/0053_block_items.txt b/crates/ra_syntax/tests/data/parser/inline/0053_block_items.txt
index 20122d763..20122d763 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0053_block_items.txt
+++ b/crates/ra_syntax/tests/data/parser/inline/0053_block_items.txt
diff --git a/crates/libsyntax2/tests/data/parser/inline/0054_field_pat_list.rs b/crates/ra_syntax/tests/data/parser/inline/0054_field_pat_list.rs
index da3412fa8..da3412fa8 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0054_field_pat_list.rs
+++ b/crates/ra_syntax/tests/data/parser/inline/0054_field_pat_list.rs
diff --git a/crates/libsyntax2/tests/data/parser/inline/0054_field_pat_list.txt b/crates/ra_syntax/tests/data/parser/inline/0054_field_pat_list.txt
index 4df4ca35b..4df4ca35b 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0054_field_pat_list.txt
+++ b/crates/ra_syntax/tests/data/parser/inline/0054_field_pat_list.txt
diff --git a/crates/libsyntax2/tests/data/parser/inline/0055_self_param.rs b/crates/ra_syntax/tests/data/parser/inline/0055_self_param.rs
index 80c0a43f5..80c0a43f5 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0055_self_param.rs
+++ b/crates/ra_syntax/tests/data/parser/inline/0055_self_param.rs
diff --git a/crates/libsyntax2/tests/data/parser/inline/0055_self_param.txt b/crates/ra_syntax/tests/data/parser/inline/0055_self_param.txt
index f0e47c2dc..f0e47c2dc 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0055_self_param.txt
+++ b/crates/ra_syntax/tests/data/parser/inline/0055_self_param.txt
diff --git a/crates/libsyntax2/tests/data/parser/inline/0056_trait_item.rs b/crates/ra_syntax/tests/data/parser/inline/0056_trait_item.rs
index 4385afca9..4385afca9 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0056_trait_item.rs
+++ b/crates/ra_syntax/tests/data/parser/inline/0056_trait_item.rs
diff --git a/crates/libsyntax2/tests/data/parser/inline/0056_trait_item.txt b/crates/ra_syntax/tests/data/parser/inline/0056_trait_item.txt
index 40c77db4b..40c77db4b 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0056_trait_item.txt
+++ b/crates/ra_syntax/tests/data/parser/inline/0056_trait_item.txt
diff --git a/crates/libsyntax2/tests/data/parser/inline/0057_auto_trait.rs b/crates/ra_syntax/tests/data/parser/inline/0057_auto_trait.rs
index 72adf6035..72adf6035 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0057_auto_trait.rs
+++ b/crates/ra_syntax/tests/data/parser/inline/0057_auto_trait.rs
diff --git a/crates/libsyntax2/tests/data/parser/inline/0057_auto_trait.txt b/crates/ra_syntax/tests/data/parser/inline/0057_auto_trait.txt
index 0303d76bd..0303d76bd 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0057_auto_trait.txt
+++ b/crates/ra_syntax/tests/data/parser/inline/0057_auto_trait.txt
diff --git a/crates/libsyntax2/tests/data/parser/inline/0058_type_arg.rs b/crates/ra_syntax/tests/data/parser/inline/0058_type_arg.rs
index f0c8cc3a8..f0c8cc3a8 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0058_type_arg.rs
+++ b/crates/ra_syntax/tests/data/parser/inline/0058_type_arg.rs
diff --git a/crates/libsyntax2/tests/data/parser/inline/0058_type_arg.txt b/crates/ra_syntax/tests/data/parser/inline/0058_type_arg.txt
index aaf2924ba..aaf2924ba 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0058_type_arg.txt
+++ b/crates/ra_syntax/tests/data/parser/inline/0058_type_arg.txt
diff --git a/crates/libsyntax2/tests/data/parser/inline/0059_function_where_clause.rs b/crates/ra_syntax/tests/data/parser/inline/0059_function_where_clause.rs
index f0920b2a8..f0920b2a8 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0059_function_where_clause.rs
+++ b/crates/ra_syntax/tests/data/parser/inline/0059_function_where_clause.rs
diff --git a/crates/libsyntax2/tests/data/parser/inline/0059_function_where_clause.txt b/crates/ra_syntax/tests/data/parser/inline/0059_function_where_clause.txt
index 281e79deb..281e79deb 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0059_function_where_clause.txt
+++ b/crates/ra_syntax/tests/data/parser/inline/0059_function_where_clause.txt
diff --git a/crates/libsyntax2/tests/data/parser/inline/0060_function_type_params.rs b/crates/ra_syntax/tests/data/parser/inline/0060_function_type_params.rs
index 9df40ed39..9df40ed39 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0060_function_type_params.rs
+++ b/crates/ra_syntax/tests/data/parser/inline/0060_function_type_params.rs
diff --git a/crates/libsyntax2/tests/data/parser/inline/0060_function_type_params.txt b/crates/ra_syntax/tests/data/parser/inline/0060_function_type_params.txt
index b6fea5ab2..b6fea5ab2 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0060_function_type_params.txt
+++ b/crates/ra_syntax/tests/data/parser/inline/0060_function_type_params.txt
diff --git a/crates/libsyntax2/tests/data/parser/inline/0061_struct_lit.rs b/crates/ra_syntax/tests/data/parser/inline/0061_struct_lit.rs
index eb711f68a..eb711f68a 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0061_struct_lit.rs
+++ b/crates/ra_syntax/tests/data/parser/inline/0061_struct_lit.rs
diff --git a/crates/libsyntax2/tests/data/parser/inline/0061_struct_lit.txt b/crates/ra_syntax/tests/data/parser/inline/0061_struct_lit.txt
index cf6e881b2..cf6e881b2 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0061_struct_lit.txt
+++ b/crates/ra_syntax/tests/data/parser/inline/0061_struct_lit.txt
diff --git a/crates/libsyntax2/tests/data/parser/inline/0063_impl_trait_type.rs b/crates/ra_syntax/tests/data/parser/inline/0063_impl_trait_type.rs
index 54c5a7c46..54c5a7c46 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0063_impl_trait_type.rs
+++ b/crates/ra_syntax/tests/data/parser/inline/0063_impl_trait_type.rs
diff --git a/crates/libsyntax2/tests/data/parser/inline/0063_impl_trait_type.txt b/crates/ra_syntax/tests/data/parser/inline/0063_impl_trait_type.txt
index 68fce58ee..68fce58ee 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0063_impl_trait_type.txt
+++ b/crates/ra_syntax/tests/data/parser/inline/0063_impl_trait_type.txt
diff --git a/crates/libsyntax2/tests/data/parser/inline/0063_lambda_expr.txt b/crates/ra_syntax/tests/data/parser/inline/0063_lambda_expr.txt
index 93f6285ac..93f6285ac 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0063_lambda_expr.txt
+++ b/crates/ra_syntax/tests/data/parser/inline/0063_lambda_expr.txt
diff --git a/crates/libsyntax2/tests/data/parser/inline/0064_param_list.rs b/crates/ra_syntax/tests/data/parser/inline/0064_param_list.rs
index 9d55bedbb..9d55bedbb 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0064_param_list.rs
+++ b/crates/ra_syntax/tests/data/parser/inline/0064_param_list.rs
diff --git a/crates/libsyntax2/tests/data/parser/inline/0064_param_list.txt b/crates/ra_syntax/tests/data/parser/inline/0064_param_list.txt
index de547d699..de547d699 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0064_param_list.txt
+++ b/crates/ra_syntax/tests/data/parser/inline/0064_param_list.txt
diff --git a/crates/libsyntax2/tests/data/parser/inline/0065_if_expr.rs b/crates/ra_syntax/tests/data/parser/inline/0065_if_expr.rs
index 4b0d9af89..4b0d9af89 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0065_if_expr.rs
+++ b/crates/ra_syntax/tests/data/parser/inline/0065_if_expr.rs
diff --git a/crates/libsyntax2/tests/data/parser/inline/0065_if_expr.txt b/crates/ra_syntax/tests/data/parser/inline/0065_if_expr.txt
index ae1a8101e..ae1a8101e 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0065_if_expr.txt
+++ b/crates/ra_syntax/tests/data/parser/inline/0065_if_expr.txt
diff --git a/crates/libsyntax2/tests/data/parser/inline/0066_lambda_expr.rs b/crates/ra_syntax/tests/data/parser/inline/0066_lambda_expr.rs
index c20d29751..c20d29751 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0066_lambda_expr.rs
+++ b/crates/ra_syntax/tests/data/parser/inline/0066_lambda_expr.rs
diff --git a/crates/libsyntax2/tests/data/parser/inline/0066_lambda_expr.txt b/crates/ra_syntax/tests/data/parser/inline/0066_lambda_expr.txt
index 82aaf3897..82aaf3897 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0066_lambda_expr.txt
+++ b/crates/ra_syntax/tests/data/parser/inline/0066_lambda_expr.txt
diff --git a/crates/libsyntax2/tests/data/parser/inline/0067_block_expr.rs b/crates/ra_syntax/tests/data/parser/inline/0067_block_expr.rs
index 2fed74c5e..2fed74c5e 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0067_block_expr.rs
+++ b/crates/ra_syntax/tests/data/parser/inline/0067_block_expr.rs
diff --git a/crates/libsyntax2/tests/data/parser/inline/0067_block_expr.txt b/crates/ra_syntax/tests/data/parser/inline/0067_block_expr.txt
index 12a1ff49a..12a1ff49a 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0067_block_expr.txt
+++ b/crates/ra_syntax/tests/data/parser/inline/0067_block_expr.txt
diff --git a/crates/libsyntax2/tests/data/parser/inline/0068_pub_expr.rs b/crates/ra_syntax/tests/data/parser/inline/0068_pub_expr.rs
index d9d99d2d3..d9d99d2d3 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0068_pub_expr.rs
+++ b/crates/ra_syntax/tests/data/parser/inline/0068_pub_expr.rs
diff --git a/crates/libsyntax2/tests/data/parser/inline/0068_pub_expr.txt b/crates/ra_syntax/tests/data/parser/inline/0068_pub_expr.txt
index 5f179c3ca..5f179c3ca 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0068_pub_expr.txt
+++ b/crates/ra_syntax/tests/data/parser/inline/0068_pub_expr.txt
diff --git a/crates/libsyntax2/tests/data/parser/inline/0068_return_expr.rs b/crates/ra_syntax/tests/data/parser/inline/0068_return_expr.rs
index 5733666b6..5733666b6 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0068_return_expr.rs
+++ b/crates/ra_syntax/tests/data/parser/inline/0068_return_expr.rs
diff --git a/crates/libsyntax2/tests/data/parser/inline/0068_return_expr.txt b/crates/ra_syntax/tests/data/parser/inline/0068_return_expr.txt
index ead1ada96..ead1ada96 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0068_return_expr.txt
+++ b/crates/ra_syntax/tests/data/parser/inline/0068_return_expr.txt
diff --git a/crates/libsyntax2/tests/data/parser/inline/0069_match_arm.rs b/crates/ra_syntax/tests/data/parser/inline/0069_match_arm.rs
index 2c0e88414..2c0e88414 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0069_match_arm.rs
+++ b/crates/ra_syntax/tests/data/parser/inline/0069_match_arm.rs
diff --git a/crates/libsyntax2/tests/data/parser/inline/0069_match_arm.txt b/crates/ra_syntax/tests/data/parser/inline/0069_match_arm.txt
index 013d1716a..013d1716a 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0069_match_arm.txt
+++ b/crates/ra_syntax/tests/data/parser/inline/0069_match_arm.txt
diff --git a/crates/libsyntax2/tests/data/parser/inline/0070_match_expr.rs b/crates/ra_syntax/tests/data/parser/inline/0070_match_expr.rs
index c9205dfa3..c9205dfa3 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0070_match_expr.rs
+++ b/crates/ra_syntax/tests/data/parser/inline/0070_match_expr.rs
diff --git a/crates/libsyntax2/tests/data/parser/inline/0070_match_expr.txt b/crates/ra_syntax/tests/data/parser/inline/0070_match_expr.txt
index d7740e3cc..d7740e3cc 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0070_match_expr.txt
+++ b/crates/ra_syntax/tests/data/parser/inline/0070_match_expr.txt
diff --git a/crates/libsyntax2/tests/data/parser/inline/0071_tuple_pat_fields.rs b/crates/ra_syntax/tests/data/parser/inline/0071_tuple_pat_fields.rs
index 0dfe63629..0dfe63629 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0071_tuple_pat_fields.rs
+++ b/crates/ra_syntax/tests/data/parser/inline/0071_tuple_pat_fields.rs
diff --git a/crates/libsyntax2/tests/data/parser/inline/0071_tuple_pat_fields.txt b/crates/ra_syntax/tests/data/parser/inline/0071_tuple_pat_fields.txt
index 734e0726c..734e0726c 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0071_tuple_pat_fields.txt
+++ b/crates/ra_syntax/tests/data/parser/inline/0071_tuple_pat_fields.txt
diff --git a/crates/libsyntax2/tests/data/parser/inline/0072_path_part.rs b/crates/ra_syntax/tests/data/parser/inline/0072_path_part.rs
index f6e32c7c1..f6e32c7c1 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0072_path_part.rs
+++ b/crates/ra_syntax/tests/data/parser/inline/0072_path_part.rs
diff --git a/crates/libsyntax2/tests/data/parser/inline/0072_path_part.txt b/crates/ra_syntax/tests/data/parser/inline/0072_path_part.txt
index 1a8d1546d..1a8d1546d 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0072_path_part.txt
+++ b/crates/ra_syntax/tests/data/parser/inline/0072_path_part.txt
diff --git a/crates/libsyntax2/tests/data/parser/inline/0073_impl_item_list.rs b/crates/ra_syntax/tests/data/parser/inline/0073_impl_item_list.rs
index f10851487..f10851487 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0073_impl_item_list.rs
+++ b/crates/ra_syntax/tests/data/parser/inline/0073_impl_item_list.rs
diff --git a/crates/libsyntax2/tests/data/parser/inline/0073_impl_item_list.txt b/crates/ra_syntax/tests/data/parser/inline/0073_impl_item_list.txt
index 1f524f34a..1f524f34a 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0073_impl_item_list.txt
+++ b/crates/ra_syntax/tests/data/parser/inline/0073_impl_item_list.txt
diff --git a/crates/libsyntax2/tests/data/parser/inline/0074_unary_expr.rs b/crates/ra_syntax/tests/data/parser/inline/0074_unary_expr.rs
index f1c3f7118..f1c3f7118 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0074_unary_expr.rs
+++ b/crates/ra_syntax/tests/data/parser/inline/0074_unary_expr.rs
diff --git a/crates/libsyntax2/tests/data/parser/inline/0074_unary_expr.txt b/crates/ra_syntax/tests/data/parser/inline/0074_unary_expr.txt
index 4d77c8c11..4d77c8c11 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0074_unary_expr.txt
+++ b/crates/ra_syntax/tests/data/parser/inline/0074_unary_expr.txt
diff --git a/crates/libsyntax2/tests/data/parser/inline/0075_try_expr.rs b/crates/ra_syntax/tests/data/parser/inline/0075_try_expr.rs
index 8b74f7bc8..8b74f7bc8 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0075_try_expr.rs
+++ b/crates/ra_syntax/tests/data/parser/inline/0075_try_expr.rs
diff --git a/crates/libsyntax2/tests/data/parser/inline/0075_try_expr.txt b/crates/ra_syntax/tests/data/parser/inline/0075_try_expr.txt
index b80235146..b80235146 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0075_try_expr.txt
+++ b/crates/ra_syntax/tests/data/parser/inline/0075_try_expr.txt
diff --git a/crates/libsyntax2/tests/data/parser/inline/0076_cond.rs b/crates/ra_syntax/tests/data/parser/inline/0076_cond.rs
index fdb37ee6f..fdb37ee6f 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0076_cond.rs
+++ b/crates/ra_syntax/tests/data/parser/inline/0076_cond.rs
diff --git a/crates/libsyntax2/tests/data/parser/inline/0076_cond.txt b/crates/ra_syntax/tests/data/parser/inline/0076_cond.txt
index 1808f10fb..1808f10fb 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0076_cond.txt
+++ b/crates/ra_syntax/tests/data/parser/inline/0076_cond.txt
diff --git a/crates/libsyntax2/tests/data/parser/inline/0077_while_expr.rs b/crates/ra_syntax/tests/data/parser/inline/0077_while_expr.rs
index 293046a04..293046a04 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0077_while_expr.rs
+++ b/crates/ra_syntax/tests/data/parser/inline/0077_while_expr.rs
diff --git a/crates/libsyntax2/tests/data/parser/inline/0077_while_expr.txt b/crates/ra_syntax/tests/data/parser/inline/0077_while_expr.txt
index c73157c04..c73157c04 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0077_while_expr.txt
+++ b/crates/ra_syntax/tests/data/parser/inline/0077_while_expr.txt
diff --git a/crates/libsyntax2/tests/data/parser/inline/0078_mod_contents.rs b/crates/ra_syntax/tests/data/parser/inline/0078_mod_contents.rs
index 24a15c5c5..24a15c5c5 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0078_mod_contents.rs
+++ b/crates/ra_syntax/tests/data/parser/inline/0078_mod_contents.rs
diff --git a/crates/libsyntax2/tests/data/parser/inline/0078_mod_contents.txt b/crates/ra_syntax/tests/data/parser/inline/0078_mod_contents.txt
index 57b2b9372..57b2b9372 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0078_mod_contents.txt
+++ b/crates/ra_syntax/tests/data/parser/inline/0078_mod_contents.txt
diff --git a/crates/libsyntax2/tests/data/parser/inline/0079_cast_expr.rs b/crates/ra_syntax/tests/data/parser/inline/0079_cast_expr.rs
index 3e53d56d6..3e53d56d6 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0079_cast_expr.rs
+++ b/crates/ra_syntax/tests/data/parser/inline/0079_cast_expr.rs
diff --git a/crates/libsyntax2/tests/data/parser/inline/0079_cast_expr.txt b/crates/ra_syntax/tests/data/parser/inline/0079_cast_expr.txt
index 6d57078b3..6d57078b3 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0079_cast_expr.txt
+++ b/crates/ra_syntax/tests/data/parser/inline/0079_cast_expr.txt
diff --git a/crates/libsyntax2/tests/data/parser/inline/0080_tuple_expr.rs b/crates/ra_syntax/tests/data/parser/inline/0080_tuple_expr.rs
index e4f774280..e4f774280 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0080_tuple_expr.rs
+++ b/crates/ra_syntax/tests/data/parser/inline/0080_tuple_expr.rs
diff --git a/crates/libsyntax2/tests/data/parser/inline/0080_tuple_expr.txt b/crates/ra_syntax/tests/data/parser/inline/0080_tuple_expr.txt
index cf541411f..cf541411f 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0080_tuple_expr.txt
+++ b/crates/ra_syntax/tests/data/parser/inline/0080_tuple_expr.txt
diff --git a/crates/libsyntax2/tests/data/parser/inline/0081_index_expr.rs b/crates/ra_syntax/tests/data/parser/inline/0081_index_expr.rs
index b9ba78a6c..b9ba78a6c 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0081_index_expr.rs
+++ b/crates/ra_syntax/tests/data/parser/inline/0081_index_expr.rs
diff --git a/crates/libsyntax2/tests/data/parser/inline/0081_index_expr.txt b/crates/ra_syntax/tests/data/parser/inline/0081_index_expr.txt
index 4624aab23..4624aab23 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0081_index_expr.txt
+++ b/crates/ra_syntax/tests/data/parser/inline/0081_index_expr.txt
diff --git a/crates/libsyntax2/tests/data/parser/inline/0082_tuple_pat.rs b/crates/ra_syntax/tests/data/parser/inline/0082_tuple_pat.rs
index f785acd36..f785acd36 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0082_tuple_pat.rs
+++ b/crates/ra_syntax/tests/data/parser/inline/0082_tuple_pat.rs
diff --git a/crates/libsyntax2/tests/data/parser/inline/0082_tuple_pat.txt b/crates/ra_syntax/tests/data/parser/inline/0082_tuple_pat.txt
index 2d68a5ff2..2d68a5ff2 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0082_tuple_pat.txt
+++ b/crates/ra_syntax/tests/data/parser/inline/0082_tuple_pat.txt
diff --git a/crates/libsyntax2/tests/data/parser/inline/0083_postfix_range.rs b/crates/ra_syntax/tests/data/parser/inline/0083_postfix_range.rs
index c39fe8e68..c39fe8e68 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0083_postfix_range.rs
+++ b/crates/ra_syntax/tests/data/parser/inline/0083_postfix_range.rs
diff --git a/crates/libsyntax2/tests/data/parser/inline/0083_postfix_range.txt b/crates/ra_syntax/tests/data/parser/inline/0083_postfix_range.txt
index 475251ea7..475251ea7 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0083_postfix_range.txt
+++ b/crates/ra_syntax/tests/data/parser/inline/0083_postfix_range.txt
diff --git a/crates/libsyntax2/tests/data/parser/inline/0084_loop_expr.rs b/crates/ra_syntax/tests/data/parser/inline/0084_loop_expr.rs
index 9f078fa48..9f078fa48 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0084_loop_expr.rs
+++ b/crates/ra_syntax/tests/data/parser/inline/0084_loop_expr.rs
diff --git a/crates/libsyntax2/tests/data/parser/inline/0084_loop_expr.txt b/crates/ra_syntax/tests/data/parser/inline/0084_loop_expr.txt
index 5321fade9..5321fade9 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0084_loop_expr.txt
+++ b/crates/ra_syntax/tests/data/parser/inline/0084_loop_expr.txt
diff --git a/crates/libsyntax2/tests/data/parser/inline/0085_for_expr.rs b/crates/ra_syntax/tests/data/parser/inline/0085_for_expr.rs
index 972197d2a..972197d2a 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0085_for_expr.rs
+++ b/crates/ra_syntax/tests/data/parser/inline/0085_for_expr.rs
diff --git a/crates/libsyntax2/tests/data/parser/inline/0085_for_expr.txt b/crates/ra_syntax/tests/data/parser/inline/0085_for_expr.txt
index 7ddf8122f..7ddf8122f 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0085_for_expr.txt
+++ b/crates/ra_syntax/tests/data/parser/inline/0085_for_expr.txt
diff --git a/crates/libsyntax2/tests/data/parser/inline/0085_match_arms_commas.rs b/crates/ra_syntax/tests/data/parser/inline/0085_match_arms_commas.rs
index 1f25d577a..1f25d577a 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0085_match_arms_commas.rs
+++ b/crates/ra_syntax/tests/data/parser/inline/0085_match_arms_commas.rs
diff --git a/crates/libsyntax2/tests/data/parser/inline/0085_match_arms_commas.txt b/crates/ra_syntax/tests/data/parser/inline/0085_match_arms_commas.txt
index 560931645..560931645 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0085_match_arms_commas.txt
+++ b/crates/ra_syntax/tests/data/parser/inline/0085_match_arms_commas.txt
diff --git a/crates/libsyntax2/tests/data/parser/inline/0086_array_expr.rs b/crates/ra_syntax/tests/data/parser/inline/0086_array_expr.rs
index 4dc1999d1..4dc1999d1 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0086_array_expr.rs
+++ b/crates/ra_syntax/tests/data/parser/inline/0086_array_expr.rs
diff --git a/crates/libsyntax2/tests/data/parser/inline/0086_array_expr.txt b/crates/ra_syntax/tests/data/parser/inline/0086_array_expr.txt
index dcdeff609..dcdeff609 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0086_array_expr.txt
+++ b/crates/ra_syntax/tests/data/parser/inline/0086_array_expr.txt
diff --git a/crates/libsyntax2/tests/data/parser/inline/0086_no_semi_after_block.rs b/crates/ra_syntax/tests/data/parser/inline/0086_no_semi_after_block.rs
index d769da43d..d769da43d 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0086_no_semi_after_block.rs
+++ b/crates/ra_syntax/tests/data/parser/inline/0086_no_semi_after_block.rs
diff --git a/crates/libsyntax2/tests/data/parser/inline/0086_no_semi_after_block.txt b/crates/ra_syntax/tests/data/parser/inline/0086_no_semi_after_block.txt
index f1b0e2787..f1b0e2787 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0086_no_semi_after_block.txt
+++ b/crates/ra_syntax/tests/data/parser/inline/0086_no_semi_after_block.txt
diff --git a/crates/libsyntax2/tests/data/parser/inline/0087_stmt_postfix_expr_ambiguity.rs b/crates/ra_syntax/tests/data/parser/inline/0087_stmt_postfix_expr_ambiguity.rs
index 2edd578f9..2edd578f9 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0087_stmt_postfix_expr_ambiguity.rs
+++ b/crates/ra_syntax/tests/data/parser/inline/0087_stmt_postfix_expr_ambiguity.rs
diff --git a/crates/libsyntax2/tests/data/parser/inline/0087_stmt_postfix_expr_ambiguity.txt b/crates/ra_syntax/tests/data/parser/inline/0087_stmt_postfix_expr_ambiguity.txt
index 91edf3f84..91edf3f84 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0087_stmt_postfix_expr_ambiguity.txt
+++ b/crates/ra_syntax/tests/data/parser/inline/0087_stmt_postfix_expr_ambiguity.txt
diff --git a/crates/libsyntax2/tests/data/parser/inline/0088_stmt_bin_expr_ambiguity.rs b/crates/ra_syntax/tests/data/parser/inline/0088_stmt_bin_expr_ambiguity.rs
index 37b843742..37b843742 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0088_stmt_bin_expr_ambiguity.rs
+++ b/crates/ra_syntax/tests/data/parser/inline/0088_stmt_bin_expr_ambiguity.rs
diff --git a/crates/libsyntax2/tests/data/parser/inline/0088_stmt_bin_expr_ambiguity.txt b/crates/ra_syntax/tests/data/parser/inline/0088_stmt_bin_expr_ambiguity.txt
index ff1298acb..ff1298acb 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0088_stmt_bin_expr_ambiguity.txt
+++ b/crates/ra_syntax/tests/data/parser/inline/0088_stmt_bin_expr_ambiguity.txt
diff --git a/crates/libsyntax2/tests/data/parser/inline/0089_slice_pat.rs b/crates/ra_syntax/tests/data/parser/inline/0089_slice_pat.rs
index 7955973b9..7955973b9 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0089_slice_pat.rs
+++ b/crates/ra_syntax/tests/data/parser/inline/0089_slice_pat.rs
diff --git a/crates/libsyntax2/tests/data/parser/inline/0089_slice_pat.txt b/crates/ra_syntax/tests/data/parser/inline/0089_slice_pat.txt
index 99e8dd427..99e8dd427 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0089_slice_pat.txt
+++ b/crates/ra_syntax/tests/data/parser/inline/0089_slice_pat.txt
diff --git a/crates/libsyntax2/tests/data/parser/inline/0091_fn_decl.rs b/crates/ra_syntax/tests/data/parser/inline/0091_fn_decl.rs
index c9f74f7f5..c9f74f7f5 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0091_fn_decl.rs
+++ b/crates/ra_syntax/tests/data/parser/inline/0091_fn_decl.rs
diff --git a/crates/libsyntax2/tests/data/parser/inline/0091_fn_decl.txt b/crates/ra_syntax/tests/data/parser/inline/0091_fn_decl.txt
index c35bc8428..c35bc8428 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0091_fn_decl.txt
+++ b/crates/ra_syntax/tests/data/parser/inline/0091_fn_decl.txt
diff --git a/crates/libsyntax2/tests/data/parser/inline/0092_literal_pattern.rs b/crates/ra_syntax/tests/data/parser/inline/0092_literal_pattern.rs
index 16f674d9d..16f674d9d 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0092_literal_pattern.rs
+++ b/crates/ra_syntax/tests/data/parser/inline/0092_literal_pattern.rs
diff --git a/crates/libsyntax2/tests/data/parser/inline/0092_literal_pattern.txt b/crates/ra_syntax/tests/data/parser/inline/0092_literal_pattern.txt
index 3128bfd7d..3128bfd7d 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0092_literal_pattern.txt
+++ b/crates/ra_syntax/tests/data/parser/inline/0092_literal_pattern.txt
diff --git a/crates/libsyntax2/tests/data/parser/inline/0093_path_fn_trait_args.rs b/crates/ra_syntax/tests/data/parser/inline/0093_path_fn_trait_args.rs
index aef45e561..aef45e561 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0093_path_fn_trait_args.rs
+++ b/crates/ra_syntax/tests/data/parser/inline/0093_path_fn_trait_args.rs
diff --git a/crates/libsyntax2/tests/data/parser/inline/0093_path_fn_trait_args.txt b/crates/ra_syntax/tests/data/parser/inline/0093_path_fn_trait_args.txt
index 26a690d3a..26a690d3a 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0093_path_fn_trait_args.txt
+++ b/crates/ra_syntax/tests/data/parser/inline/0093_path_fn_trait_args.txt
diff --git a/crates/libsyntax2/tests/data/parser/inline/0094_range_pat.rs b/crates/ra_syntax/tests/data/parser/inline/0094_range_pat.rs
index 657467e75..657467e75 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0094_range_pat.rs
+++ b/crates/ra_syntax/tests/data/parser/inline/0094_range_pat.rs
diff --git a/crates/libsyntax2/tests/data/parser/inline/0094_range_pat.txt b/crates/ra_syntax/tests/data/parser/inline/0094_range_pat.txt
index 4f14d5431..4f14d5431 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0094_range_pat.txt
+++ b/crates/ra_syntax/tests/data/parser/inline/0094_range_pat.txt
diff --git a/crates/libsyntax2/tests/data/parser/inline/0095_path_type_with_bounds.rs b/crates/ra_syntax/tests/data/parser/inline/0095_path_type_with_bounds.rs
index 215210e27..215210e27 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0095_path_type_with_bounds.rs
+++ b/crates/ra_syntax/tests/data/parser/inline/0095_path_type_with_bounds.rs
diff --git a/crates/libsyntax2/tests/data/parser/inline/0095_path_type_with_bounds.txt b/crates/ra_syntax/tests/data/parser/inline/0095_path_type_with_bounds.txt
index 4b864f741..4b864f741 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0095_path_type_with_bounds.txt
+++ b/crates/ra_syntax/tests/data/parser/inline/0095_path_type_with_bounds.txt
diff --git a/crates/libsyntax2/tests/data/parser/inline/0096_value_parameters_no_patterns.rs b/crates/ra_syntax/tests/data/parser/inline/0096_value_parameters_no_patterns.rs
index d8c23c76a..d8c23c76a 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0096_value_parameters_no_patterns.rs
+++ b/crates/ra_syntax/tests/data/parser/inline/0096_value_parameters_no_patterns.rs
diff --git a/crates/libsyntax2/tests/data/parser/inline/0096_value_parameters_no_patterns.txt b/crates/ra_syntax/tests/data/parser/inline/0096_value_parameters_no_patterns.txt
index 3c8352067..3c8352067 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0096_value_parameters_no_patterns.txt
+++ b/crates/ra_syntax/tests/data/parser/inline/0096_value_parameters_no_patterns.txt
diff --git a/crates/libsyntax2/tests/data/parser/inline/0097_param_list_opt_patterns.rs b/crates/ra_syntax/tests/data/parser/inline/0097_param_list_opt_patterns.rs
index 9b93442c0..9b93442c0 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0097_param_list_opt_patterns.rs
+++ b/crates/ra_syntax/tests/data/parser/inline/0097_param_list_opt_patterns.rs
diff --git a/crates/libsyntax2/tests/data/parser/inline/0097_param_list_opt_patterns.txt b/crates/ra_syntax/tests/data/parser/inline/0097_param_list_opt_patterns.txt
index 39bab8dd2..39bab8dd2 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0097_param_list_opt_patterns.txt
+++ b/crates/ra_syntax/tests/data/parser/inline/0097_param_list_opt_patterns.txt
diff --git a/crates/libsyntax2/tests/data/parser/inline/0098_where_clause.rs b/crates/ra_syntax/tests/data/parser/inline/0098_where_clause.rs
index 592a005f9..592a005f9 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0098_where_clause.rs
+++ b/crates/ra_syntax/tests/data/parser/inline/0098_where_clause.rs
diff --git a/crates/libsyntax2/tests/data/parser/inline/0098_where_clause.txt b/crates/ra_syntax/tests/data/parser/inline/0098_where_clause.txt
index 9fe803554..9fe803554 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0098_where_clause.txt
+++ b/crates/ra_syntax/tests/data/parser/inline/0098_where_clause.txt
diff --git a/crates/libsyntax2/tests/data/parser/inline/0099_crate_keyword_vis.rs b/crates/ra_syntax/tests/data/parser/inline/0099_crate_keyword_vis.rs
index 660d927cf..660d927cf 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0099_crate_keyword_vis.rs
+++ b/crates/ra_syntax/tests/data/parser/inline/0099_crate_keyword_vis.rs
diff --git a/crates/libsyntax2/tests/data/parser/inline/0099_crate_keyword_vis.txt b/crates/ra_syntax/tests/data/parser/inline/0099_crate_keyword_vis.txt
index 96a4e9162..96a4e9162 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0099_crate_keyword_vis.txt
+++ b/crates/ra_syntax/tests/data/parser/inline/0099_crate_keyword_vis.txt
diff --git a/crates/libsyntax2/tests/data/parser/inline/0100_dyn_trait_type.rs b/crates/ra_syntax/tests/data/parser/inline/0100_dyn_trait_type.rs
index c3ecabb99..c3ecabb99 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0100_dyn_trait_type.rs
+++ b/crates/ra_syntax/tests/data/parser/inline/0100_dyn_trait_type.rs
diff --git a/crates/libsyntax2/tests/data/parser/inline/0100_dyn_trait_type.txt b/crates/ra_syntax/tests/data/parser/inline/0100_dyn_trait_type.txt
index c81ae5545..c81ae5545 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0100_dyn_trait_type.txt
+++ b/crates/ra_syntax/tests/data/parser/inline/0100_dyn_trait_type.txt
diff --git a/crates/libsyntax2/tests/data/parser/inline/0101_qual_paths.rs b/crates/ra_syntax/tests/data/parser/inline/0101_qual_paths.rs
index d140692e2..d140692e2 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0101_qual_paths.rs
+++ b/crates/ra_syntax/tests/data/parser/inline/0101_qual_paths.rs
diff --git a/crates/libsyntax2/tests/data/parser/inline/0101_qual_paths.txt b/crates/ra_syntax/tests/data/parser/inline/0101_qual_paths.txt
index 99516bf15..99516bf15 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0101_qual_paths.txt
+++ b/crates/ra_syntax/tests/data/parser/inline/0101_qual_paths.txt
diff --git a/crates/libsyntax2/tests/data/parser/inline/0102_full_range_expr.rs b/crates/ra_syntax/tests/data/parser/inline/0102_full_range_expr.rs
index ae21ad94c..ae21ad94c 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0102_full_range_expr.rs
+++ b/crates/ra_syntax/tests/data/parser/inline/0102_full_range_expr.rs
diff --git a/crates/libsyntax2/tests/data/parser/inline/0102_full_range_expr.txt b/crates/ra_syntax/tests/data/parser/inline/0102_full_range_expr.txt
index 19f77fb73..19f77fb73 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0102_full_range_expr.txt
+++ b/crates/ra_syntax/tests/data/parser/inline/0102_full_range_expr.txt
diff --git a/crates/libsyntax2/tests/data/parser/inline/0103_field_attrs.rs b/crates/ra_syntax/tests/data/parser/inline/0103_field_attrs.rs
index 4744d8ac0..4744d8ac0 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0103_field_attrs.rs
+++ b/crates/ra_syntax/tests/data/parser/inline/0103_field_attrs.rs
diff --git a/crates/libsyntax2/tests/data/parser/inline/0103_field_attrs.txt b/crates/ra_syntax/tests/data/parser/inline/0103_field_attrs.txt
index 420712e89..420712e89 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0103_field_attrs.txt
+++ b/crates/ra_syntax/tests/data/parser/inline/0103_field_attrs.txt
diff --git a/crates/libsyntax2/tests/data/parser/inline/0104_arb_self_types.rs b/crates/ra_syntax/tests/data/parser/inline/0104_arb_self_types.rs
index 6a170d5ac..6a170d5ac 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0104_arb_self_types.rs
+++ b/crates/ra_syntax/tests/data/parser/inline/0104_arb_self_types.rs
diff --git a/crates/libsyntax2/tests/data/parser/inline/0104_arb_self_types.txt b/crates/ra_syntax/tests/data/parser/inline/0104_arb_self_types.txt
index 9a306921e..9a306921e 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0104_arb_self_types.txt
+++ b/crates/ra_syntax/tests/data/parser/inline/0104_arb_self_types.txt
diff --git a/crates/libsyntax2/tests/data/parser/inline/0105_continue_expr.rs b/crates/ra_syntax/tests/data/parser/inline/0105_continue_expr.rs
index 474cc3f0e..474cc3f0e 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0105_continue_expr.rs
+++ b/crates/ra_syntax/tests/data/parser/inline/0105_continue_expr.rs
diff --git a/crates/libsyntax2/tests/data/parser/inline/0105_continue_expr.txt b/crates/ra_syntax/tests/data/parser/inline/0105_continue_expr.txt
index 1c78704fa..1c78704fa 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0105_continue_expr.txt
+++ b/crates/ra_syntax/tests/data/parser/inline/0105_continue_expr.txt
diff --git a/crates/libsyntax2/tests/data/parser/inline/0106_break_expr.rs b/crates/ra_syntax/tests/data/parser/inline/0106_break_expr.rs
index 1b4094636..1b4094636 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0106_break_expr.rs
+++ b/crates/ra_syntax/tests/data/parser/inline/0106_break_expr.rs
diff --git a/crates/libsyntax2/tests/data/parser/inline/0106_break_expr.txt b/crates/ra_syntax/tests/data/parser/inline/0106_break_expr.txt
index 92b6b8bea..92b6b8bea 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0106_break_expr.txt
+++ b/crates/ra_syntax/tests/data/parser/inline/0106_break_expr.txt
diff --git a/crates/libsyntax2/tests/data/parser/inline/0107_label.rs b/crates/ra_syntax/tests/data/parser/inline/0107_label.rs
index 48e83f263..48e83f263 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0107_label.rs
+++ b/crates/ra_syntax/tests/data/parser/inline/0107_label.rs
diff --git a/crates/libsyntax2/tests/data/parser/inline/0107_label.txt b/crates/ra_syntax/tests/data/parser/inline/0107_label.txt
index 768515595..768515595 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0107_label.txt
+++ b/crates/ra_syntax/tests/data/parser/inline/0107_label.txt
diff --git a/crates/libsyntax2/tests/data/parser/inline/0108_misplaced_label_err.rs b/crates/ra_syntax/tests/data/parser/inline/0108_misplaced_label_err.rs
index a2164c510..a2164c510 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0108_misplaced_label_err.rs
+++ b/crates/ra_syntax/tests/data/parser/inline/0108_misplaced_label_err.rs
diff --git a/crates/libsyntax2/tests/data/parser/inline/0108_misplaced_label_err.txt b/crates/ra_syntax/tests/data/parser/inline/0108_misplaced_label_err.txt
index d00305b97..d00305b97 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0108_misplaced_label_err.txt
+++ b/crates/ra_syntax/tests/data/parser/inline/0108_misplaced_label_err.txt
diff --git a/crates/libsyntax2/tests/data/parser/inline/0109_struct_items.rs b/crates/ra_syntax/tests/data/parser/inline/0109_struct_items.rs
index 693e3f3ee..693e3f3ee 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0109_struct_items.rs
+++ b/crates/ra_syntax/tests/data/parser/inline/0109_struct_items.rs
diff --git a/crates/libsyntax2/tests/data/parser/inline/0109_struct_items.txt b/crates/ra_syntax/tests/data/parser/inline/0109_struct_items.txt
index f9b34cc5e..f9b34cc5e 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0109_struct_items.txt
+++ b/crates/ra_syntax/tests/data/parser/inline/0109_struct_items.txt
diff --git a/crates/libsyntax2/tests/data/parser/inline/0110_union_items.rs b/crates/ra_syntax/tests/data/parser/inline/0110_union_items.rs
index b7dd610d8..b7dd610d8 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0110_union_items.rs
+++ b/crates/ra_syntax/tests/data/parser/inline/0110_union_items.rs
diff --git a/crates/libsyntax2/tests/data/parser/inline/0110_union_items.txt b/crates/ra_syntax/tests/data/parser/inline/0110_union_items.txt
index e2e755414..e2e755414 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0110_union_items.txt
+++ b/crates/ra_syntax/tests/data/parser/inline/0110_union_items.txt
diff --git a/crates/libsyntax2/tests/data/parser/ok/0000_empty.rs b/crates/ra_syntax/tests/data/parser/ok/0000_empty.rs
index e69de29bb..e69de29bb 100644
--- a/crates/libsyntax2/tests/data/parser/ok/0000_empty.rs
+++ b/crates/ra_syntax/tests/data/parser/ok/0000_empty.rs
diff --git a/crates/libsyntax2/tests/data/parser/ok/0000_empty.txt b/crates/ra_syntax/tests/data/parser/ok/0000_empty.txt
index 9f505ee96..9f505ee96 100644
--- a/crates/libsyntax2/tests/data/parser/ok/0000_empty.txt
+++ b/crates/ra_syntax/tests/data/parser/ok/0000_empty.txt
diff --git a/crates/libsyntax2/tests/data/parser/ok/0001_struct_item.rs b/crates/ra_syntax/tests/data/parser/ok/0001_struct_item.rs
index 512aeb3e7..512aeb3e7 100644
--- a/crates/libsyntax2/tests/data/parser/ok/0001_struct_item.rs
+++ b/crates/ra_syntax/tests/data/parser/ok/0001_struct_item.rs
diff --git a/crates/libsyntax2/tests/data/parser/ok/0001_struct_item.txt b/crates/ra_syntax/tests/data/parser/ok/0001_struct_item.txt
index aa2f1b712..aa2f1b712 100644
--- a/crates/libsyntax2/tests/data/parser/ok/0001_struct_item.txt
+++ b/crates/ra_syntax/tests/data/parser/ok/0001_struct_item.txt
diff --git a/crates/libsyntax2/tests/data/parser/ok/0002_struct_item_field.rs b/crates/ra_syntax/tests/data/parser/ok/0002_struct_item_field.rs
index cc3866d25..cc3866d25 100644
--- a/crates/libsyntax2/tests/data/parser/ok/0002_struct_item_field.rs
+++ b/crates/ra_syntax/tests/data/parser/ok/0002_struct_item_field.rs
diff --git a/crates/libsyntax2/tests/data/parser/ok/0002_struct_item_field.txt b/crates/ra_syntax/tests/data/parser/ok/0002_struct_item_field.txt
index 0b65387ef..0b65387ef 100644
--- a/crates/libsyntax2/tests/data/parser/ok/0002_struct_item_field.txt
+++ b/crates/ra_syntax/tests/data/parser/ok/0002_struct_item_field.txt
diff --git a/crates/libsyntax2/tests/data/parser/ok/0004_file_shebang.rs b/crates/ra_syntax/tests/data/parser/ok/0004_file_shebang.rs
index 53dc9e617..53dc9e617 100644
--- a/crates/libsyntax2/tests/data/parser/ok/0004_file_shebang.rs
+++ b/crates/ra_syntax/tests/data/parser/ok/0004_file_shebang.rs
diff --git a/crates/libsyntax2/tests/data/parser/ok/0004_file_shebang.txt b/crates/ra_syntax/tests/data/parser/ok/0004_file_shebang.txt
index bb8874ead..bb8874ead 100644
--- a/crates/libsyntax2/tests/data/parser/ok/0004_file_shebang.txt
+++ b/crates/ra_syntax/tests/data/parser/ok/0004_file_shebang.txt
diff --git a/crates/libsyntax2/tests/data/parser/ok/0005_fn_item.rs b/crates/ra_syntax/tests/data/parser/ok/0005_fn_item.rs
index 03210551c..03210551c 100644
--- a/crates/libsyntax2/tests/data/parser/ok/0005_fn_item.rs
+++ b/crates/ra_syntax/tests/data/parser/ok/0005_fn_item.rs
diff --git a/crates/libsyntax2/tests/data/parser/ok/0005_fn_item.txt b/crates/ra_syntax/tests/data/parser/ok/0005_fn_item.txt
index 8ed92f2a4..8ed92f2a4 100644
--- a/crates/libsyntax2/tests/data/parser/ok/0005_fn_item.txt
+++ b/crates/ra_syntax/tests/data/parser/ok/0005_fn_item.txt
diff --git a/crates/libsyntax2/tests/data/parser/ok/0006_inner_attributes.rs b/crates/ra_syntax/tests/data/parser/ok/0006_inner_attributes.rs
index e81f8b1e8..e81f8b1e8 100644
--- a/crates/libsyntax2/tests/data/parser/ok/0006_inner_attributes.rs
+++ b/crates/ra_syntax/tests/data/parser/ok/0006_inner_attributes.rs
diff --git a/crates/libsyntax2/tests/data/parser/ok/0006_inner_attributes.txt b/crates/ra_syntax/tests/data/parser/ok/0006_inner_attributes.txt
index 2b64c497f..2b64c497f 100644
--- a/crates/libsyntax2/tests/data/parser/ok/0006_inner_attributes.txt
+++ b/crates/ra_syntax/tests/data/parser/ok/0006_inner_attributes.txt
diff --git a/crates/libsyntax2/tests/data/parser/ok/0007_extern_crate.rs b/crates/ra_syntax/tests/data/parser/ok/0007_extern_crate.rs
index 3ce336676..3ce336676 100644
--- a/crates/libsyntax2/tests/data/parser/ok/0007_extern_crate.rs
+++ b/crates/ra_syntax/tests/data/parser/ok/0007_extern_crate.rs
diff --git a/crates/libsyntax2/tests/data/parser/ok/0007_extern_crate.txt b/crates/ra_syntax/tests/data/parser/ok/0007_extern_crate.txt
index 12193397e..12193397e 100644
--- a/crates/libsyntax2/tests/data/parser/ok/0007_extern_crate.txt
+++ b/crates/ra_syntax/tests/data/parser/ok/0007_extern_crate.txt
diff --git a/crates/libsyntax2/tests/data/parser/ok/0008_mod_item.rs b/crates/ra_syntax/tests/data/parser/ok/0008_mod_item.rs
index d22993bc1..d22993bc1 100644
--- a/crates/libsyntax2/tests/data/parser/ok/0008_mod_item.rs
+++ b/crates/ra_syntax/tests/data/parser/ok/0008_mod_item.rs
diff --git a/crates/libsyntax2/tests/data/parser/ok/0008_mod_item.txt b/crates/ra_syntax/tests/data/parser/ok/0008_mod_item.txt
index c790f8431..c790f8431 100644
--- a/crates/libsyntax2/tests/data/parser/ok/0008_mod_item.txt
+++ b/crates/ra_syntax/tests/data/parser/ok/0008_mod_item.txt
diff --git a/crates/libsyntax2/tests/data/parser/ok/0009_use_item.rs b/crates/ra_syntax/tests/data/parser/ok/0009_use_item.rs
index 05a6aff83..05a6aff83 100644
--- a/crates/libsyntax2/tests/data/parser/ok/0009_use_item.rs
+++ b/crates/ra_syntax/tests/data/parser/ok/0009_use_item.rs
diff --git a/crates/libsyntax2/tests/data/parser/ok/0009_use_item.txt b/crates/ra_syntax/tests/data/parser/ok/0009_use_item.txt
index 4bcd15357..4bcd15357 100644
--- a/crates/libsyntax2/tests/data/parser/ok/0009_use_item.txt
+++ b/crates/ra_syntax/tests/data/parser/ok/0009_use_item.txt
diff --git a/crates/libsyntax2/tests/data/parser/ok/0010_use_path_segments.rs b/crates/ra_syntax/tests/data/parser/ok/0010_use_path_segments.rs
index 1e71b7a6c..1e71b7a6c 100644
--- a/crates/libsyntax2/tests/data/parser/ok/0010_use_path_segments.rs
+++ b/crates/ra_syntax/tests/data/parser/ok/0010_use_path_segments.rs
diff --git a/crates/libsyntax2/tests/data/parser/ok/0010_use_path_segments.txt b/crates/ra_syntax/tests/data/parser/ok/0010_use_path_segments.txt
index f76ea1a35..f76ea1a35 100644
--- a/crates/libsyntax2/tests/data/parser/ok/0010_use_path_segments.txt
+++ b/crates/ra_syntax/tests/data/parser/ok/0010_use_path_segments.txt
diff --git a/crates/libsyntax2/tests/data/parser/ok/0011_outer_attribute.rs b/crates/ra_syntax/tests/data/parser/ok/0011_outer_attribute.rs
index 8b80c0d90..8b80c0d90 100644
--- a/crates/libsyntax2/tests/data/parser/ok/0011_outer_attribute.rs
+++ b/crates/ra_syntax/tests/data/parser/ok/0011_outer_attribute.rs
diff --git a/crates/libsyntax2/tests/data/parser/ok/0011_outer_attribute.txt b/crates/ra_syntax/tests/data/parser/ok/0011_outer_attribute.txt
index 203a07193..203a07193 100644
--- a/crates/libsyntax2/tests/data/parser/ok/0011_outer_attribute.txt
+++ b/crates/ra_syntax/tests/data/parser/ok/0011_outer_attribute.txt
diff --git a/crates/libsyntax2/tests/data/parser/ok/0012_visibility.rs b/crates/ra_syntax/tests/data/parser/ok/0012_visibility.rs
index 75b1db121..75b1db121 100644
--- a/crates/libsyntax2/tests/data/parser/ok/0012_visibility.rs
+++ b/crates/ra_syntax/tests/data/parser/ok/0012_visibility.rs
diff --git a/crates/libsyntax2/tests/data/parser/ok/0012_visibility.txt b/crates/ra_syntax/tests/data/parser/ok/0012_visibility.txt
index 66901af54..66901af54 100644
--- a/crates/libsyntax2/tests/data/parser/ok/0012_visibility.txt
+++ b/crates/ra_syntax/tests/data/parser/ok/0012_visibility.txt
diff --git a/crates/libsyntax2/tests/data/parser/ok/0013_use_path_self_super.rs b/crates/ra_syntax/tests/data/parser/ok/0013_use_path_self_super.rs
index faf6a42c7..faf6a42c7 100644
--- a/crates/libsyntax2/tests/data/parser/ok/0013_use_path_self_super.rs
+++ b/crates/ra_syntax/tests/data/parser/ok/0013_use_path_self_super.rs
diff --git a/crates/libsyntax2/tests/data/parser/ok/0013_use_path_self_super.txt b/crates/ra_syntax/tests/data/parser/ok/0013_use_path_self_super.txt
index 95be4f75d..95be4f75d 100644
--- a/crates/libsyntax2/tests/data/parser/ok/0013_use_path_self_super.txt
+++ b/crates/ra_syntax/tests/data/parser/ok/0013_use_path_self_super.txt
diff --git a/crates/libsyntax2/tests/data/parser/ok/0014_use_tree.rs b/crates/ra_syntax/tests/data/parser/ok/0014_use_tree.rs
index 5e4aa3a33..5e4aa3a33 100644
--- a/crates/libsyntax2/tests/data/parser/ok/0014_use_tree.rs
+++ b/crates/ra_syntax/tests/data/parser/ok/0014_use_tree.rs
diff --git a/crates/libsyntax2/tests/data/parser/ok/0014_use_tree.txt b/crates/ra_syntax/tests/data/parser/ok/0014_use_tree.txt
index 4aa539159..4aa539159 100644
--- a/crates/libsyntax2/tests/data/parser/ok/0014_use_tree.txt
+++ b/crates/ra_syntax/tests/data/parser/ok/0014_use_tree.txt
diff --git a/crates/libsyntax2/tests/data/parser/ok/0015_use_tree.rs b/crates/ra_syntax/tests/data/parser/ok/0015_use_tree.rs
index 46a0783a2..46a0783a2 100644
--- a/crates/libsyntax2/tests/data/parser/ok/0015_use_tree.rs
+++ b/crates/ra_syntax/tests/data/parser/ok/0015_use_tree.rs
diff --git a/crates/libsyntax2/tests/data/parser/ok/0015_use_tree.txt b/crates/ra_syntax/tests/data/parser/ok/0015_use_tree.txt
index aa4ef3715..aa4ef3715 100644
--- a/crates/libsyntax2/tests/data/parser/ok/0015_use_tree.txt
+++ b/crates/ra_syntax/tests/data/parser/ok/0015_use_tree.txt
diff --git a/crates/libsyntax2/tests/data/parser/ok/0016_struct_flavors.rs b/crates/ra_syntax/tests/data/parser/ok/0016_struct_flavors.rs
index 69638350c..69638350c 100644
--- a/crates/libsyntax2/tests/data/parser/ok/0016_struct_flavors.rs
+++ b/crates/ra_syntax/tests/data/parser/ok/0016_struct_flavors.rs
diff --git a/crates/libsyntax2/tests/data/parser/ok/0016_struct_flavors.txt b/crates/ra_syntax/tests/data/parser/ok/0016_struct_flavors.txt
index 349481157..349481157 100644
--- a/crates/libsyntax2/tests/data/parser/ok/0016_struct_flavors.txt
+++ b/crates/ra_syntax/tests/data/parser/ok/0016_struct_flavors.txt
diff --git a/crates/libsyntax2/tests/data/parser/ok/0017_attr_trailing_comma.rs b/crates/ra_syntax/tests/data/parser/ok/0017_attr_trailing_comma.rs
index fe0a7bb97..fe0a7bb97 100644
--- a/crates/libsyntax2/tests/data/parser/ok/0017_attr_trailing_comma.rs
+++ b/crates/ra_syntax/tests/data/parser/ok/0017_attr_trailing_comma.rs
diff --git a/crates/libsyntax2/tests/data/parser/ok/0017_attr_trailing_comma.txt b/crates/ra_syntax/tests/data/parser/ok/0017_attr_trailing_comma.txt
index 8cfd77256..8cfd77256 100644
--- a/crates/libsyntax2/tests/data/parser/ok/0017_attr_trailing_comma.txt
+++ b/crates/ra_syntax/tests/data/parser/ok/0017_attr_trailing_comma.txt
diff --git a/crates/libsyntax2/tests/data/parser/ok/0018_struct_type_params.rs b/crates/ra_syntax/tests/data/parser/ok/0018_struct_type_params.rs
index 88c544923..88c544923 100644
--- a/crates/libsyntax2/tests/data/parser/ok/0018_struct_type_params.rs
+++ b/crates/ra_syntax/tests/data/parser/ok/0018_struct_type_params.rs
diff --git a/crates/libsyntax2/tests/data/parser/ok/0018_struct_type_params.txt b/crates/ra_syntax/tests/data/parser/ok/0018_struct_type_params.txt
index a98e823f6..a98e823f6 100644
--- a/crates/libsyntax2/tests/data/parser/ok/0018_struct_type_params.txt
+++ b/crates/ra_syntax/tests/data/parser/ok/0018_struct_type_params.txt
diff --git a/crates/libsyntax2/tests/data/parser/ok/0019_enums.rs b/crates/ra_syntax/tests/data/parser/ok/0019_enums.rs
index 7a1afa0e6..7a1afa0e6 100644
--- a/crates/libsyntax2/tests/data/parser/ok/0019_enums.rs
+++ b/crates/ra_syntax/tests/data/parser/ok/0019_enums.rs
diff --git a/crates/libsyntax2/tests/data/parser/ok/0019_enums.txt b/crates/ra_syntax/tests/data/parser/ok/0019_enums.txt
index 6333e47c5..6333e47c5 100644
--- a/crates/libsyntax2/tests/data/parser/ok/0019_enums.txt
+++ b/crates/ra_syntax/tests/data/parser/ok/0019_enums.txt
diff --git a/crates/libsyntax2/tests/data/parser/ok/0020_type_param_bounds.rs b/crates/ra_syntax/tests/data/parser/ok/0020_type_param_bounds.rs
index a1b9f00a4..a1b9f00a4 100644
--- a/crates/libsyntax2/tests/data/parser/ok/0020_type_param_bounds.rs
+++ b/crates/ra_syntax/tests/data/parser/ok/0020_type_param_bounds.rs
diff --git a/crates/libsyntax2/tests/data/parser/ok/0020_type_param_bounds.txt b/crates/ra_syntax/tests/data/parser/ok/0020_type_param_bounds.txt
index ac1a58e9a..ac1a58e9a 100644
--- a/crates/libsyntax2/tests/data/parser/ok/0020_type_param_bounds.txt
+++ b/crates/ra_syntax/tests/data/parser/ok/0020_type_param_bounds.txt
diff --git a/crates/libsyntax2/tests/data/parser/ok/0021_extern_fn.rs b/crates/ra_syntax/tests/data/parser/ok/0021_extern_fn.rs
index e929eef74..e929eef74 100644
--- a/crates/libsyntax2/tests/data/parser/ok/0021_extern_fn.rs
+++ b/crates/ra_syntax/tests/data/parser/ok/0021_extern_fn.rs
diff --git a/crates/libsyntax2/tests/data/parser/ok/0021_extern_fn.txt b/crates/ra_syntax/tests/data/parser/ok/0021_extern_fn.txt
index 5ceef46e0..5ceef46e0 100644
--- a/crates/libsyntax2/tests/data/parser/ok/0021_extern_fn.txt
+++ b/crates/ra_syntax/tests/data/parser/ok/0021_extern_fn.txt
diff --git a/crates/libsyntax2/tests/data/parser/ok/0022_empty_extern_block.rs b/crates/ra_syntax/tests/data/parser/ok/0022_empty_extern_block.rs
index f5fe0e6ef..f5fe0e6ef 100644
--- a/crates/libsyntax2/tests/data/parser/ok/0022_empty_extern_block.rs
+++ b/crates/ra_syntax/tests/data/parser/ok/0022_empty_extern_block.rs
diff --git a/crates/libsyntax2/tests/data/parser/ok/0022_empty_extern_block.txt b/crates/ra_syntax/tests/data/parser/ok/0022_empty_extern_block.txt
index 2099e2433..2099e2433 100644
--- a/crates/libsyntax2/tests/data/parser/ok/0022_empty_extern_block.txt
+++ b/crates/ra_syntax/tests/data/parser/ok/0022_empty_extern_block.txt
diff --git a/crates/libsyntax2/tests/data/parser/ok/0023_static_items.rs b/crates/ra_syntax/tests/data/parser/ok/0023_static_items.rs
index 5fb92ce33..5fb92ce33 100644
--- a/crates/libsyntax2/tests/data/parser/ok/0023_static_items.rs
+++ b/crates/ra_syntax/tests/data/parser/ok/0023_static_items.rs
diff --git a/crates/libsyntax2/tests/data/parser/ok/0023_static_items.txt b/crates/ra_syntax/tests/data/parser/ok/0023_static_items.txt
index 5c1a3a7a5..5c1a3a7a5 100644
--- a/crates/libsyntax2/tests/data/parser/ok/0023_static_items.txt
+++ b/crates/ra_syntax/tests/data/parser/ok/0023_static_items.txt
diff --git a/crates/libsyntax2/tests/data/parser/ok/0024_const_item.rs b/crates/ra_syntax/tests/data/parser/ok/0024_const_item.rs
index 7446859b5..7446859b5 100644
--- a/crates/libsyntax2/tests/data/parser/ok/0024_const_item.rs
+++ b/crates/ra_syntax/tests/data/parser/ok/0024_const_item.rs
diff --git a/crates/libsyntax2/tests/data/parser/ok/0024_const_item.txt b/crates/ra_syntax/tests/data/parser/ok/0024_const_item.txt
index d0e5842da..d0e5842da 100644
--- a/crates/libsyntax2/tests/data/parser/ok/0024_const_item.txt
+++ b/crates/ra_syntax/tests/data/parser/ok/0024_const_item.txt
diff --git a/crates/libsyntax2/tests/data/parser/ok/0025_extern_fn_in_block.rs b/crates/ra_syntax/tests/data/parser/ok/0025_extern_fn_in_block.rs
index 289809809..289809809 100644
--- a/crates/libsyntax2/tests/data/parser/ok/0025_extern_fn_in_block.rs
+++ b/crates/ra_syntax/tests/data/parser/ok/0025_extern_fn_in_block.rs
diff --git a/crates/libsyntax2/tests/data/parser/ok/0025_extern_fn_in_block.txt b/crates/ra_syntax/tests/data/parser/ok/0025_extern_fn_in_block.txt
index 363b3576e..363b3576e 100644
--- a/crates/libsyntax2/tests/data/parser/ok/0025_extern_fn_in_block.txt
+++ b/crates/ra_syntax/tests/data/parser/ok/0025_extern_fn_in_block.txt
diff --git a/crates/libsyntax2/tests/data/parser/ok/0026_const_fn_in_block.rs b/crates/ra_syntax/tests/data/parser/ok/0026_const_fn_in_block.rs
index 7641a3d28..7641a3d28 100644
--- a/crates/libsyntax2/tests/data/parser/ok/0026_const_fn_in_block.rs
+++ b/crates/ra_syntax/tests/data/parser/ok/0026_const_fn_in_block.rs
diff --git a/crates/libsyntax2/tests/data/parser/ok/0026_const_fn_in_block.txt b/crates/ra_syntax/tests/data/parser/ok/0026_const_fn_in_block.txt
index d45fc2559..d45fc2559 100644
--- a/crates/libsyntax2/tests/data/parser/ok/0026_const_fn_in_block.txt
+++ b/crates/ra_syntax/tests/data/parser/ok/0026_const_fn_in_block.txt
diff --git a/crates/libsyntax2/tests/data/parser/ok/0027_unsafe_fn_in_block.rs b/crates/ra_syntax/tests/data/parser/ok/0027_unsafe_fn_in_block.rs
index f3c5ff938..f3c5ff938 100644
--- a/crates/libsyntax2/tests/data/parser/ok/0027_unsafe_fn_in_block.rs
+++ b/crates/ra_syntax/tests/data/parser/ok/0027_unsafe_fn_in_block.rs
diff --git a/crates/libsyntax2/tests/data/parser/ok/0027_unsafe_fn_in_block.txt b/crates/ra_syntax/tests/data/parser/ok/0027_unsafe_fn_in_block.txt
index 5a39fa98c..5a39fa98c 100644
--- a/crates/libsyntax2/tests/data/parser/ok/0027_unsafe_fn_in_block.txt
+++ b/crates/ra_syntax/tests/data/parser/ok/0027_unsafe_fn_in_block.txt
diff --git a/crates/libsyntax2/tests/data/parser/ok/0028_operator_binding_power.rs b/crates/ra_syntax/tests/data/parser/ok/0028_operator_binding_power.rs
index cc9598470..cc9598470 100644
--- a/crates/libsyntax2/tests/data/parser/ok/0028_operator_binding_power.rs
+++ b/crates/ra_syntax/tests/data/parser/ok/0028_operator_binding_power.rs
diff --git a/crates/libsyntax2/tests/data/parser/ok/0028_operator_binding_power.txt b/crates/ra_syntax/tests/data/parser/ok/0028_operator_binding_power.txt
index 27efd180f..27efd180f 100644
--- a/crates/libsyntax2/tests/data/parser/ok/0028_operator_binding_power.txt
+++ b/crates/ra_syntax/tests/data/parser/ok/0028_operator_binding_power.txt
diff --git a/crates/libsyntax2/tests/data/parser/ok/0029_range_forms.rs b/crates/ra_syntax/tests/data/parser/ok/0029_range_forms.rs
index 03f4ae7b2..03f4ae7b2 100644
--- a/crates/libsyntax2/tests/data/parser/ok/0029_range_forms.rs
+++ b/crates/ra_syntax/tests/data/parser/ok/0029_range_forms.rs
diff --git a/crates/libsyntax2/tests/data/parser/ok/0029_range_forms.txt b/crates/ra_syntax/tests/data/parser/ok/0029_range_forms.txt
index 6d6d2f4d0..6d6d2f4d0 100644
--- a/crates/libsyntax2/tests/data/parser/ok/0029_range_forms.txt
+++ b/crates/ra_syntax/tests/data/parser/ok/0029_range_forms.txt
diff --git a/crates/libsyntax2/tests/data/parser/ok/0030_traits.rs b/crates/ra_syntax/tests/data/parser/ok/0030_traits.rs
index 23c4be0e1..23c4be0e1 100644
--- a/crates/libsyntax2/tests/data/parser/ok/0030_traits.rs
+++ b/crates/ra_syntax/tests/data/parser/ok/0030_traits.rs
diff --git a/crates/libsyntax2/tests/data/parser/ok/0030_traits.txt b/crates/ra_syntax/tests/data/parser/ok/0030_traits.txt
index ddd666407..ddd666407 100644
--- a/crates/libsyntax2/tests/data/parser/ok/0030_traits.txt
+++ b/crates/ra_syntax/tests/data/parser/ok/0030_traits.txt
diff --git a/crates/libsyntax2/tests/data/parser/ok/0031_extern.rs b/crates/ra_syntax/tests/data/parser/ok/0031_extern.rs
index b33ac273c..b33ac273c 100644
--- a/crates/libsyntax2/tests/data/parser/ok/0031_extern.rs
+++ b/crates/ra_syntax/tests/data/parser/ok/0031_extern.rs
diff --git a/crates/libsyntax2/tests/data/parser/ok/0031_extern.txt b/crates/ra_syntax/tests/data/parser/ok/0031_extern.txt
index f3f1c25a9..f3f1c25a9 100644
--- a/crates/libsyntax2/tests/data/parser/ok/0031_extern.txt
+++ b/crates/ra_syntax/tests/data/parser/ok/0031_extern.txt
diff --git a/crates/libsyntax2/tests/data/parser/ok/0032_where_for.rs b/crates/ra_syntax/tests/data/parser/ok/0032_where_for.rs
index 588170fbe..588170fbe 100644
--- a/crates/libsyntax2/tests/data/parser/ok/0032_where_for.rs
+++ b/crates/ra_syntax/tests/data/parser/ok/0032_where_for.rs
diff --git a/crates/libsyntax2/tests/data/parser/ok/0032_where_for.txt b/crates/ra_syntax/tests/data/parser/ok/0032_where_for.txt
index e3b9386a8..e3b9386a8 100644
--- a/crates/libsyntax2/tests/data/parser/ok/0032_where_for.txt
+++ b/crates/ra_syntax/tests/data/parser/ok/0032_where_for.txt
diff --git a/crates/libsyntax2/tests/data/parser/ok/0033_label_break.rs b/crates/ra_syntax/tests/data/parser/ok/0033_label_break.rs
index 728d78137..728d78137 100644
--- a/crates/libsyntax2/tests/data/parser/ok/0033_label_break.rs
+++ b/crates/ra_syntax/tests/data/parser/ok/0033_label_break.rs
diff --git a/crates/libsyntax2/tests/data/parser/ok/0033_label_break.txt b/crates/ra_syntax/tests/data/parser/ok/0033_label_break.txt
index 6abb9234c..6abb9234c 100644
--- a/crates/libsyntax2/tests/data/parser/ok/0033_label_break.txt
+++ b/crates/ra_syntax/tests/data/parser/ok/0033_label_break.txt
diff --git a/crates/libsyntax2/tests/data/parser/ok/0034_macro_2.0.rs b/crates/ra_syntax/tests/data/parser/ok/0034_macro_2.0.rs
index 2a70ee83a..2a70ee83a 100644
--- a/crates/libsyntax2/tests/data/parser/ok/0034_macro_2.0.rs
+++ b/crates/ra_syntax/tests/data/parser/ok/0034_macro_2.0.rs
diff --git a/crates/libsyntax2/tests/data/parser/ok/0034_macro_2.0.txt b/crates/ra_syntax/tests/data/parser/ok/0034_macro_2.0.txt
index 74af9d71b..74af9d71b 100644
--- a/crates/libsyntax2/tests/data/parser/ok/0034_macro_2.0.txt
+++ b/crates/ra_syntax/tests/data/parser/ok/0034_macro_2.0.txt
diff --git a/crates/libsyntax2/tests/data/parser/ok/0034_macro_stuck.txt b/crates/ra_syntax/tests/data/parser/ok/0034_macro_stuck.txt
index 1a8ca761d..1a8ca761d 100644
--- a/crates/libsyntax2/tests/data/parser/ok/0034_macro_stuck.txt
+++ b/crates/ra_syntax/tests/data/parser/ok/0034_macro_stuck.txt
diff --git a/crates/libsyntax2/tests/test/main.rs b/crates/ra_syntax/tests/test.rs
index 5a8879fce..27380efef 100644
--- a/crates/libsyntax2/tests/test/main.rs
+++ b/crates/ra_syntax/tests/test.rs
@@ -1,4 +1,4 @@
-extern crate libsyntax2;
+extern crate ra_syntax;
 #[macro_use]
 extern crate test_utils;
 extern crate walkdir;
@@ -9,7 +9,7 @@ use std::{
     fmt::Write,
 };
 
-use libsyntax2::{
+use ra_syntax::{
     File,
     utils::{dump_tree, check_fuzz_invariants},
 };
@@ -17,7 +17,7 @@ use libsyntax2::{
 #[test]
 fn lexer_tests() {
     dir_tests(&["lexer"], |text| {
-        let tokens = libsyntax2::tokenize(text);
+        let tokens = ra_syntax::tokenize(text);
         dump_tokens(&tokens, text)
     })
 }
@@ -134,10 +134,10 @@ fn project_dir() -> PathBuf {
 }
 
 fn test_data_dir() -> PathBuf {
-    project_dir().join("crates/libsyntax2/tests/data")
+    project_dir().join("crates/ra_syntax/tests/data")
 }
 
-fn dump_tokens(tokens: &[libsyntax2::Token], text: &str) -> String {
+fn dump_tokens(tokens: &[ra_syntax::Token], text: &str) -> String {
     let mut acc = String::new();
     let mut offset = 0;
     for token in tokens {
diff --git a/crates/tools/src/main.rs b/crates/tools/src/main.rs
index f8b840718..ee900553c 100644
--- a/crates/tools/src/main.rs
+++ b/crates/tools/src/main.rs
@@ -19,13 +19,13 @@ use tools::{collect_tests, Test};
 
 type Result<T> = ::std::result::Result<T, failure::Error>;
 
-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";
+const GRAMMAR_DIR: &str = "./crates/ra_syntax/src/grammar";
+const INLINE_TESTS_DIR: &str = "./crates/ra_syntax/tests/data/parser/inline";
+const GRAMMAR: &str = "./crates/ra_syntax/src/grammar.ron";
+const SYNTAX_KINDS: &str = "./crates/ra_syntax/src/syntax_kinds/generated.rs";
+const SYNTAX_KINDS_TEMPLATE: &str = "./crates/ra_syntax/src/syntax_kinds/generated.rs.tera";
+const AST: &str = "./crates/ra_syntax/src/ast/generated.rs";
+const AST_TEMPLATE: &str = "./crates/ra_syntax/src/ast/generated.rs.tera";
 
 fn main() -> Result<()> {
     let matches = App::new("tasks")
@@ -190,17 +190,17 @@ fn existing_tests(dir: &Path) -> Result<HashMap<String, (PathBuf, Test)>> {
 }
 
 fn install_code_extension() -> Result<()> {
-    run("cargo install --path crates/server --force", ".")?;
+    run("cargo install --path crates/ra_lsp_server --force", ".")?;
     if cfg!(windows) {
-        run(r"cmd.exe /c npm.cmd install", "./code")?;
+        run(r"cmd.exe /c npm.cmd install", "./editors/code")?;
     } else {
-        run(r"npm install", "./code")?;
+        run(r"npm install", "./editors/code")?;
     }
-    run(r"node ./node_modules/vsce/out/vsce package", "./code")?;
+    run(r"node ./node_modules/vsce/out/vsce package", "./editors/code")?;
     if cfg!(windows) {
-        run(r"cmd.exe /c code.cmd --install-extension ./rcf-lsp-0.0.1.vsix", "./code")?;
+        run(r"cmd.exe /c code.cmd --install-extension ./ra-lsp-0.0.1.vsix", "./editors/code")?;
     } else {
-        run(r"code --install-extension ./rcf-lsp-0.0.1.vsix", "./code")?;
+        run(r"code --install-extension ./ra-lsp-0.0.1.vsix", "./editors/code")?;
     }
     Ok(())
 }
diff --git a/code/.gitignore b/editors/code/.gitignore
index 5fe00fea8..5fe00fea8 100644
--- a/code/.gitignore
+++ b/editors/code/.gitignore
diff --git a/code/.vscode/launch.json b/editors/code/.vscode/launch.json
index c174db304..c174db304 100644
--- a/code/.vscode/launch.json
+++ b/editors/code/.vscode/launch.json
diff --git a/code/.vscode/settings.json b/editors/code/.vscode/settings.json
index 30bf8c2d3..30bf8c2d3 100644
--- a/code/.vscode/settings.json
+++ b/editors/code/.vscode/settings.json
diff --git a/code/.vscode/tasks.json b/editors/code/.vscode/tasks.json
index 604e38f5a..604e38f5a 100644
--- a/code/.vscode/tasks.json
+++ b/editors/code/.vscode/tasks.json
diff --git a/code/.vscodeignore b/editors/code/.vscodeignore
index 855717896..855717896 100644
--- a/code/.vscodeignore
+++ b/editors/code/.vscodeignore
diff --git a/code/package-lock.json b/editors/code/package-lock.json
index d9084b1b3..594a10b51 100644
--- a/code/package-lock.json
+++ b/editors/code/package-lock.json
@@ -1,5 +1,5 @@
 {
-    "name": "rcf-lsp",
+    "name": "ra-lsp",
     "version": "0.0.1",
     "lockfileVersion": 1,
     "requires": true,
@@ -11,9 +11,9 @@
             "dev": true
         },
         "@types/node": {
-            "version": "8.10.28",
-            "resolved": "https://registry.npmjs.org/@types/node/-/node-8.10.28.tgz",
-            "integrity": "sha512-iHsAzDg3OLH7JP+wipniUULHoDSWLgEDYOvsar6/mpAkTJd9/n23Ap8ikruMlvRTqMv/LXrflH9v/AfiEqaBGg==",
+            "version": "8.10.29",
+            "resolved": "https://registry.npmjs.org/@types/node/-/node-8.10.29.tgz",
+            "integrity": "sha512-zbteaWZ2mdduacm0byELwtRyhYE40aK+pAanQk415gr1eRuu67x7QGOLmn8jz5zI8LDK7d0WI/oT6r5Trz4rzQ==",
             "dev": true
         },
         "ajv": {
@@ -241,7 +241,7 @@
                 "dom-serializer": "0.1.0",
                 "entities": "1.1.1",
                 "htmlparser2": "3.9.2",
-                "lodash": "4.17.10",
+                "lodash": "4.17.11",
                 "parse5": "3.0.3"
             }
         },
@@ -290,9 +290,9 @@
             }
         },
         "commander": {
-            "version": "2.11.0",
-            "resolved": "https://registry.npmjs.org/commander/-/commander-2.11.0.tgz",
-            "integrity": "sha512-b0553uYA5YAEGgyYIGYROzKQ7X5RAqedkfjiZxwi0kL1g3bOaBNNZfYkzt/CL0umgD5wc9Jec2FbB98CjkMRvQ==",
+            "version": "2.18.0",
+            "resolved": "https://registry.npmjs.org/commander/-/commander-2.18.0.tgz",
+            "integrity": "sha512-6CYPa+JP2ftfRU2qkDK+UTVeQYosOg/2GbcjIcKPHfinyOLPVGXu/ovN86RP49Re5ndJK1N0kuiidFFuepc4ZQ==",
             "dev": true
         },
         "concat-map": {
@@ -302,10 +302,13 @@
             "dev": true
         },
         "convert-source-map": {
-            "version": "1.5.1",
-            "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.5.1.tgz",
-            "integrity": "sha1-uCeAl7m8IpNl3lxiz1/K7YtVmeU=",
-            "dev": true
+            "version": "1.6.0",
+            "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.6.0.tgz",
+            "integrity": "sha512-eFu7XigvxdZ1ETfbgPBohgyQ/Z++C0eEhTor0qRwBw9unw+L0/6V8wkSuGgzdThkiS5lSpdptOQPD8Ak40a+7A==",
+            "dev": true,
+            "requires": {
+                "safe-buffer": "5.1.2"
+            }
         },
         "core-util-is": {
             "version": "1.0.2",
@@ -421,7 +424,7 @@
         },
         "duplexer": {
             "version": "0.1.1",
-            "resolved": "https://registry.npmjs.org/duplexer/-/duplexer-0.1.1.tgz",
+            "resolved": "http://registry.npmjs.org/duplexer/-/duplexer-0.1.1.tgz",
             "integrity": "sha1-rOb/gIwc5mtX0ev5eXessCM0z8E=",
             "dev": true
         },
@@ -470,17 +473,18 @@
             "dev": true
         },
         "event-stream": {
-            "version": "3.3.4",
-            "resolved": "http://registry.npmjs.org/event-stream/-/event-stream-3.3.4.tgz",
-            "integrity": "sha1-SrTJoPWlTbkzi0w02Gv86PSzVXE=",
+            "version": "3.3.6",
+            "resolved": "https://registry.npmjs.org/event-stream/-/event-stream-3.3.6.tgz",
+            "integrity": "sha512-dGXNg4F/FgVzlApjzItL+7naHutA3fDqbV/zAZqDDlXTjiMnQmZKu+prImWKszeBM5UQeGvAl3u1wBiKeDh61g==",
             "dev": true,
             "requires": {
                 "duplexer": "0.1.1",
+                "flatmap-stream": "0.1.0",
                 "from": "0.1.7",
-                "map-stream": "0.1.0",
+                "map-stream": "0.0.7",
                 "pause-stream": "0.0.11",
-                "split": "0.3.3",
-                "stream-combiner": "0.0.4",
+                "split": "1.0.1",
+                "stream-combiner": "0.2.2",
                 "through": "2.3.8"
             }
         },
@@ -586,6 +590,12 @@
             "integrity": "sha1-Wb+1DNkF9g18OUzT2ayqtOatk04=",
             "dev": true
         },
+        "flatmap-stream": {
+            "version": "0.1.0",
+            "resolved": "https://registry.npmjs.org/flatmap-stream/-/flatmap-stream-0.1.0.tgz",
+            "integrity": "sha512-Nlic4ZRYxikqnK5rj3YoxDVKGGtUjcNDUtvQ7XsdGLZmMwdUYnXf10o1zcXtzEZTBgc6GxeRpQxV/Wu3WPIIHA==",
+            "dev": true
+        },
         "for-in": {
             "version": "1.0.2",
             "resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz",
@@ -748,7 +758,7 @@
                 },
                 "readable-stream": {
                     "version": "1.0.34",
-                    "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
+                    "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
                     "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=",
                     "dev": true,
                     "requires": {
@@ -828,7 +838,7 @@
                 },
                 "readable-stream": {
                     "version": "1.0.34",
-                    "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
+                    "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
                     "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=",
                     "dev": true,
                     "requires": {
@@ -862,7 +872,7 @@
             "integrity": "sha512-/9vtSk9eI9DEWCqzGieglPqmx0WUQ9pwPHyHFpKmfxqdgqGJC2l0vFMdYs54hLdDsMDEZFLDL2J4ikjc4hQ5HQ==",
             "dev": true,
             "requires": {
-                "event-stream": "3.3.4",
+                "event-stream": "3.3.6",
                 "node.extend": "1.1.6",
                 "request": "2.88.0",
                 "through2": "2.0.3",
@@ -903,7 +913,7 @@
             "integrity": "sha1-uG/zSdgBzrVuHZ59x7vLS33uYAw=",
             "dev": true,
             "requires": {
-                "convert-source-map": "1.5.1",
+                "convert-source-map": "1.6.0",
                 "graceful-fs": "4.1.11",
                 "strip-bom": "2.0.0",
                 "through2": "2.0.3",
@@ -941,7 +951,7 @@
             "integrity": "sha1-wWUyBzLRks5W/ZQnH/oSMjS/KuA=",
             "dev": true,
             "requires": {
-                "event-stream": "3.3.4",
+                "event-stream": "3.3.6",
                 "mkdirp": "0.5.1",
                 "queue": "3.1.0",
                 "vinyl-fs": "2.4.4"
@@ -953,7 +963,7 @@
             "integrity": "sha512-0QfbCH2a1k2qkTLWPqTX+QO4qNsHn3kC546YhAP3/n0h+nvtyGITDuDrYBMDZeW4WnFijmkOvBWa5HshTic1tw==",
             "dev": true,
             "requires": {
-                "event-stream": "3.3.4",
+                "event-stream": "3.3.6",
                 "streamifier": "0.1.1",
                 "tar": "2.2.1",
                 "through2": "2.0.3",
@@ -991,7 +1001,7 @@
             "integrity": "sha1-JOQGhdwFtxSZlSRQmeBZAmO+ja0=",
             "dev": true,
             "requires": {
-                "event-stream": "3.3.4",
+                "event-stream": "3.3.6",
                 "queue": "4.5.0",
                 "through2": "2.0.3",
                 "vinyl": "2.2.0",
@@ -1176,7 +1186,7 @@
         },
         "is-obj": {
             "version": "1.0.1",
-            "resolved": "https://registry.npmjs.org/is-obj/-/is-obj-1.0.1.tgz",
+            "resolved": "http://registry.npmjs.org/is-obj/-/is-obj-1.0.1.tgz",
             "integrity": "sha1-PkcprB9f3gJc19g6iW2rn09n2w8=",
             "dev": true
         },
@@ -1314,9 +1324,9 @@
             }
         },
         "lodash": {
-            "version": "4.17.10",
-            "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.10.tgz",
-            "integrity": "sha512-UejweD1pDoXu+AD825lWwp4ZGtSwgnpZxb3JDViD7StjQz+Nb/6l093lx4OQ0foGWNRoc19mWy7BzL+UAK2iVg==",
+            "version": "4.17.11",
+            "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.11.tgz",
+            "integrity": "sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg==",
             "dev": true
         },
         "lodash.isequal": {
@@ -1326,9 +1336,9 @@
             "dev": true
         },
         "map-stream": {
-            "version": "0.1.0",
-            "resolved": "https://registry.npmjs.org/map-stream/-/map-stream-0.1.0.tgz",
-            "integrity": "sha1-5WqpTEyAVaFkBKBnS3jyFffI4ZQ=",
+            "version": "0.0.7",
+            "resolved": "https://registry.npmjs.org/map-stream/-/map-stream-0.0.7.tgz",
+            "integrity": "sha1-ih8HiW2CsQkmvTdEokIACfiJdKg=",
             "dev": true
         },
         "markdown-it": {
@@ -1453,13 +1463,13 @@
         },
         "minimist": {
             "version": "0.0.8",
-            "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
+            "resolved": "http://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
             "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=",
             "dev": true
         },
         "mkdirp": {
             "version": "0.5.1",
-            "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
+            "resolved": "http://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
             "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
             "dev": true,
             "requires": {
@@ -1484,6 +1494,12 @@
                 "supports-color": "4.4.0"
             },
             "dependencies": {
+                "commander": {
+                    "version": "2.11.0",
+                    "resolved": "https://registry.npmjs.org/commander/-/commander-2.11.0.tgz",
+                    "integrity": "sha512-b0553uYA5YAEGgyYIGYROzKQ7X5RAqedkfjiZxwi0kL1g3bOaBNNZfYkzt/CL0umgD5wc9Jec2FbB98CjkMRvQ==",
+                    "dev": true
+                },
                 "glob": {
                     "version": "7.1.2",
                     "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz",
@@ -1658,7 +1674,7 @@
             "integrity": "sha512-rgO9Zg5LLLkfJF9E6CCmXlSE4UVceloys8JrFqCcHloC3usd/kJCyPDwH2SOlzix2j3xaP9sUX3e8+kvkuleAA==",
             "dev": true,
             "requires": {
-                "@types/node": "8.10.28"
+                "@types/node": "8.10.29"
             }
         },
         "path-dirname": {
@@ -1675,7 +1691,7 @@
         },
         "pause-stream": {
             "version": "0.0.11",
-            "resolved": "https://registry.npmjs.org/pause-stream/-/pause-stream-0.0.11.tgz",
+            "resolved": "http://registry.npmjs.org/pause-stream/-/pause-stream-0.0.11.tgz",
             "integrity": "sha1-/lo0sMvOErWqaitAPuLnO2AvFEU=",
             "dev": true,
             "requires": {
@@ -1794,7 +1810,7 @@
         },
         "readable-stream": {
             "version": "2.3.6",
-            "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
+            "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
             "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
             "dev": true,
             "requires": {
@@ -1918,9 +1934,9 @@
             }
         },
         "split": {
-            "version": "0.3.3",
-            "resolved": "https://registry.npmjs.org/split/-/split-0.3.3.tgz",
-            "integrity": "sha1-zQ7qXmOiEd//frDwkcQTPi0N0o8=",
+            "version": "1.0.1",
+            "resolved": "https://registry.npmjs.org/split/-/split-1.0.1.tgz",
+            "integrity": "sha512-mTyOoPbrivtXnwnIxZRFYRrPNtEFKlpB2fvjSnCQUiAA6qAZzqwna5envK4uk6OIeP17CsdF3rSBGYVBsU0Tkg==",
             "dev": true,
             "requires": {
                 "through": "2.3.8"
@@ -1956,12 +1972,13 @@
             "dev": true
         },
         "stream-combiner": {
-            "version": "0.0.4",
-            "resolved": "https://registry.npmjs.org/stream-combiner/-/stream-combiner-0.0.4.tgz",
-            "integrity": "sha1-TV5DPBhSYd3mI8o/RMWGvPXErRQ=",
+            "version": "0.2.2",
+            "resolved": "http://registry.npmjs.org/stream-combiner/-/stream-combiner-0.2.2.tgz",
+            "integrity": "sha1-rsjLrBd7Vrb0+kec7YwZEs7lKFg=",
             "dev": true,
             "requires": {
-                "duplexer": "0.1.1"
+                "duplexer": "0.1.1",
+                "through": "2.3.8"
             }
         },
         "stream-shift": {
@@ -2035,7 +2052,7 @@
         },
         "through": {
             "version": "2.3.8",
-            "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",
+            "resolved": "http://registry.npmjs.org/through/-/through-2.3.8.tgz",
             "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=",
             "dev": true
         },
@@ -2100,7 +2117,7 @@
         },
         "tunnel": {
             "version": "0.0.4",
-            "resolved": "https://registry.npmjs.org/tunnel/-/tunnel-0.0.4.tgz",
+            "resolved": "http://registry.npmjs.org/tunnel/-/tunnel-0.0.4.tgz",
             "integrity": "sha1-LTeFoVjBdMmhbcLARuxfxfF0IhM=",
             "dev": true
         },
@@ -2282,16 +2299,16 @@
             }
         },
         "vsce": {
-            "version": "1.46.0",
-            "resolved": "https://registry.npmjs.org/vsce/-/vsce-1.46.0.tgz",
-            "integrity": "sha512-cNQru5mXBPUtMDgwRNoespaR0gjdL09hV1KWktT5wkmTZfv0dSaAqqGAfr+2UI0aJTGttCcO3xKFQqtIcJpczA==",
+            "version": "1.48.0",
+            "resolved": "https://registry.npmjs.org/vsce/-/vsce-1.48.0.tgz",
+            "integrity": "sha512-1qJn6QLRTu26FIvvMbK/gzHLLdxJVTg9CUTSnCjJHObCCF5CQ0F3FUv7t+5cT7i0J5v5YljrsRY09u7dPBcEnA==",
             "dev": true,
             "requires": {
                 "cheerio": "1.0.0-rc.2",
-                "commander": "2.11.0",
+                "commander": "2.18.0",
                 "denodeify": "1.2.1",
                 "glob": "7.1.3",
-                "lodash": "4.17.10",
+                "lodash": "4.17.11",
                 "markdown-it": "8.4.2",
                 "mime": "1.6.0",
                 "minimatch": "3.0.4",
@@ -2329,31 +2346,31 @@
             }
         },
         "vscode-jsonrpc": {
-            "version": "3.6.2",
-            "resolved": "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-3.6.2.tgz",
-            "integrity": "sha512-T24Jb5V48e4VgYliUXMnZ379ItbrXgOimweKaJshD84z+8q7ZOZjJan0MeDe+Ugb+uqERDVV8SBmemaGMSMugA=="
+            "version": "4.0.0",
+            "resolved": "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-4.0.0.tgz",
+            "integrity": "sha512-perEnXQdQOJMTDFNv+UF3h1Y0z4iSiaN9jIlb0OqIYgosPCZGYh/MCUlkFtV2668PL69lRDO32hmvL2yiidUYg=="
         },
         "vscode-languageclient": {
             "version": "4.4.2",
             "resolved": "https://registry.npmjs.org/vscode-languageclient/-/vscode-languageclient-4.4.2.tgz",
             "integrity": "sha512-9TUzsg1UM6n1UEyPlWbDf7tK1wJAK7UGFRmGDN8sz4KmbbDiVRh6YicaB/5oRSVTpuV47PdJpYlOl3SJ0RiK1Q==",
             "requires": {
-                "vscode-languageserver-protocol": "3.12.0"
+                "vscode-languageserver-protocol": "3.13.0"
             }
         },
         "vscode-languageserver-protocol": {
-            "version": "3.12.0",
-            "resolved": "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.12.0.tgz",
-            "integrity": "sha512-evY6hmyzLnwQrqlQWPrNBq1z8wrSNjLesmgPzeS6Zv11mVS5UJRel26hbM/DH5tHdn45huNzRW0eFHRmIm8LpA==",
+            "version": "3.13.0",
+            "resolved": "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.13.0.tgz",
+            "integrity": "sha512-2ZGKwI+P2ovQll2PGAp+2UfJH+FK9eait86VBUdkPd9HRlm8e58aYT9pV/NYanHOcp3pL6x2yTLVCFMcTer0mg==",
             "requires": {
-                "vscode-jsonrpc": "3.6.2",
-                "vscode-languageserver-types": "3.12.0"
+                "vscode-jsonrpc": "4.0.0",
+                "vscode-languageserver-types": "3.13.0"
             }
         },
         "vscode-languageserver-types": {
-            "version": "3.12.0",
-            "resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.12.0.tgz",
-            "integrity": "sha512-UxqnpzBToPO7Mi2tr/s5JeyPOSKSJtLB8lIdxCg9ZNdvP2cU8wS7iTDtwQKz91Ne4CUmTdf85ddR5SIZKXmMjQ=="
+            "version": "3.13.0",
+            "resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.13.0.tgz",
+            "integrity": "sha512-BnJIxS+5+8UWiNKCP7W3g9FlE7fErFw0ofP5BXJe7c2tl0VeWh+nNHFbwAS2vmVC4a5kYxHBjRy0UeOtziemVA=="
         },
         "vso-node-api": {
             "version": "6.1.2-preview",
diff --git a/code/package.json b/editors/code/package.json
index 87e715c44..cc8fb93f5 100644
--- a/code/package.json
+++ b/editors/code/package.json
@@ -1,11 +1,11 @@
 {
-    "name": "rcf-lsp",
-    "displayName": "rcf-lsp",
+    "name": "ra-lsp",
+    "displayName": "ra-lsp",
     "description": "",
     "version": "0.0.1",
     "publisher": "matklad",
     "repository": {
-        "url": "https://github.com/matklad/libsyntax2/"
+        "url": "https://github.com/matklad/rust-analyzer/"
     },
     "categories": [
         "Other"
@@ -58,57 +58,57 @@
         ],
         "commands": [
             {
-                "command": "libsyntax-rust.createFile",
+                "command": "ra-lsp.createFile",
                 "title": "Show Rust syntax tree"
             },
             {
-                "command": "libsyntax-rust.syntaxTree",
+                "command": "ra-lsp.syntaxTree",
                 "title": "Show Rust syntax tree"
             },
             {
-                "command": "libsyntax-rust.extendSelection",
+                "command": "ra-lsp.extendSelection",
                 "title": "Rust Extend Selection"
             },
             {
-                "command": "libsyntax-rust.matchingBrace",
+                "command": "ra-lsp.matchingBrace",
                 "title": "Rust Matching Brace"
             },
             {
-                "command": "libsyntax-rust.parentModule",
+                "command": "ra-lsp.parentModule",
                 "title": "Rust Parent Module"
             },
             {
-                "command": "libsyntax-rust.joinLines",
+                "command": "ra-lsp.joinLines",
                 "title": "Rust Join Lines"
             },
             {
-                "command": "libsyntax-rust.run",
+                "command": "ra-lsp.run",
                 "title": "Rust Run"
             }
         ],
         "keybindings": [
             {
-                "command": "libsyntax-rust.parentModule",
+                "command": "ra-lsp.parentModule",
                 "key": "ctrl+u",
                 "when": "editorTextFocus && editorLangId == rust"
             },
             {
-                "command": "libsyntax-rust.matchingBrace",
+                "command": "ra-lsp.matchingBrace",
                 "key": "ctrl+shift+m",
                 "when": "editorTextFocus && editorLangId == rust"
             },
             {
-                "command": "libsyntax-rust.extendSelection",
+                "command": "ra-lsp.extendSelection",
                 "key": "ctrl+w",
                 "when": "editorTextFocus && editorLangId == rust"
             },
             {
-                "command": "libsyntax-rust.joinLines",
+                "command": "ra-lsp.joinLines",
                 "key": "ctrl+shift+j",
                 "when": "editorTextFocus && editorLangId == rust"
             },
             {
-                "command": "libsyntax-rust.run",
+                "command": "ra-lsp.run",
                 "key": "ctrl+r",
                 "when": "editorTextFocus && editorLangId == rust"
             }
diff --git a/code/src/extension.ts b/editors/code/src/extension.ts
index 53ef83aab..2c42c07fe 100644
--- a/code/src/extension.ts
+++ b/editors/code/src/extension.ts
@@ -7,7 +7,7 @@ import { DH_UNABLE_TO_CHECK_GENERATOR } from 'constants';
 let client: lc.LanguageClient;
 
 let uris = {
-    syntaxTree: vscode.Uri.parse('libsyntax-rust://syntaxtree')
+    syntaxTree: vscode.Uri.parse('ra-lsp://syntaxtree')
 }
 
 
@@ -20,8 +20,8 @@ export function activate(context: vscode.ExtensionContext) {
         dispose(vscode.commands.registerCommand(name, f))
     }
 
-    registerCommand('libsyntax-rust.syntaxTree', () => openDoc(uris.syntaxTree))
-    registerCommand('libsyntax-rust.extendSelection', async () => {
+    registerCommand('ra-lsp.syntaxTree', () => openDoc(uris.syntaxTree))
+    registerCommand('ra-lsp.extendSelection', async () => {
         let editor = vscode.window.activeTextEditor
         if (editor == null || editor.document.languageId != "rust") return
         let request: ExtendSelectionParams = {
@@ -36,7 +36,7 @@ export function activate(context: vscode.ExtensionContext) {
             return new vscode.Selection(r.start, r.end)
         })
     })
-    registerCommand('libsyntax-rust.matchingBrace', async () => {
+    registerCommand('ra-lsp.matchingBrace', async () => {
         let editor = vscode.window.activeTextEditor
         if (editor == null || editor.document.languageId != "rust") return
         let request: FindMatchingBraceParams = {
@@ -53,7 +53,7 @@ export function activate(context: vscode.ExtensionContext) {
         })
         editor.revealRange(editor.selection)
     })
-    registerCommand('libsyntax-rust.joinLines', async () => {
+    registerCommand('ra-lsp.joinLines', async () => {
         let editor = vscode.window.activeTextEditor
         if (editor == null || editor.document.languageId != "rust") return
         let request: JoinLinesParams = {
@@ -63,7 +63,7 @@ export function activate(context: vscode.ExtensionContext) {
         let change = await client.sendRequest<SourceChange>("m/joinLines", request)
         await applySourceChange(change)
     })
-    registerCommand('libsyntax-rust.parentModule', async () => {
+    registerCommand('ra-lsp.parentModule', async () => {
         let editor = vscode.window.activeTextEditor
         if (editor == null || editor.document.languageId != "rust") return
         let request: lc.TextDocumentIdentifier = {
@@ -81,7 +81,7 @@ export function activate(context: vscode.ExtensionContext) {
     })
 
     let prevRunnable: RunnableQuickPick | undefined = undefined
-    registerCommand('libsyntax-rust.run', async () => {
+    registerCommand('ra-lsp.run', async () => {
         let editor = vscode.window.activeTextEditor
         if (editor == null || editor.document.languageId != "rust") return
         let textDocument: lc.TextDocumentIdentifier = {
@@ -110,10 +110,10 @@ export function activate(context: vscode.ExtensionContext) {
             return await vscode.tasks.executeTask(task)
         }
     })
-    registerCommand('libsyntax-rust.applySourceChange', applySourceChange)
+    registerCommand('ra-lsp.applySourceChange', applySourceChange)
 
     dispose(vscode.workspace.registerTextDocumentContentProvider(
-        'libsyntax-rust',
+        'ra-lsp',
         textDocumentContentProvider
     ))
     startServer()
@@ -149,9 +149,7 @@ export function deactivate(): Thenable<void> {
 
 function startServer() {
     let run: lc.Executable = {
-        // command: "cargo",
-        // args: ["run", "--package", "m"],
-        command: "m",
+        command: "ra_lsp_server",
         options: { cwd: "." }
     }
     let serverOptions: lc.ServerOptions = {
@@ -164,8 +162,8 @@ function startServer() {
     };
 
     client = new lc.LanguageClient(
-        'm',
-        'm languge server',
+        'ra-lsp',
+        'rust-analyzer languge server',
         serverOptions,
         clientOptions,
     );
diff --git a/code/tsconfig.json b/editors/code/tsconfig.json
index ebec01624..ebec01624 100644
--- a/code/tsconfig.json
+++ b/editors/code/tsconfig.json