diff --git a/.gitattributes b/.gitattributes index 4cd50e4810..7c2f752d69 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,5 +1,5 @@ * text=auto eol=lf -crates/ra_syntax/test_data/** -text eof=LF +crates/syntax/test_data/** -text eof=LF # Older git versions try to fix line endings on images, this prevents it. *.png binary *.jpg binary diff --git a/Cargo.lock b/Cargo.lock index 095127b99f..c95ef002d3 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -933,9 +933,9 @@ dependencies = [ "ra_fmt", "ra_hir", "ra_ide_db", - "ra_syntax", "rustc-hash", "stdx", + "syntax", "test_utils", "text_edit", ] @@ -945,8 +945,8 @@ name = "ra_cfg" version = "0.1.0" dependencies = [ "ra_mbe", - "ra_syntax", "rustc-hash", + "syntax", "tt", ] @@ -956,10 +956,10 @@ version = "0.1.0" dependencies = [ "profile", "ra_cfg", - "ra_syntax", "rustc-hash", "salsa", "stdx", + "syntax", "test_utils", "tt", "vfs", @@ -970,7 +970,7 @@ name = "ra_fmt" version = "0.1.0" dependencies = [ "itertools", - "ra_syntax", + "syntax", ] [[package]] @@ -986,9 +986,9 @@ dependencies = [ "ra_hir_def", "ra_hir_expand", "ra_hir_ty", - "ra_syntax", "rustc-hash", "stdx", + "syntax", ] [[package]] @@ -1010,10 +1010,10 @@ dependencies = [ "ra_db", "ra_hir_expand", "ra_mbe", - "ra_syntax", "rustc-hash", "smallvec", "stdx", + "syntax", "test_utils", "tt", ] @@ -1029,8 +1029,8 @@ dependencies = [ "profile", "ra_db", "ra_mbe", - "ra_syntax", "rustc-hash", + "syntax", "test_utils", "tt", ] @@ -1052,11 +1052,11 @@ dependencies = [ "ra_db", "ra_hir_def", "ra_hir_expand", - "ra_syntax", "rustc-hash", "scoped-tls", "smallvec", "stdx", + "syntax", "test_utils", "tracing", "tracing-subscriber", @@ -1081,9 +1081,9 @@ dependencies = [ "ra_hir", "ra_ide_db", "ra_ssr", - "ra_syntax", "rustc-hash", "stdx", + "syntax", "test_utils", "text_edit", ] @@ -1099,10 +1099,10 @@ dependencies = [ "profile", "ra_db", "ra_hir", - "ra_syntax", "rayon", "rustc-hash", "stdx", + "syntax", "test_utils", "text_edit", ] @@ -1113,9 +1113,9 @@ version = "0.1.0" dependencies = [ "log", "parser", - "ra_syntax", "rustc-hash", "smallvec", + "syntax", "test_utils", "tt", ] @@ -1176,33 +1176,12 @@ dependencies = [ "ra_db", "ra_hir", "ra_ide_db", - "ra_syntax", "rustc-hash", + "syntax", "test_utils", "text_edit", ] -[[package]] -name = "ra_syntax" -version = "0.1.0" -dependencies = [ - "arrayvec", - "expect", - "itertools", - "once_cell", - "parser", - "rayon", - "rowan", - "rustc-ap-rustc_lexer", - "rustc-hash", - "serde", - "smol_str", - "stdx", - "test_utils", - "text_edit", - "walkdir", -] - [[package]] name = "rayon" version = "1.3.1" @@ -1304,12 +1283,12 @@ dependencies = [ "ra_proc_macro_srv", "ra_project_model", "ra_ssr", - "ra_syntax", "rayon", "rustc-hash", "serde", "serde_json", "stdx", + "syntax", "test_utils", "text_edit", "threadpool", @@ -1532,6 +1511,27 @@ dependencies = [ "unicode-xid", ] +[[package]] +name = "syntax" +version = "0.0.0" +dependencies = [ + "arrayvec", + "expect", + "itertools", + "once_cell", + "parser", + "rayon", + "rowan", + "rustc-ap-rustc_lexer", + "rustc-hash", + "serde", + "smol_str", + "stdx", + "test_utils", + "text_edit", + "walkdir", +] + [[package]] name = "termcolor" version = "1.1.0" diff --git a/crates/parser/src/grammar.rs b/crates/parser/src/grammar.rs index 88468bc971..9dbd2ebc44 100644 --- a/crates/parser/src/grammar.rs +++ b/crates/parser/src/grammar.rs @@ -20,7 +20,7 @@ //! //! After adding a new inline-test, run `cargo xtask codegen` to //! extract it as a standalone text-fixture into -//! `crates/ra_syntax/test_data/parser/`, and run `cargo test` once to +//! `crates/syntax/test_data/parser/`, and run `cargo test` once to //! create the "gold" value. //! //! Coding convention: rules like `where_clause` always produce either a diff --git a/crates/parser/src/lib.rs b/crates/parser/src/lib.rs index eeb8ad66bd..41e62116f8 100644 --- a/crates/parser/src/lib.rs +++ b/crates/parser/src/lib.rs @@ -10,7 +10,7 @@ //! //! The actual parsing happens in the `grammar` module. //! -//! Tests for this crate live in `ra_syntax` crate. +//! Tests for this crate live in `syntax` crate. #[macro_use] mod token_set; diff --git a/crates/ra_assists/Cargo.toml b/crates/ra_assists/Cargo.toml index e4a5ee6c1c..abc290463a 100644 --- a/crates/ra_assists/Cargo.toml +++ b/crates/ra_assists/Cargo.toml @@ -15,7 +15,7 @@ either = "1.5.3" stdx = { path = "../stdx" } -ra_syntax = { path = "../ra_syntax" } +syntax = { path = "../syntax" } text_edit = { path = "../text_edit" } ra_fmt = { path = "../ra_fmt" } profile = { path = "../profile" } diff --git a/crates/ra_assists/src/assist_context.rs b/crates/ra_assists/src/assist_context.rs index fcaa1aedcf..217f692a4e 100644 --- a/crates/ra_assists/src/assist_context.rs +++ b/crates/ra_assists/src/assist_context.rs @@ -10,7 +10,7 @@ use ra_ide_db::{ source_change::{SourceChange, SourceFileEdit}, RootDatabase, }; -use ra_syntax::{ +use syntax::{ algo::{self, find_node_at_offset, SyntaxRewriter}, AstNode, SourceFile, SyntaxElement, SyntaxKind, SyntaxNode, SyntaxToken, TextRange, TextSize, TokenAtOffset, @@ -271,7 +271,7 @@ impl AssistBuilder { } /// Replaces specified `node` of text with a given string, reindenting the /// string to maintain `node`'s existing indent. - // FIXME: remove in favor of ra_syntax::edit::IndentLevel::increase_indent + // FIXME: remove in favor of syntax::edit::IndentLevel::increase_indent pub(crate) fn replace_node_and_indent( &mut self, node: &SyntaxNode, diff --git a/crates/ra_assists/src/ast_transform.rs b/crates/ra_assists/src/ast_transform.rs index 07c978378a..4c41c16d86 100644 --- a/crates/ra_assists/src/ast_transform.rs +++ b/crates/ra_assists/src/ast_transform.rs @@ -2,13 +2,13 @@ use rustc_hash::FxHashMap; use hir::{HirDisplay, PathResolution, SemanticsScope}; -use ra_syntax::{ +use syntax::{ algo::SyntaxRewriter, ast::{self, AstNode}, }; pub trait AstTransform<'a> { - fn get_substitution(&self, node: &ra_syntax::SyntaxNode) -> Option; + fn get_substitution(&self, node: &syntax::SyntaxNode) -> Option; fn chain_before(self, other: Box + 'a>) -> Box + 'a>; fn or + 'a>(self, other: T) -> Box + 'a> @@ -22,7 +22,7 @@ pub trait AstTransform<'a> { struct NullTransformer; impl<'a> AstTransform<'a> for NullTransformer { - fn get_substitution(&self, _node: &ra_syntax::SyntaxNode) -> Option { + fn get_substitution(&self, _node: &syntax::SyntaxNode) -> Option { None } fn chain_before(self, other: Box + 'a>) -> Box + 'a> { @@ -101,10 +101,7 @@ impl<'a> SubstituteTypeParams<'a> { Some(result) } } - fn get_substitution_inner( - &self, - node: &ra_syntax::SyntaxNode, - ) -> Option { + fn get_substitution_inner(&self, node: &syntax::SyntaxNode) -> Option { let type_ref = ast::Type::cast(node.clone())?; let path = match &type_ref { ast::Type::PathType(path_type) => path_type.path()?, @@ -122,7 +119,7 @@ impl<'a> SubstituteTypeParams<'a> { } impl<'a> AstTransform<'a> for SubstituteTypeParams<'a> { - fn get_substitution(&self, node: &ra_syntax::SyntaxNode) -> Option { + fn get_substitution(&self, node: &syntax::SyntaxNode) -> Option { self.get_substitution_inner(node).or_else(|| self.previous.get_substitution(node)) } fn chain_before(self, other: Box + 'a>) -> Box + 'a> { @@ -141,10 +138,7 @@ impl<'a> QualifyPaths<'a> { Self { target_scope, source_scope, previous: Box::new(NullTransformer) } } - fn get_substitution_inner( - &self, - node: &ra_syntax::SyntaxNode, - ) -> Option { + fn get_substitution_inner(&self, node: &syntax::SyntaxNode) -> Option { // FIXME handle value ns? let from = self.target_scope.module()?; let p = ast::Path::cast(node.clone())?; @@ -183,7 +177,7 @@ impl<'a> QualifyPaths<'a> { pub fn apply<'a, N: AstNode>(transformer: &dyn AstTransform<'a>, node: N) -> N { SyntaxRewriter::from_fn(|element| match element { - ra_syntax::SyntaxElement::Node(n) => { + syntax::SyntaxElement::Node(n) => { let replacement = transformer.get_substitution(&n)?; Some(replacement.into()) } @@ -193,7 +187,7 @@ pub fn apply<'a, N: AstNode>(transformer: &dyn AstTransform<'a>, node: N) -> N { } impl<'a> AstTransform<'a> for QualifyPaths<'a> { - fn get_substitution(&self, node: &ra_syntax::SyntaxNode) -> Option { + fn get_substitution(&self, node: &syntax::SyntaxNode) -> Option { self.get_substitution_inner(node).or_else(|| self.previous.get_substitution(node)) } fn chain_before(self, other: Box + 'a>) -> Box + 'a> { diff --git a/crates/ra_assists/src/handlers/add_custom_impl.rs b/crates/ra_assists/src/handlers/add_custom_impl.rs index ebdf00e676..8757fa33f2 100644 --- a/crates/ra_assists/src/handlers/add_custom_impl.rs +++ b/crates/ra_assists/src/handlers/add_custom_impl.rs @@ -1,5 +1,5 @@ use itertools::Itertools; -use ra_syntax::{ +use syntax::{ ast::{self, AstNode}, Direction, SmolStr, SyntaxKind::{IDENT, WHITESPACE}, diff --git a/crates/ra_assists/src/handlers/add_explicit_type.rs b/crates/ra_assists/src/handlers/add_explicit_type.rs index 135a2ac9c9..563cbf505f 100644 --- a/crates/ra_assists/src/handlers/add_explicit_type.rs +++ b/crates/ra_assists/src/handlers/add_explicit_type.rs @@ -1,5 +1,5 @@ use hir::HirDisplay; -use ra_syntax::{ +use syntax::{ ast::{self, AstNode, LetStmt, NameOwner}, TextRange, }; diff --git a/crates/ra_assists/src/handlers/add_missing_impl_members.rs b/crates/ra_assists/src/handlers/add_missing_impl_members.rs index dd1406228c..81b61ebf8e 100644 --- a/crates/ra_assists/src/handlers/add_missing_impl_members.rs +++ b/crates/ra_assists/src/handlers/add_missing_impl_members.rs @@ -1,5 +1,5 @@ use hir::HasSource; -use ra_syntax::{ +use syntax::{ ast::{ self, edit::{self, AstNodeEdit, IndentLevel}, diff --git a/crates/ra_assists/src/handlers/add_turbo_fish.rs b/crates/ra_assists/src/handlers/add_turbo_fish.rs index 537322a72c..8c7ffae3dd 100644 --- a/crates/ra_assists/src/handlers/add_turbo_fish.rs +++ b/crates/ra_assists/src/handlers/add_turbo_fish.rs @@ -1,5 +1,5 @@ use ra_ide_db::defs::{classify_name_ref, Definition, NameRefClass}; -use ra_syntax::{ast, AstNode, SyntaxKind, T}; +use syntax::{ast, AstNode, SyntaxKind, T}; use test_utils::mark; use crate::{ diff --git a/crates/ra_assists/src/handlers/apply_demorgan.rs b/crates/ra_assists/src/handlers/apply_demorgan.rs index 3ac4aed7d2..1a6fdafda2 100644 --- a/crates/ra_assists/src/handlers/apply_demorgan.rs +++ b/crates/ra_assists/src/handlers/apply_demorgan.rs @@ -1,4 +1,4 @@ -use ra_syntax::ast::{self, AstNode}; +use syntax::ast::{self, AstNode}; use crate::{utils::invert_boolean_expression, AssistContext, AssistId, AssistKind, Assists}; diff --git a/crates/ra_assists/src/handlers/auto_import.rs b/crates/ra_assists/src/handlers/auto_import.rs index 6ec59ec4d4..e19b197d9e 100644 --- a/crates/ra_assists/src/handlers/auto_import.rs +++ b/crates/ra_assists/src/handlers/auto_import.rs @@ -6,11 +6,11 @@ use hir::{ Type, }; use ra_ide_db::{imports_locator, RootDatabase}; -use ra_syntax::{ +use rustc_hash::FxHashSet; +use syntax::{ ast::{self, AstNode}, SyntaxNode, }; -use rustc_hash::FxHashSet; use crate::{ utils::insert_use_statement, AssistContext, AssistId, AssistKind, Assists, GroupLabel, diff --git a/crates/ra_assists/src/handlers/change_return_type_to_result.rs b/crates/ra_assists/src/handlers/change_return_type_to_result.rs index b83c944049..d5a68a24c9 100644 --- a/crates/ra_assists/src/handlers/change_return_type_to_result.rs +++ b/crates/ra_assists/src/handlers/change_return_type_to_result.rs @@ -1,4 +1,4 @@ -use ra_syntax::{ +use syntax::{ ast::{self, BlockExpr, Expr, LoopBodyOwner}, AstNode, SyntaxNode, }; diff --git a/crates/ra_assists/src/handlers/change_visibility.rs b/crates/ra_assists/src/handlers/change_visibility.rs index 724daa93f4..32dc053789 100644 --- a/crates/ra_assists/src/handlers/change_visibility.rs +++ b/crates/ra_assists/src/handlers/change_visibility.rs @@ -1,4 +1,4 @@ -use ra_syntax::{ +use syntax::{ ast::{self, NameOwner, VisibilityOwner}, AstNode, SyntaxKind::{CONST, ENUM, FN, MODULE, STATIC, STRUCT, TRAIT, VISIBILITY}, diff --git a/crates/ra_assists/src/handlers/early_return.rs b/crates/ra_assists/src/handlers/early_return.rs index 6816a2709e..7fd78e9d47 100644 --- a/crates/ra_assists/src/handlers/early_return.rs +++ b/crates/ra_assists/src/handlers/early_return.rs @@ -1,6 +1,6 @@ use std::{iter::once, ops::RangeInclusive}; -use ra_syntax::{ +use syntax::{ algo::replace_children, ast::{ self, diff --git a/crates/ra_assists/src/handlers/expand_glob_import.rs b/crates/ra_assists/src/handlers/expand_glob_import.rs index eb216a81a1..cf34ffaf7f 100644 --- a/crates/ra_assists/src/handlers/expand_glob_import.rs +++ b/crates/ra_assists/src/handlers/expand_glob_import.rs @@ -3,7 +3,7 @@ use ra_ide_db::{ defs::{classify_name_ref, Definition, NameRefClass}, RootDatabase, }; -use ra_syntax::{algo, ast, match_ast, AstNode, SyntaxNode, SyntaxToken, T}; +use syntax::{algo, ast, match_ast, AstNode, SyntaxNode, SyntaxToken, T}; use crate::{ assist_context::{AssistBuilder, AssistContext, Assists}, diff --git a/crates/ra_assists/src/handlers/extract_struct_from_enum_variant.rs b/crates/ra_assists/src/handlers/extract_struct_from_enum_variant.rs index ccec688cae..6e9f2d0fc7 100644 --- a/crates/ra_assists/src/handlers/extract_struct_from_enum_variant.rs +++ b/crates/ra_assists/src/handlers/extract_struct_from_enum_variant.rs @@ -2,12 +2,12 @@ use hir::{EnumVariant, Module, ModuleDef, Name}; use ra_db::FileId; use ra_fmt::leading_indent; use ra_ide_db::{defs::Definition, search::Reference, RootDatabase}; -use ra_syntax::{ +use rustc_hash::FxHashSet; +use syntax::{ algo::find_node_at_offset, ast::{self, ArgListOwner, AstNode, NameOwner, VisibilityOwner}, SourceFile, SyntaxNode, TextRange, TextSize, }; -use rustc_hash::FxHashSet; use crate::{ assist_context::AssistBuilder, utils::insert_use_statement, AssistContext, AssistId, diff --git a/crates/ra_assists/src/handlers/extract_variable.rs b/crates/ra_assists/src/handlers/extract_variable.rs index cc62db0c44..d2ae137cdd 100644 --- a/crates/ra_assists/src/handlers/extract_variable.rs +++ b/crates/ra_assists/src/handlers/extract_variable.rs @@ -1,11 +1,11 @@ -use ra_syntax::{ +use stdx::format_to; +use syntax::{ ast::{self, AstNode}, SyntaxKind::{ BLOCK_EXPR, BREAK_EXPR, CLOSURE_EXPR, COMMENT, LOOP_EXPR, MATCH_ARM, PATH_EXPR, RETURN_EXPR, }, SyntaxNode, }; -use stdx::format_to; use test_utils::mark; use crate::{AssistContext, AssistId, AssistKind, Assists}; diff --git a/crates/ra_assists/src/handlers/fill_match_arms.rs b/crates/ra_assists/src/handlers/fill_match_arms.rs index 6698d1a27a..8f66606372 100644 --- a/crates/ra_assists/src/handlers/fill_match_arms.rs +++ b/crates/ra_assists/src/handlers/fill_match_arms.rs @@ -3,7 +3,7 @@ use std::iter; use hir::{Adt, HasSource, ModuleDef, Semantics}; use itertools::Itertools; use ra_ide_db::RootDatabase; -use ra_syntax::ast::{self, make, AstNode, MatchArm, NameOwner, Pat}; +use syntax::ast::{self, make, AstNode, MatchArm, NameOwner, Pat}; use test_utils::mark; use crate::{ diff --git a/crates/ra_assists/src/handlers/fix_visibility.rs b/crates/ra_assists/src/handlers/fix_visibility.rs index a19dbf33f6..b6cc1a3204 100644 --- a/crates/ra_assists/src/handlers/fix_visibility.rs +++ b/crates/ra_assists/src/handlers/fix_visibility.rs @@ -1,6 +1,6 @@ use hir::{db::HirDatabase, HasSource, HasVisibility, PathResolution}; use ra_db::FileId; -use ra_syntax::{ast, AstNode, TextRange, TextSize}; +use syntax::{ast, AstNode, TextRange, TextSize}; use crate::{utils::vis_offset, AssistContext, AssistId, AssistKind, Assists}; use ast::VisibilityOwner; diff --git a/crates/ra_assists/src/handlers/flip_binexpr.rs b/crates/ra_assists/src/handlers/flip_binexpr.rs index 3cd5326505..404f06133d 100644 --- a/crates/ra_assists/src/handlers/flip_binexpr.rs +++ b/crates/ra_assists/src/handlers/flip_binexpr.rs @@ -1,4 +1,4 @@ -use ra_syntax::ast::{AstNode, BinExpr, BinOp}; +use syntax::ast::{AstNode, BinExpr, BinOp}; use crate::{AssistContext, AssistId, AssistKind, Assists}; diff --git a/crates/ra_assists/src/handlers/flip_comma.rs b/crates/ra_assists/src/handlers/flip_comma.rs index 55a971dc77..5c69db53e5 100644 --- a/crates/ra_assists/src/handlers/flip_comma.rs +++ b/crates/ra_assists/src/handlers/flip_comma.rs @@ -1,4 +1,4 @@ -use ra_syntax::{algo::non_trivia_sibling, Direction, T}; +use syntax::{algo::non_trivia_sibling, Direction, T}; use crate::{AssistContext, AssistId, AssistKind, Assists}; diff --git a/crates/ra_assists/src/handlers/flip_trait_bound.rs b/crates/ra_assists/src/handlers/flip_trait_bound.rs index 1234f4d296..347e79b1da 100644 --- a/crates/ra_assists/src/handlers/flip_trait_bound.rs +++ b/crates/ra_assists/src/handlers/flip_trait_bound.rs @@ -1,4 +1,4 @@ -use ra_syntax::{ +use syntax::{ algo::non_trivia_sibling, ast::{self, AstNode}, Direction, T, diff --git a/crates/ra_assists/src/handlers/generate_derive.rs b/crates/ra_assists/src/handlers/generate_derive.rs index 90ece9fab0..314504e15c 100644 --- a/crates/ra_assists/src/handlers/generate_derive.rs +++ b/crates/ra_assists/src/handlers/generate_derive.rs @@ -1,4 +1,4 @@ -use ra_syntax::{ +use syntax::{ ast::{self, AstNode, AttrsOwner}, SyntaxKind::{COMMENT, WHITESPACE}, TextSize, diff --git a/crates/ra_assists/src/handlers/generate_from_impl_for_enum.rs b/crates/ra_assists/src/handlers/generate_from_impl_for_enum.rs index 4c1aef8a21..302b6b67d4 100644 --- a/crates/ra_assists/src/handlers/generate_from_impl_for_enum.rs +++ b/crates/ra_assists/src/handlers/generate_from_impl_for_enum.rs @@ -1,5 +1,5 @@ use ra_ide_db::RootDatabase; -use ra_syntax::ast::{self, AstNode, NameOwner}; +use syntax::ast::{self, AstNode, NameOwner}; use test_utils::mark; use crate::{utils::FamousDefs, AssistContext, AssistId, AssistKind, Assists}; diff --git a/crates/ra_assists/src/handlers/generate_function.rs b/crates/ra_assists/src/handlers/generate_function.rs index acc97e6482..b5df441019 100644 --- a/crates/ra_assists/src/handlers/generate_function.rs +++ b/crates/ra_assists/src/handlers/generate_function.rs @@ -1,6 +1,7 @@ use hir::HirDisplay; use ra_db::FileId; -use ra_syntax::{ +use rustc_hash::{FxHashMap, FxHashSet}; +use syntax::{ ast::{ self, edit::{AstNodeEdit, IndentLevel}, @@ -8,7 +9,6 @@ use ra_syntax::{ }, SyntaxKind, SyntaxNode, TextSize, }; -use rustc_hash::{FxHashMap, FxHashSet}; use crate::{ assist_config::SnippetCap, diff --git a/crates/ra_assists/src/handlers/generate_impl.rs b/crates/ra_assists/src/handlers/generate_impl.rs index 7162dc1848..9989109b5a 100644 --- a/crates/ra_assists/src/handlers/generate_impl.rs +++ b/crates/ra_assists/src/handlers/generate_impl.rs @@ -1,6 +1,6 @@ use itertools::Itertools; -use ra_syntax::ast::{self, AstNode, GenericParamsOwner, NameOwner}; use stdx::format_to; +use syntax::ast::{self, AstNode, GenericParamsOwner, NameOwner}; use crate::{AssistContext, AssistId, AssistKind, Assists}; diff --git a/crates/ra_assists/src/handlers/generate_new.rs b/crates/ra_assists/src/handlers/generate_new.rs index 32dfed274a..7db10f2768 100644 --- a/crates/ra_assists/src/handlers/generate_new.rs +++ b/crates/ra_assists/src/handlers/generate_new.rs @@ -1,10 +1,10 @@ use hir::Adt; use itertools::Itertools; -use ra_syntax::{ +use stdx::format_to; +use syntax::{ ast::{self, AstNode, GenericParamsOwner, NameOwner, StructKind, VisibilityOwner}, T, }; -use stdx::format_to; use crate::{AssistContext, AssistId, AssistKind, Assists}; diff --git a/crates/ra_assists/src/handlers/inline_local_variable.rs b/crates/ra_assists/src/handlers/inline_local_variable.rs index 3c58020f80..5315923206 100644 --- a/crates/ra_assists/src/handlers/inline_local_variable.rs +++ b/crates/ra_assists/src/handlers/inline_local_variable.rs @@ -1,5 +1,5 @@ use ra_ide_db::defs::Definition; -use ra_syntax::{ +use syntax::{ ast::{self, AstNode, AstToken}, TextRange, }; diff --git a/crates/ra_assists/src/handlers/introduce_named_lifetime.rs b/crates/ra_assists/src/handlers/introduce_named_lifetime.rs index fbaf3c06b5..5f623e5f7a 100644 --- a/crates/ra_assists/src/handlers/introduce_named_lifetime.rs +++ b/crates/ra_assists/src/handlers/introduce_named_lifetime.rs @@ -1,8 +1,8 @@ -use ra_syntax::{ +use rustc_hash::FxHashSet; +use syntax::{ ast::{self, GenericParamsOwner, NameOwner}, AstNode, SyntaxKind, TextRange, TextSize, }; -use rustc_hash::FxHashSet; use crate::{assist_context::AssistBuilder, AssistContext, AssistId, AssistKind, Assists}; diff --git a/crates/ra_assists/src/handlers/invert_if.rs b/crates/ra_assists/src/handlers/invert_if.rs index bbe3f36436..f0e0475389 100644 --- a/crates/ra_assists/src/handlers/invert_if.rs +++ b/crates/ra_assists/src/handlers/invert_if.rs @@ -1,4 +1,4 @@ -use ra_syntax::{ +use syntax::{ ast::{self, AstNode}, T, }; diff --git a/crates/ra_assists/src/handlers/merge_imports.rs b/crates/ra_assists/src/handlers/merge_imports.rs index c775fe25c5..9c5c6eda72 100644 --- a/crates/ra_assists/src/handlers/merge_imports.rs +++ b/crates/ra_assists/src/handlers/merge_imports.rs @@ -1,6 +1,6 @@ use std::iter::successors; -use ra_syntax::{ +use syntax::{ algo::{neighbor, skip_trivia_token, SyntaxRewriter}, ast::{self, edit::AstNodeEdit, make}, AstNode, Direction, InsertPosition, SyntaxElement, T, diff --git a/crates/ra_assists/src/handlers/merge_match_arms.rs b/crates/ra_assists/src/handlers/merge_match_arms.rs index 5632922823..c347eb40ef 100644 --- a/crates/ra_assists/src/handlers/merge_match_arms.rs +++ b/crates/ra_assists/src/handlers/merge_match_arms.rs @@ -1,6 +1,6 @@ use std::iter::successors; -use ra_syntax::{ +use syntax::{ algo::neighbor, ast::{self, AstNode}, Direction, diff --git a/crates/ra_assists/src/handlers/move_bounds.rs b/crates/ra_assists/src/handlers/move_bounds.rs index 6d394443eb..e2e461520d 100644 --- a/crates/ra_assists/src/handlers/move_bounds.rs +++ b/crates/ra_assists/src/handlers/move_bounds.rs @@ -1,4 +1,4 @@ -use ra_syntax::{ +use syntax::{ ast::{self, edit::AstNodeEdit, make, AstNode, NameOwner, TypeBoundsOwner}, match_ast, SyntaxKind::*, diff --git a/crates/ra_assists/src/handlers/move_guard.rs b/crates/ra_assists/src/handlers/move_guard.rs index 4060d34c64..c62ebc3061 100644 --- a/crates/ra_assists/src/handlers/move_guard.rs +++ b/crates/ra_assists/src/handlers/move_guard.rs @@ -1,4 +1,4 @@ -use ra_syntax::{ +use syntax::{ ast::{AstNode, IfExpr, MatchArm}, SyntaxKind::WHITESPACE, }; diff --git a/crates/ra_assists/src/handlers/raw_string.rs b/crates/ra_assists/src/handlers/raw_string.rs index 4c797178f1..9ddd116e01 100644 --- a/crates/ra_assists/src/handlers/raw_string.rs +++ b/crates/ra_assists/src/handlers/raw_string.rs @@ -1,6 +1,6 @@ use std::borrow::Cow; -use ra_syntax::{ +use syntax::{ ast::{self, HasQuotes, HasStringValue}, AstToken, SyntaxKind::{RAW_STRING, STRING}, diff --git a/crates/ra_assists/src/handlers/remove_dbg.rs b/crates/ra_assists/src/handlers/remove_dbg.rs index 9430ce1b5b..f3dcca5348 100644 --- a/crates/ra_assists/src/handlers/remove_dbg.rs +++ b/crates/ra_assists/src/handlers/remove_dbg.rs @@ -1,4 +1,4 @@ -use ra_syntax::{ +use syntax::{ ast::{self, AstNode}, TextRange, TextSize, T, }; diff --git a/crates/ra_assists/src/handlers/remove_mut.rs b/crates/ra_assists/src/handlers/remove_mut.rs index ef55c354ee..44f41daa92 100644 --- a/crates/ra_assists/src/handlers/remove_mut.rs +++ b/crates/ra_assists/src/handlers/remove_mut.rs @@ -1,4 +1,4 @@ -use ra_syntax::{SyntaxKind, TextRange, T}; +use syntax::{SyntaxKind, TextRange, T}; use crate::{AssistContext, AssistId, AssistKind, Assists}; diff --git a/crates/ra_assists/src/handlers/reorder_fields.rs b/crates/ra_assists/src/handlers/reorder_fields.rs index c9b743a06b..013720dfcb 100644 --- a/crates/ra_assists/src/handlers/reorder_fields.rs +++ b/crates/ra_assists/src/handlers/reorder_fields.rs @@ -3,7 +3,7 @@ use rustc_hash::FxHashMap; use hir::{Adt, ModuleDef, PathResolution, Semantics, Struct}; use ra_ide_db::RootDatabase; -use ra_syntax::{algo, ast, match_ast, AstNode, SyntaxKind, SyntaxKind::*, SyntaxNode}; +use syntax::{algo, ast, match_ast, AstNode, SyntaxKind, SyntaxKind::*, SyntaxNode}; use crate::{AssistContext, AssistId, AssistKind, Assists}; diff --git a/crates/ra_assists/src/handlers/replace_if_let_with_match.rs b/crates/ra_assists/src/handlers/replace_if_let_with_match.rs index ecafb74a1e..2442f049b6 100644 --- a/crates/ra_assists/src/handlers/replace_if_let_with_match.rs +++ b/crates/ra_assists/src/handlers/replace_if_let_with_match.rs @@ -1,5 +1,5 @@ use ra_fmt::unwrap_trivial_block; -use ra_syntax::{ +use syntax::{ ast::{ self, edit::{AstNodeEdit, IndentLevel}, diff --git a/crates/ra_assists/src/handlers/replace_let_with_if_let.rs b/crates/ra_assists/src/handlers/replace_let_with_if_let.rs index e4d436decc..ed6d0c29be 100644 --- a/crates/ra_assists/src/handlers/replace_let_with_if_let.rs +++ b/crates/ra_assists/src/handlers/replace_let_with_if_let.rs @@ -1,6 +1,6 @@ use std::iter::once; -use ra_syntax::{ +use syntax::{ ast::{ self, edit::{AstNodeEdit, IndentLevel}, diff --git a/crates/ra_assists/src/handlers/replace_qualified_name_with_use.rs b/crates/ra_assists/src/handlers/replace_qualified_name_with_use.rs index da0a860c59..011bf1106d 100644 --- a/crates/ra_assists/src/handlers/replace_qualified_name_with_use.rs +++ b/crates/ra_assists/src/handlers/replace_qualified_name_with_use.rs @@ -1,5 +1,5 @@ use hir; -use ra_syntax::{algo::SyntaxRewriter, ast, match_ast, AstNode, SmolStr, SyntaxNode}; +use syntax::{algo::SyntaxRewriter, ast, match_ast, AstNode, SmolStr, SyntaxNode}; use crate::{ utils::{find_insert_use_container, insert_use_statement}, diff --git a/crates/ra_assists/src/handlers/replace_unwrap_with_match.rs b/crates/ra_assists/src/handlers/replace_unwrap_with_match.rs index d69f2c1b0e..9705f11b76 100644 --- a/crates/ra_assists/src/handlers/replace_unwrap_with_match.rs +++ b/crates/ra_assists/src/handlers/replace_unwrap_with_match.rs @@ -1,6 +1,6 @@ use std::iter; -use ra_syntax::{ +use syntax::{ ast::{ self, edit::{AstNodeEdit, IndentLevel}, diff --git a/crates/ra_assists/src/handlers/split_import.rs b/crates/ra_assists/src/handlers/split_import.rs index 4ca5c3ca14..15e67eaa19 100644 --- a/crates/ra_assists/src/handlers/split_import.rs +++ b/crates/ra_assists/src/handlers/split_import.rs @@ -1,6 +1,6 @@ use std::iter::successors; -use ra_syntax::{ast, AstNode, T}; +use syntax::{ast, AstNode, T}; use crate::{AssistContext, AssistId, AssistKind, Assists}; diff --git a/crates/ra_assists/src/handlers/unwrap_block.rs b/crates/ra_assists/src/handlers/unwrap_block.rs index 8b38695a94..2879090b86 100644 --- a/crates/ra_assists/src/handlers/unwrap_block.rs +++ b/crates/ra_assists/src/handlers/unwrap_block.rs @@ -1,5 +1,5 @@ use ra_fmt::unwrap_trivial_block; -use ra_syntax::{ +use syntax::{ ast::{ self, edit::{AstNodeEdit, IndentLevel}, diff --git a/crates/ra_assists/src/lib.rs b/crates/ra_assists/src/lib.rs index 890996a68d..e2ef561fee 100644 --- a/crates/ra_assists/src/lib.rs +++ b/crates/ra_assists/src/lib.rs @@ -20,7 +20,7 @@ pub mod ast_transform; use hir::Semantics; use ra_db::FileRange; use ra_ide_db::{source_change::SourceChange, RootDatabase}; -use ra_syntax::TextRange; +use syntax::TextRange; pub(crate) use crate::assist_context::{AssistContext, Assists}; diff --git a/crates/ra_assists/src/tests.rs b/crates/ra_assists/src/tests.rs index e738364220..1ae7aaa09b 100644 --- a/crates/ra_assists/src/tests.rs +++ b/crates/ra_assists/src/tests.rs @@ -3,7 +3,7 @@ mod generated; use hir::Semantics; use ra_db::{fixture::WithFixture, FileId, FileRange, SourceDatabaseExt}; use ra_ide_db::RootDatabase; -use ra_syntax::TextRange; +use syntax::TextRange; use test_utils::{assert_eq_text, extract_offset, extract_range}; use crate::{handlers::Handler, Assist, AssistConfig, AssistContext, AssistKind, Assists}; diff --git a/crates/ra_assists/src/utils.rs b/crates/ra_assists/src/utils.rs index 0de6fdf3fb..6d85661c46 100644 --- a/crates/ra_assists/src/utils.rs +++ b/crates/ra_assists/src/utils.rs @@ -5,13 +5,13 @@ use std::{iter, ops}; use hir::{Adt, Crate, Enum, ScopeDef, Semantics, Trait, Type}; use ra_ide_db::RootDatabase; -use ra_syntax::{ +use rustc_hash::FxHashSet; +use syntax::{ ast::{self, make, NameOwner}, AstNode, SyntaxKind::*, SyntaxNode, TextSize, T, }; -use rustc_hash::FxHashSet; use crate::assist_config::SnippetCap; diff --git a/crates/ra_assists/src/utils/insert_use.rs b/crates/ra_assists/src/utils/insert_use.rs index 13dbe1919c..f89c288da4 100644 --- a/crates/ra_assists/src/utils/insert_use.rs +++ b/crates/ra_assists/src/utils/insert_use.rs @@ -4,7 +4,7 @@ use either::Either; use hir::{self, ModPath}; -use ra_syntax::{ +use syntax::{ ast::{self, NameOwner, VisibilityOwner}, AstNode, Direction, SmolStr, SyntaxKind::{PATH, PATH_SEGMENT}, diff --git a/crates/ra_cfg/Cargo.toml b/crates/ra_cfg/Cargo.toml index 770a407428..cb0d2b9d73 100644 --- a/crates/ra_cfg/Cargo.toml +++ b/crates/ra_cfg/Cargo.toml @@ -11,7 +11,7 @@ doctest = false [dependencies] rustc-hash = "1.1.0" -ra_syntax = { path = "../ra_syntax" } +syntax = { path = "../syntax" } tt = { path = "../tt" } [dev-dependencies] diff --git a/crates/ra_cfg/src/cfg_expr.rs b/crates/ra_cfg/src/cfg_expr.rs index f48928aee8..940091465c 100644 --- a/crates/ra_cfg/src/cfg_expr.rs +++ b/crates/ra_cfg/src/cfg_expr.rs @@ -4,7 +4,7 @@ use std::slice::Iter as SliceIter; -use ra_syntax::SmolStr; +use syntax::SmolStr; #[derive(Debug, Clone, PartialEq, Eq)] pub enum CfgExpr { @@ -87,7 +87,7 @@ mod tests { use super::*; use mbe::{ast_to_token_tree, TokenMap}; - use ra_syntax::ast::{self, AstNode}; + use syntax::ast::{self, AstNode}; fn get_token_tree_generated(input: &str) -> (tt::Subtree, TokenMap) { let source_file = ast::SourceFile::parse(input).ok().unwrap(); diff --git a/crates/ra_cfg/src/lib.rs b/crates/ra_cfg/src/lib.rs index cd5a0a7b64..7e025143bd 100644 --- a/crates/ra_cfg/src/lib.rs +++ b/crates/ra_cfg/src/lib.rs @@ -2,8 +2,8 @@ mod cfg_expr; -use ra_syntax::SmolStr; use rustc_hash::FxHashSet; +use syntax::SmolStr; pub use cfg_expr::CfgExpr; diff --git a/crates/ra_db/Cargo.toml b/crates/ra_db/Cargo.toml index 47a0f6248f..156ea1ee4b 100644 --- a/crates/ra_db/Cargo.toml +++ b/crates/ra_db/Cargo.toml @@ -12,7 +12,7 @@ doctest = false salsa = "0.15.2" rustc-hash = "1.1.0" -ra_syntax = { path = "../ra_syntax" } +syntax = { path = "../syntax" } ra_cfg = { path = "../ra_cfg" } profile = { path = "../profile" } tt = { path = "../tt" } diff --git a/crates/ra_db/src/input.rs b/crates/ra_db/src/input.rs index 02a1abee0f..12a8634997 100644 --- a/crates/ra_db/src/input.rs +++ b/crates/ra_db/src/input.rs @@ -9,8 +9,8 @@ use std::{fmt, iter::FromIterator, ops, str::FromStr, sync::Arc}; use ra_cfg::CfgOptions; -use ra_syntax::SmolStr; use rustc_hash::{FxHashMap, FxHashSet}; +use syntax::SmolStr; use tt::TokenExpander; use vfs::file_set::FileSet; diff --git a/crates/ra_db/src/lib.rs b/crates/ra_db/src/lib.rs index 795d7d2b61..73ac243d66 100644 --- a/crates/ra_db/src/lib.rs +++ b/crates/ra_db/src/lib.rs @@ -5,8 +5,8 @@ pub mod fixture; use std::{panic, sync::Arc}; -use ra_syntax::{ast, Parse, SourceFile, TextRange, TextSize}; use rustc_hash::FxHashSet; +use syntax::{ast, Parse, SourceFile, TextRange, TextSize}; pub use crate::{ cancellation::Canceled, diff --git a/crates/ra_fmt/Cargo.toml b/crates/ra_fmt/Cargo.toml index b4ef93f2b2..d42ca62be2 100644 --- a/crates/ra_fmt/Cargo.toml +++ b/crates/ra_fmt/Cargo.toml @@ -12,4 +12,4 @@ doctest = false [dependencies] itertools = "0.9.0" -ra_syntax = { path = "../ra_syntax" } +syntax = { path = "../syntax" } diff --git a/crates/ra_fmt/src/lib.rs b/crates/ra_fmt/src/lib.rs index f910ded9da..d0bf0593f7 100644 --- a/crates/ra_fmt/src/lib.rs +++ b/crates/ra_fmt/src/lib.rs @@ -3,7 +3,7 @@ use std::iter::successors; use itertools::Itertools; -use ra_syntax::{ +use syntax::{ ast::{self, AstNode, AstToken}, SmolStr, SyntaxKind, SyntaxKind::*, diff --git a/crates/ra_hir/Cargo.toml b/crates/ra_hir/Cargo.toml index 903406e849..ee5622a7d9 100644 --- a/crates/ra_hir/Cargo.toml +++ b/crates/ra_hir/Cargo.toml @@ -17,7 +17,7 @@ arrayvec = "0.5.1" itertools = "0.9.0" stdx = { path = "../stdx" } -ra_syntax = { path = "../ra_syntax" } +syntax = { path = "../syntax" } ra_db = { path = "../ra_db" } profile = { path = "../profile" } hir_expand = { path = "../ra_hir_expand", package = "ra_hir_expand" } diff --git a/crates/ra_hir/src/code_model.rs b/crates/ra_hir/src/code_model.rs index 5c0c6184a7..98724c1462 100644 --- a/crates/ra_hir/src/code_model.rs +++ b/crates/ra_hir/src/code_model.rs @@ -31,12 +31,12 @@ use hir_ty::{ InEnvironment, Substs, TraitEnvironment, Ty, TyDefId, TypeCtor, }; use ra_db::{CrateId, Edition, FileId}; -use ra_syntax::{ +use rustc_hash::FxHashSet; +use stdx::impl_from; +use syntax::{ ast::{self, AttrsOwner, NameOwner}, AstNode, }; -use rustc_hash::FxHashSet; -use stdx::impl_from; use crate::{ db::{DefDatabase, HirDatabase}, diff --git a/crates/ra_hir/src/has_source.rs b/crates/ra_hir/src/has_source.rs index 1c691d9619..a50d4ff029 100644 --- a/crates/ra_hir/src/has_source.rs +++ b/crates/ra_hir/src/has_source.rs @@ -6,7 +6,7 @@ use hir_def::{ src::{HasChildSource, HasSource as _}, Lookup, VariantId, }; -use ra_syntax::ast; +use syntax::ast; use crate::{ db::HirDatabase, Const, Enum, EnumVariant, Field, FieldSource, Function, ImplDef, MacroDef, diff --git a/crates/ra_hir/src/semantics.rs b/crates/ra_hir/src/semantics.rs index 7e3ec6315e..2e0ef44085 100644 --- a/crates/ra_hir/src/semantics.rs +++ b/crates/ra_hir/src/semantics.rs @@ -12,11 +12,11 @@ use hir_expand::{hygiene::Hygiene, name::AsName, ExpansionInfo}; use hir_ty::associated_type_shorthand_candidates; use itertools::Itertools; use ra_db::{FileId, FileRange}; -use ra_syntax::{ +use rustc_hash::{FxHashMap, FxHashSet}; +use syntax::{ algo::{find_node_at_offset, skip_trivia_token}, ast, AstNode, Direction, SyntaxNode, SyntaxToken, TextRange, TextSize, }; -use rustc_hash::{FxHashMap, FxHashSet}; use crate::{ db::HirDatabase, diff --git a/crates/ra_hir/src/semantics/source_to_def.rs b/crates/ra_hir/src/semantics/source_to_def.rs index a6ff8b0bfc..ab2fd0957f 100644 --- a/crates/ra_hir/src/semantics/source_to_def.rs +++ b/crates/ra_hir/src/semantics/source_to_def.rs @@ -10,12 +10,12 @@ use hir_def::{ }; use hir_expand::{name::AsName, AstId, MacroDefKind}; use ra_db::FileId; -use ra_syntax::{ +use rustc_hash::FxHashMap; +use stdx::impl_from; +use syntax::{ ast::{self, NameOwner}, match_ast, AstNode, SyntaxNode, }; -use rustc_hash::FxHashMap; -use stdx::impl_from; use crate::{db::HirDatabase, InFile, MacroDefId}; diff --git a/crates/ra_hir/src/source_analyzer.rs b/crates/ra_hir/src/source_analyzer.rs index d3d62debfd..6b2de3a06f 100644 --- a/crates/ra_hir/src/source_analyzer.rs +++ b/crates/ra_hir/src/source_analyzer.rs @@ -21,7 +21,7 @@ use hir_ty::{ diagnostics::{record_literal_missing_fields, record_pattern_missing_fields}, InferenceResult, Substs, Ty, }; -use ra_syntax::{ +use syntax::{ ast::{self, AstNode}, SyntaxNode, TextRange, TextSize, }; diff --git a/crates/ra_hir_def/Cargo.toml b/crates/ra_hir_def/Cargo.toml index 1a080a8b4b..38129782fe 100644 --- a/crates/ra_hir_def/Cargo.toml +++ b/crates/ra_hir_def/Cargo.toml @@ -24,7 +24,7 @@ stdx = { path = "../stdx" } arena = { path = "../arena" } ra_db = { path = "../ra_db" } -ra_syntax = { path = "../ra_syntax" } +syntax = { path = "../syntax" } profile = { path = "../profile" } hir_expand = { path = "../ra_hir_expand", package = "ra_hir_expand" } test_utils = { path = "../test_utils" } diff --git a/crates/ra_hir_def/src/adt.rs b/crates/ra_hir_def/src/adt.rs index 896a69ca80..c83219d771 100644 --- a/crates/ra_hir_def/src/adt.rs +++ b/crates/ra_hir_def/src/adt.rs @@ -8,7 +8,7 @@ use hir_expand::{ name::{AsName, Name}, InFile, }; -use ra_syntax::ast::{self, NameOwner, VisibilityOwner}; +use syntax::ast::{self, NameOwner, VisibilityOwner}; use tt::{Delimiter, DelimiterKind, Leaf, Subtree, TokenTree}; use crate::{ diff --git a/crates/ra_hir_def/src/attr.rs b/crates/ra_hir_def/src/attr.rs index 050832ce01..36dc8b8166 100644 --- a/crates/ra_hir_def/src/attr.rs +++ b/crates/ra_hir_def/src/attr.rs @@ -6,7 +6,7 @@ use either::Either; use hir_expand::{hygiene::Hygiene, AstId, InFile}; use mbe::ast_to_token_tree; use ra_cfg::{CfgExpr, CfgOptions}; -use ra_syntax::{ +use syntax::{ ast::{self, AstNode, AttrsOwner}, SmolStr, }; diff --git a/crates/ra_hir_def/src/body.rs b/crates/ra_hir_def/src/body.rs index 1deb1a8371..7c33966a71 100644 --- a/crates/ra_hir_def/src/body.rs +++ b/crates/ra_hir_def/src/body.rs @@ -11,8 +11,8 @@ use either::Either; use hir_expand::{ast_id_map::AstIdMap, hygiene::Hygiene, AstId, HirFileId, InFile, MacroDefId}; use ra_cfg::CfgOptions; use ra_db::CrateId; -use ra_syntax::{ast, AstNode, AstPtr}; use rustc_hash::FxHashMap; +use syntax::{ast, AstNode, AstPtr}; use test_utils::mark; pub(crate) use lower::LowerCtx; diff --git a/crates/ra_hir_def/src/body/lower.rs b/crates/ra_hir_def/src/body/lower.rs index 4823930062..a26251cdeb 100644 --- a/crates/ra_hir_def/src/body/lower.rs +++ b/crates/ra_hir_def/src/body/lower.rs @@ -10,14 +10,14 @@ use hir_expand::{ name::{name, AsName, Name}, HirFileId, MacroDefId, MacroDefKind, }; -use ra_syntax::{ +use rustc_hash::FxHashMap; +use syntax::{ ast::{ self, ArgListOwner, ArrayExprKind, AstChildren, LiteralKind, LoopBodyOwner, NameOwner, SlicePatComponents, }, AstNode, AstPtr, }; -use rustc_hash::FxHashMap; use test_utils::mark; use crate::{ diff --git a/crates/ra_hir_def/src/body/scope.rs b/crates/ra_hir_def/src/body/scope.rs index f783e18b54..079f14c298 100644 --- a/crates/ra_hir_def/src/body/scope.rs +++ b/crates/ra_hir_def/src/body/scope.rs @@ -171,7 +171,7 @@ fn compute_expr_scopes(expr: ExprId, body: &Body, scopes: &mut ExprScopes, scope mod tests { use hir_expand::{name::AsName, InFile}; use ra_db::{fixture::WithFixture, FileId, SourceDatabase}; - use ra_syntax::{algo::find_node_at_offset, ast, AstNode}; + use syntax::{algo::find_node_at_offset, ast, AstNode}; use test_utils::{assert_eq_text, extract_offset, mark}; use crate::{db::DefDatabase, test_db::TestDB, FunctionId, ModuleDefId}; diff --git a/crates/ra_hir_def/src/data.rs b/crates/ra_hir_def/src/data.rs index 758c12f331..9a8eb4edec 100644 --- a/crates/ra_hir_def/src/data.rs +++ b/crates/ra_hir_def/src/data.rs @@ -3,7 +3,7 @@ use std::sync::Arc; use hir_expand::{name::Name, InFile}; -use ra_syntax::ast; +use syntax::ast; use crate::{ attr::Attrs, diff --git a/crates/ra_hir_def/src/db.rs b/crates/ra_hir_def/src/db.rs index 1dd4197f85..a925548b58 100644 --- a/crates/ra_hir_def/src/db.rs +++ b/crates/ra_hir_def/src/db.rs @@ -3,7 +3,7 @@ use std::sync::Arc; use hir_expand::{db::AstDatabase, HirFileId}; use ra_db::{salsa, CrateId, SourceDatabase, Upcast}; -use ra_syntax::SmolStr; +use syntax::SmolStr; use crate::{ adt::{EnumData, StructData}, diff --git a/crates/ra_hir_def/src/diagnostics.rs b/crates/ra_hir_def/src/diagnostics.rs index 71d177070d..2e38a978f8 100644 --- a/crates/ra_hir_def/src/diagnostics.rs +++ b/crates/ra_hir_def/src/diagnostics.rs @@ -3,7 +3,7 @@ use std::any::Any; use hir_expand::diagnostics::Diagnostic; -use ra_syntax::{ast, AstPtr, SyntaxNodePtr}; +use syntax::{ast, AstPtr, SyntaxNodePtr}; use hir_expand::{HirFileId, InFile}; diff --git a/crates/ra_hir_def/src/docs.rs b/crates/ra_hir_def/src/docs.rs index 2630b3d895..e9a02b11bb 100644 --- a/crates/ra_hir_def/src/docs.rs +++ b/crates/ra_hir_def/src/docs.rs @@ -6,7 +6,7 @@ use std::sync::Arc; use either::Either; -use ra_syntax::ast; +use syntax::ast; use crate::{ db::DefDatabase, diff --git a/crates/ra_hir_def/src/expr.rs b/crates/ra_hir_def/src/expr.rs index befe41c2ae..c94b3a36f5 100644 --- a/crates/ra_hir_def/src/expr.rs +++ b/crates/ra_hir_def/src/expr.rs @@ -14,7 +14,7 @@ use arena::{Idx, RawId}; use hir_expand::name::Name; -use ra_syntax::ast::RangeOp; +use syntax::ast::RangeOp; use crate::{ builtin_type::{BuiltinFloat, BuiltinInt}, @@ -197,7 +197,7 @@ pub enum ArithOp { BitAnd, } -pub use ra_syntax::ast::PrefixOp as UnaryOp; +pub use syntax::ast::PrefixOp as UnaryOp; #[derive(Debug, Clone, Eq, PartialEq)] pub enum Array { ElementList(Vec), diff --git a/crates/ra_hir_def/src/find_path.rs b/crates/ra_hir_def/src/find_path.rs index 46e70eb48a..5099f417d3 100644 --- a/crates/ra_hir_def/src/find_path.rs +++ b/crates/ra_hir_def/src/find_path.rs @@ -294,7 +294,7 @@ fn find_local_import_locations( mod tests { use hir_expand::hygiene::Hygiene; use ra_db::fixture::WithFixture; - use ra_syntax::ast::AstNode; + use syntax::ast::AstNode; use test_utils::mark; use crate::test_db::TestDB; @@ -307,12 +307,9 @@ mod tests { fn check_found_path(ra_fixture: &str, path: &str) { let (db, pos) = TestDB::with_position(ra_fixture); let module = db.module_for_file(pos.file_id); - let parsed_path_file = ra_syntax::SourceFile::parse(&format!("use {};", path)); - let ast_path = parsed_path_file - .syntax_node() - .descendants() - .find_map(ra_syntax::ast::Path::cast) - .unwrap(); + let parsed_path_file = syntax::SourceFile::parse(&format!("use {};", path)); + let ast_path = + parsed_path_file.syntax_node().descendants().find_map(syntax::ast::Path::cast).unwrap(); let mod_path = ModPath::from_src(ast_path, &Hygiene::new_unhygienic()).unwrap(); let crate_def_map = db.crate_def_map(module.krate); @@ -441,12 +438,12 @@ mod tests { // already in scope. check_found_path( r#" - //- /main.rs crate:main deps:ra_syntax + //- /main.rs crate:main deps:syntax - use ra_syntax::ast; + use syntax::ast; <|> - //- /lib.rs crate:ra_syntax + //- /lib.rs crate:syntax pub mod ast { pub enum ModuleItem { A, B, C, @@ -458,18 +455,18 @@ mod tests { check_found_path( r#" - //- /main.rs crate:main deps:ra_syntax + //- /main.rs crate:main deps:syntax <|> - //- /lib.rs crate:ra_syntax + //- /lib.rs crate:syntax pub mod ast { pub enum ModuleItem { A, B, C, } } "#, - "ra_syntax::ast::ModuleItem", + "syntax::ast::ModuleItem", ); } diff --git a/crates/ra_hir_def/src/generics.rs b/crates/ra_hir_def/src/generics.rs index 0e06a0b12e..4476f03162 100644 --- a/crates/ra_hir_def/src/generics.rs +++ b/crates/ra_hir_def/src/generics.rs @@ -11,7 +11,7 @@ use hir_expand::{ InFile, }; use ra_db::FileId; -use ra_syntax::ast::{self, GenericParamsOwner, NameOwner, TypeBoundsOwner}; +use syntax::ast::{self, GenericParamsOwner, NameOwner, TypeBoundsOwner}; use crate::{ body::LowerCtx, diff --git a/crates/ra_hir_def/src/import_map.rs b/crates/ra_hir_def/src/import_map.rs index 3a9eec8873..431ff30abd 100644 --- a/crates/ra_hir_def/src/import_map.rs +++ b/crates/ra_hir_def/src/import_map.rs @@ -5,9 +5,9 @@ use std::{cmp::Ordering, fmt, hash::BuildHasherDefault, sync::Arc}; use fst::{self, Streamer}; use indexmap::{map::Entry, IndexMap}; use ra_db::CrateId; -use ra_syntax::SmolStr; use rustc_hash::{FxHashMap, FxHasher}; use smallvec::SmallVec; +use syntax::SmolStr; use crate::{ db::DefDatabase, diff --git a/crates/ra_hir_def/src/item_tree.rs b/crates/ra_hir_def/src/item_tree.rs index 104966c7f2..e14722caeb 100644 --- a/crates/ra_hir_def/src/item_tree.rs +++ b/crates/ra_hir_def/src/item_tree.rs @@ -22,9 +22,9 @@ use hir_expand::{ name::{name, AsName, Name}, HirFileId, InFile, }; -use ra_syntax::{ast, match_ast}; use rustc_hash::FxHashMap; use smallvec::SmallVec; +use syntax::{ast, match_ast}; use test_utils::mark; use crate::{ diff --git a/crates/ra_hir_def/src/item_tree/lower.rs b/crates/ra_hir_def/src/item_tree/lower.rs index 4523d0fbbf..391ab5d392 100644 --- a/crates/ra_hir_def/src/item_tree/lower.rs +++ b/crates/ra_hir_def/src/item_tree/lower.rs @@ -4,11 +4,11 @@ use std::{collections::hash_map::Entry, mem, sync::Arc}; use arena::map::ArenaMap; use hir_expand::{ast_id_map::AstIdMap, hygiene::Hygiene, HirFileId}; -use ra_syntax::{ +use smallvec::SmallVec; +use syntax::{ ast::{self, ModuleItemOwner}, SyntaxNode, }; -use smallvec::SmallVec; use crate::{ attr::Attrs, diff --git a/crates/ra_hir_def/src/item_tree/tests.rs b/crates/ra_hir_def/src/item_tree/tests.rs index a81497fa8a..6c843e339a 100644 --- a/crates/ra_hir_def/src/item_tree/tests.rs +++ b/crates/ra_hir_def/src/item_tree/tests.rs @@ -1,10 +1,10 @@ use expect::{expect, Expect}; use hir_expand::{db::AstDatabase, HirFileId, InFile}; use ra_db::fixture::WithFixture; -use ra_syntax::{ast, AstNode}; use rustc_hash::FxHashSet; use std::sync::Arc; use stdx::format_to; +use syntax::{ast, AstNode}; use crate::{db::DefDatabase, test_db::TestDB}; @@ -228,31 +228,31 @@ fn smoke() { top-level items: #[Attrs { entries: Some([Attr { path: ModPath { kind: Plain, segments: [Name(Text("attr_on_use"))] }, input: None }]) }] - Import { path: ModPath { kind: Plain, segments: [Name(Text("a"))] }, alias: None, visibility: RawVisibilityId("pub(self)"), is_glob: false, is_prelude: false, ast_id: FileAstId::(0) } + Import { path: ModPath { kind: Plain, segments: [Name(Text("a"))] }, alias: None, visibility: RawVisibilityId("pub(self)"), is_glob: false, is_prelude: false, ast_id: FileAstId::(0) } #[Attrs { entries: Some([Attr { path: ModPath { kind: Plain, segments: [Name(Text("attr_on_use"))] }, input: None }]) }] - Import { path: ModPath { kind: Plain, segments: [Name(Text("b"))] }, alias: None, visibility: RawVisibilityId("pub(self)"), is_glob: true, is_prelude: false, ast_id: FileAstId::(0) } + Import { path: ModPath { kind: Plain, segments: [Name(Text("b"))] }, alias: None, visibility: RawVisibilityId("pub(self)"), is_glob: true, is_prelude: false, ast_id: FileAstId::(0) } #[Attrs { entries: Some([Attr { path: ModPath { kind: Plain, segments: [Name(Text("ext_crate"))] }, input: None }]) }] - ExternCrate { path: ModPath { kind: Plain, segments: [Name(Text("krate"))] }, alias: None, visibility: RawVisibilityId("pub(self)"), is_macro_use: false, ast_id: FileAstId::(1) } + ExternCrate { path: ModPath { kind: Plain, segments: [Name(Text("krate"))] }, alias: None, visibility: RawVisibilityId("pub(self)"), is_macro_use: false, ast_id: FileAstId::(1) } #[Attrs { entries: Some([Attr { path: ModPath { kind: Plain, segments: [Name(Text("on_trait"))] }, input: None }]) }] - Trait { name: Name(Text("Tr")), visibility: RawVisibilityId("pub(self)"), generic_params: GenericParamsId(0), auto: false, items: [TypeAlias(Idx::(0)), Const(Idx::(0)), Function(Idx::(0)), Function(Idx::(1))], ast_id: FileAstId::(2) } + Trait { name: Name(Text("Tr")), visibility: RawVisibilityId("pub(self)"), generic_params: GenericParamsId(0), auto: false, items: [TypeAlias(Idx::(0)), Const(Idx::(0)), Function(Idx::(0)), Function(Idx::(1))], ast_id: FileAstId::(2) } > #[Attrs { entries: Some([Attr { path: ModPath { kind: Plain, segments: [Name(Text("assoc_ty"))] }, input: None }]) }] - > TypeAlias { name: Name(Text("AssocTy")), visibility: RawVisibilityId("pub(self)"), bounds: [Path(Path { type_anchor: None, mod_path: ModPath { kind: Plain, segments: [Name(Text("Tr"))] }, generic_args: [Some(GenericArgs { args: [Type(Tuple([]))], has_self_type: false, bindings: [] })] })], generic_params: GenericParamsId(4294967295), type_ref: None, ast_id: FileAstId::(8) } + > TypeAlias { name: Name(Text("AssocTy")), visibility: RawVisibilityId("pub(self)"), bounds: [Path(Path { type_anchor: None, mod_path: ModPath { kind: Plain, segments: [Name(Text("Tr"))] }, generic_args: [Some(GenericArgs { args: [Type(Tuple([]))], has_self_type: false, bindings: [] })] })], generic_params: GenericParamsId(4294967295), type_ref: None, ast_id: FileAstId::(8) } > #[Attrs { entries: Some([Attr { path: ModPath { kind: Plain, segments: [Name(Text("assoc_const"))] }, input: None }]) }] - > Const { name: Some(Name(Text("CONST"))), visibility: RawVisibilityId("pub(self)"), type_ref: Path(Path { type_anchor: None, mod_path: ModPath { kind: Plain, segments: [Name(Text("u8"))] }, generic_args: [None] }), ast_id: FileAstId::(9) } + > Const { name: Some(Name(Text("CONST"))), visibility: RawVisibilityId("pub(self)"), type_ref: Path(Path { type_anchor: None, mod_path: ModPath { kind: Plain, segments: [Name(Text("u8"))] }, generic_args: [None] }), ast_id: FileAstId::(9) } > #[Attrs { entries: Some([Attr { path: ModPath { kind: Plain, segments: [Name(Text("assoc_method"))] }, input: None }]) }] - > Function { name: Name(Text("method")), visibility: RawVisibilityId("pub(self)"), generic_params: GenericParamsId(4294967295), has_self_param: true, is_unsafe: false, params: [Reference(Path(Path { type_anchor: None, mod_path: ModPath { kind: Plain, segments: [Name(Text("Self"))] }, generic_args: [None] }), Shared)], is_varargs: false, ret_type: Tuple([]), ast_id: FileAstId::(10) } + > Function { name: Name(Text("method")), visibility: RawVisibilityId("pub(self)"), generic_params: GenericParamsId(4294967295), has_self_param: true, is_unsafe: false, params: [Reference(Path(Path { type_anchor: None, mod_path: ModPath { kind: Plain, segments: [Name(Text("Self"))] }, generic_args: [None] }), Shared)], is_varargs: false, ret_type: Tuple([]), ast_id: FileAstId::(10) } > #[Attrs { entries: Some([Attr { path: ModPath { kind: Plain, segments: [Name(Text("assoc_dfl_method"))] }, input: None }]) }] - > Function { name: Name(Text("dfl_method")), visibility: RawVisibilityId("pub(self)"), generic_params: GenericParamsId(4294967295), has_self_param: true, is_unsafe: false, params: [Reference(Path(Path { type_anchor: None, mod_path: ModPath { kind: Plain, segments: [Name(Text("Self"))] }, generic_args: [None] }), Mut)], is_varargs: false, ret_type: Tuple([]), ast_id: FileAstId::(11) } + > Function { name: Name(Text("dfl_method")), visibility: RawVisibilityId("pub(self)"), generic_params: GenericParamsId(4294967295), has_self_param: true, is_unsafe: false, params: [Reference(Path(Path { type_anchor: None, mod_path: ModPath { kind: Plain, segments: [Name(Text("Self"))] }, generic_args: [None] }), Mut)], is_varargs: false, ret_type: Tuple([]), ast_id: FileAstId::(11) } #[Attrs { entries: Some([Attr { path: ModPath { kind: Plain, segments: [Name(Text("struct0"))] }, input: None }]) }] - Struct { name: Name(Text("Struct0")), visibility: RawVisibilityId("pub(self)"), generic_params: GenericParamsId(1), fields: Unit, ast_id: FileAstId::(3), kind: Unit } + Struct { name: Name(Text("Struct0")), visibility: RawVisibilityId("pub(self)"), generic_params: GenericParamsId(1), fields: Unit, ast_id: FileAstId::(3), kind: Unit } #[Attrs { entries: Some([Attr { path: ModPath { kind: Plain, segments: [Name(Text("struct1"))] }, input: None }]) }] - Struct { name: Name(Text("Struct1")), visibility: RawVisibilityId("pub(self)"), generic_params: GenericParamsId(2), fields: Tuple(IdRange::(0..1)), ast_id: FileAstId::(4), kind: Tuple } + Struct { name: Name(Text("Struct1")), visibility: RawVisibilityId("pub(self)"), generic_params: GenericParamsId(2), fields: Tuple(IdRange::(0..1)), ast_id: FileAstId::(4), kind: Tuple } #[Attrs { entries: Some([Attr { path: ModPath { kind: Plain, segments: [Name(Text("struct2"))] }, input: None }]) }] - Struct { name: Name(Text("Struct2")), visibility: RawVisibilityId("pub(self)"), generic_params: GenericParamsId(3), fields: Record(IdRange::(1..2)), ast_id: FileAstId::(5), kind: Record } + Struct { name: Name(Text("Struct2")), visibility: RawVisibilityId("pub(self)"), generic_params: GenericParamsId(3), fields: Record(IdRange::(1..2)), ast_id: FileAstId::(5), kind: Record } #[Attrs { entries: Some([Attr { path: ModPath { kind: Plain, segments: [Name(Text("en"))] }, input: None }]) }] - Enum { name: Name(Text("En")), visibility: RawVisibilityId("pub(self)"), generic_params: GenericParamsId(4294967295), variants: IdRange::(0..1), ast_id: FileAstId::(6) } + Enum { name: Name(Text("En")), visibility: RawVisibilityId("pub(self)"), generic_params: GenericParamsId(4294967295), variants: IdRange::(0..1), ast_id: FileAstId::(6) } #[Attrs { entries: Some([Attr { path: ModPath { kind: Plain, segments: [Name(Text("un"))] }, input: None }]) }] - Union { name: Name(Text("Un")), visibility: RawVisibilityId("pub(self)"), generic_params: GenericParamsId(4294967295), fields: Record(IdRange::(3..4)), ast_id: FileAstId::(7) } + Union { name: Name(Text("Un")), visibility: RawVisibilityId("pub(self)"), generic_params: GenericParamsId(4294967295), fields: Record(IdRange::(3..4)), ast_id: FileAstId::(7) } "##]], ); } @@ -274,13 +274,13 @@ fn simple_inner_items() { inner attrs: Attrs { entries: None } top-level items: - Impl { generic_params: GenericParamsId(0), target_trait: Some(Path(Path { type_anchor: None, mod_path: ModPath { kind: Plain, segments: [Name(Text("D"))] }, generic_args: [None] })), target_type: Path(Path { type_anchor: None, mod_path: ModPath { kind: Plain, segments: [Name(Text("Response"))] }, generic_args: [Some(GenericArgs { args: [Type(Path(Path { type_anchor: None, mod_path: ModPath { kind: Plain, segments: [Name(Text("T"))] }, generic_args: [None] }))], has_self_type: false, bindings: [] })] }), is_negative: false, items: [Function(Idx::(1))], ast_id: FileAstId::(0) } - > Function { name: Name(Text("foo")), visibility: RawVisibilityId("pub(self)"), generic_params: GenericParamsId(4294967295), has_self_param: false, is_unsafe: false, params: [], is_varargs: false, ret_type: Tuple([]), ast_id: FileAstId::(1) } + Impl { generic_params: GenericParamsId(0), target_trait: Some(Path(Path { type_anchor: None, mod_path: ModPath { kind: Plain, segments: [Name(Text("D"))] }, generic_args: [None] })), target_type: Path(Path { type_anchor: None, mod_path: ModPath { kind: Plain, segments: [Name(Text("Response"))] }, generic_args: [Some(GenericArgs { args: [Type(Path(Path { type_anchor: None, mod_path: ModPath { kind: Plain, segments: [Name(Text("T"))] }, generic_args: [None] }))], has_self_type: false, bindings: [] })] }), is_negative: false, items: [Function(Idx::(1))], ast_id: FileAstId::(0) } + > Function { name: Name(Text("foo")), visibility: RawVisibilityId("pub(self)"), generic_params: GenericParamsId(4294967295), has_self_param: false, is_unsafe: false, params: [], is_varargs: false, ret_type: Tuple([]), ast_id: FileAstId::(1) } inner items: - for AST FileAstId::(2): - Function { name: Name(Text("end")), visibility: RawVisibilityId("pub(self)"), generic_params: GenericParamsId(1), has_self_param: false, is_unsafe: false, params: [], is_varargs: false, ret_type: Tuple([]), ast_id: FileAstId::(2) } + for AST FileAstId::(2): + Function { name: Name(Text("end")), visibility: RawVisibilityId("pub(self)"), generic_params: GenericParamsId(1), has_self_param: false, is_unsafe: false, params: [], is_varargs: false, ret_type: Tuple([]), ast_id: FileAstId::(2) } "#]], ); @@ -303,9 +303,9 @@ fn extern_attrs() { top-level items: #[Attrs { entries: Some([Attr { path: ModPath { kind: Plain, segments: [Name(Text("attr_a"))] }, input: None }, Attr { path: ModPath { kind: Plain, segments: [Name(Text("block_attr"))] }, input: None }]) }] - Function { name: Name(Text("a")), visibility: RawVisibilityId("pub(self)"), generic_params: GenericParamsId(4294967295), has_self_param: false, is_unsafe: true, params: [], is_varargs: false, ret_type: Tuple([]), ast_id: FileAstId::(1) } + Function { name: Name(Text("a")), visibility: RawVisibilityId("pub(self)"), generic_params: GenericParamsId(4294967295), has_self_param: false, is_unsafe: true, params: [], is_varargs: false, ret_type: Tuple([]), ast_id: FileAstId::(1) } #[Attrs { entries: Some([Attr { path: ModPath { kind: Plain, segments: [Name(Text("attr_b"))] }, input: None }, Attr { path: ModPath { kind: Plain, segments: [Name(Text("block_attr"))] }, input: None }]) }] - Function { name: Name(Text("b")), visibility: RawVisibilityId("pub(self)"), generic_params: GenericParamsId(4294967295), has_self_param: false, is_unsafe: true, params: [], is_varargs: false, ret_type: Tuple([]), ast_id: FileAstId::(2) } + Function { name: Name(Text("b")), visibility: RawVisibilityId("pub(self)"), generic_params: GenericParamsId(4294967295), has_self_param: false, is_unsafe: true, params: [], is_varargs: false, ret_type: Tuple([]), ast_id: FileAstId::(2) } "##]], ); } @@ -327,11 +327,11 @@ fn trait_attrs() { top-level items: #[Attrs { entries: Some([Attr { path: ModPath { kind: Plain, segments: [Name(Text("trait_attr"))] }, input: None }]) }] - Trait { name: Name(Text("Tr")), visibility: RawVisibilityId("pub(self)"), generic_params: GenericParamsId(0), auto: false, items: [Function(Idx::(0)), Function(Idx::(1))], ast_id: FileAstId::(0) } + Trait { name: Name(Text("Tr")), visibility: RawVisibilityId("pub(self)"), generic_params: GenericParamsId(0), auto: false, items: [Function(Idx::(0)), Function(Idx::(1))], ast_id: FileAstId::(0) } > #[Attrs { entries: Some([Attr { path: ModPath { kind: Plain, segments: [Name(Text("attr_a"))] }, input: None }]) }] - > Function { name: Name(Text("a")), visibility: RawVisibilityId("pub(self)"), generic_params: GenericParamsId(4294967295), has_self_param: false, is_unsafe: false, params: [], is_varargs: false, ret_type: Tuple([]), ast_id: FileAstId::(1) } + > Function { name: Name(Text("a")), visibility: RawVisibilityId("pub(self)"), generic_params: GenericParamsId(4294967295), has_self_param: false, is_unsafe: false, params: [], is_varargs: false, ret_type: Tuple([]), ast_id: FileAstId::(1) } > #[Attrs { entries: Some([Attr { path: ModPath { kind: Plain, segments: [Name(Text("attr_b"))] }, input: None }]) }] - > Function { name: Name(Text("b")), visibility: RawVisibilityId("pub(self)"), generic_params: GenericParamsId(4294967295), has_self_param: false, is_unsafe: false, params: [], is_varargs: false, ret_type: Tuple([]), ast_id: FileAstId::(2) } + > Function { name: Name(Text("b")), visibility: RawVisibilityId("pub(self)"), generic_params: GenericParamsId(4294967295), has_self_param: false, is_unsafe: false, params: [], is_varargs: false, ret_type: Tuple([]), ast_id: FileAstId::(2) } "##]], ); } @@ -353,11 +353,11 @@ fn impl_attrs() { top-level items: #[Attrs { entries: Some([Attr { path: ModPath { kind: Plain, segments: [Name(Text("impl_attr"))] }, input: None }]) }] - Impl { generic_params: GenericParamsId(4294967295), target_trait: None, target_type: Path(Path { type_anchor: None, mod_path: ModPath { kind: Plain, segments: [Name(Text("Ty"))] }, generic_args: [None] }), is_negative: false, items: [Function(Idx::(0)), Function(Idx::(1))], ast_id: FileAstId::(0) } + Impl { generic_params: GenericParamsId(4294967295), target_trait: None, target_type: Path(Path { type_anchor: None, mod_path: ModPath { kind: Plain, segments: [Name(Text("Ty"))] }, generic_args: [None] }), is_negative: false, items: [Function(Idx::(0)), Function(Idx::(1))], ast_id: FileAstId::(0) } > #[Attrs { entries: Some([Attr { path: ModPath { kind: Plain, segments: [Name(Text("attr_a"))] }, input: None }]) }] - > Function { name: Name(Text("a")), visibility: RawVisibilityId("pub(self)"), generic_params: GenericParamsId(4294967295), has_self_param: false, is_unsafe: false, params: [], is_varargs: false, ret_type: Tuple([]), ast_id: FileAstId::(1) } + > Function { name: Name(Text("a")), visibility: RawVisibilityId("pub(self)"), generic_params: GenericParamsId(4294967295), has_self_param: false, is_unsafe: false, params: [], is_varargs: false, ret_type: Tuple([]), ast_id: FileAstId::(1) } > #[Attrs { entries: Some([Attr { path: ModPath { kind: Plain, segments: [Name(Text("attr_b"))] }, input: None }]) }] - > Function { name: Name(Text("b")), visibility: RawVisibilityId("pub(self)"), generic_params: GenericParamsId(4294967295), has_self_param: false, is_unsafe: false, params: [], is_varargs: false, ret_type: Tuple([]), ast_id: FileAstId::(2) } + > Function { name: Name(Text("b")), visibility: RawVisibilityId("pub(self)"), generic_params: GenericParamsId(4294967295), has_self_param: false, is_unsafe: false, params: [], is_varargs: false, ret_type: Tuple([]), ast_id: FileAstId::(2) } "##]], ); } @@ -408,13 +408,13 @@ fn inner_item_attrs() { inner attrs: Attrs { entries: None } top-level items: - Function { name: Name(Text("foo")), visibility: RawVisibilityId("pub(self)"), generic_params: GenericParamsId(4294967295), has_self_param: false, is_unsafe: false, params: [], is_varargs: false, ret_type: Tuple([]), ast_id: FileAstId::(0) } + Function { name: Name(Text("foo")), visibility: RawVisibilityId("pub(self)"), generic_params: GenericParamsId(4294967295), has_self_param: false, is_unsafe: false, params: [], is_varargs: false, ret_type: Tuple([]), ast_id: FileAstId::(0) } inner items: - for AST FileAstId::(1): + for AST FileAstId::(1): #[Attrs { entries: Some([Attr { path: ModPath { kind: Plain, segments: [Name(Text("on_inner"))] }, input: None }]) }] - Function { name: Name(Text("inner")), visibility: RawVisibilityId("pub(self)"), generic_params: GenericParamsId(4294967295), has_self_param: false, is_unsafe: false, params: [], is_varargs: false, ret_type: Tuple([]), ast_id: FileAstId::(1) } + Function { name: Name(Text("inner")), visibility: RawVisibilityId("pub(self)"), generic_params: GenericParamsId(4294967295), has_self_param: false, is_unsafe: false, params: [], is_varargs: false, ret_type: Tuple([]), ast_id: FileAstId::(1) } "##]], ); @@ -432,8 +432,8 @@ fn assoc_item_macros() { inner attrs: Attrs { entries: None } top-level items: - Impl { generic_params: GenericParamsId(4294967295), target_trait: None, target_type: Path(Path { type_anchor: None, mod_path: ModPath { kind: Plain, segments: [Name(Text("S"))] }, generic_args: [None] }), is_negative: false, items: [MacroCall(Idx::(0))], ast_id: FileAstId::(0) } - > MacroCall { name: None, path: ModPath { kind: Plain, segments: [Name(Text("items"))] }, is_export: false, is_local_inner: false, is_builtin: false, ast_id: FileAstId::(1) } + Impl { generic_params: GenericParamsId(4294967295), target_trait: None, target_type: Path(Path { type_anchor: None, mod_path: ModPath { kind: Plain, segments: [Name(Text("S"))] }, generic_args: [None] }), is_negative: false, items: [MacroCall(Idx::(0))], ast_id: FileAstId::(0) } + > MacroCall { name: None, path: ModPath { kind: Plain, segments: [Name(Text("items"))] }, is_export: false, is_local_inner: false, is_builtin: false, ast_id: FileAstId::(1) } "#]], ); } diff --git a/crates/ra_hir_def/src/keys.rs b/crates/ra_hir_def/src/keys.rs index 441bdbead8..40a5d92b50 100644 --- a/crates/ra_hir_def/src/keys.rs +++ b/crates/ra_hir_def/src/keys.rs @@ -3,8 +3,8 @@ use std::marker::PhantomData; use hir_expand::{InFile, MacroDefId}; -use ra_syntax::{ast, AstNode, AstPtr}; use rustc_hash::FxHashMap; +use syntax::{ast, AstNode, AstPtr}; use crate::{ dyn_map::{DynMap, Policy}, diff --git a/crates/ra_hir_def/src/lang_item.rs b/crates/ra_hir_def/src/lang_item.rs index 3631499bf7..063eadccb2 100644 --- a/crates/ra_hir_def/src/lang_item.rs +++ b/crates/ra_hir_def/src/lang_item.rs @@ -4,8 +4,8 @@ //! features, such as Fn family of traits. use std::sync::Arc; -use ra_syntax::SmolStr; use rustc_hash::FxHashMap; +use syntax::SmolStr; use crate::{ db::DefDatabase, AdtId, AttrDefId, CrateId, EnumId, FunctionId, ImplId, ModuleDefId, ModuleId, diff --git a/crates/ra_hir_def/src/lib.rs b/crates/ra_hir_def/src/lib.rs index 8103937397..806ac731f5 100644 --- a/crates/ra_hir_def/src/lib.rs +++ b/crates/ra_hir_def/src/lib.rs @@ -58,7 +58,7 @@ use hir_expand::{ MacroCallId, MacroCallKind, MacroDefId, MacroDefKind, }; use ra_db::{impl_intern_key, salsa, CrateId}; -use ra_syntax::ast; +use syntax::ast; use crate::builtin_type::BuiltinType; use item_tree::{ diff --git a/crates/ra_hir_def/src/nameres.rs b/crates/ra_hir_def/src/nameres.rs index dc239997f9..d26c837cc8 100644 --- a/crates/ra_hir_def/src/nameres.rs +++ b/crates/ra_hir_def/src/nameres.rs @@ -59,9 +59,9 @@ use std::sync::Arc; use arena::Arena; use hir_expand::{diagnostics::DiagnosticSink, name::Name, InFile}; use ra_db::{CrateId, Edition, FileId}; -use ra_syntax::ast; use rustc_hash::FxHashMap; use stdx::format_to; +use syntax::ast; use crate::{ db::DefDatabase, @@ -288,7 +288,7 @@ pub enum ModuleSource { mod diagnostics { use hir_expand::diagnostics::DiagnosticSink; - use ra_syntax::{ast, AstPtr}; + use syntax::{ast, AstPtr}; use crate::{db::DefDatabase, diagnostics::UnresolvedModule, nameres::LocalModuleId, AstId}; diff --git a/crates/ra_hir_def/src/nameres/collector.rs b/crates/ra_hir_def/src/nameres/collector.rs index 52ee401d9e..f7270ec91c 100644 --- a/crates/ra_hir_def/src/nameres/collector.rs +++ b/crates/ra_hir_def/src/nameres/collector.rs @@ -13,8 +13,8 @@ use hir_expand::{ }; use ra_cfg::CfgOptions; use ra_db::{CrateId, FileId, ProcMacroId}; -use ra_syntax::ast; use rustc_hash::FxHashMap; +use syntax::ast; use test_utils::mark; use crate::{ diff --git a/crates/ra_hir_def/src/nameres/mod_resolution.rs b/crates/ra_hir_def/src/nameres/mod_resolution.rs index 9539616325..316245d6ba 100644 --- a/crates/ra_hir_def/src/nameres/mod_resolution.rs +++ b/crates/ra_hir_def/src/nameres/mod_resolution.rs @@ -1,7 +1,7 @@ //! This module resolves `mod foo;` declaration to file. use hir_expand::name::Name; use ra_db::FileId; -use ra_syntax::SmolStr; +use syntax::SmolStr; use crate::{db::DefDatabase, HirFileId}; diff --git a/crates/ra_hir_def/src/nameres/tests/mod_resolution.rs b/crates/ra_hir_def/src/nameres/tests/mod_resolution.rs index ae58948c42..1f619787e1 100644 --- a/crates/ra_hir_def/src/nameres/tests/mod_resolution.rs +++ b/crates/ra_hir_def/src/nameres/tests/mod_resolution.rs @@ -698,7 +698,7 @@ fn unresolved_module_diagnostics() { ), ), ), - value: FileAstId::(1), + value: FileAstId::(1), }, candidate: "bar.rs", }, diff --git a/crates/ra_hir_def/src/path.rs b/crates/ra_hir_def/src/path.rs index cc1726e9e0..88be07c8a7 100644 --- a/crates/ra_hir_def/src/path.rs +++ b/crates/ra_hir_def/src/path.rs @@ -13,7 +13,7 @@ use hir_expand::{ name::{AsName, Name}, }; use ra_db::CrateId; -use ra_syntax::ast; +use syntax::ast; use crate::{ type_ref::{TypeBound, TypeRef}, diff --git a/crates/ra_hir_def/src/path/lower.rs b/crates/ra_hir_def/src/path/lower.rs index d09fc66e4d..07b9723ce0 100644 --- a/crates/ra_hir_def/src/path/lower.rs +++ b/crates/ra_hir_def/src/path/lower.rs @@ -9,7 +9,7 @@ use hir_expand::{ hygiene::Hygiene, name::{name, AsName}, }; -use ra_syntax::ast::{self, AstNode, TypeBoundsOwner}; +use syntax::ast::{self, AstNode, TypeBoundsOwner}; use super::AssociatedTypeBinding; use crate::{ diff --git a/crates/ra_hir_def/src/path/lower/lower_use.rs b/crates/ra_hir_def/src/path/lower/lower_use.rs index 794be45e89..53cecb05fb 100644 --- a/crates/ra_hir_def/src/path/lower/lower_use.rs +++ b/crates/ra_hir_def/src/path/lower/lower_use.rs @@ -5,7 +5,7 @@ use std::iter; use either::Either; use hir_expand::{hygiene::Hygiene, name::AsName}; -use ra_syntax::ast::{self, NameOwner}; +use syntax::ast::{self, NameOwner}; use test_utils::mark; use crate::path::{ImportAlias, ModPath, PathKind}; diff --git a/crates/ra_hir_def/src/type_ref.rs b/crates/ra_hir_def/src/type_ref.rs index 6f7884ffe5..1a78c1444c 100644 --- a/crates/ra_hir_def/src/type_ref.rs +++ b/crates/ra_hir_def/src/type_ref.rs @@ -1,6 +1,6 @@ //! HIR for references to types. Paths in these are not yet resolved. They can //! be directly created from an ast::TypeRef, without further queries. -use ra_syntax::ast::{self}; +use syntax::ast::{self}; use crate::{body::LowerCtx, path::Path}; diff --git a/crates/ra_hir_def/src/visibility.rs b/crates/ra_hir_def/src/visibility.rs index 1abffb4c3c..e6e0853a30 100644 --- a/crates/ra_hir_def/src/visibility.rs +++ b/crates/ra_hir_def/src/visibility.rs @@ -1,7 +1,7 @@ //! Defines hir-level representation of visibility (e.g. `pub` and `pub(crate)`). use hir_expand::{hygiene::Hygiene, InFile}; -use ra_syntax::ast; +use syntax::ast; use crate::{ db::DefDatabase, diff --git a/crates/ra_hir_expand/Cargo.toml b/crates/ra_hir_expand/Cargo.toml index 052330fdef..153a70bdf5 100644 --- a/crates/ra_hir_expand/Cargo.toml +++ b/crates/ra_hir_expand/Cargo.toml @@ -15,7 +15,7 @@ rustc-hash = "1.0.0" arena = { path = "../arena" } ra_db = { path = "../ra_db" } -ra_syntax = { path = "../ra_syntax" } +syntax = { path = "../syntax" } parser = { path = "../parser" } profile = { path = "../profile" } tt = { path = "../tt" } diff --git a/crates/ra_hir_expand/src/ast_id_map.rs b/crates/ra_hir_expand/src/ast_id_map.rs index 703a85b0f7..f63629b305 100644 --- a/crates/ra_hir_expand/src/ast_id_map.rs +++ b/crates/ra_hir_expand/src/ast_id_map.rs @@ -13,7 +13,7 @@ use std::{ }; use arena::{Arena, Idx}; -use ra_syntax::{ast, AstNode, AstPtr, SyntaxNode, SyntaxNodePtr}; +use syntax::{ast, AstNode, AstPtr, SyntaxNode, SyntaxNodePtr}; /// `AstId` points to an AST node in a specific file. pub struct FileAstId { diff --git a/crates/ra_hir_expand/src/builtin_derive.rs b/crates/ra_hir_expand/src/builtin_derive.rs index 95e6977f24..2d2f8bcb84 100644 --- a/crates/ra_hir_expand/src/builtin_derive.rs +++ b/crates/ra_hir_expand/src/builtin_derive.rs @@ -3,7 +3,7 @@ use log::debug; use parser::FragmentKind; -use ra_syntax::{ +use syntax::{ ast::{self, AstNode, GenericParamsOwner, ModuleItemOwner, NameOwner}, match_ast, }; diff --git a/crates/ra_hir_expand/src/builtin_macro.rs b/crates/ra_hir_expand/src/builtin_macro.rs index 24dc0b4e7f..ae4c843820 100644 --- a/crates/ra_hir_expand/src/builtin_macro.rs +++ b/crates/ra_hir_expand/src/builtin_macro.rs @@ -8,7 +8,7 @@ use either::Either; use mbe::parse_to_token_tree; use parser::FragmentKind; use ra_db::FileId; -use ra_syntax::ast::{self, AstToken, HasStringValue}; +use syntax::ast::{self, AstToken, HasStringValue}; macro_rules! register_builtin { ( LAZY: $(($name:ident, $kind: ident) => $expand:ident),* , EAGER: $(($e_name:ident, $e_kind: ident) => $e_expand:ident),* ) => { @@ -427,8 +427,8 @@ mod tests { MacroCallLoc, }; use ra_db::{fixture::WithFixture, SourceDatabase}; - use ra_syntax::ast::NameOwner; use std::sync::Arc; + use syntax::ast::NameOwner; fn expand_builtin_macro(ra_fixture: &str) -> String { let (db, file_id) = TestDB::with_single_file(&ra_fixture); diff --git a/crates/ra_hir_expand/src/db.rs b/crates/ra_hir_expand/src/db.rs index d83c391a90..c275f6b017 100644 --- a/crates/ra_hir_expand/src/db.rs +++ b/crates/ra_hir_expand/src/db.rs @@ -5,7 +5,7 @@ use std::sync::Arc; use mbe::{ExpandResult, MacroRules}; use parser::FragmentKind; use ra_db::{salsa, SourceDatabase}; -use ra_syntax::{algo::diff, AstNode, GreenNode, Parse, SyntaxKind::*, SyntaxNode}; +use syntax::{algo::diff, AstNode, GreenNode, Parse, SyntaxKind::*, SyntaxNode}; use crate::{ ast_id_map::AstIdMap, BuiltinDeriveExpander, BuiltinFnLikeExpander, EagerCallLoc, EagerMacroId, @@ -92,9 +92,9 @@ pub trait AstDatabase: SourceDatabase { pub fn expand_hypothetical( db: &dyn AstDatabase, actual_macro_call: MacroCallId, - hypothetical_args: &ra_syntax::ast::TokenTree, - token_to_map: ra_syntax::SyntaxToken, -) -> Option<(SyntaxNode, ra_syntax::SyntaxToken)> { + hypothetical_args: &syntax::ast::TokenTree, + token_to_map: syntax::SyntaxToken, +) -> Option<(SyntaxNode, syntax::SyntaxToken)> { let macro_file = MacroFile { macro_call_id: actual_macro_call }; let (tt, tmap_1) = mbe::syntax_node_to_token_tree(hypothetical_args.syntax()).unwrap(); let range = @@ -105,7 +105,7 @@ pub fn expand_hypothetical( parse_macro_with_arg(db, macro_file, Some(std::sync::Arc::new((tt, tmap_1))))?; let token_id = macro_def.0.map_id_down(token_id); let range = tmap_2.range_by_token(token_id)?.by_kind(token_to_map.kind())?; - let token = ra_syntax::algo::find_covering_element(&node.syntax_node(), range).into_token()?; + let token = syntax::algo::find_covering_element(&node.syntax_node(), range).into_token()?; Some((node.syntax_node(), token)) } diff --git a/crates/ra_hir_expand/src/diagnostics.rs b/crates/ra_hir_expand/src/diagnostics.rs index b138500e73..59d35debe3 100644 --- a/crates/ra_hir_expand/src/diagnostics.rs +++ b/crates/ra_hir_expand/src/diagnostics.rs @@ -16,7 +16,7 @@ use std::{any::Any, fmt}; -use ra_syntax::SyntaxNodePtr; +use syntax::SyntaxNodePtr; use crate::InFile; diff --git a/crates/ra_hir_expand/src/eager.rs b/crates/ra_hir_expand/src/eager.rs index dc83044ea4..bd3409f973 100644 --- a/crates/ra_hir_expand/src/eager.rs +++ b/crates/ra_hir_expand/src/eager.rs @@ -27,8 +27,8 @@ use crate::{ use parser::FragmentKind; use ra_db::CrateId; -use ra_syntax::{algo::SyntaxRewriter, SyntaxNode}; use std::sync::Arc; +use syntax::{algo::SyntaxRewriter, SyntaxNode}; pub fn expand_eager_macro( db: &dyn AstDatabase, diff --git a/crates/ra_hir_expand/src/hygiene.rs b/crates/ra_hir_expand/src/hygiene.rs index aefe47bd32..23b5eac270 100644 --- a/crates/ra_hir_expand/src/hygiene.rs +++ b/crates/ra_hir_expand/src/hygiene.rs @@ -4,7 +4,7 @@ //! this moment, this is horribly incomplete and handles only `$crate`. use either::Either; use ra_db::CrateId; -use ra_syntax::ast; +use syntax::ast; use crate::{ db::AstDatabase, diff --git a/crates/ra_hir_expand/src/lib.rs b/crates/ra_hir_expand/src/lib.rs index 38f0ffff81..af0cc445f7 100644 --- a/crates/ra_hir_expand/src/lib.rs +++ b/crates/ra_hir_expand/src/lib.rs @@ -19,7 +19,7 @@ use std::hash::Hash; use std::sync::Arc; use ra_db::{impl_intern_key, salsa, CrateId, FileId}; -use ra_syntax::{ +use syntax::{ algo, ast::{self, AstNode}, SyntaxNode, SyntaxToken, TextSize, diff --git a/crates/ra_hir_expand/src/name.rs b/crates/ra_hir_expand/src/name.rs index 969a2e5b83..4dcaff0885 100644 --- a/crates/ra_hir_expand/src/name.rs +++ b/crates/ra_hir_expand/src/name.rs @@ -2,7 +2,7 @@ use std::fmt; -use ra_syntax::{ast, SmolStr}; +use syntax::{ast, SmolStr}; /// `Name` is a wrapper around string, which is used in hir for both references /// and declarations. In theory, names should also carry hygiene info, but we are @@ -37,8 +37,8 @@ impl Name { Name(Repr::TupleField(idx)) } - pub fn new_lifetime(lt: &ra_syntax::SyntaxToken) -> Name { - assert!(lt.kind() == ra_syntax::SyntaxKind::LIFETIME); + pub fn new_lifetime(lt: &syntax::SyntaxToken) -> Name { + assert!(lt.kind() == syntax::SyntaxKind::LIFETIME); Name(Repr::Text(lt.text().clone())) } diff --git a/crates/ra_hir_ty/Cargo.toml b/crates/ra_hir_ty/Cargo.toml index 380d5e6015..6156e4a854 100644 --- a/crates/ra_hir_ty/Cargo.toml +++ b/crates/ra_hir_ty/Cargo.toml @@ -23,7 +23,7 @@ hir_expand = { path = "../ra_hir_expand", package = "ra_hir_expand" } arena = { path = "../arena" } ra_db = { path = "../ra_db" } profile = { path = "../profile" } -ra_syntax = { path = "../ra_syntax" } +syntax = { path = "../syntax" } test_utils = { path = "../test_utils" } scoped-tls = "1" diff --git a/crates/ra_hir_ty/src/diagnostics.rs b/crates/ra_hir_ty/src/diagnostics.rs index 55c02c1feb..bf35d2d0ee 100644 --- a/crates/ra_hir_ty/src/diagnostics.rs +++ b/crates/ra_hir_ty/src/diagnostics.rs @@ -8,8 +8,8 @@ use std::any::Any; use hir_def::DefWithBodyId; use hir_expand::diagnostics::{Diagnostic, DiagnosticSink}; use hir_expand::{name::Name, HirFileId, InFile}; -use ra_syntax::{ast, AstPtr, SyntaxNodePtr}; use stdx::format_to; +use syntax::{ast, AstPtr, SyntaxNodePtr}; use crate::db::HirDatabase; @@ -214,8 +214,8 @@ mod tests { diagnostics::{Diagnostic, DiagnosticSinkBuilder}, }; use ra_db::{fixture::WithFixture, FileId, SourceDatabase, SourceDatabaseExt}; - use ra_syntax::{TextRange, TextSize}; use rustc_hash::FxHashMap; + use syntax::{TextRange, TextSize}; use crate::{diagnostics::validate_body, test_db::TestDB}; diff --git a/crates/ra_hir_ty/src/diagnostics/expr.rs b/crates/ra_hir_ty/src/diagnostics/expr.rs index 51adcecafa..fb76e2e4ec 100644 --- a/crates/ra_hir_ty/src/diagnostics/expr.rs +++ b/crates/ra_hir_ty/src/diagnostics/expr.rs @@ -4,8 +4,8 @@ use std::sync::Arc; use hir_def::{path::path, resolver::HasResolver, AdtId, DefWithBodyId}; use hir_expand::diagnostics::DiagnosticSink; -use ra_syntax::{ast, AstPtr}; use rustc_hash::FxHashSet; +use syntax::{ast, AstPtr}; use crate::{ db::HirDatabase, diff --git a/crates/ra_hir_ty/src/infer.rs b/crates/ra_hir_ty/src/infer.rs index 784ae1c3cc..03b00b101c 100644 --- a/crates/ra_hir_ty/src/infer.rs +++ b/crates/ra_hir_ty/src/infer.rs @@ -31,9 +31,9 @@ use hir_def::{ TypeAliasId, VariantId, }; use hir_expand::{diagnostics::DiagnosticSink, name::name}; -use ra_syntax::SmolStr; use rustc_hash::FxHashMap; use stdx::impl_from; +use syntax::SmolStr; use super::{ primitive::{FloatTy, IntTy}, diff --git a/crates/ra_hir_ty/src/infer/expr.rs b/crates/ra_hir_ty/src/infer/expr.rs index 731b062c2d..a2f849d021 100644 --- a/crates/ra_hir_ty/src/infer/expr.rs +++ b/crates/ra_hir_ty/src/infer/expr.rs @@ -11,7 +11,7 @@ use hir_def::{ AdtId, AssocContainerId, FieldId, Lookup, }; use hir_expand::name::{name, Name}; -use ra_syntax::ast::RangeOp; +use syntax::ast::RangeOp; use crate::{ autoderef, method_resolution, op, diff --git a/crates/ra_hir_ty/src/test_db.rs b/crates/ra_hir_ty/src/test_db.rs index a1714ff0fc..0e2a69eec2 100644 --- a/crates/ra_hir_ty/src/test_db.rs +++ b/crates/ra_hir_ty/src/test_db.rs @@ -8,8 +8,8 @@ use std::{ use hir_def::{db::DefDatabase, ModuleId}; use hir_expand::db::AstDatabase; use ra_db::{salsa, CrateId, FileId, FileLoader, FileLoaderDelegate, SourceDatabase, Upcast}; -use ra_syntax::TextRange; use rustc_hash::{FxHashMap, FxHashSet}; +use syntax::TextRange; use test_utils::extract_annotations; #[salsa::database( diff --git a/crates/ra_hir_ty/src/tests.rs b/crates/ra_hir_ty/src/tests.rs index 016e689fff..5f6f8869ae 100644 --- a/crates/ra_hir_ty/src/tests.rs +++ b/crates/ra_hir_ty/src/tests.rs @@ -22,12 +22,12 @@ use hir_def::{ }; use hir_expand::{db::AstDatabase, InFile}; use ra_db::{fixture::WithFixture, FileRange, SourceDatabase, SourceDatabaseExt}; -use ra_syntax::{ +use stdx::format_to; +use syntax::{ algo, ast::{self, AstNode}, SyntaxNode, }; -use stdx::format_to; use crate::{ db::HirDatabase, display::HirDisplay, infer::TypeMismatch, test_db::TestDB, InferenceResult, Ty, diff --git a/crates/ra_hir_ty/src/tests/macros.rs b/crates/ra_hir_ty/src/tests/macros.rs index 24c53eb022..d887c7a799 100644 --- a/crates/ra_hir_ty/src/tests/macros.rs +++ b/crates/ra_hir_ty/src/tests/macros.rs @@ -543,7 +543,7 @@ fn bar() -> u32 {0} #[test] #[ignore] fn include_accidentally_quadratic() { - let file = project_dir().join("crates/ra_syntax/test_data/accidentally_quadratic"); + let file = project_dir().join("crates/syntax/test_data/accidentally_quadratic"); let big_file = fs::read_to_string(file).unwrap(); let big_file = vec![big_file; 10].join("\n"); diff --git a/crates/ra_ide/Cargo.toml b/crates/ra_ide/Cargo.toml index 84c25f0b8a..8e0fa59178 100644 --- a/crates/ra_ide/Cargo.toml +++ b/crates/ra_ide/Cargo.toml @@ -21,7 +21,7 @@ oorandom = "11.1.2" stdx = { path = "../stdx" } -ra_syntax = { path = "../ra_syntax" } +syntax = { path = "../syntax" } text_edit = { path = "../text_edit" } ra_db = { path = "../ra_db" } ra_ide_db = { path = "../ra_ide_db" } diff --git a/crates/ra_ide/src/call_hierarchy.rs b/crates/ra_ide/src/call_hierarchy.rs index 1fcaf4a32b..116e6bf83e 100644 --- a/crates/ra_ide/src/call_hierarchy.rs +++ b/crates/ra_ide/src/call_hierarchy.rs @@ -4,7 +4,7 @@ use indexmap::IndexMap; use hir::Semantics; use ra_ide_db::RootDatabase; -use ra_syntax::{ast, match_ast, AstNode, TextRange}; +use syntax::{ast, match_ast, AstNode, TextRange}; use crate::{ call_info::FnCallNode, display::ToNav, goto_definition, references, FilePosition, diff --git a/crates/ra_ide/src/call_info.rs b/crates/ra_ide/src/call_info.rs index ff602202f2..703cbc6b43 100644 --- a/crates/ra_ide/src/call_info.rs +++ b/crates/ra_ide/src/call_info.rs @@ -2,11 +2,11 @@ use either::Either; use hir::{Docs, HirDisplay, Semantics, Type}; use ra_ide_db::RootDatabase; -use ra_syntax::{ +use stdx::format_to; +use syntax::{ ast::{self, ArgListOwner}, match_ast, AstNode, SyntaxNode, SyntaxToken, TextRange, TextSize, }; -use stdx::format_to; use test_utils::mark; use crate::FilePosition; diff --git a/crates/ra_ide/src/completion/complete_attribute.rs b/crates/ra_ide/src/completion/complete_attribute.rs index 2faaae9746..603d935deb 100644 --- a/crates/ra_ide/src/completion/complete_attribute.rs +++ b/crates/ra_ide/src/completion/complete_attribute.rs @@ -3,8 +3,8 @@ //! This module uses a bit of static metadata to provide completions //! for built-in attributes. -use ra_syntax::{ast, AstNode, SyntaxKind}; use rustc_hash::FxHashSet; +use syntax::{ast, AstNode, SyntaxKind}; use crate::completion::{ completion_context::CompletionContext, diff --git a/crates/ra_ide/src/completion/complete_fn_param.rs b/crates/ra_ide/src/completion/complete_fn_param.rs index 4063342572..7c63ce58f8 100644 --- a/crates/ra_ide/src/completion/complete_fn_param.rs +++ b/crates/ra_ide/src/completion/complete_fn_param.rs @@ -1,10 +1,10 @@ //! See `complete_fn_param`. -use ra_syntax::{ +use rustc_hash::FxHashMap; +use syntax::{ ast::{self, ModuleItemOwner}, match_ast, AstNode, }; -use rustc_hash::FxHashMap; use crate::completion::{CompletionContext, CompletionItem, CompletionKind, Completions}; diff --git a/crates/ra_ide/src/completion/complete_keyword.rs b/crates/ra_ide/src/completion/complete_keyword.rs index b62064797b..a80708935e 100644 --- a/crates/ra_ide/src/completion/complete_keyword.rs +++ b/crates/ra_ide/src/completion/complete_keyword.rs @@ -1,6 +1,6 @@ //! FIXME: write short doc here -use ra_syntax::{ast, SyntaxKind}; +use syntax::{ast, SyntaxKind}; use test_utils::mark; use crate::completion::{ diff --git a/crates/ra_ide/src/completion/complete_postfix.rs b/crates/ra_ide/src/completion/complete_postfix.rs index 42087da8dc..05e15d4647 100644 --- a/crates/ra_ide/src/completion/complete_postfix.rs +++ b/crates/ra_ide/src/completion/complete_postfix.rs @@ -1,6 +1,6 @@ //! FIXME: write short doc here use ra_assists::utils::TryEnum; -use ra_syntax::{ +use syntax::{ ast::{self, AstNode}, TextRange, TextSize, }; diff --git a/crates/ra_ide/src/completion/complete_qualified_path.rs b/crates/ra_ide/src/completion/complete_qualified_path.rs index b08f5b9b45..cb7dd23c18 100644 --- a/crates/ra_ide/src/completion/complete_qualified_path.rs +++ b/crates/ra_ide/src/completion/complete_qualified_path.rs @@ -1,8 +1,8 @@ //! Completion of paths, i.e. `some::prefix::<|>`. use hir::{Adt, HasVisibility, PathResolution, ScopeDef}; -use ra_syntax::AstNode; use rustc_hash::FxHashSet; +use syntax::AstNode; use test_utils::mark; use crate::completion::{CompletionContext, Completions}; diff --git a/crates/ra_ide/src/completion/complete_trait_impl.rs b/crates/ra_ide/src/completion/complete_trait_impl.rs index b397baf107..d7edd92cf0 100644 --- a/crates/ra_ide/src/completion/complete_trait_impl.rs +++ b/crates/ra_ide/src/completion/complete_trait_impl.rs @@ -33,7 +33,7 @@ use hir::{self, Docs, HasSource}; use ra_assists::utils::get_missing_assoc_items; -use ra_syntax::{ +use syntax::{ ast::{self, edit, Impl}, AstNode, SyntaxKind, SyntaxNode, TextRange, T, }; diff --git a/crates/ra_ide/src/completion/complete_unqualified_path.rs b/crates/ra_ide/src/completion/complete_unqualified_path.rs index bd9551f358..824227f310 100644 --- a/crates/ra_ide/src/completion/complete_unqualified_path.rs +++ b/crates/ra_ide/src/completion/complete_unqualified_path.rs @@ -1,7 +1,7 @@ //! Completion of names from the current scope, e.g. locals and imported items. use hir::{Adt, ModuleDef, ScopeDef, Type}; -use ra_syntax::AstNode; +use syntax::AstNode; use test_utils::mark; use crate::completion::{CompletionContext, Completions}; diff --git a/crates/ra_ide/src/completion/completion_context.rs b/crates/ra_ide/src/completion/completion_context.rs index 0cb57fb1b4..b5efb6cd67 100644 --- a/crates/ra_ide/src/completion/completion_context.rs +++ b/crates/ra_ide/src/completion/completion_context.rs @@ -3,7 +3,7 @@ use hir::{Semantics, SemanticsScope, Type}; use ra_db::SourceDatabase; use ra_ide_db::RootDatabase; -use ra_syntax::{ +use syntax::{ algo::{find_covering_element, find_node_at_offset}, ast, match_ast, AstNode, NodeOrToken, SyntaxKind::*, diff --git a/crates/ra_ide/src/completion/completion_item.rs b/crates/ra_ide/src/completion/completion_item.rs index 1c0684f4ed..9377cdc577 100644 --- a/crates/ra_ide/src/completion/completion_item.rs +++ b/crates/ra_ide/src/completion/completion_item.rs @@ -3,7 +3,7 @@ use std::fmt; use hir::Documentation; -use ra_syntax::TextRange; +use syntax::TextRange; use text_edit::TextEdit; use crate::completion::completion_config::SnippetCap; diff --git a/crates/ra_ide/src/completion/patterns.rs b/crates/ra_ide/src/completion/patterns.rs index 7c4feff6d1..ffc97c076a 100644 --- a/crates/ra_ide/src/completion/patterns.rs +++ b/crates/ra_ide/src/completion/patterns.rs @@ -1,6 +1,6 @@ //! Patterns telling us certain facts about current syntax element, they are used in completion context -use ra_syntax::{ +use syntax::{ algo::non_trivia_sibling, ast::{self, LoopBodyOwner}, match_ast, AstNode, Direction, NodeOrToken, SyntaxElement, diff --git a/crates/ra_ide/src/completion/presentation.rs b/crates/ra_ide/src/completion/presentation.rs index 59f1b14246..e1b1ea4ce4 100644 --- a/crates/ra_ide/src/completion/presentation.rs +++ b/crates/ra_ide/src/completion/presentation.rs @@ -3,7 +3,7 @@ use hir::{Docs, HasAttrs, HasSource, HirDisplay, ModPath, ScopeDef, StructKind, Type}; use itertools::Itertools; -use ra_syntax::ast::NameOwner; +use syntax::ast::NameOwner; use test_utils::mark; use crate::{ diff --git a/crates/ra_ide/src/completion/test_utils.rs b/crates/ra_ide/src/completion/test_utils.rs index 9191777455..1452d7e9e5 100644 --- a/crates/ra_ide/src/completion/test_utils.rs +++ b/crates/ra_ide/src/completion/test_utils.rs @@ -2,8 +2,8 @@ use hir::Semantics; use itertools::Itertools; -use ra_syntax::{AstNode, NodeOrToken, SyntaxElement}; use stdx::{format_to, trim_indent}; +use syntax::{AstNode, NodeOrToken, SyntaxElement}; use test_utils::assert_eq_text; use crate::{ diff --git a/crates/ra_ide/src/diagnostics.rs b/crates/ra_ide/src/diagnostics.rs index 54810d5bbf..18def6115d 100644 --- a/crates/ra_ide/src/diagnostics.rs +++ b/crates/ra_ide/src/diagnostics.rs @@ -10,7 +10,7 @@ use hir::{diagnostics::DiagnosticSinkBuilder, Semantics}; use itertools::Itertools; use ra_db::SourceDatabase; use ra_ide_db::RootDatabase; -use ra_syntax::{ +use syntax::{ ast::{self, AstNode}, SyntaxNode, TextRange, T, }; diff --git a/crates/ra_ide/src/diagnostics/diagnostics_with_fix.rs b/crates/ra_ide/src/diagnostics/diagnostics_with_fix.rs index 8fb25de6c1..efcd631b31 100644 --- a/crates/ra_ide/src/diagnostics/diagnostics_with_fix.rs +++ b/crates/ra_ide/src/diagnostics/diagnostics_with_fix.rs @@ -12,7 +12,7 @@ use ra_ide_db::{ source_change::{FileSystemEdit, SourceFileEdit}, RootDatabase, }; -use ra_syntax::{algo, ast, AstNode}; +use syntax::{algo, ast, AstNode}; use text_edit::TextEdit; /// A [Diagnostic] that potentially has a fix available. diff --git a/crates/ra_ide/src/display.rs b/crates/ra_ide/src/display.rs index fd42aa4352..41b5bdc490 100644 --- a/crates/ra_ide/src/display.rs +++ b/crates/ra_ide/src/display.rs @@ -4,7 +4,7 @@ mod navigation_target; mod short_label; -use ra_syntax::{ +use syntax::{ ast::{self, AstNode, AttrsOwner, GenericParamsOwner, NameOwner}, SyntaxKind::{ATTR, COMMENT}, }; diff --git a/crates/ra_ide/src/display/navigation_target.rs b/crates/ra_ide/src/display/navigation_target.rs index fdbf75abd9..683088a748 100644 --- a/crates/ra_ide/src/display/navigation_target.rs +++ b/crates/ra_ide/src/display/navigation_target.rs @@ -4,7 +4,7 @@ use either::Either; use hir::{original_range, AssocItem, FieldSource, HasSource, InFile, ModuleSource}; use ra_db::{FileId, SourceDatabase}; use ra_ide_db::{defs::Definition, RootDatabase}; -use ra_syntax::{ +use syntax::{ ast::{self, DocCommentsOwner, NameOwner}, match_ast, AstNode, SmolStr, SyntaxKind::{self, IDENT_PAT, TYPE_PARAM}, diff --git a/crates/ra_ide/src/display/short_label.rs b/crates/ra_ide/src/display/short_label.rs index 010c34705c..ea49d9f970 100644 --- a/crates/ra_ide/src/display/short_label.rs +++ b/crates/ra_ide/src/display/short_label.rs @@ -1,7 +1,7 @@ //! FIXME: write short doc here -use ra_syntax::ast::{self, AstNode, NameOwner, VisibilityOwner}; use stdx::format_to; +use syntax::ast::{self, AstNode, NameOwner, VisibilityOwner}; pub(crate) trait ShortLabel { fn short_label(&self) -> Option; diff --git a/crates/ra_ide/src/expand_macro.rs b/crates/ra_ide/src/expand_macro.rs index 043515f541..c25e068d60 100644 --- a/crates/ra_ide/src/expand_macro.rs +++ b/crates/ra_ide/src/expand_macro.rs @@ -1,6 +1,6 @@ use hir::Semantics; use ra_ide_db::RootDatabase; -use ra_syntax::{ +use syntax::{ algo::{find_node_at_offset, SyntaxRewriter}, ast, AstNode, NodeOrToken, SyntaxKind, SyntaxKind::*, diff --git a/crates/ra_ide/src/extend_selection.rs b/crates/ra_ide/src/extend_selection.rs index 7230a0ff9e..f30df2bff4 100644 --- a/crates/ra_ide/src/extend_selection.rs +++ b/crates/ra_ide/src/extend_selection.rs @@ -2,7 +2,7 @@ use std::iter::successors; use hir::Semantics; use ra_ide_db::RootDatabase; -use ra_syntax::{ +use syntax::{ algo::{self, find_covering_element, skip_trivia_token}, ast::{self, AstNode, AstToken}, Direction, NodeOrToken, diff --git a/crates/ra_ide/src/file_structure.rs b/crates/ra_ide/src/file_structure.rs index 87cab45037..c90247ba65 100644 --- a/crates/ra_ide/src/file_structure.rs +++ b/crates/ra_ide/src/file_structure.rs @@ -1,4 +1,4 @@ -use ra_syntax::{ +use syntax::{ ast::{self, AttrsOwner, GenericParamsOwner, NameOwner}, match_ast, AstNode, SourceFile, SyntaxKind, SyntaxNode, TextRange, WalkEvent, }; diff --git a/crates/ra_ide/src/folding_ranges.rs b/crates/ra_ide/src/folding_ranges.rs index 0fbc9babd5..7523aec557 100644 --- a/crates/ra_ide/src/folding_ranges.rs +++ b/crates/ra_ide/src/folding_ranges.rs @@ -2,7 +2,7 @@ use rustc_hash::FxHashSet; -use ra_syntax::{ +use syntax::{ ast::{self, AstNode, AstToken, VisibilityOwner}, Direction, NodeOrToken, SourceFile, SyntaxKind::{self, *}, diff --git a/crates/ra_ide/src/goto_definition.rs b/crates/ra_ide/src/goto_definition.rs index 45389fd23f..77f374ea2a 100644 --- a/crates/ra_ide/src/goto_definition.rs +++ b/crates/ra_ide/src/goto_definition.rs @@ -3,7 +3,7 @@ use ra_ide_db::{ defs::{classify_name, classify_name_ref}, symbol_index, RootDatabase, }; -use ra_syntax::{ +use syntax::{ ast::{self}, match_ast, AstNode, SyntaxKind::*, @@ -101,7 +101,7 @@ pub(crate) fn reference_definition( #[cfg(test)] mod tests { use ra_db::FileRange; - use ra_syntax::{TextRange, TextSize}; + use syntax::{TextRange, TextSize}; use crate::mock_analysis::MockAnalysis; diff --git a/crates/ra_ide/src/goto_implementation.rs b/crates/ra_ide/src/goto_implementation.rs index 9912b71421..91a8c1dd17 100644 --- a/crates/ra_ide/src/goto_implementation.rs +++ b/crates/ra_ide/src/goto_implementation.rs @@ -1,6 +1,6 @@ use hir::{Crate, ImplDef, Semantics}; use ra_ide_db::RootDatabase; -use ra_syntax::{algo::find_node_at_offset, ast, AstNode}; +use syntax::{algo::find_node_at_offset, ast, AstNode}; use crate::{display::ToNav, FilePosition, NavigationTarget, RangeInfo}; diff --git a/crates/ra_ide/src/goto_type_definition.rs b/crates/ra_ide/src/goto_type_definition.rs index 8f52feea6e..3ec2ee59de 100644 --- a/crates/ra_ide/src/goto_type_definition.rs +++ b/crates/ra_ide/src/goto_type_definition.rs @@ -1,5 +1,5 @@ use ra_ide_db::RootDatabase; -use ra_syntax::{ast, match_ast, AstNode, SyntaxKind::*, SyntaxToken, TokenAtOffset, T}; +use syntax::{ast, match_ast, AstNode, SyntaxKind::*, SyntaxToken, TokenAtOffset, T}; use crate::{display::ToNav, FilePosition, NavigationTarget, RangeInfo}; diff --git a/crates/ra_ide/src/hover.rs b/crates/ra_ide/src/hover.rs index f66f62bfb5..37e68ff7a5 100644 --- a/crates/ra_ide/src/hover.rs +++ b/crates/ra_ide/src/hover.rs @@ -8,8 +8,8 @@ use ra_ide_db::{ defs::{classify_name, classify_name_ref, Definition}, RootDatabase, }; -use ra_syntax::{ast, match_ast, AstNode, SyntaxKind::*, SyntaxToken, TokenAtOffset, T}; use stdx::format_to; +use syntax::{ast, match_ast, AstNode, SyntaxKind::*, SyntaxToken, TokenAtOffset, T}; use test_utils::mark; use crate::{ diff --git a/crates/ra_ide/src/inlay_hints.rs b/crates/ra_ide/src/inlay_hints.rs index 920b04e8d7..46ddc528e5 100644 --- a/crates/ra_ide/src/inlay_hints.rs +++ b/crates/ra_ide/src/inlay_hints.rs @@ -1,10 +1,10 @@ use hir::{Adt, Callable, HirDisplay, Semantics, Type}; use ra_ide_db::RootDatabase; -use ra_syntax::{ +use stdx::to_lower_snake_case; +use syntax::{ ast::{self, ArgListOwner, AstNode}, match_ast, Direction, NodeOrToken, SmolStr, SyntaxKind, TextRange, T, }; -use stdx::to_lower_snake_case; use crate::FileId; use ast::NameOwner; diff --git a/crates/ra_ide/src/join_lines.rs b/crates/ra_ide/src/join_lines.rs index caf63933a9..35cec87f67 100644 --- a/crates/ra_ide/src/join_lines.rs +++ b/crates/ra_ide/src/join_lines.rs @@ -1,6 +1,6 @@ use itertools::Itertools; use ra_fmt::{compute_ws, extract_trivial_expression}; -use ra_syntax::{ +use syntax::{ algo::{find_covering_element, non_trivia_sibling}, ast::{self, AstNode, AstToken}, Direction, NodeOrToken, SourceFile, @@ -170,7 +170,7 @@ fn is_trailing_comma(left: SyntaxKind, right: SyntaxKind) -> bool { #[cfg(test)] mod tests { - use ra_syntax::SourceFile; + use syntax::SourceFile; use test_utils::{add_cursor, assert_eq_text, extract_offset, extract_range}; use super::*; @@ -437,11 +437,11 @@ fn foo() { // No space after the '{' check_join_lines( r" -<|>use ra_syntax::{ +<|>use syntax::{ TextSize, TextRange, };", r" -<|>use ra_syntax::{TextSize, TextRange, +<|>use syntax::{TextSize, TextRange, };", ); } @@ -451,11 +451,11 @@ fn foo() { // No space after the '}' check_join_lines( r" -use ra_syntax::{ +use syntax::{ <|> TextSize, TextRange };", r" -use ra_syntax::{ +use syntax::{ <|> TextSize, TextRange};", ); } @@ -465,11 +465,11 @@ use ra_syntax::{ // No space after the '}' check_join_lines( r" -use ra_syntax::{ +use syntax::{ <|> TextSize, TextRange, };", r" -use ra_syntax::{ +use syntax::{ <|> TextSize, TextRange};", ); } @@ -478,14 +478,14 @@ use ra_syntax::{ fn test_join_lines_use_tree() { check_join_lines( r" -use ra_syntax::{ +use syntax::{ algo::<|>{ find_token_at_offset, }, ast, };", r" -use ra_syntax::{ +use syntax::{ algo::<|>find_token_at_offset, ast, };", diff --git a/crates/ra_ide/src/lib.rs b/crates/ra_ide/src/lib.rs index 09cb5faf68..20967ba990 100644 --- a/crates/ra_ide/src/lib.rs +++ b/crates/ra_ide/src/lib.rs @@ -56,7 +56,7 @@ use ra_ide_db::{ symbol_index::{self, FileSymbol}, LineIndexDatabase, }; -use ra_syntax::{SourceFile, TextRange, TextSize}; +use syntax::{SourceFile, TextRange, TextSize}; use crate::display::ToNav; diff --git a/crates/ra_ide/src/matching_brace.rs b/crates/ra_ide/src/matching_brace.rs index 742d70c9c0..cb6abb0db9 100644 --- a/crates/ra_ide/src/matching_brace.rs +++ b/crates/ra_ide/src/matching_brace.rs @@ -1,4 +1,4 @@ -use ra_syntax::{ +use syntax::{ ast::{self, AstNode}, SourceFile, SyntaxKind, TextSize, T, }; diff --git a/crates/ra_ide/src/parent_module.rs b/crates/ra_ide/src/parent_module.rs index e3e0c76392..69af0c86ad 100644 --- a/crates/ra_ide/src/parent_module.rs +++ b/crates/ra_ide/src/parent_module.rs @@ -1,7 +1,7 @@ use hir::Semantics; use ra_db::{CrateId, FileId, FilePosition}; use ra_ide_db::RootDatabase; -use ra_syntax::{ +use syntax::{ algo::find_node_at_offset, ast::{self, AstNode}, }; diff --git a/crates/ra_ide/src/references.rs b/crates/ra_ide/src/references.rs index c4eea3a45b..e89dca869c 100644 --- a/crates/ra_ide/src/references.rs +++ b/crates/ra_ide/src/references.rs @@ -17,7 +17,7 @@ use ra_ide_db::{ search::SearchScope, RootDatabase, }; -use ra_syntax::{ +use syntax::{ algo::find_node_at_offset, ast::{self, NameOwner}, AstNode, SyntaxKind, SyntaxNode, TextRange, TokenAtOffset, diff --git a/crates/ra_ide/src/references/rename.rs b/crates/ra_ide/src/references/rename.rs index 9c688fb063..a075618e74 100644 --- a/crates/ra_ide/src/references/rename.rs +++ b/crates/ra_ide/src/references/rename.rs @@ -6,12 +6,12 @@ use ra_ide_db::{ defs::{classify_name, classify_name_ref, Definition, NameClass, NameRefClass}, RootDatabase, }; -use ra_syntax::{ +use std::convert::TryInto; +use syntax::{ algo::find_node_at_offset, ast::{self, NameOwner}, lex_single_valid_syntax_kind, match_ast, AstNode, SyntaxKind, SyntaxNode, SyntaxToken, }; -use std::convert::TryInto; use test_utils::mark; use text_edit::TextEdit; diff --git a/crates/ra_ide/src/runnables.rs b/crates/ra_ide/src/runnables.rs index 3b7162b841..54cb3b3094 100644 --- a/crates/ra_ide/src/runnables.rs +++ b/crates/ra_ide/src/runnables.rs @@ -4,7 +4,7 @@ use hir::{AsAssocItem, Attrs, HirFileId, InFile, Semantics}; use itertools::Itertools; use ra_cfg::CfgExpr; use ra_ide_db::RootDatabase; -use ra_syntax::{ +use syntax::{ ast::{self, AstNode, AttrsOwner, DocCommentsOwner, ModuleItemOwner, NameOwner}, match_ast, SyntaxNode, }; diff --git a/crates/ra_ide/src/status.rs b/crates/ra_ide/src/status.rs index 009bb662f7..797ead1ada 100644 --- a/crates/ra_ide/src/status.rs +++ b/crates/ra_ide/src/status.rs @@ -10,8 +10,8 @@ use ra_ide_db::{ symbol_index::{LibrarySymbolsQuery, SymbolIndex}, RootDatabase, }; -use ra_syntax::{ast, Parse, SyntaxNode}; use rustc_hash::FxHashMap; +use syntax::{ast, Parse, SyntaxNode}; use crate::FileId; diff --git a/crates/ra_ide/src/syntax_highlighting.rs b/crates/ra_ide/src/syntax_highlighting.rs index ebdf05127a..4b41ceb1dc 100644 --- a/crates/ra_ide/src/syntax_highlighting.rs +++ b/crates/ra_ide/src/syntax_highlighting.rs @@ -9,13 +9,13 @@ use ra_ide_db::{ defs::{classify_name, classify_name_ref, Definition, NameClass, NameRefClass}, RootDatabase, }; -use ra_syntax::{ +use rustc_hash::FxHashMap; +use syntax::{ ast::{self, HasFormatSpecifier}, AstNode, AstToken, Direction, NodeOrToken, SyntaxElement, SyntaxKind::*, TextRange, WalkEvent, T, }; -use rustc_hash::FxHashMap; use crate::FileId; diff --git a/crates/ra_ide/src/syntax_highlighting/html.rs b/crates/ra_ide/src/syntax_highlighting/html.rs index a5e7d28676..418122648a 100644 --- a/crates/ra_ide/src/syntax_highlighting/html.rs +++ b/crates/ra_ide/src/syntax_highlighting/html.rs @@ -2,7 +2,7 @@ use oorandom::Rand32; use ra_db::SourceDatabase; -use ra_syntax::{AstNode, TextRange, TextSize}; +use syntax::{AstNode, TextRange, TextSize}; use crate::{syntax_highlighting::highlight, FileId, RootDatabase}; diff --git a/crates/ra_ide/src/syntax_highlighting/injection.rs b/crates/ra_ide/src/syntax_highlighting/injection.rs index 6046643ef1..43f4e6feab 100644 --- a/crates/ra_ide/src/syntax_highlighting/injection.rs +++ b/crates/ra_ide/src/syntax_highlighting/injection.rs @@ -5,7 +5,7 @@ use std::{collections::BTreeMap, convert::TryFrom}; use ast::{HasQuotes, HasStringValue}; use hir::Semantics; use itertools::Itertools; -use ra_syntax::{ast, AstToken, SyntaxNode, SyntaxToken, TextRange, TextSize}; +use syntax::{ast, AstToken, SyntaxNode, SyntaxToken, TextRange, TextSize}; use crate::{ call_info::ActiveParameter, Analysis, Highlight, HighlightModifier, HighlightTag, diff --git a/crates/ra_ide/src/syntax_highlighting/tests.rs b/crates/ra_ide/src/syntax_highlighting/tests.rs index a8087635a8..594f61e85b 100644 --- a/crates/ra_ide/src/syntax_highlighting/tests.rs +++ b/crates/ra_ide/src/syntax_highlighting/tests.rs @@ -135,7 +135,7 @@ fn bar() { #[test] fn accidentally_quadratic() { - let file = project_dir().join("crates/ra_syntax/test_data/accidentally_quadratic"); + let file = project_dir().join("crates/syntax/test_data/accidentally_quadratic"); let src = fs::read_to_string(file).unwrap(); let (analysis, file_id) = single_file(&src); diff --git a/crates/ra_ide/src/syntax_tree.rs b/crates/ra_ide/src/syntax_tree.rs index 07217e8087..d05ff22149 100644 --- a/crates/ra_ide/src/syntax_tree.rs +++ b/crates/ra_ide/src/syntax_tree.rs @@ -1,6 +1,6 @@ use ra_db::{FileId, SourceDatabase}; use ra_ide_db::RootDatabase; -use ra_syntax::{ +use syntax::{ algo, AstNode, NodeOrToken, SourceFile, SyntaxKind::{RAW_STRING, STRING}, SyntaxToken, TextRange, TextSize, diff --git a/crates/ra_ide/src/typing.rs b/crates/ra_ide/src/typing.rs index 952429cde6..c408b1d521 100644 --- a/crates/ra_ide/src/typing.rs +++ b/crates/ra_ide/src/typing.rs @@ -18,7 +18,7 @@ mod on_enter; use ra_db::{FilePosition, SourceDatabase}; use ra_fmt::leading_indent; use ra_ide_db::{source_change::SourceFileEdit, RootDatabase}; -use ra_syntax::{ +use syntax::{ algo::find_node_at_offset, ast::{self, AstToken}, AstNode, SourceFile, diff --git a/crates/ra_ide/src/typing/on_enter.rs b/crates/ra_ide/src/typing/on_enter.rs index c0c5ce3bcd..9cd153f94a 100644 --- a/crates/ra_ide/src/typing/on_enter.rs +++ b/crates/ra_ide/src/typing/on_enter.rs @@ -3,7 +3,7 @@ use ra_db::{FilePosition, SourceDatabase}; use ra_ide_db::RootDatabase; -use ra_syntax::{ +use syntax::{ ast::{self, AstToken}, AstNode, SmolStr, SourceFile, SyntaxKind::*, diff --git a/crates/ra_ide_db/Cargo.toml b/crates/ra_ide_db/Cargo.toml index 5446a59614..9ed13a13db 100644 --- a/crates/ra_ide_db/Cargo.toml +++ b/crates/ra_ide_db/Cargo.toml @@ -21,7 +21,7 @@ either = "1.5.3" stdx = { path = "../stdx" } -ra_syntax = { path = "../ra_syntax" } +syntax = { path = "../syntax" } text_edit = { path = "../text_edit" } ra_db = { path = "../ra_db" } profile = { path = "../profile" } diff --git a/crates/ra_ide_db/src/defs.rs b/crates/ra_ide_db/src/defs.rs index d46d1fe71b..7b5d6ac491 100644 --- a/crates/ra_ide_db/src/defs.rs +++ b/crates/ra_ide_db/src/defs.rs @@ -9,7 +9,7 @@ use hir::{ db::HirDatabase, Crate, Field, HasVisibility, ImplDef, Local, MacroDef, Module, ModuleDef, Name, PathResolution, Semantics, TypeParam, Visibility, }; -use ra_syntax::{ +use syntax::{ ast::{self, AstNode}, match_ast, SyntaxNode, }; diff --git a/crates/ra_ide_db/src/imports_locator.rs b/crates/ra_ide_db/src/imports_locator.rs index d510ce3b76..1d0c202915 100644 --- a/crates/ra_ide_db/src/imports_locator.rs +++ b/crates/ra_ide_db/src/imports_locator.rs @@ -2,7 +2,7 @@ //! Later, this should be moved away to a separate crate that is accessible from the ra_assists module. use hir::{Crate, MacroDef, ModuleDef, Semantics}; -use ra_syntax::{ast, AstNode, SyntaxKind::NAME}; +use syntax::{ast, AstNode, SyntaxKind::NAME}; use crate::{ defs::{classify_name, Definition}, diff --git a/crates/ra_ide_db/src/line_index.rs b/crates/ra_ide_db/src/line_index.rs index 2ab662098a..a381f7fb8d 100644 --- a/crates/ra_ide_db/src/line_index.rs +++ b/crates/ra_ide_db/src/line_index.rs @@ -2,9 +2,9 @@ //! representation. use std::iter; -use ra_syntax::{TextRange, TextSize}; use rustc_hash::FxHashMap; use stdx::partition_point; +use syntax::{TextRange, TextSize}; #[derive(Clone, Debug, PartialEq, Eq)] pub struct LineIndex { diff --git a/crates/ra_ide_db/src/search.rs b/crates/ra_ide_db/src/search.rs index d90b830d0c..7827cc71cf 100644 --- a/crates/ra_ide_db/src/search.rs +++ b/crates/ra_ide_db/src/search.rs @@ -9,8 +9,8 @@ use std::{convert::TryInto, mem}; use hir::{DefWithBody, HasSource, Module, ModuleSource, Semantics, Visibility}; use once_cell::unsync::Lazy; use ra_db::{FileId, FileRange, SourceDatabaseExt}; -use ra_syntax::{ast, match_ast, AstNode, TextRange, TextSize}; use rustc_hash::FxHashMap; +use syntax::{ast, match_ast, AstNode, TextRange, TextSize}; use crate::{ defs::{classify_name_ref, Definition, NameRefClass}, diff --git a/crates/ra_ide_db/src/symbol_index.rs b/crates/ra_ide_db/src/symbol_index.rs index 6ca8bb5169..896092b467 100644 --- a/crates/ra_ide_db/src/symbol_index.rs +++ b/crates/ra_ide_db/src/symbol_index.rs @@ -34,14 +34,14 @@ use ra_db::{ salsa::{self, ParallelDatabase}, CrateId, FileId, SourceDatabaseExt, SourceRootId, }; -use ra_syntax::{ +use rayon::prelude::*; +use rustc_hash::{FxHashMap, FxHashSet}; +use syntax::{ ast::{self, NameOwner}, match_ast, AstNode, Parse, SmolStr, SourceFile, SyntaxKind::{self, *}, SyntaxNode, SyntaxNodePtr, TextRange, WalkEvent, }; -use rayon::prelude::*; -use rustc_hash::{FxHashMap, FxHashSet}; use crate::RootDatabase; diff --git a/crates/ra_mbe/Cargo.toml b/crates/ra_mbe/Cargo.toml index e518f73e32..4a4be65ebc 100644 --- a/crates/ra_mbe/Cargo.toml +++ b/crates/ra_mbe/Cargo.toml @@ -9,7 +9,7 @@ license = "MIT OR Apache-2.0" doctest = false [dependencies] -ra_syntax = { path = "../ra_syntax" } +syntax = { path = "../syntax" } parser = { path = "../parser" } tt = { path = "../tt" } rustc-hash = "1.1.0" diff --git a/crates/ra_mbe/src/mbe_expander.rs b/crates/ra_mbe/src/mbe_expander.rs index b1eacf1242..1ad8b9f8a5 100644 --- a/crates/ra_mbe/src/mbe_expander.rs +++ b/crates/ra_mbe/src/mbe_expander.rs @@ -5,8 +5,8 @@ mod matcher; mod transcriber; -use ra_syntax::SmolStr; use rustc_hash::FxHashMap; +use syntax::SmolStr; use crate::{ExpandError, ExpandResult}; @@ -123,7 +123,7 @@ enum Fragment { #[cfg(test)] mod tests { - use ra_syntax::{ast, AstNode}; + use syntax::{ast, AstNode}; use super::*; use crate::ast_to_token_tree; diff --git a/crates/ra_mbe/src/mbe_expander/matcher.rs b/crates/ra_mbe/src/mbe_expander/matcher.rs index c752804b29..b698b98326 100644 --- a/crates/ra_mbe/src/mbe_expander/matcher.rs +++ b/crates/ra_mbe/src/mbe_expander/matcher.rs @@ -10,7 +10,7 @@ use crate::{ use super::ExpandResult; use parser::{FragmentKind::*, TreeSink}; -use ra_syntax::{SmolStr, SyntaxKind}; +use syntax::{SmolStr, SyntaxKind}; use tt::buffer::{Cursor, TokenBuffer}; impl Bindings { diff --git a/crates/ra_mbe/src/mbe_expander/transcriber.rs b/crates/ra_mbe/src/mbe_expander/transcriber.rs index 7c9bb4d00e..c9525c5bf2 100644 --- a/crates/ra_mbe/src/mbe_expander/transcriber.rs +++ b/crates/ra_mbe/src/mbe_expander/transcriber.rs @@ -1,7 +1,7 @@ //! Transcriber takes a template, like `fn $ident() {}`, a set of bindings like //! `$ident => foo`, interpolates variables in the template, to get `fn foo() {}` -use ra_syntax::SmolStr; +use syntax::SmolStr; use super::ExpandResult; use crate::{ diff --git a/crates/ra_mbe/src/parser.rs b/crates/ra_mbe/src/parser.rs index 1e5dafbdf9..6b46a1673c 100644 --- a/crates/ra_mbe/src/parser.rs +++ b/crates/ra_mbe/src/parser.rs @@ -1,8 +1,8 @@ //! Parser recognizes special macro syntax, `$var` and `$(repeat)*`, in token //! trees. -use ra_syntax::SmolStr; use smallvec::SmallVec; +use syntax::SmolStr; use crate::{tt_iter::TtIter, ExpandError}; diff --git a/crates/ra_mbe/src/subtree_source.rs b/crates/ra_mbe/src/subtree_source.rs index 1a1cb08cf7..41461b3150 100644 --- a/crates/ra_mbe/src/subtree_source.rs +++ b/crates/ra_mbe/src/subtree_source.rs @@ -1,8 +1,8 @@ //! FIXME: write short doc here use parser::{Token, TokenSource}; -use ra_syntax::{lex_single_syntax_kind, SmolStr, SyntaxKind, SyntaxKind::*, T}; use std::cell::{Cell, Ref, RefCell}; +use syntax::{lex_single_syntax_kind, SmolStr, SyntaxKind, SyntaxKind::*, T}; use tt::buffer::{Cursor, TokenBuffer}; #[derive(Debug, Clone, Eq, PartialEq)] diff --git a/crates/ra_mbe/src/syntax_bridge.rs b/crates/ra_mbe/src/syntax_bridge.rs index 7b9c88ae64..a8ad917fb8 100644 --- a/crates/ra_mbe/src/syntax_bridge.rs +++ b/crates/ra_mbe/src/syntax_bridge.rs @@ -1,13 +1,13 @@ //! FIXME: write short doc here use parser::{FragmentKind, ParseError, TreeSink}; -use ra_syntax::{ +use rustc_hash::FxHashMap; +use syntax::{ ast::{self, make::tokens::doc_comment}, tokenize, AstToken, Parse, SmolStr, SyntaxKind, SyntaxKind::*, SyntaxNode, SyntaxToken, SyntaxTreeBuilder, TextRange, TextSize, Token as RawToken, T, }; -use rustc_hash::FxHashMap; use tt::buffer::{Cursor, TokenBuffer}; use crate::subtree_source::SubtreeTokenSource; @@ -176,7 +176,7 @@ fn doc_comment_text(comment: &ast::Comment) -> SmolStr { text.into() } -fn convert_doc_comment(token: &ra_syntax::SyntaxToken) -> Option> { +fn convert_doc_comment(token: &syntax::SyntaxToken) -> Option> { let comment = ast::Comment::cast(token.clone())?; let doc = comment.kind().doc?; @@ -716,7 +716,7 @@ mod tests { use super::*; use crate::tests::parse_macro; use parser::TokenSource; - use ra_syntax::{ + use syntax::{ algo::{insert_children, InsertPosition}, ast::AstNode, }; diff --git a/crates/ra_mbe/src/tests.rs b/crates/ra_mbe/src/tests.rs index be39b0e45e..0796ceee1a 100644 --- a/crates/ra_mbe/src/tests.rs +++ b/crates/ra_mbe/src/tests.rs @@ -1,13 +1,13 @@ use std::fmt::Write; use ::parser::FragmentKind; -use ra_syntax::{ast, AstNode, NodeOrToken, SyntaxKind::IDENT, SyntaxNode, WalkEvent, T}; +use syntax::{ast, AstNode, NodeOrToken, SyntaxKind::IDENT, SyntaxNode, WalkEvent, T}; use test_utils::assert_eq_text; use super::*; mod rule_parsing { - use ra_syntax::{ast, AstNode}; + use syntax::{ast, AstNode}; use crate::ast_to_token_tree; @@ -1698,7 +1698,7 @@ pub(crate) fn parse_to_token_tree_by_syntax(ra_fixture: &str) -> tt::Subtree { parsed } -fn debug_dump_ignore_spaces(node: &ra_syntax::SyntaxNode) -> String { +fn debug_dump_ignore_spaces(node: &syntax::SyntaxNode) -> String { let mut level = 0; let mut buf = String::new(); macro_rules! indent { @@ -1718,7 +1718,7 @@ fn debug_dump_ignore_spaces(node: &ra_syntax::SyntaxNode) -> String { writeln!(buf, "{:?}", node.kind()).unwrap(); } NodeOrToken::Token(token) => match token.kind() { - ra_syntax::SyntaxKind::WHITESPACE => {} + syntax::SyntaxKind::WHITESPACE => {} _ => { indent!(); writeln!(buf, "{:?}", token.kind()).unwrap(); diff --git a/crates/ra_ssr/Cargo.toml b/crates/ra_ssr/Cargo.toml index d0f2ae7339..958baa2df7 100644 --- a/crates/ra_ssr/Cargo.toml +++ b/crates/ra_ssr/Cargo.toml @@ -12,7 +12,7 @@ doctest = false [dependencies] text_edit = { path = "../text_edit" } -ra_syntax = { path = "../ra_syntax" } +syntax = { path = "../syntax" } ra_db = { path = "../ra_db" } ra_ide_db = { path = "../ra_ide_db" } hir = { path = "../ra_hir", package = "ra_hir" } diff --git a/crates/ra_ssr/src/lib.rs b/crates/ra_ssr/src/lib.rs index c780b460a7..fb53212a3a 100644 --- a/crates/ra_ssr/src/lib.rs +++ b/crates/ra_ssr/src/lib.rs @@ -21,9 +21,9 @@ use crate::matching::MatchFailureReason; use hir::Semantics; use ra_db::{FileId, FilePosition, FileRange}; use ra_ide_db::source_change::SourceFileEdit; -use ra_syntax::{ast, AstNode, SyntaxNode, TextRange}; use resolving::ResolvedRule; use rustc_hash::FxHashMap; +use syntax::{ast, AstNode, SyntaxNode, TextRange}; // A structured search replace rule. Create by calling `parse` on a str. #[derive(Debug)] diff --git a/crates/ra_ssr/src/matching.rs b/crates/ra_ssr/src/matching.rs index 0f72fea691..125bf38951 100644 --- a/crates/ra_ssr/src/matching.rs +++ b/crates/ra_ssr/src/matching.rs @@ -8,10 +8,10 @@ use crate::{ }; use hir::Semantics; use ra_db::FileRange; -use ra_syntax::ast::{AstNode, AstToken}; -use ra_syntax::{ast, SyntaxElement, SyntaxElementChildren, SyntaxKind, SyntaxNode, SyntaxToken}; use rustc_hash::FxHashMap; use std::{cell::Cell, iter::Peekable}; +use syntax::ast::{AstNode, AstToken}; +use syntax::{ast, SyntaxElement, SyntaxElementChildren, SyntaxKind, SyntaxNode, SyntaxToken}; use test_utils::mark; // Creates a match error. If we're currently attempting to match some code that we thought we were @@ -264,7 +264,7 @@ impl<'db, 'sema> Matcher<'db, 'sema> { &self, phase: &mut Phase, pattern: &mut Peekable, - code: &ra_syntax::SyntaxToken, + code: &syntax::SyntaxToken, ) -> Result<(), MatchFailed> { phase.record_ignored_comments(code); // Ignore whitespace and comments. @@ -444,7 +444,7 @@ impl<'db, 'sema> Matcher<'db, 'sema> { &self, phase: &mut Phase, pattern: &SyntaxNode, - code: &ra_syntax::SyntaxNode, + code: &syntax::SyntaxNode, ) -> Result<(), MatchFailed> { let mut pattern = PatternIterator::new(pattern).peekable(); let mut children = code.children_with_tokens(); diff --git a/crates/ra_ssr/src/nester.rs b/crates/ra_ssr/src/nester.rs index b3e20579bd..8be570d3cf 100644 --- a/crates/ra_ssr/src/nester.rs +++ b/crates/ra_ssr/src/nester.rs @@ -8,8 +8,8 @@ //! middle match would take the second `foo` from the outer match. use crate::{Match, SsrMatches}; -use ra_syntax::SyntaxNode; use rustc_hash::FxHashMap; +use syntax::SyntaxNode; pub(crate) fn nest_and_remove_collisions( mut matches: Vec, diff --git a/crates/ra_ssr/src/parsing.rs b/crates/ra_ssr/src/parsing.rs index f455eb5b7e..9570e96e36 100644 --- a/crates/ra_ssr/src/parsing.rs +++ b/crates/ra_ssr/src/parsing.rs @@ -7,9 +7,9 @@ use crate::errors::bail; use crate::{SsrError, SsrPattern, SsrRule}; -use ra_syntax::{ast, AstNode, SmolStr, SyntaxKind, SyntaxNode, T}; use rustc_hash::{FxHashMap, FxHashSet}; use std::str::FromStr; +use syntax::{ast, AstNode, SmolStr, SyntaxKind, SyntaxNode, T}; use test_utils::mark; #[derive(Debug)] @@ -243,7 +243,7 @@ fn validate_rule(rule: &SsrRule) -> Result<(), SsrError> { fn tokenize(source: &str) -> Result, SsrError> { let mut start = 0; - let (raw_tokens, errors) = ra_syntax::tokenize(source); + let (raw_tokens, errors) = syntax::tokenize(source); if let Some(first_error) = errors.first() { bail!("Failed to parse pattern: {}", first_error); } diff --git a/crates/ra_ssr/src/replacing.rs b/crates/ra_ssr/src/replacing.rs index 74f9e7db61..8f8fe6149a 100644 --- a/crates/ra_ssr/src/replacing.rs +++ b/crates/ra_ssr/src/replacing.rs @@ -2,9 +2,9 @@ use crate::matching::Var; use crate::{resolving::ResolvedRule, Match, SsrMatches}; -use ra_syntax::ast::{self, AstToken}; -use ra_syntax::{SyntaxElement, SyntaxKind, SyntaxNode, SyntaxToken, TextRange, TextSize}; use rustc_hash::{FxHashMap, FxHashSet}; +use syntax::ast::{self, AstToken}; +use syntax::{SyntaxElement, SyntaxKind, SyntaxNode, SyntaxToken, TextRange, TextSize}; use text_edit::TextEdit; /// Returns a text edit that will replace each match in `matches` with its corresponding replacement @@ -92,7 +92,7 @@ impl ReplacementRenderer<'_> { } fn render_node(&mut self, node: &SyntaxNode) { - use ra_syntax::ast::AstNode; + use syntax::ast::AstNode; if let Some(mod_path) = self.match_info.rendered_template_paths.get(&node) { self.out.push_str(&mod_path.to_string()); // Emit everything except for the segment's name-ref, since we already effectively @@ -180,7 +180,7 @@ impl ReplacementRenderer<'_> { } fn parse_as_kind(code: &str, kind: SyntaxKind) -> Option { - use ra_syntax::ast::AstNode; + use syntax::ast::AstNode; if ast::Expr::can_cast(kind) { if let Ok(expr) = ast::Expr::parse(code) { return Some(expr.syntax().clone()); diff --git a/crates/ra_ssr/src/resolving.rs b/crates/ra_ssr/src/resolving.rs index d53bd46c77..7e7585c8bb 100644 --- a/crates/ra_ssr/src/resolving.rs +++ b/crates/ra_ssr/src/resolving.rs @@ -4,8 +4,8 @@ use crate::errors::error; use crate::{parsing, SsrError}; use parsing::Placeholder; use ra_db::FilePosition; -use ra_syntax::{ast, SmolStr, SyntaxKind, SyntaxNode, SyntaxToken}; use rustc_hash::FxHashMap; +use syntax::{ast, SmolStr, SyntaxKind, SyntaxNode, SyntaxToken}; use test_utils::mark; pub(crate) struct ResolutionScope<'db> { @@ -70,7 +70,7 @@ struct Resolver<'a, 'db> { impl Resolver<'_, '_> { fn resolve_pattern_tree(&self, pattern: SyntaxNode) -> Result { - use ra_syntax::{SyntaxElement, T}; + use syntax::{SyntaxElement, T}; let mut resolved_paths = FxHashMap::default(); self.resolve(pattern.clone(), 0, &mut resolved_paths)?; let ufcs_function_calls = resolved_paths @@ -108,7 +108,7 @@ impl Resolver<'_, '_> { depth: u32, resolved_paths: &mut FxHashMap, ) -> Result<(), SsrError> { - use ra_syntax::ast::AstNode; + use syntax::ast::AstNode; if let Some(path) = ast::Path::cast(node.clone()) { if is_self(&path) { // Self cannot be resolved like other paths. @@ -179,7 +179,7 @@ impl<'db> ResolutionScope<'db> { sema: &hir::Semantics<'db, ra_ide_db::RootDatabase>, resolve_context: FilePosition, ) -> ResolutionScope<'db> { - use ra_syntax::ast::AstNode; + use syntax::ast::AstNode; let file = sema.parse(resolve_context.file_id); // Find a node at the requested position, falling back to the whole file. let node = file diff --git a/crates/ra_ssr/src/search.rs b/crates/ra_ssr/src/search.rs index 85ffa2ac23..e44e149599 100644 --- a/crates/ra_ssr/src/search.rs +++ b/crates/ra_ssr/src/search.rs @@ -10,8 +10,8 @@ use ra_ide_db::{ defs::Definition, search::{Reference, SearchScope}, }; -use ra_syntax::{ast, AstNode, SyntaxKind, SyntaxNode}; use rustc_hash::FxHashSet; +use syntax::{ast, AstNode, SyntaxKind, SyntaxNode}; use test_utils::mark; /// A cache for the results of find_usages. This is for when we have multiple patterns that have the diff --git a/crates/rust-analyzer/Cargo.toml b/crates/rust-analyzer/Cargo.toml index ef244da597..86c786e25c 100644 --- a/crates/rust-analyzer/Cargo.toml +++ b/crates/rust-analyzer/Cargo.toml @@ -38,7 +38,7 @@ flycheck = { path = "../flycheck" } ra_ide = { path = "../ra_ide" } profile = { path = "../profile" } ra_project_model = { path = "../ra_project_model" } -ra_syntax = { path = "../ra_syntax" } +syntax = { path = "../syntax" } text_edit = { path = "../text_edit" } vfs = { path = "../vfs" } vfs-notify = { path = "../vfs-notify" } diff --git a/crates/rust-analyzer/src/cargo_target_spec.rs b/crates/rust-analyzer/src/cargo_target_spec.rs index 03c41263aa..7929368c0c 100644 --- a/crates/rust-analyzer/src/cargo_target_spec.rs +++ b/crates/rust-analyzer/src/cargo_target_spec.rs @@ -179,7 +179,7 @@ mod tests { use mbe::ast_to_token_tree; use ra_cfg::CfgExpr; - use ra_syntax::{ + use syntax::{ ast::{self, AstNode}, SmolStr, }; diff --git a/crates/rust-analyzer/src/cli.rs b/crates/rust-analyzer/src/cli.rs index 46d70fcb2a..420abaccb9 100644 --- a/crates/rust-analyzer/src/cli.rs +++ b/crates/rust-analyzer/src/cli.rs @@ -11,7 +11,7 @@ use std::io::Read; use anyhow::Result; use ra_ide::Analysis; -use ra_syntax::{AstNode, SourceFile}; +use syntax::{AstNode, SourceFile}; pub use analysis_bench::{BenchCmd, BenchWhat, Position}; pub use analysis_stats::AnalysisStatsCmd; diff --git a/crates/rust-analyzer/src/cli/analysis_stats.rs b/crates/rust-analyzer/src/cli/analysis_stats.rs index a30c1ec798..cfc1b22440 100644 --- a/crates/rust-analyzer/src/cli/analysis_stats.rs +++ b/crates/rust-analyzer/src/cli/analysis_stats.rs @@ -18,10 +18,10 @@ use ra_db::{ salsa::{self, ParallelDatabase}, SourceDatabaseExt, }; -use ra_syntax::AstNode; use rayon::prelude::*; use rustc_hash::FxHashSet; use stdx::format_to; +use syntax::AstNode; use crate::{ cli::{ diff --git a/crates/rust-analyzer/src/from_proto.rs b/crates/rust-analyzer/src/from_proto.rs index 9f8ce3b991..ad88ffdd72 100644 --- a/crates/rust-analyzer/src/from_proto.rs +++ b/crates/rust-analyzer/src/from_proto.rs @@ -3,7 +3,7 @@ use std::convert::TryFrom; use ra_db::{FileId, FilePosition, FileRange}; use ra_ide::{AssistKind, LineCol, LineIndex}; -use ra_syntax::{TextRange, TextSize}; +use syntax::{TextRange, TextSize}; use vfs::AbsPathBuf; use crate::{global_state::GlobalStateSnapshot, Result}; diff --git a/crates/rust-analyzer/src/handlers.rs b/crates/rust-analyzer/src/handlers.rs index 07f4af3d3b..86e7833f2f 100644 --- a/crates/rust-analyzer/src/handlers.rs +++ b/crates/rust-analyzer/src/handlers.rs @@ -23,10 +23,10 @@ use ra_ide::{ RangeInfo, Runnable, RunnableKind, SearchScope, TextEdit, }; use ra_project_model::TargetKind; -use ra_syntax::{algo, ast, AstNode, SyntaxKind, TextRange, TextSize}; use serde::{Deserialize, Serialize}; use serde_json::to_value; use stdx::{format_to, split_once}; +use syntax::{algo, ast, AstNode, SyntaxKind, TextRange, TextSize}; use crate::{ cargo_target_spec::CargoTargetSpec, diff --git a/crates/rust-analyzer/src/to_proto.rs b/crates/rust-analyzer/src/to_proto.rs index 62fda8a1f2..278819a5c3 100644 --- a/crates/rust-analyzer/src/to_proto.rs +++ b/crates/rust-analyzer/src/to_proto.rs @@ -12,7 +12,7 @@ use ra_ide::{ Indel, InlayHint, InlayKind, InsertTextFormat, LineIndex, Markup, NavigationTarget, ReferenceAccess, ResolvedAssist, Runnable, Severity, SourceChange, SourceFileEdit, TextEdit, }; -use ra_syntax::{SyntaxKind, TextRange, TextSize}; +use syntax::{SyntaxKind, TextRange, TextSize}; use crate::{ cargo_target_spec::CargoTargetSpec, global_state::GlobalStateSnapshot, diff --git a/crates/ra_syntax/Cargo.toml b/crates/syntax/Cargo.toml similarity index 96% rename from crates/ra_syntax/Cargo.toml rename to crates/syntax/Cargo.toml index eec4bd845e..47e351f9d1 100644 --- a/crates/ra_syntax/Cargo.toml +++ b/crates/syntax/Cargo.toml @@ -1,11 +1,11 @@ [package] -edition = "2018" -name = "ra_syntax" -version = "0.1.0" -authors = ["rust-analyzer developers"] -license = "MIT OR Apache-2.0" +name = "syntax" +version = "0.0.0" description = "Comment and whitespace preserving parser for the Rust language" +license = "MIT OR Apache-2.0" repository = "https://github.com/rust-analyzer/rust-analyzer" +authors = ["rust-analyzer developers"] +edition = "2018" [lib] doctest = false @@ -17,20 +17,19 @@ rustc_lexer = { version = "671.0.0", package = "rustc-ap-rustc_lexer" } rustc-hash = "1.1.0" arrayvec = "0.5.1" once_cell = "1.3.1" - -stdx = { path = "../stdx" } - -text_edit = { path = "../text_edit" } -parser = { path = "../parser" } - # This crate transitively depends on `smol_str` via `rowan`. # ideally, `serde` should be enabled by `rust-analyzer`, but we enable it here # to reduce number of compilations smol_str = { version = "0.1.15", features = ["serde"] } serde = { version = "1.0.106", features = ["derive"] } +stdx = { path = "../stdx" } +text_edit = { path = "../text_edit" } +parser = { path = "../parser" } + [dev-dependencies] -test_utils = { path = "../test_utils" } -expect = { path = "../expect" } walkdir = "2.3.1" rayon = "1" + +test_utils = { path = "../test_utils" } +expect = { path = "../expect" } diff --git a/crates/ra_syntax/fuzz/.gitignore b/crates/syntax/fuzz/.gitignore similarity index 100% rename from crates/ra_syntax/fuzz/.gitignore rename to crates/syntax/fuzz/.gitignore diff --git a/crates/ra_syntax/fuzz/Cargo.toml b/crates/syntax/fuzz/Cargo.toml similarity index 89% rename from crates/ra_syntax/fuzz/Cargo.toml rename to crates/syntax/fuzz/Cargo.toml index 4cec3c4cd8..32c40d1b95 100644 --- a/crates/ra_syntax/fuzz/Cargo.toml +++ b/crates/syntax/fuzz/Cargo.toml @@ -1,6 +1,6 @@ [package] -name = "ra_syntax-fuzz" +name = "syntax-fuzz" version = "0.0.1" authors = ["rust-analyzer developers"] publish = false @@ -10,7 +10,7 @@ edition = "2018" cargo-fuzz = true [dependencies] -ra_syntax = { path = ".." } +syntax = { path = ".." } text_edit = { path = "../../text_edit" } libfuzzer-sys = { git = "https://github.com/rust-fuzz/libfuzzer-sys.git" } diff --git a/crates/ra_syntax/fuzz/fuzz_targets/parser.rs b/crates/syntax/fuzz/fuzz_targets/parser.rs similarity index 84% rename from crates/ra_syntax/fuzz/fuzz_targets/parser.rs rename to crates/syntax/fuzz/fuzz_targets/parser.rs index 7bc4ef30d0..386768343b 100644 --- a/crates/ra_syntax/fuzz/fuzz_targets/parser.rs +++ b/crates/syntax/fuzz/fuzz_targets/parser.rs @@ -2,7 +2,7 @@ #![no_main] use libfuzzer_sys::fuzz_target; -use ra_syntax::fuzz::check_parser; +use syntax::fuzz::check_parser; fuzz_target!(|data: &[u8]| { if let Ok(text) = std::str::from_utf8(data) { diff --git a/crates/ra_syntax/fuzz/fuzz_targets/reparse.rs b/crates/syntax/fuzz/fuzz_targets/reparse.rs similarity index 84% rename from crates/ra_syntax/fuzz/fuzz_targets/reparse.rs rename to crates/syntax/fuzz/fuzz_targets/reparse.rs index 16598f5f11..5ac99fdafd 100644 --- a/crates/ra_syntax/fuzz/fuzz_targets/reparse.rs +++ b/crates/syntax/fuzz/fuzz_targets/reparse.rs @@ -2,7 +2,7 @@ #![no_main] use libfuzzer_sys::fuzz_target; -use ra_syntax::fuzz::CheckReparse; +use syntax::fuzz::CheckReparse; fuzz_target!(|data: &[u8]| { if let Some(check) = CheckReparse::from_data(data) { diff --git a/crates/ra_syntax/src/algo.rs b/crates/syntax/src/algo.rs similarity index 100% rename from crates/ra_syntax/src/algo.rs rename to crates/syntax/src/algo.rs diff --git a/crates/ra_syntax/src/ast.rs b/crates/syntax/src/ast.rs similarity index 100% rename from crates/ra_syntax/src/ast.rs rename to crates/syntax/src/ast.rs diff --git a/crates/ra_syntax/src/ast/edit.rs b/crates/syntax/src/ast/edit.rs similarity index 100% rename from crates/ra_syntax/src/ast/edit.rs rename to crates/syntax/src/ast/edit.rs diff --git a/crates/ra_syntax/src/ast/expr_ext.rs b/crates/syntax/src/ast/expr_ext.rs similarity index 100% rename from crates/ra_syntax/src/ast/expr_ext.rs rename to crates/syntax/src/ast/expr_ext.rs diff --git a/crates/ra_syntax/src/ast/generated.rs b/crates/syntax/src/ast/generated.rs similarity index 100% rename from crates/ra_syntax/src/ast/generated.rs rename to crates/syntax/src/ast/generated.rs diff --git a/crates/ra_syntax/src/ast/generated/nodes.rs b/crates/syntax/src/ast/generated/nodes.rs similarity index 100% rename from crates/ra_syntax/src/ast/generated/nodes.rs rename to crates/syntax/src/ast/generated/nodes.rs diff --git a/crates/ra_syntax/src/ast/generated/tokens.rs b/crates/syntax/src/ast/generated/tokens.rs similarity index 100% rename from crates/ra_syntax/src/ast/generated/tokens.rs rename to crates/syntax/src/ast/generated/tokens.rs diff --git a/crates/ra_syntax/src/ast/make.rs b/crates/syntax/src/ast/make.rs similarity index 100% rename from crates/ra_syntax/src/ast/make.rs rename to crates/syntax/src/ast/make.rs diff --git a/crates/ra_syntax/src/ast/node_ext.rs b/crates/syntax/src/ast/node_ext.rs similarity index 100% rename from crates/ra_syntax/src/ast/node_ext.rs rename to crates/syntax/src/ast/node_ext.rs diff --git a/crates/ra_syntax/src/ast/token_ext.rs b/crates/syntax/src/ast/token_ext.rs similarity index 100% rename from crates/ra_syntax/src/ast/token_ext.rs rename to crates/syntax/src/ast/token_ext.rs diff --git a/crates/ra_syntax/src/ast/traits.rs b/crates/syntax/src/ast/traits.rs similarity index 100% rename from crates/ra_syntax/src/ast/traits.rs rename to crates/syntax/src/ast/traits.rs diff --git a/crates/ra_syntax/src/fuzz.rs b/crates/syntax/src/fuzz.rs similarity index 100% rename from crates/ra_syntax/src/fuzz.rs rename to crates/syntax/src/fuzz.rs diff --git a/crates/ra_syntax/src/lib.rs b/crates/syntax/src/lib.rs similarity index 100% rename from crates/ra_syntax/src/lib.rs rename to crates/syntax/src/lib.rs diff --git a/crates/ra_syntax/src/parsing.rs b/crates/syntax/src/parsing.rs similarity index 100% rename from crates/ra_syntax/src/parsing.rs rename to crates/syntax/src/parsing.rs diff --git a/crates/ra_syntax/src/parsing/lexer.rs b/crates/syntax/src/parsing/lexer.rs similarity index 100% rename from crates/ra_syntax/src/parsing/lexer.rs rename to crates/syntax/src/parsing/lexer.rs diff --git a/crates/ra_syntax/src/parsing/reparsing.rs b/crates/syntax/src/parsing/reparsing.rs similarity index 100% rename from crates/ra_syntax/src/parsing/reparsing.rs rename to crates/syntax/src/parsing/reparsing.rs diff --git a/crates/ra_syntax/src/parsing/text_token_source.rs b/crates/syntax/src/parsing/text_token_source.rs similarity index 100% rename from crates/ra_syntax/src/parsing/text_token_source.rs rename to crates/syntax/src/parsing/text_token_source.rs diff --git a/crates/ra_syntax/src/parsing/text_tree_sink.rs b/crates/syntax/src/parsing/text_tree_sink.rs similarity index 100% rename from crates/ra_syntax/src/parsing/text_tree_sink.rs rename to crates/syntax/src/parsing/text_tree_sink.rs diff --git a/crates/ra_syntax/src/ptr.rs b/crates/syntax/src/ptr.rs similarity index 100% rename from crates/ra_syntax/src/ptr.rs rename to crates/syntax/src/ptr.rs diff --git a/crates/ra_syntax/src/syntax_error.rs b/crates/syntax/src/syntax_error.rs similarity index 100% rename from crates/ra_syntax/src/syntax_error.rs rename to crates/syntax/src/syntax_error.rs diff --git a/crates/ra_syntax/src/syntax_node.rs b/crates/syntax/src/syntax_node.rs similarity index 100% rename from crates/ra_syntax/src/syntax_node.rs rename to crates/syntax/src/syntax_node.rs diff --git a/crates/ra_syntax/src/tests.rs b/crates/syntax/src/tests.rs similarity index 98% rename from crates/ra_syntax/src/tests.rs rename to crates/syntax/src/tests.rs index 00b957f434..ddc7183694 100644 --- a/crates/ra_syntax/src/tests.rs +++ b/crates/syntax/src/tests.rs @@ -126,7 +126,7 @@ fn self_hosting_parsing() { let files = walkdir::WalkDir::new(dir) .into_iter() .filter_entry(|entry| { - // Get all files which are not in the crates/ra_syntax/test_data folder + // Get all files which are not in the crates/syntax/test_data folder !entry.path().components().any(|component| component.as_os_str() == "test_data") }) .map(|e| e.unwrap()) @@ -162,7 +162,7 @@ fn self_hosting_parsing() { } fn test_data_dir() -> PathBuf { - project_dir().join("crates/ra_syntax/test_data") + project_dir().join("crates/syntax/test_data") } fn assert_errors_are_present(errors: &[SyntaxError], path: &Path) { diff --git a/crates/ra_syntax/src/validation.rs b/crates/syntax/src/validation.rs similarity index 100% rename from crates/ra_syntax/src/validation.rs rename to crates/syntax/src/validation.rs diff --git a/crates/ra_syntax/src/validation/block.rs b/crates/syntax/src/validation/block.rs similarity index 100% rename from crates/ra_syntax/src/validation/block.rs rename to crates/syntax/src/validation/block.rs diff --git a/crates/ra_syntax/test_data/accidentally_quadratic b/crates/syntax/test_data/accidentally_quadratic similarity index 100% rename from crates/ra_syntax/test_data/accidentally_quadratic rename to crates/syntax/test_data/accidentally_quadratic diff --git a/crates/ra_syntax/test_data/lexer/err/0001_unclosed_char_at_eof.rs b/crates/syntax/test_data/lexer/err/0001_unclosed_char_at_eof.rs similarity index 100% rename from crates/ra_syntax/test_data/lexer/err/0001_unclosed_char_at_eof.rs rename to crates/syntax/test_data/lexer/err/0001_unclosed_char_at_eof.rs diff --git a/crates/ra_syntax/test_data/lexer/err/0001_unclosed_char_at_eof.txt b/crates/syntax/test_data/lexer/err/0001_unclosed_char_at_eof.txt similarity index 100% rename from crates/ra_syntax/test_data/lexer/err/0001_unclosed_char_at_eof.txt rename to crates/syntax/test_data/lexer/err/0001_unclosed_char_at_eof.txt diff --git a/crates/ra_syntax/test_data/lexer/err/0002_unclosed_char_with_ferris.rs b/crates/syntax/test_data/lexer/err/0002_unclosed_char_with_ferris.rs similarity index 100% rename from crates/ra_syntax/test_data/lexer/err/0002_unclosed_char_with_ferris.rs rename to crates/syntax/test_data/lexer/err/0002_unclosed_char_with_ferris.rs diff --git a/crates/ra_syntax/test_data/lexer/err/0002_unclosed_char_with_ferris.txt b/crates/syntax/test_data/lexer/err/0002_unclosed_char_with_ferris.txt similarity index 100% rename from crates/ra_syntax/test_data/lexer/err/0002_unclosed_char_with_ferris.txt rename to crates/syntax/test_data/lexer/err/0002_unclosed_char_with_ferris.txt diff --git a/crates/ra_syntax/test_data/lexer/err/0003_unclosed_char_with_ascii_escape.rs b/crates/syntax/test_data/lexer/err/0003_unclosed_char_with_ascii_escape.rs similarity index 100% rename from crates/ra_syntax/test_data/lexer/err/0003_unclosed_char_with_ascii_escape.rs rename to crates/syntax/test_data/lexer/err/0003_unclosed_char_with_ascii_escape.rs diff --git a/crates/ra_syntax/test_data/lexer/err/0003_unclosed_char_with_ascii_escape.txt b/crates/syntax/test_data/lexer/err/0003_unclosed_char_with_ascii_escape.txt similarity index 100% rename from crates/ra_syntax/test_data/lexer/err/0003_unclosed_char_with_ascii_escape.txt rename to crates/syntax/test_data/lexer/err/0003_unclosed_char_with_ascii_escape.txt diff --git a/crates/ra_syntax/test_data/lexer/err/0004_unclosed_char_with_unicode_escape.rs b/crates/syntax/test_data/lexer/err/0004_unclosed_char_with_unicode_escape.rs similarity index 100% rename from crates/ra_syntax/test_data/lexer/err/0004_unclosed_char_with_unicode_escape.rs rename to crates/syntax/test_data/lexer/err/0004_unclosed_char_with_unicode_escape.rs diff --git a/crates/ra_syntax/test_data/lexer/err/0004_unclosed_char_with_unicode_escape.txt b/crates/syntax/test_data/lexer/err/0004_unclosed_char_with_unicode_escape.txt similarity index 100% rename from crates/ra_syntax/test_data/lexer/err/0004_unclosed_char_with_unicode_escape.txt rename to crates/syntax/test_data/lexer/err/0004_unclosed_char_with_unicode_escape.txt diff --git a/crates/ra_syntax/test_data/lexer/err/0005_unclosed_char_with_space.rs b/crates/syntax/test_data/lexer/err/0005_unclosed_char_with_space.rs similarity index 100% rename from crates/ra_syntax/test_data/lexer/err/0005_unclosed_char_with_space.rs rename to crates/syntax/test_data/lexer/err/0005_unclosed_char_with_space.rs diff --git a/crates/ra_syntax/test_data/lexer/err/0005_unclosed_char_with_space.txt b/crates/syntax/test_data/lexer/err/0005_unclosed_char_with_space.txt similarity index 100% rename from crates/ra_syntax/test_data/lexer/err/0005_unclosed_char_with_space.txt rename to crates/syntax/test_data/lexer/err/0005_unclosed_char_with_space.txt diff --git a/crates/ra_syntax/test_data/lexer/err/0006_unclosed_char_with_slash.rs b/crates/syntax/test_data/lexer/err/0006_unclosed_char_with_slash.rs similarity index 100% rename from crates/ra_syntax/test_data/lexer/err/0006_unclosed_char_with_slash.rs rename to crates/syntax/test_data/lexer/err/0006_unclosed_char_with_slash.rs diff --git a/crates/ra_syntax/test_data/lexer/err/0006_unclosed_char_with_slash.txt b/crates/syntax/test_data/lexer/err/0006_unclosed_char_with_slash.txt similarity index 100% rename from crates/ra_syntax/test_data/lexer/err/0006_unclosed_char_with_slash.txt rename to crates/syntax/test_data/lexer/err/0006_unclosed_char_with_slash.txt diff --git a/crates/ra_syntax/test_data/lexer/err/0007_unclosed_char_with_slash_n.rs b/crates/syntax/test_data/lexer/err/0007_unclosed_char_with_slash_n.rs similarity index 100% rename from crates/ra_syntax/test_data/lexer/err/0007_unclosed_char_with_slash_n.rs rename to crates/syntax/test_data/lexer/err/0007_unclosed_char_with_slash_n.rs diff --git a/crates/ra_syntax/test_data/lexer/err/0007_unclosed_char_with_slash_n.txt b/crates/syntax/test_data/lexer/err/0007_unclosed_char_with_slash_n.txt similarity index 100% rename from crates/ra_syntax/test_data/lexer/err/0007_unclosed_char_with_slash_n.txt rename to crates/syntax/test_data/lexer/err/0007_unclosed_char_with_slash_n.txt diff --git a/crates/ra_syntax/test_data/lexer/err/0008_unclosed_char_with_slash_single_quote.rs b/crates/syntax/test_data/lexer/err/0008_unclosed_char_with_slash_single_quote.rs similarity index 100% rename from crates/ra_syntax/test_data/lexer/err/0008_unclosed_char_with_slash_single_quote.rs rename to crates/syntax/test_data/lexer/err/0008_unclosed_char_with_slash_single_quote.rs diff --git a/crates/ra_syntax/test_data/lexer/err/0008_unclosed_char_with_slash_single_quote.txt b/crates/syntax/test_data/lexer/err/0008_unclosed_char_with_slash_single_quote.txt similarity index 100% rename from crates/ra_syntax/test_data/lexer/err/0008_unclosed_char_with_slash_single_quote.txt rename to crates/syntax/test_data/lexer/err/0008_unclosed_char_with_slash_single_quote.txt diff --git a/crates/ra_syntax/test_data/lexer/err/0009_unclosed_byte_at_eof.rs b/crates/syntax/test_data/lexer/err/0009_unclosed_byte_at_eof.rs similarity index 100% rename from crates/ra_syntax/test_data/lexer/err/0009_unclosed_byte_at_eof.rs rename to crates/syntax/test_data/lexer/err/0009_unclosed_byte_at_eof.rs diff --git a/crates/ra_syntax/test_data/lexer/err/0009_unclosed_byte_at_eof.txt b/crates/syntax/test_data/lexer/err/0009_unclosed_byte_at_eof.txt similarity index 100% rename from crates/ra_syntax/test_data/lexer/err/0009_unclosed_byte_at_eof.txt rename to crates/syntax/test_data/lexer/err/0009_unclosed_byte_at_eof.txt diff --git a/crates/ra_syntax/test_data/lexer/err/0010_unclosed_byte_with_ferris.rs b/crates/syntax/test_data/lexer/err/0010_unclosed_byte_with_ferris.rs similarity index 100% rename from crates/ra_syntax/test_data/lexer/err/0010_unclosed_byte_with_ferris.rs rename to crates/syntax/test_data/lexer/err/0010_unclosed_byte_with_ferris.rs diff --git a/crates/ra_syntax/test_data/lexer/err/0010_unclosed_byte_with_ferris.txt b/crates/syntax/test_data/lexer/err/0010_unclosed_byte_with_ferris.txt similarity index 100% rename from crates/ra_syntax/test_data/lexer/err/0010_unclosed_byte_with_ferris.txt rename to crates/syntax/test_data/lexer/err/0010_unclosed_byte_with_ferris.txt diff --git a/crates/ra_syntax/test_data/lexer/err/0011_unclosed_byte_with_ascii_escape.rs b/crates/syntax/test_data/lexer/err/0011_unclosed_byte_with_ascii_escape.rs similarity index 100% rename from crates/ra_syntax/test_data/lexer/err/0011_unclosed_byte_with_ascii_escape.rs rename to crates/syntax/test_data/lexer/err/0011_unclosed_byte_with_ascii_escape.rs diff --git a/crates/ra_syntax/test_data/lexer/err/0011_unclosed_byte_with_ascii_escape.txt b/crates/syntax/test_data/lexer/err/0011_unclosed_byte_with_ascii_escape.txt similarity index 100% rename from crates/ra_syntax/test_data/lexer/err/0011_unclosed_byte_with_ascii_escape.txt rename to crates/syntax/test_data/lexer/err/0011_unclosed_byte_with_ascii_escape.txt diff --git a/crates/ra_syntax/test_data/lexer/err/0012_unclosed_byte_with_unicode_escape.rs b/crates/syntax/test_data/lexer/err/0012_unclosed_byte_with_unicode_escape.rs similarity index 100% rename from crates/ra_syntax/test_data/lexer/err/0012_unclosed_byte_with_unicode_escape.rs rename to crates/syntax/test_data/lexer/err/0012_unclosed_byte_with_unicode_escape.rs diff --git a/crates/ra_syntax/test_data/lexer/err/0012_unclosed_byte_with_unicode_escape.txt b/crates/syntax/test_data/lexer/err/0012_unclosed_byte_with_unicode_escape.txt similarity index 100% rename from crates/ra_syntax/test_data/lexer/err/0012_unclosed_byte_with_unicode_escape.txt rename to crates/syntax/test_data/lexer/err/0012_unclosed_byte_with_unicode_escape.txt diff --git a/crates/ra_syntax/test_data/lexer/err/0013_unclosed_byte_with_space.rs b/crates/syntax/test_data/lexer/err/0013_unclosed_byte_with_space.rs similarity index 100% rename from crates/ra_syntax/test_data/lexer/err/0013_unclosed_byte_with_space.rs rename to crates/syntax/test_data/lexer/err/0013_unclosed_byte_with_space.rs diff --git a/crates/ra_syntax/test_data/lexer/err/0013_unclosed_byte_with_space.txt b/crates/syntax/test_data/lexer/err/0013_unclosed_byte_with_space.txt similarity index 100% rename from crates/ra_syntax/test_data/lexer/err/0013_unclosed_byte_with_space.txt rename to crates/syntax/test_data/lexer/err/0013_unclosed_byte_with_space.txt diff --git a/crates/ra_syntax/test_data/lexer/err/0014_unclosed_byte_with_slash.rs b/crates/syntax/test_data/lexer/err/0014_unclosed_byte_with_slash.rs similarity index 100% rename from crates/ra_syntax/test_data/lexer/err/0014_unclosed_byte_with_slash.rs rename to crates/syntax/test_data/lexer/err/0014_unclosed_byte_with_slash.rs diff --git a/crates/ra_syntax/test_data/lexer/err/0014_unclosed_byte_with_slash.txt b/crates/syntax/test_data/lexer/err/0014_unclosed_byte_with_slash.txt similarity index 100% rename from crates/ra_syntax/test_data/lexer/err/0014_unclosed_byte_with_slash.txt rename to crates/syntax/test_data/lexer/err/0014_unclosed_byte_with_slash.txt diff --git a/crates/ra_syntax/test_data/lexer/err/0015_unclosed_byte_with_slash_n.rs b/crates/syntax/test_data/lexer/err/0015_unclosed_byte_with_slash_n.rs similarity index 100% rename from crates/ra_syntax/test_data/lexer/err/0015_unclosed_byte_with_slash_n.rs rename to crates/syntax/test_data/lexer/err/0015_unclosed_byte_with_slash_n.rs diff --git a/crates/ra_syntax/test_data/lexer/err/0015_unclosed_byte_with_slash_n.txt b/crates/syntax/test_data/lexer/err/0015_unclosed_byte_with_slash_n.txt similarity index 100% rename from crates/ra_syntax/test_data/lexer/err/0015_unclosed_byte_with_slash_n.txt rename to crates/syntax/test_data/lexer/err/0015_unclosed_byte_with_slash_n.txt diff --git a/crates/ra_syntax/test_data/lexer/err/0016_unclosed_byte_with_slash_single_quote.rs b/crates/syntax/test_data/lexer/err/0016_unclosed_byte_with_slash_single_quote.rs similarity index 100% rename from crates/ra_syntax/test_data/lexer/err/0016_unclosed_byte_with_slash_single_quote.rs rename to crates/syntax/test_data/lexer/err/0016_unclosed_byte_with_slash_single_quote.rs diff --git a/crates/ra_syntax/test_data/lexer/err/0016_unclosed_byte_with_slash_single_quote.txt b/crates/syntax/test_data/lexer/err/0016_unclosed_byte_with_slash_single_quote.txt similarity index 100% rename from crates/ra_syntax/test_data/lexer/err/0016_unclosed_byte_with_slash_single_quote.txt rename to crates/syntax/test_data/lexer/err/0016_unclosed_byte_with_slash_single_quote.txt diff --git a/crates/ra_syntax/test_data/lexer/err/0017_unclosed_string_at_eof.rs b/crates/syntax/test_data/lexer/err/0017_unclosed_string_at_eof.rs similarity index 100% rename from crates/ra_syntax/test_data/lexer/err/0017_unclosed_string_at_eof.rs rename to crates/syntax/test_data/lexer/err/0017_unclosed_string_at_eof.rs diff --git a/crates/ra_syntax/test_data/lexer/err/0017_unclosed_string_at_eof.txt b/crates/syntax/test_data/lexer/err/0017_unclosed_string_at_eof.txt similarity index 100% rename from crates/ra_syntax/test_data/lexer/err/0017_unclosed_string_at_eof.txt rename to crates/syntax/test_data/lexer/err/0017_unclosed_string_at_eof.txt diff --git a/crates/ra_syntax/test_data/lexer/err/0018_unclosed_string_with_ferris.rs b/crates/syntax/test_data/lexer/err/0018_unclosed_string_with_ferris.rs similarity index 100% rename from crates/ra_syntax/test_data/lexer/err/0018_unclosed_string_with_ferris.rs rename to crates/syntax/test_data/lexer/err/0018_unclosed_string_with_ferris.rs diff --git a/crates/ra_syntax/test_data/lexer/err/0018_unclosed_string_with_ferris.txt b/crates/syntax/test_data/lexer/err/0018_unclosed_string_with_ferris.txt similarity index 100% rename from crates/ra_syntax/test_data/lexer/err/0018_unclosed_string_with_ferris.txt rename to crates/syntax/test_data/lexer/err/0018_unclosed_string_with_ferris.txt diff --git a/crates/ra_syntax/test_data/lexer/err/0019_unclosed_string_with_ascii_escape.rs b/crates/syntax/test_data/lexer/err/0019_unclosed_string_with_ascii_escape.rs similarity index 100% rename from crates/ra_syntax/test_data/lexer/err/0019_unclosed_string_with_ascii_escape.rs rename to crates/syntax/test_data/lexer/err/0019_unclosed_string_with_ascii_escape.rs diff --git a/crates/ra_syntax/test_data/lexer/err/0019_unclosed_string_with_ascii_escape.txt b/crates/syntax/test_data/lexer/err/0019_unclosed_string_with_ascii_escape.txt similarity index 100% rename from crates/ra_syntax/test_data/lexer/err/0019_unclosed_string_with_ascii_escape.txt rename to crates/syntax/test_data/lexer/err/0019_unclosed_string_with_ascii_escape.txt diff --git a/crates/ra_syntax/test_data/lexer/err/0020_unclosed_string_with_unicode_escape.rs b/crates/syntax/test_data/lexer/err/0020_unclosed_string_with_unicode_escape.rs similarity index 100% rename from crates/ra_syntax/test_data/lexer/err/0020_unclosed_string_with_unicode_escape.rs rename to crates/syntax/test_data/lexer/err/0020_unclosed_string_with_unicode_escape.rs diff --git a/crates/ra_syntax/test_data/lexer/err/0020_unclosed_string_with_unicode_escape.txt b/crates/syntax/test_data/lexer/err/0020_unclosed_string_with_unicode_escape.txt similarity index 100% rename from crates/ra_syntax/test_data/lexer/err/0020_unclosed_string_with_unicode_escape.txt rename to crates/syntax/test_data/lexer/err/0020_unclosed_string_with_unicode_escape.txt diff --git a/crates/ra_syntax/test_data/lexer/err/0021_unclosed_string_with_space.rs b/crates/syntax/test_data/lexer/err/0021_unclosed_string_with_space.rs similarity index 100% rename from crates/ra_syntax/test_data/lexer/err/0021_unclosed_string_with_space.rs rename to crates/syntax/test_data/lexer/err/0021_unclosed_string_with_space.rs diff --git a/crates/ra_syntax/test_data/lexer/err/0021_unclosed_string_with_space.txt b/crates/syntax/test_data/lexer/err/0021_unclosed_string_with_space.txt similarity index 100% rename from crates/ra_syntax/test_data/lexer/err/0021_unclosed_string_with_space.txt rename to crates/syntax/test_data/lexer/err/0021_unclosed_string_with_space.txt diff --git a/crates/ra_syntax/test_data/lexer/err/0022_unclosed_string_with_slash.rs b/crates/syntax/test_data/lexer/err/0022_unclosed_string_with_slash.rs similarity index 100% rename from crates/ra_syntax/test_data/lexer/err/0022_unclosed_string_with_slash.rs rename to crates/syntax/test_data/lexer/err/0022_unclosed_string_with_slash.rs diff --git a/crates/ra_syntax/test_data/lexer/err/0022_unclosed_string_with_slash.txt b/crates/syntax/test_data/lexer/err/0022_unclosed_string_with_slash.txt similarity index 100% rename from crates/ra_syntax/test_data/lexer/err/0022_unclosed_string_with_slash.txt rename to crates/syntax/test_data/lexer/err/0022_unclosed_string_with_slash.txt diff --git a/crates/ra_syntax/test_data/lexer/err/0023_unclosed_string_with_slash_n.rs b/crates/syntax/test_data/lexer/err/0023_unclosed_string_with_slash_n.rs similarity index 100% rename from crates/ra_syntax/test_data/lexer/err/0023_unclosed_string_with_slash_n.rs rename to crates/syntax/test_data/lexer/err/0023_unclosed_string_with_slash_n.rs diff --git a/crates/ra_syntax/test_data/lexer/err/0023_unclosed_string_with_slash_n.txt b/crates/syntax/test_data/lexer/err/0023_unclosed_string_with_slash_n.txt similarity index 100% rename from crates/ra_syntax/test_data/lexer/err/0023_unclosed_string_with_slash_n.txt rename to crates/syntax/test_data/lexer/err/0023_unclosed_string_with_slash_n.txt diff --git a/crates/ra_syntax/test_data/lexer/err/0024_unclosed_string_with_slash_double_quote.rs b/crates/syntax/test_data/lexer/err/0024_unclosed_string_with_slash_double_quote.rs similarity index 100% rename from crates/ra_syntax/test_data/lexer/err/0024_unclosed_string_with_slash_double_quote.rs rename to crates/syntax/test_data/lexer/err/0024_unclosed_string_with_slash_double_quote.rs diff --git a/crates/ra_syntax/test_data/lexer/err/0024_unclosed_string_with_slash_double_quote.txt b/crates/syntax/test_data/lexer/err/0024_unclosed_string_with_slash_double_quote.txt similarity index 100% rename from crates/ra_syntax/test_data/lexer/err/0024_unclosed_string_with_slash_double_quote.txt rename to crates/syntax/test_data/lexer/err/0024_unclosed_string_with_slash_double_quote.txt diff --git a/crates/ra_syntax/test_data/lexer/err/0025_unclosed_byte_string_at_eof.rs b/crates/syntax/test_data/lexer/err/0025_unclosed_byte_string_at_eof.rs similarity index 100% rename from crates/ra_syntax/test_data/lexer/err/0025_unclosed_byte_string_at_eof.rs rename to crates/syntax/test_data/lexer/err/0025_unclosed_byte_string_at_eof.rs diff --git a/crates/ra_syntax/test_data/lexer/err/0025_unclosed_byte_string_at_eof.txt b/crates/syntax/test_data/lexer/err/0025_unclosed_byte_string_at_eof.txt similarity index 100% rename from crates/ra_syntax/test_data/lexer/err/0025_unclosed_byte_string_at_eof.txt rename to crates/syntax/test_data/lexer/err/0025_unclosed_byte_string_at_eof.txt diff --git a/crates/ra_syntax/test_data/lexer/err/0026_unclosed_byte_string_with_ferris.rs b/crates/syntax/test_data/lexer/err/0026_unclosed_byte_string_with_ferris.rs similarity index 100% rename from crates/ra_syntax/test_data/lexer/err/0026_unclosed_byte_string_with_ferris.rs rename to crates/syntax/test_data/lexer/err/0026_unclosed_byte_string_with_ferris.rs diff --git a/crates/ra_syntax/test_data/lexer/err/0026_unclosed_byte_string_with_ferris.txt b/crates/syntax/test_data/lexer/err/0026_unclosed_byte_string_with_ferris.txt similarity index 100% rename from crates/ra_syntax/test_data/lexer/err/0026_unclosed_byte_string_with_ferris.txt rename to crates/syntax/test_data/lexer/err/0026_unclosed_byte_string_with_ferris.txt diff --git a/crates/ra_syntax/test_data/lexer/err/0027_unclosed_byte_string_with_ascii_escape.rs b/crates/syntax/test_data/lexer/err/0027_unclosed_byte_string_with_ascii_escape.rs similarity index 100% rename from crates/ra_syntax/test_data/lexer/err/0027_unclosed_byte_string_with_ascii_escape.rs rename to crates/syntax/test_data/lexer/err/0027_unclosed_byte_string_with_ascii_escape.rs diff --git a/crates/ra_syntax/test_data/lexer/err/0027_unclosed_byte_string_with_ascii_escape.txt b/crates/syntax/test_data/lexer/err/0027_unclosed_byte_string_with_ascii_escape.txt similarity index 100% rename from crates/ra_syntax/test_data/lexer/err/0027_unclosed_byte_string_with_ascii_escape.txt rename to crates/syntax/test_data/lexer/err/0027_unclosed_byte_string_with_ascii_escape.txt diff --git a/crates/ra_syntax/test_data/lexer/err/0028_unclosed_byte_string_with_unicode_escape.rs b/crates/syntax/test_data/lexer/err/0028_unclosed_byte_string_with_unicode_escape.rs similarity index 100% rename from crates/ra_syntax/test_data/lexer/err/0028_unclosed_byte_string_with_unicode_escape.rs rename to crates/syntax/test_data/lexer/err/0028_unclosed_byte_string_with_unicode_escape.rs diff --git a/crates/ra_syntax/test_data/lexer/err/0028_unclosed_byte_string_with_unicode_escape.txt b/crates/syntax/test_data/lexer/err/0028_unclosed_byte_string_with_unicode_escape.txt similarity index 100% rename from crates/ra_syntax/test_data/lexer/err/0028_unclosed_byte_string_with_unicode_escape.txt rename to crates/syntax/test_data/lexer/err/0028_unclosed_byte_string_with_unicode_escape.txt diff --git a/crates/ra_syntax/test_data/lexer/err/0029_unclosed_byte_string_with_space.rs b/crates/syntax/test_data/lexer/err/0029_unclosed_byte_string_with_space.rs similarity index 100% rename from crates/ra_syntax/test_data/lexer/err/0029_unclosed_byte_string_with_space.rs rename to crates/syntax/test_data/lexer/err/0029_unclosed_byte_string_with_space.rs diff --git a/crates/ra_syntax/test_data/lexer/err/0029_unclosed_byte_string_with_space.txt b/crates/syntax/test_data/lexer/err/0029_unclosed_byte_string_with_space.txt similarity index 100% rename from crates/ra_syntax/test_data/lexer/err/0029_unclosed_byte_string_with_space.txt rename to crates/syntax/test_data/lexer/err/0029_unclosed_byte_string_with_space.txt diff --git a/crates/ra_syntax/test_data/lexer/err/0030_unclosed_byte_string_with_slash.rs b/crates/syntax/test_data/lexer/err/0030_unclosed_byte_string_with_slash.rs similarity index 100% rename from crates/ra_syntax/test_data/lexer/err/0030_unclosed_byte_string_with_slash.rs rename to crates/syntax/test_data/lexer/err/0030_unclosed_byte_string_with_slash.rs diff --git a/crates/ra_syntax/test_data/lexer/err/0030_unclosed_byte_string_with_slash.txt b/crates/syntax/test_data/lexer/err/0030_unclosed_byte_string_with_slash.txt similarity index 100% rename from crates/ra_syntax/test_data/lexer/err/0030_unclosed_byte_string_with_slash.txt rename to crates/syntax/test_data/lexer/err/0030_unclosed_byte_string_with_slash.txt diff --git a/crates/ra_syntax/test_data/lexer/err/0031_unclosed_byte_string_with_slash_n.rs b/crates/syntax/test_data/lexer/err/0031_unclosed_byte_string_with_slash_n.rs similarity index 100% rename from crates/ra_syntax/test_data/lexer/err/0031_unclosed_byte_string_with_slash_n.rs rename to crates/syntax/test_data/lexer/err/0031_unclosed_byte_string_with_slash_n.rs diff --git a/crates/ra_syntax/test_data/lexer/err/0031_unclosed_byte_string_with_slash_n.txt b/crates/syntax/test_data/lexer/err/0031_unclosed_byte_string_with_slash_n.txt similarity index 100% rename from crates/ra_syntax/test_data/lexer/err/0031_unclosed_byte_string_with_slash_n.txt rename to crates/syntax/test_data/lexer/err/0031_unclosed_byte_string_with_slash_n.txt diff --git a/crates/ra_syntax/test_data/lexer/err/0032_unclosed_byte_string_with_slash_double_quote.rs b/crates/syntax/test_data/lexer/err/0032_unclosed_byte_string_with_slash_double_quote.rs similarity index 100% rename from crates/ra_syntax/test_data/lexer/err/0032_unclosed_byte_string_with_slash_double_quote.rs rename to crates/syntax/test_data/lexer/err/0032_unclosed_byte_string_with_slash_double_quote.rs diff --git a/crates/ra_syntax/test_data/lexer/err/0032_unclosed_byte_string_with_slash_double_quote.txt b/crates/syntax/test_data/lexer/err/0032_unclosed_byte_string_with_slash_double_quote.txt similarity index 100% rename from crates/ra_syntax/test_data/lexer/err/0032_unclosed_byte_string_with_slash_double_quote.txt rename to crates/syntax/test_data/lexer/err/0032_unclosed_byte_string_with_slash_double_quote.txt diff --git a/crates/ra_syntax/test_data/lexer/err/0033_unclosed_raw_string_at_eof.rs b/crates/syntax/test_data/lexer/err/0033_unclosed_raw_string_at_eof.rs similarity index 100% rename from crates/ra_syntax/test_data/lexer/err/0033_unclosed_raw_string_at_eof.rs rename to crates/syntax/test_data/lexer/err/0033_unclosed_raw_string_at_eof.rs diff --git a/crates/ra_syntax/test_data/lexer/err/0033_unclosed_raw_string_at_eof.txt b/crates/syntax/test_data/lexer/err/0033_unclosed_raw_string_at_eof.txt similarity index 100% rename from crates/ra_syntax/test_data/lexer/err/0033_unclosed_raw_string_at_eof.txt rename to crates/syntax/test_data/lexer/err/0033_unclosed_raw_string_at_eof.txt diff --git a/crates/ra_syntax/test_data/lexer/err/0034_unclosed_raw_string_with_ferris.rs b/crates/syntax/test_data/lexer/err/0034_unclosed_raw_string_with_ferris.rs similarity index 100% rename from crates/ra_syntax/test_data/lexer/err/0034_unclosed_raw_string_with_ferris.rs rename to crates/syntax/test_data/lexer/err/0034_unclosed_raw_string_with_ferris.rs diff --git a/crates/ra_syntax/test_data/lexer/err/0034_unclosed_raw_string_with_ferris.txt b/crates/syntax/test_data/lexer/err/0034_unclosed_raw_string_with_ferris.txt similarity index 100% rename from crates/ra_syntax/test_data/lexer/err/0034_unclosed_raw_string_with_ferris.txt rename to crates/syntax/test_data/lexer/err/0034_unclosed_raw_string_with_ferris.txt diff --git a/crates/ra_syntax/test_data/lexer/err/0035_unclosed_raw_string_with_ascii_escape.rs b/crates/syntax/test_data/lexer/err/0035_unclosed_raw_string_with_ascii_escape.rs similarity index 100% rename from crates/ra_syntax/test_data/lexer/err/0035_unclosed_raw_string_with_ascii_escape.rs rename to crates/syntax/test_data/lexer/err/0035_unclosed_raw_string_with_ascii_escape.rs diff --git a/crates/ra_syntax/test_data/lexer/err/0035_unclosed_raw_string_with_ascii_escape.txt b/crates/syntax/test_data/lexer/err/0035_unclosed_raw_string_with_ascii_escape.txt similarity index 100% rename from crates/ra_syntax/test_data/lexer/err/0035_unclosed_raw_string_with_ascii_escape.txt rename to crates/syntax/test_data/lexer/err/0035_unclosed_raw_string_with_ascii_escape.txt diff --git a/crates/ra_syntax/test_data/lexer/err/0036_unclosed_raw_string_with_unicode_escape.rs b/crates/syntax/test_data/lexer/err/0036_unclosed_raw_string_with_unicode_escape.rs similarity index 100% rename from crates/ra_syntax/test_data/lexer/err/0036_unclosed_raw_string_with_unicode_escape.rs rename to crates/syntax/test_data/lexer/err/0036_unclosed_raw_string_with_unicode_escape.rs diff --git a/crates/ra_syntax/test_data/lexer/err/0036_unclosed_raw_string_with_unicode_escape.txt b/crates/syntax/test_data/lexer/err/0036_unclosed_raw_string_with_unicode_escape.txt similarity index 100% rename from crates/ra_syntax/test_data/lexer/err/0036_unclosed_raw_string_with_unicode_escape.txt rename to crates/syntax/test_data/lexer/err/0036_unclosed_raw_string_with_unicode_escape.txt diff --git a/crates/ra_syntax/test_data/lexer/err/0037_unclosed_raw_string_with_space.rs b/crates/syntax/test_data/lexer/err/0037_unclosed_raw_string_with_space.rs similarity index 100% rename from crates/ra_syntax/test_data/lexer/err/0037_unclosed_raw_string_with_space.rs rename to crates/syntax/test_data/lexer/err/0037_unclosed_raw_string_with_space.rs diff --git a/crates/ra_syntax/test_data/lexer/err/0037_unclosed_raw_string_with_space.txt b/crates/syntax/test_data/lexer/err/0037_unclosed_raw_string_with_space.txt similarity index 100% rename from crates/ra_syntax/test_data/lexer/err/0037_unclosed_raw_string_with_space.txt rename to crates/syntax/test_data/lexer/err/0037_unclosed_raw_string_with_space.txt diff --git a/crates/ra_syntax/test_data/lexer/err/0038_unclosed_raw_string_with_slash.rs b/crates/syntax/test_data/lexer/err/0038_unclosed_raw_string_with_slash.rs similarity index 100% rename from crates/ra_syntax/test_data/lexer/err/0038_unclosed_raw_string_with_slash.rs rename to crates/syntax/test_data/lexer/err/0038_unclosed_raw_string_with_slash.rs diff --git a/crates/ra_syntax/test_data/lexer/err/0038_unclosed_raw_string_with_slash.txt b/crates/syntax/test_data/lexer/err/0038_unclosed_raw_string_with_slash.txt similarity index 100% rename from crates/ra_syntax/test_data/lexer/err/0038_unclosed_raw_string_with_slash.txt rename to crates/syntax/test_data/lexer/err/0038_unclosed_raw_string_with_slash.txt diff --git a/crates/ra_syntax/test_data/lexer/err/0039_unclosed_raw_string_with_slash_n.rs b/crates/syntax/test_data/lexer/err/0039_unclosed_raw_string_with_slash_n.rs similarity index 100% rename from crates/ra_syntax/test_data/lexer/err/0039_unclosed_raw_string_with_slash_n.rs rename to crates/syntax/test_data/lexer/err/0039_unclosed_raw_string_with_slash_n.rs diff --git a/crates/ra_syntax/test_data/lexer/err/0039_unclosed_raw_string_with_slash_n.txt b/crates/syntax/test_data/lexer/err/0039_unclosed_raw_string_with_slash_n.txt similarity index 100% rename from crates/ra_syntax/test_data/lexer/err/0039_unclosed_raw_string_with_slash_n.txt rename to crates/syntax/test_data/lexer/err/0039_unclosed_raw_string_with_slash_n.txt diff --git a/crates/ra_syntax/test_data/lexer/err/0040_unclosed_raw_byte_string_at_eof.rs b/crates/syntax/test_data/lexer/err/0040_unclosed_raw_byte_string_at_eof.rs similarity index 100% rename from crates/ra_syntax/test_data/lexer/err/0040_unclosed_raw_byte_string_at_eof.rs rename to crates/syntax/test_data/lexer/err/0040_unclosed_raw_byte_string_at_eof.rs diff --git a/crates/ra_syntax/test_data/lexer/err/0040_unclosed_raw_byte_string_at_eof.txt b/crates/syntax/test_data/lexer/err/0040_unclosed_raw_byte_string_at_eof.txt similarity index 100% rename from crates/ra_syntax/test_data/lexer/err/0040_unclosed_raw_byte_string_at_eof.txt rename to crates/syntax/test_data/lexer/err/0040_unclosed_raw_byte_string_at_eof.txt diff --git a/crates/ra_syntax/test_data/lexer/err/0041_unclosed_raw_byte_string_with_ferris.rs b/crates/syntax/test_data/lexer/err/0041_unclosed_raw_byte_string_with_ferris.rs similarity index 100% rename from crates/ra_syntax/test_data/lexer/err/0041_unclosed_raw_byte_string_with_ferris.rs rename to crates/syntax/test_data/lexer/err/0041_unclosed_raw_byte_string_with_ferris.rs diff --git a/crates/ra_syntax/test_data/lexer/err/0041_unclosed_raw_byte_string_with_ferris.txt b/crates/syntax/test_data/lexer/err/0041_unclosed_raw_byte_string_with_ferris.txt similarity index 100% rename from crates/ra_syntax/test_data/lexer/err/0041_unclosed_raw_byte_string_with_ferris.txt rename to crates/syntax/test_data/lexer/err/0041_unclosed_raw_byte_string_with_ferris.txt diff --git a/crates/ra_syntax/test_data/lexer/err/0042_unclosed_raw_byte_string_with_ascii_escape.rs b/crates/syntax/test_data/lexer/err/0042_unclosed_raw_byte_string_with_ascii_escape.rs similarity index 100% rename from crates/ra_syntax/test_data/lexer/err/0042_unclosed_raw_byte_string_with_ascii_escape.rs rename to crates/syntax/test_data/lexer/err/0042_unclosed_raw_byte_string_with_ascii_escape.rs diff --git a/crates/ra_syntax/test_data/lexer/err/0042_unclosed_raw_byte_string_with_ascii_escape.txt b/crates/syntax/test_data/lexer/err/0042_unclosed_raw_byte_string_with_ascii_escape.txt similarity index 100% rename from crates/ra_syntax/test_data/lexer/err/0042_unclosed_raw_byte_string_with_ascii_escape.txt rename to crates/syntax/test_data/lexer/err/0042_unclosed_raw_byte_string_with_ascii_escape.txt diff --git a/crates/ra_syntax/test_data/lexer/err/0043_unclosed_raw_byte_string_with_unicode_escape.rs b/crates/syntax/test_data/lexer/err/0043_unclosed_raw_byte_string_with_unicode_escape.rs similarity index 100% rename from crates/ra_syntax/test_data/lexer/err/0043_unclosed_raw_byte_string_with_unicode_escape.rs rename to crates/syntax/test_data/lexer/err/0043_unclosed_raw_byte_string_with_unicode_escape.rs diff --git a/crates/ra_syntax/test_data/lexer/err/0043_unclosed_raw_byte_string_with_unicode_escape.txt b/crates/syntax/test_data/lexer/err/0043_unclosed_raw_byte_string_with_unicode_escape.txt similarity index 100% rename from crates/ra_syntax/test_data/lexer/err/0043_unclosed_raw_byte_string_with_unicode_escape.txt rename to crates/syntax/test_data/lexer/err/0043_unclosed_raw_byte_string_with_unicode_escape.txt diff --git a/crates/ra_syntax/test_data/lexer/err/0044_unclosed_raw_byte_string_with_space.rs b/crates/syntax/test_data/lexer/err/0044_unclosed_raw_byte_string_with_space.rs similarity index 100% rename from crates/ra_syntax/test_data/lexer/err/0044_unclosed_raw_byte_string_with_space.rs rename to crates/syntax/test_data/lexer/err/0044_unclosed_raw_byte_string_with_space.rs diff --git a/crates/ra_syntax/test_data/lexer/err/0044_unclosed_raw_byte_string_with_space.txt b/crates/syntax/test_data/lexer/err/0044_unclosed_raw_byte_string_with_space.txt similarity index 100% rename from crates/ra_syntax/test_data/lexer/err/0044_unclosed_raw_byte_string_with_space.txt rename to crates/syntax/test_data/lexer/err/0044_unclosed_raw_byte_string_with_space.txt diff --git a/crates/ra_syntax/test_data/lexer/err/0045_unclosed_raw_byte_string_with_slash.rs b/crates/syntax/test_data/lexer/err/0045_unclosed_raw_byte_string_with_slash.rs similarity index 100% rename from crates/ra_syntax/test_data/lexer/err/0045_unclosed_raw_byte_string_with_slash.rs rename to crates/syntax/test_data/lexer/err/0045_unclosed_raw_byte_string_with_slash.rs diff --git a/crates/ra_syntax/test_data/lexer/err/0045_unclosed_raw_byte_string_with_slash.txt b/crates/syntax/test_data/lexer/err/0045_unclosed_raw_byte_string_with_slash.txt similarity index 100% rename from crates/ra_syntax/test_data/lexer/err/0045_unclosed_raw_byte_string_with_slash.txt rename to crates/syntax/test_data/lexer/err/0045_unclosed_raw_byte_string_with_slash.txt diff --git a/crates/ra_syntax/test_data/lexer/err/0046_unclosed_raw_byte_string_with_slash_n.rs b/crates/syntax/test_data/lexer/err/0046_unclosed_raw_byte_string_with_slash_n.rs similarity index 100% rename from crates/ra_syntax/test_data/lexer/err/0046_unclosed_raw_byte_string_with_slash_n.rs rename to crates/syntax/test_data/lexer/err/0046_unclosed_raw_byte_string_with_slash_n.rs diff --git a/crates/ra_syntax/test_data/lexer/err/0046_unclosed_raw_byte_string_with_slash_n.txt b/crates/syntax/test_data/lexer/err/0046_unclosed_raw_byte_string_with_slash_n.txt similarity index 100% rename from crates/ra_syntax/test_data/lexer/err/0046_unclosed_raw_byte_string_with_slash_n.txt rename to crates/syntax/test_data/lexer/err/0046_unclosed_raw_byte_string_with_slash_n.txt diff --git a/crates/ra_syntax/test_data/lexer/err/0047_unstarted_raw_string_at_eof.rs b/crates/syntax/test_data/lexer/err/0047_unstarted_raw_string_at_eof.rs similarity index 100% rename from crates/ra_syntax/test_data/lexer/err/0047_unstarted_raw_string_at_eof.rs rename to crates/syntax/test_data/lexer/err/0047_unstarted_raw_string_at_eof.rs diff --git a/crates/ra_syntax/test_data/lexer/err/0047_unstarted_raw_string_at_eof.txt b/crates/syntax/test_data/lexer/err/0047_unstarted_raw_string_at_eof.txt similarity index 100% rename from crates/ra_syntax/test_data/lexer/err/0047_unstarted_raw_string_at_eof.txt rename to crates/syntax/test_data/lexer/err/0047_unstarted_raw_string_at_eof.txt diff --git a/crates/ra_syntax/test_data/lexer/err/0048_unstarted_raw_byte_string_at_eof.rs b/crates/syntax/test_data/lexer/err/0048_unstarted_raw_byte_string_at_eof.rs similarity index 100% rename from crates/ra_syntax/test_data/lexer/err/0048_unstarted_raw_byte_string_at_eof.rs rename to crates/syntax/test_data/lexer/err/0048_unstarted_raw_byte_string_at_eof.rs diff --git a/crates/ra_syntax/test_data/lexer/err/0048_unstarted_raw_byte_string_at_eof.txt b/crates/syntax/test_data/lexer/err/0048_unstarted_raw_byte_string_at_eof.txt similarity index 100% rename from crates/ra_syntax/test_data/lexer/err/0048_unstarted_raw_byte_string_at_eof.txt rename to crates/syntax/test_data/lexer/err/0048_unstarted_raw_byte_string_at_eof.txt diff --git a/crates/ra_syntax/test_data/lexer/err/0049_unstarted_raw_string_with_ascii.rs b/crates/syntax/test_data/lexer/err/0049_unstarted_raw_string_with_ascii.rs similarity index 100% rename from crates/ra_syntax/test_data/lexer/err/0049_unstarted_raw_string_with_ascii.rs rename to crates/syntax/test_data/lexer/err/0049_unstarted_raw_string_with_ascii.rs diff --git a/crates/ra_syntax/test_data/lexer/err/0049_unstarted_raw_string_with_ascii.txt b/crates/syntax/test_data/lexer/err/0049_unstarted_raw_string_with_ascii.txt similarity index 100% rename from crates/ra_syntax/test_data/lexer/err/0049_unstarted_raw_string_with_ascii.txt rename to crates/syntax/test_data/lexer/err/0049_unstarted_raw_string_with_ascii.txt diff --git a/crates/ra_syntax/test_data/lexer/err/0050_unstarted_raw_byte_string_with_ascii.rs b/crates/syntax/test_data/lexer/err/0050_unstarted_raw_byte_string_with_ascii.rs similarity index 100% rename from crates/ra_syntax/test_data/lexer/err/0050_unstarted_raw_byte_string_with_ascii.rs rename to crates/syntax/test_data/lexer/err/0050_unstarted_raw_byte_string_with_ascii.rs diff --git a/crates/ra_syntax/test_data/lexer/err/0050_unstarted_raw_byte_string_with_ascii.txt b/crates/syntax/test_data/lexer/err/0050_unstarted_raw_byte_string_with_ascii.txt similarity index 100% rename from crates/ra_syntax/test_data/lexer/err/0050_unstarted_raw_byte_string_with_ascii.txt rename to crates/syntax/test_data/lexer/err/0050_unstarted_raw_byte_string_with_ascii.txt diff --git a/crates/ra_syntax/test_data/lexer/err/0051_unclosed_block_comment_at_eof.rs b/crates/syntax/test_data/lexer/err/0051_unclosed_block_comment_at_eof.rs similarity index 100% rename from crates/ra_syntax/test_data/lexer/err/0051_unclosed_block_comment_at_eof.rs rename to crates/syntax/test_data/lexer/err/0051_unclosed_block_comment_at_eof.rs diff --git a/crates/ra_syntax/test_data/lexer/err/0051_unclosed_block_comment_at_eof.txt b/crates/syntax/test_data/lexer/err/0051_unclosed_block_comment_at_eof.txt similarity index 100% rename from crates/ra_syntax/test_data/lexer/err/0051_unclosed_block_comment_at_eof.txt rename to crates/syntax/test_data/lexer/err/0051_unclosed_block_comment_at_eof.txt diff --git a/crates/ra_syntax/test_data/lexer/err/0052_unclosed_block_comment_with_content.rs b/crates/syntax/test_data/lexer/err/0052_unclosed_block_comment_with_content.rs similarity index 100% rename from crates/ra_syntax/test_data/lexer/err/0052_unclosed_block_comment_with_content.rs rename to crates/syntax/test_data/lexer/err/0052_unclosed_block_comment_with_content.rs diff --git a/crates/ra_syntax/test_data/lexer/err/0052_unclosed_block_comment_with_content.txt b/crates/syntax/test_data/lexer/err/0052_unclosed_block_comment_with_content.txt similarity index 100% rename from crates/ra_syntax/test_data/lexer/err/0052_unclosed_block_comment_with_content.txt rename to crates/syntax/test_data/lexer/err/0052_unclosed_block_comment_with_content.txt diff --git a/crates/ra_syntax/test_data/lexer/err/0053_unclosed_nested_block_comment_entirely.rs b/crates/syntax/test_data/lexer/err/0053_unclosed_nested_block_comment_entirely.rs similarity index 100% rename from crates/ra_syntax/test_data/lexer/err/0053_unclosed_nested_block_comment_entirely.rs rename to crates/syntax/test_data/lexer/err/0053_unclosed_nested_block_comment_entirely.rs diff --git a/crates/ra_syntax/test_data/lexer/err/0053_unclosed_nested_block_comment_entirely.txt b/crates/syntax/test_data/lexer/err/0053_unclosed_nested_block_comment_entirely.txt similarity index 100% rename from crates/ra_syntax/test_data/lexer/err/0053_unclosed_nested_block_comment_entirely.txt rename to crates/syntax/test_data/lexer/err/0053_unclosed_nested_block_comment_entirely.txt diff --git a/crates/ra_syntax/test_data/lexer/err/0054_unclosed_nested_block_comment_partially.rs b/crates/syntax/test_data/lexer/err/0054_unclosed_nested_block_comment_partially.rs similarity index 100% rename from crates/ra_syntax/test_data/lexer/err/0054_unclosed_nested_block_comment_partially.rs rename to crates/syntax/test_data/lexer/err/0054_unclosed_nested_block_comment_partially.rs diff --git a/crates/ra_syntax/test_data/lexer/err/0054_unclosed_nested_block_comment_partially.txt b/crates/syntax/test_data/lexer/err/0054_unclosed_nested_block_comment_partially.txt similarity index 100% rename from crates/ra_syntax/test_data/lexer/err/0054_unclosed_nested_block_comment_partially.txt rename to crates/syntax/test_data/lexer/err/0054_unclosed_nested_block_comment_partially.txt diff --git a/crates/ra_syntax/test_data/lexer/err/0055_empty_int.rs b/crates/syntax/test_data/lexer/err/0055_empty_int.rs similarity index 100% rename from crates/ra_syntax/test_data/lexer/err/0055_empty_int.rs rename to crates/syntax/test_data/lexer/err/0055_empty_int.rs diff --git a/crates/ra_syntax/test_data/lexer/err/0055_empty_int.txt b/crates/syntax/test_data/lexer/err/0055_empty_int.txt similarity index 100% rename from crates/ra_syntax/test_data/lexer/err/0055_empty_int.txt rename to crates/syntax/test_data/lexer/err/0055_empty_int.txt diff --git a/crates/ra_syntax/test_data/lexer/err/0056_empty_exponent.rs b/crates/syntax/test_data/lexer/err/0056_empty_exponent.rs similarity index 100% rename from crates/ra_syntax/test_data/lexer/err/0056_empty_exponent.rs rename to crates/syntax/test_data/lexer/err/0056_empty_exponent.rs diff --git a/crates/ra_syntax/test_data/lexer/err/0056_empty_exponent.txt b/crates/syntax/test_data/lexer/err/0056_empty_exponent.txt similarity index 100% rename from crates/ra_syntax/test_data/lexer/err/0056_empty_exponent.txt rename to crates/syntax/test_data/lexer/err/0056_empty_exponent.txt diff --git a/crates/ra_syntax/test_data/lexer/err/0057_lifetime_strarts_with_a_number.rs b/crates/syntax/test_data/lexer/err/0057_lifetime_strarts_with_a_number.rs similarity index 100% rename from crates/ra_syntax/test_data/lexer/err/0057_lifetime_strarts_with_a_number.rs rename to crates/syntax/test_data/lexer/err/0057_lifetime_strarts_with_a_number.rs diff --git a/crates/ra_syntax/test_data/lexer/err/0057_lifetime_strarts_with_a_number.txt b/crates/syntax/test_data/lexer/err/0057_lifetime_strarts_with_a_number.txt similarity index 100% rename from crates/ra_syntax/test_data/lexer/err/0057_lifetime_strarts_with_a_number.txt rename to crates/syntax/test_data/lexer/err/0057_lifetime_strarts_with_a_number.txt diff --git a/crates/ra_syntax/test_data/lexer/ok/0001_hello.rs b/crates/syntax/test_data/lexer/ok/0001_hello.rs similarity index 100% rename from crates/ra_syntax/test_data/lexer/ok/0001_hello.rs rename to crates/syntax/test_data/lexer/ok/0001_hello.rs diff --git a/crates/ra_syntax/test_data/lexer/ok/0001_hello.txt b/crates/syntax/test_data/lexer/ok/0001_hello.txt similarity index 100% rename from crates/ra_syntax/test_data/lexer/ok/0001_hello.txt rename to crates/syntax/test_data/lexer/ok/0001_hello.txt diff --git a/crates/ra_syntax/test_data/lexer/ok/0002_whitespace.rs b/crates/syntax/test_data/lexer/ok/0002_whitespace.rs similarity index 100% rename from crates/ra_syntax/test_data/lexer/ok/0002_whitespace.rs rename to crates/syntax/test_data/lexer/ok/0002_whitespace.rs diff --git a/crates/ra_syntax/test_data/lexer/ok/0002_whitespace.txt b/crates/syntax/test_data/lexer/ok/0002_whitespace.txt similarity index 100% rename from crates/ra_syntax/test_data/lexer/ok/0002_whitespace.txt rename to crates/syntax/test_data/lexer/ok/0002_whitespace.txt diff --git a/crates/ra_syntax/test_data/lexer/ok/0003_ident.rs b/crates/syntax/test_data/lexer/ok/0003_ident.rs similarity index 100% rename from crates/ra_syntax/test_data/lexer/ok/0003_ident.rs rename to crates/syntax/test_data/lexer/ok/0003_ident.rs diff --git a/crates/ra_syntax/test_data/lexer/ok/0003_ident.txt b/crates/syntax/test_data/lexer/ok/0003_ident.txt similarity index 100% rename from crates/ra_syntax/test_data/lexer/ok/0003_ident.txt rename to crates/syntax/test_data/lexer/ok/0003_ident.txt diff --git a/crates/ra_syntax/test_data/lexer/ok/0004_numbers.rs b/crates/syntax/test_data/lexer/ok/0004_numbers.rs similarity index 100% rename from crates/ra_syntax/test_data/lexer/ok/0004_numbers.rs rename to crates/syntax/test_data/lexer/ok/0004_numbers.rs diff --git a/crates/ra_syntax/test_data/lexer/ok/0004_numbers.txt b/crates/syntax/test_data/lexer/ok/0004_numbers.txt similarity index 100% rename from crates/ra_syntax/test_data/lexer/ok/0004_numbers.txt rename to crates/syntax/test_data/lexer/ok/0004_numbers.txt diff --git a/crates/ra_syntax/test_data/lexer/ok/0005_symbols.rs b/crates/syntax/test_data/lexer/ok/0005_symbols.rs similarity index 100% rename from crates/ra_syntax/test_data/lexer/ok/0005_symbols.rs rename to crates/syntax/test_data/lexer/ok/0005_symbols.rs diff --git a/crates/ra_syntax/test_data/lexer/ok/0005_symbols.txt b/crates/syntax/test_data/lexer/ok/0005_symbols.txt similarity index 100% rename from crates/ra_syntax/test_data/lexer/ok/0005_symbols.txt rename to crates/syntax/test_data/lexer/ok/0005_symbols.txt diff --git a/crates/ra_syntax/test_data/lexer/ok/0006_chars.rs b/crates/syntax/test_data/lexer/ok/0006_chars.rs similarity index 100% rename from crates/ra_syntax/test_data/lexer/ok/0006_chars.rs rename to crates/syntax/test_data/lexer/ok/0006_chars.rs diff --git a/crates/ra_syntax/test_data/lexer/ok/0006_chars.txt b/crates/syntax/test_data/lexer/ok/0006_chars.txt similarity index 100% rename from crates/ra_syntax/test_data/lexer/ok/0006_chars.txt rename to crates/syntax/test_data/lexer/ok/0006_chars.txt diff --git a/crates/ra_syntax/test_data/lexer/ok/0007_lifetimes.rs b/crates/syntax/test_data/lexer/ok/0007_lifetimes.rs similarity index 100% rename from crates/ra_syntax/test_data/lexer/ok/0007_lifetimes.rs rename to crates/syntax/test_data/lexer/ok/0007_lifetimes.rs diff --git a/crates/ra_syntax/test_data/lexer/ok/0007_lifetimes.txt b/crates/syntax/test_data/lexer/ok/0007_lifetimes.txt similarity index 100% rename from crates/ra_syntax/test_data/lexer/ok/0007_lifetimes.txt rename to crates/syntax/test_data/lexer/ok/0007_lifetimes.txt diff --git a/crates/ra_syntax/test_data/lexer/ok/0008_byte_strings.rs b/crates/syntax/test_data/lexer/ok/0008_byte_strings.rs similarity index 100% rename from crates/ra_syntax/test_data/lexer/ok/0008_byte_strings.rs rename to crates/syntax/test_data/lexer/ok/0008_byte_strings.rs diff --git a/crates/ra_syntax/test_data/lexer/ok/0008_byte_strings.txt b/crates/syntax/test_data/lexer/ok/0008_byte_strings.txt similarity index 100% rename from crates/ra_syntax/test_data/lexer/ok/0008_byte_strings.txt rename to crates/syntax/test_data/lexer/ok/0008_byte_strings.txt diff --git a/crates/ra_syntax/test_data/lexer/ok/0009_strings.rs b/crates/syntax/test_data/lexer/ok/0009_strings.rs similarity index 100% rename from crates/ra_syntax/test_data/lexer/ok/0009_strings.rs rename to crates/syntax/test_data/lexer/ok/0009_strings.rs diff --git a/crates/ra_syntax/test_data/lexer/ok/0009_strings.txt b/crates/syntax/test_data/lexer/ok/0009_strings.txt similarity index 100% rename from crates/ra_syntax/test_data/lexer/ok/0009_strings.txt rename to crates/syntax/test_data/lexer/ok/0009_strings.txt diff --git a/crates/ra_syntax/test_data/lexer/ok/0010_single_line_comments.rs b/crates/syntax/test_data/lexer/ok/0010_single_line_comments.rs similarity index 100% rename from crates/ra_syntax/test_data/lexer/ok/0010_single_line_comments.rs rename to crates/syntax/test_data/lexer/ok/0010_single_line_comments.rs diff --git a/crates/ra_syntax/test_data/lexer/ok/0010_single_line_comments.txt b/crates/syntax/test_data/lexer/ok/0010_single_line_comments.txt similarity index 100% rename from crates/ra_syntax/test_data/lexer/ok/0010_single_line_comments.txt rename to crates/syntax/test_data/lexer/ok/0010_single_line_comments.txt diff --git a/crates/ra_syntax/test_data/lexer/ok/0011_keywords.rs b/crates/syntax/test_data/lexer/ok/0011_keywords.rs similarity index 100% rename from crates/ra_syntax/test_data/lexer/ok/0011_keywords.rs rename to crates/syntax/test_data/lexer/ok/0011_keywords.rs diff --git a/crates/ra_syntax/test_data/lexer/ok/0011_keywords.txt b/crates/syntax/test_data/lexer/ok/0011_keywords.txt similarity index 100% rename from crates/ra_syntax/test_data/lexer/ok/0011_keywords.txt rename to crates/syntax/test_data/lexer/ok/0011_keywords.txt diff --git a/crates/ra_syntax/test_data/lexer/ok/0012_block_comment.rs b/crates/syntax/test_data/lexer/ok/0012_block_comment.rs similarity index 100% rename from crates/ra_syntax/test_data/lexer/ok/0012_block_comment.rs rename to crates/syntax/test_data/lexer/ok/0012_block_comment.rs diff --git a/crates/ra_syntax/test_data/lexer/ok/0012_block_comment.txt b/crates/syntax/test_data/lexer/ok/0012_block_comment.txt similarity index 100% rename from crates/ra_syntax/test_data/lexer/ok/0012_block_comment.txt rename to crates/syntax/test_data/lexer/ok/0012_block_comment.txt diff --git a/crates/ra_syntax/test_data/lexer/ok/0013_raw_strings.rs b/crates/syntax/test_data/lexer/ok/0013_raw_strings.rs similarity index 100% rename from crates/ra_syntax/test_data/lexer/ok/0013_raw_strings.rs rename to crates/syntax/test_data/lexer/ok/0013_raw_strings.rs diff --git a/crates/ra_syntax/test_data/lexer/ok/0013_raw_strings.txt b/crates/syntax/test_data/lexer/ok/0013_raw_strings.txt similarity index 100% rename from crates/ra_syntax/test_data/lexer/ok/0013_raw_strings.txt rename to crates/syntax/test_data/lexer/ok/0013_raw_strings.txt diff --git a/crates/ra_syntax/test_data/lexer/ok/0014_raw_ident.rs b/crates/syntax/test_data/lexer/ok/0014_raw_ident.rs similarity index 100% rename from crates/ra_syntax/test_data/lexer/ok/0014_raw_ident.rs rename to crates/syntax/test_data/lexer/ok/0014_raw_ident.rs diff --git a/crates/ra_syntax/test_data/lexer/ok/0014_raw_ident.txt b/crates/syntax/test_data/lexer/ok/0014_raw_ident.txt similarity index 100% rename from crates/ra_syntax/test_data/lexer/ok/0014_raw_ident.txt rename to crates/syntax/test_data/lexer/ok/0014_raw_ident.txt diff --git a/crates/ra_syntax/test_data/parser/err/0000_struct_field_missing_comma.rast b/crates/syntax/test_data/parser/err/0000_struct_field_missing_comma.rast similarity index 100% rename from crates/ra_syntax/test_data/parser/err/0000_struct_field_missing_comma.rast rename to crates/syntax/test_data/parser/err/0000_struct_field_missing_comma.rast diff --git a/crates/ra_syntax/test_data/parser/err/0000_struct_field_missing_comma.rs b/crates/syntax/test_data/parser/err/0000_struct_field_missing_comma.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/err/0000_struct_field_missing_comma.rs rename to crates/syntax/test_data/parser/err/0000_struct_field_missing_comma.rs diff --git a/crates/ra_syntax/test_data/parser/err/0001_item_recovery_in_file.rast b/crates/syntax/test_data/parser/err/0001_item_recovery_in_file.rast similarity index 100% rename from crates/ra_syntax/test_data/parser/err/0001_item_recovery_in_file.rast rename to crates/syntax/test_data/parser/err/0001_item_recovery_in_file.rast diff --git a/crates/ra_syntax/test_data/parser/err/0001_item_recovery_in_file.rs b/crates/syntax/test_data/parser/err/0001_item_recovery_in_file.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/err/0001_item_recovery_in_file.rs rename to crates/syntax/test_data/parser/err/0001_item_recovery_in_file.rs diff --git a/crates/ra_syntax/test_data/parser/err/0002_duplicate_shebang.rast b/crates/syntax/test_data/parser/err/0002_duplicate_shebang.rast similarity index 100% rename from crates/ra_syntax/test_data/parser/err/0002_duplicate_shebang.rast rename to crates/syntax/test_data/parser/err/0002_duplicate_shebang.rast diff --git a/crates/ra_syntax/test_data/parser/err/0002_duplicate_shebang.rs b/crates/syntax/test_data/parser/err/0002_duplicate_shebang.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/err/0002_duplicate_shebang.rs rename to crates/syntax/test_data/parser/err/0002_duplicate_shebang.rs diff --git a/crates/ra_syntax/test_data/parser/err/0003_C++_semicolon.rast b/crates/syntax/test_data/parser/err/0003_C++_semicolon.rast similarity index 100% rename from crates/ra_syntax/test_data/parser/err/0003_C++_semicolon.rast rename to crates/syntax/test_data/parser/err/0003_C++_semicolon.rast diff --git a/crates/ra_syntax/test_data/parser/err/0003_C++_semicolon.rs b/crates/syntax/test_data/parser/err/0003_C++_semicolon.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/err/0003_C++_semicolon.rs rename to crates/syntax/test_data/parser/err/0003_C++_semicolon.rs diff --git a/crates/ra_syntax/test_data/parser/err/0004_use_path_bad_segment.rast b/crates/syntax/test_data/parser/err/0004_use_path_bad_segment.rast similarity index 100% rename from crates/ra_syntax/test_data/parser/err/0004_use_path_bad_segment.rast rename to crates/syntax/test_data/parser/err/0004_use_path_bad_segment.rast diff --git a/crates/ra_syntax/test_data/parser/err/0004_use_path_bad_segment.rs b/crates/syntax/test_data/parser/err/0004_use_path_bad_segment.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/err/0004_use_path_bad_segment.rs rename to crates/syntax/test_data/parser/err/0004_use_path_bad_segment.rs diff --git a/crates/ra_syntax/test_data/parser/err/0005_attribute_recover.rast b/crates/syntax/test_data/parser/err/0005_attribute_recover.rast similarity index 100% rename from crates/ra_syntax/test_data/parser/err/0005_attribute_recover.rast rename to crates/syntax/test_data/parser/err/0005_attribute_recover.rast diff --git a/crates/ra_syntax/test_data/parser/err/0005_attribute_recover.rs b/crates/syntax/test_data/parser/err/0005_attribute_recover.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/err/0005_attribute_recover.rs rename to crates/syntax/test_data/parser/err/0005_attribute_recover.rs diff --git a/crates/ra_syntax/test_data/parser/err/0006_named_field_recovery.rast b/crates/syntax/test_data/parser/err/0006_named_field_recovery.rast similarity index 100% rename from crates/ra_syntax/test_data/parser/err/0006_named_field_recovery.rast rename to crates/syntax/test_data/parser/err/0006_named_field_recovery.rast diff --git a/crates/ra_syntax/test_data/parser/err/0006_named_field_recovery.rs b/crates/syntax/test_data/parser/err/0006_named_field_recovery.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/err/0006_named_field_recovery.rs rename to crates/syntax/test_data/parser/err/0006_named_field_recovery.rs diff --git a/crates/ra_syntax/test_data/parser/err/0007_stray_curly_in_file.rast b/crates/syntax/test_data/parser/err/0007_stray_curly_in_file.rast similarity index 100% rename from crates/ra_syntax/test_data/parser/err/0007_stray_curly_in_file.rast rename to crates/syntax/test_data/parser/err/0007_stray_curly_in_file.rast diff --git a/crates/ra_syntax/test_data/parser/err/0007_stray_curly_in_file.rs b/crates/syntax/test_data/parser/err/0007_stray_curly_in_file.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/err/0007_stray_curly_in_file.rs rename to crates/syntax/test_data/parser/err/0007_stray_curly_in_file.rs diff --git a/crates/ra_syntax/test_data/parser/err/0008_item_block_recovery.rast b/crates/syntax/test_data/parser/err/0008_item_block_recovery.rast similarity index 100% rename from crates/ra_syntax/test_data/parser/err/0008_item_block_recovery.rast rename to crates/syntax/test_data/parser/err/0008_item_block_recovery.rast diff --git a/crates/ra_syntax/test_data/parser/err/0008_item_block_recovery.rs b/crates/syntax/test_data/parser/err/0008_item_block_recovery.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/err/0008_item_block_recovery.rs rename to crates/syntax/test_data/parser/err/0008_item_block_recovery.rs diff --git a/crates/ra_syntax/test_data/parser/err/0009_broken_struct_type_parameter.rast b/crates/syntax/test_data/parser/err/0009_broken_struct_type_parameter.rast similarity index 100% rename from crates/ra_syntax/test_data/parser/err/0009_broken_struct_type_parameter.rast rename to crates/syntax/test_data/parser/err/0009_broken_struct_type_parameter.rast diff --git a/crates/ra_syntax/test_data/parser/err/0009_broken_struct_type_parameter.rs b/crates/syntax/test_data/parser/err/0009_broken_struct_type_parameter.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/err/0009_broken_struct_type_parameter.rs rename to crates/syntax/test_data/parser/err/0009_broken_struct_type_parameter.rs diff --git a/crates/ra_syntax/test_data/parser/err/0010_unsafe_lambda_block.rast b/crates/syntax/test_data/parser/err/0010_unsafe_lambda_block.rast similarity index 100% rename from crates/ra_syntax/test_data/parser/err/0010_unsafe_lambda_block.rast rename to crates/syntax/test_data/parser/err/0010_unsafe_lambda_block.rast diff --git a/crates/ra_syntax/test_data/parser/err/0010_unsafe_lambda_block.rs b/crates/syntax/test_data/parser/err/0010_unsafe_lambda_block.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/err/0010_unsafe_lambda_block.rs rename to crates/syntax/test_data/parser/err/0010_unsafe_lambda_block.rs diff --git a/crates/ra_syntax/test_data/parser/err/0011_extern_struct.rast b/crates/syntax/test_data/parser/err/0011_extern_struct.rast similarity index 100% rename from crates/ra_syntax/test_data/parser/err/0011_extern_struct.rast rename to crates/syntax/test_data/parser/err/0011_extern_struct.rast diff --git a/crates/ra_syntax/test_data/parser/err/0011_extern_struct.rs b/crates/syntax/test_data/parser/err/0011_extern_struct.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/err/0011_extern_struct.rs rename to crates/syntax/test_data/parser/err/0011_extern_struct.rs diff --git a/crates/ra_syntax/test_data/parser/err/0012_broken_lambda.rast b/crates/syntax/test_data/parser/err/0012_broken_lambda.rast similarity index 100% rename from crates/ra_syntax/test_data/parser/err/0012_broken_lambda.rast rename to crates/syntax/test_data/parser/err/0012_broken_lambda.rast diff --git a/crates/ra_syntax/test_data/parser/err/0013_invalid_type.rast b/crates/syntax/test_data/parser/err/0013_invalid_type.rast similarity index 100% rename from crates/ra_syntax/test_data/parser/err/0013_invalid_type.rast rename to crates/syntax/test_data/parser/err/0013_invalid_type.rast diff --git a/crates/ra_syntax/test_data/parser/err/0013_invalid_type.rs b/crates/syntax/test_data/parser/err/0013_invalid_type.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/err/0013_invalid_type.rs rename to crates/syntax/test_data/parser/err/0013_invalid_type.rs diff --git a/crates/ra_syntax/test_data/parser/err/0014_where_no_bounds.rast b/crates/syntax/test_data/parser/err/0014_where_no_bounds.rast similarity index 100% rename from crates/ra_syntax/test_data/parser/err/0014_where_no_bounds.rast rename to crates/syntax/test_data/parser/err/0014_where_no_bounds.rast diff --git a/crates/ra_syntax/test_data/parser/err/0014_where_no_bounds.rs b/crates/syntax/test_data/parser/err/0014_where_no_bounds.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/err/0014_where_no_bounds.rs rename to crates/syntax/test_data/parser/err/0014_where_no_bounds.rs diff --git a/crates/ra_syntax/test_data/parser/err/0015_curly_in_params.rast b/crates/syntax/test_data/parser/err/0015_curly_in_params.rast similarity index 100% rename from crates/ra_syntax/test_data/parser/err/0015_curly_in_params.rast rename to crates/syntax/test_data/parser/err/0015_curly_in_params.rast diff --git a/crates/ra_syntax/test_data/parser/err/0015_curly_in_params.rs b/crates/syntax/test_data/parser/err/0015_curly_in_params.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/err/0015_curly_in_params.rs rename to crates/syntax/test_data/parser/err/0015_curly_in_params.rs diff --git a/crates/ra_syntax/test_data/parser/err/0016_missing_semi.rast b/crates/syntax/test_data/parser/err/0016_missing_semi.rast similarity index 100% rename from crates/ra_syntax/test_data/parser/err/0016_missing_semi.rast rename to crates/syntax/test_data/parser/err/0016_missing_semi.rast diff --git a/crates/ra_syntax/test_data/parser/err/0016_missing_semi.rs b/crates/syntax/test_data/parser/err/0016_missing_semi.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/err/0016_missing_semi.rs rename to crates/syntax/test_data/parser/err/0016_missing_semi.rs diff --git a/crates/ra_syntax/test_data/parser/err/0017_incomplete_binexpr.rast b/crates/syntax/test_data/parser/err/0017_incomplete_binexpr.rast similarity index 100% rename from crates/ra_syntax/test_data/parser/err/0017_incomplete_binexpr.rast rename to crates/syntax/test_data/parser/err/0017_incomplete_binexpr.rast diff --git a/crates/ra_syntax/test_data/parser/err/0017_incomplete_binexpr.rs b/crates/syntax/test_data/parser/err/0017_incomplete_binexpr.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/err/0017_incomplete_binexpr.rs rename to crates/syntax/test_data/parser/err/0017_incomplete_binexpr.rs diff --git a/crates/ra_syntax/test_data/parser/err/0018_incomplete_fn.rast b/crates/syntax/test_data/parser/err/0018_incomplete_fn.rast similarity index 100% rename from crates/ra_syntax/test_data/parser/err/0018_incomplete_fn.rast rename to crates/syntax/test_data/parser/err/0018_incomplete_fn.rast diff --git a/crates/ra_syntax/test_data/parser/err/0018_incomplete_fn.rs b/crates/syntax/test_data/parser/err/0018_incomplete_fn.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/err/0018_incomplete_fn.rs rename to crates/syntax/test_data/parser/err/0018_incomplete_fn.rs diff --git a/crates/ra_syntax/test_data/parser/err/0019_let_recover.rast b/crates/syntax/test_data/parser/err/0019_let_recover.rast similarity index 100% rename from crates/ra_syntax/test_data/parser/err/0019_let_recover.rast rename to crates/syntax/test_data/parser/err/0019_let_recover.rast diff --git a/crates/ra_syntax/test_data/parser/err/0019_let_recover.rs b/crates/syntax/test_data/parser/err/0019_let_recover.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/err/0019_let_recover.rs rename to crates/syntax/test_data/parser/err/0019_let_recover.rs diff --git a/crates/ra_syntax/test_data/parser/err/0020_fn_recover.rast b/crates/syntax/test_data/parser/err/0020_fn_recover.rast similarity index 100% rename from crates/ra_syntax/test_data/parser/err/0020_fn_recover.rast rename to crates/syntax/test_data/parser/err/0020_fn_recover.rast diff --git a/crates/ra_syntax/test_data/parser/err/0020_fn_recover.rs b/crates/syntax/test_data/parser/err/0020_fn_recover.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/err/0020_fn_recover.rs rename to crates/syntax/test_data/parser/err/0020_fn_recover.rs diff --git a/crates/ra_syntax/test_data/parser/err/0021_incomplete_param.rast b/crates/syntax/test_data/parser/err/0021_incomplete_param.rast similarity index 100% rename from crates/ra_syntax/test_data/parser/err/0021_incomplete_param.rast rename to crates/syntax/test_data/parser/err/0021_incomplete_param.rast diff --git a/crates/ra_syntax/test_data/parser/err/0021_incomplete_param.rs b/crates/syntax/test_data/parser/err/0021_incomplete_param.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/err/0021_incomplete_param.rs rename to crates/syntax/test_data/parser/err/0021_incomplete_param.rs diff --git a/crates/ra_syntax/test_data/parser/err/0022_bad_exprs.rast b/crates/syntax/test_data/parser/err/0022_bad_exprs.rast similarity index 100% rename from crates/ra_syntax/test_data/parser/err/0022_bad_exprs.rast rename to crates/syntax/test_data/parser/err/0022_bad_exprs.rast diff --git a/crates/ra_syntax/test_data/parser/err/0022_bad_exprs.rs b/crates/syntax/test_data/parser/err/0022_bad_exprs.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/err/0022_bad_exprs.rs rename to crates/syntax/test_data/parser/err/0022_bad_exprs.rs diff --git a/crates/ra_syntax/test_data/parser/err/0023_mismatched_paren.rast b/crates/syntax/test_data/parser/err/0023_mismatched_paren.rast similarity index 100% rename from crates/ra_syntax/test_data/parser/err/0023_mismatched_paren.rast rename to crates/syntax/test_data/parser/err/0023_mismatched_paren.rast diff --git a/crates/ra_syntax/test_data/parser/err/0023_mismatched_paren.rs b/crates/syntax/test_data/parser/err/0023_mismatched_paren.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/err/0023_mismatched_paren.rs rename to crates/syntax/test_data/parser/err/0023_mismatched_paren.rs diff --git a/crates/ra_syntax/test_data/parser/err/0024_many_type_parens.rast b/crates/syntax/test_data/parser/err/0024_many_type_parens.rast similarity index 100% rename from crates/ra_syntax/test_data/parser/err/0024_many_type_parens.rast rename to crates/syntax/test_data/parser/err/0024_many_type_parens.rast diff --git a/crates/ra_syntax/test_data/parser/err/0024_many_type_parens.rs b/crates/syntax/test_data/parser/err/0024_many_type_parens.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/err/0024_many_type_parens.rs rename to crates/syntax/test_data/parser/err/0024_many_type_parens.rs diff --git a/crates/ra_syntax/test_data/parser/err/0025_nope.rast b/crates/syntax/test_data/parser/err/0025_nope.rast similarity index 100% rename from crates/ra_syntax/test_data/parser/err/0025_nope.rast rename to crates/syntax/test_data/parser/err/0025_nope.rast diff --git a/crates/ra_syntax/test_data/parser/err/0025_nope.rs b/crates/syntax/test_data/parser/err/0025_nope.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/err/0025_nope.rs rename to crates/syntax/test_data/parser/err/0025_nope.rs diff --git a/crates/ra_syntax/test_data/parser/err/0026_imp_recovery.rast b/crates/syntax/test_data/parser/err/0026_imp_recovery.rast similarity index 100% rename from crates/ra_syntax/test_data/parser/err/0026_imp_recovery.rast rename to crates/syntax/test_data/parser/err/0026_imp_recovery.rast diff --git a/crates/ra_syntax/test_data/parser/err/0026_imp_recovery.rs b/crates/syntax/test_data/parser/err/0026_imp_recovery.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/err/0026_imp_recovery.rs rename to crates/syntax/test_data/parser/err/0026_imp_recovery.rs diff --git a/crates/ra_syntax/test_data/parser/err/0027_incomplere_where_for.rast b/crates/syntax/test_data/parser/err/0027_incomplere_where_for.rast similarity index 100% rename from crates/ra_syntax/test_data/parser/err/0027_incomplere_where_for.rast rename to crates/syntax/test_data/parser/err/0027_incomplere_where_for.rast diff --git a/crates/ra_syntax/test_data/parser/err/0027_incomplere_where_for.rs b/crates/syntax/test_data/parser/err/0027_incomplere_where_for.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/err/0027_incomplere_where_for.rs rename to crates/syntax/test_data/parser/err/0027_incomplere_where_for.rs diff --git a/crates/ra_syntax/test_data/parser/err/0029_field_completion.rast b/crates/syntax/test_data/parser/err/0029_field_completion.rast similarity index 100% rename from crates/ra_syntax/test_data/parser/err/0029_field_completion.rast rename to crates/syntax/test_data/parser/err/0029_field_completion.rast diff --git a/crates/ra_syntax/test_data/parser/err/0029_field_completion.rs b/crates/syntax/test_data/parser/err/0029_field_completion.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/err/0029_field_completion.rs rename to crates/syntax/test_data/parser/err/0029_field_completion.rs diff --git a/crates/ra_syntax/test_data/parser/err/0031_block_inner_attrs.rast b/crates/syntax/test_data/parser/err/0031_block_inner_attrs.rast similarity index 100% rename from crates/ra_syntax/test_data/parser/err/0031_block_inner_attrs.rast rename to crates/syntax/test_data/parser/err/0031_block_inner_attrs.rast diff --git a/crates/ra_syntax/test_data/parser/err/0031_block_inner_attrs.rs b/crates/syntax/test_data/parser/err/0031_block_inner_attrs.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/err/0031_block_inner_attrs.rs rename to crates/syntax/test_data/parser/err/0031_block_inner_attrs.rs diff --git a/crates/ra_syntax/test_data/parser/err/0032_match_arms_inner_attrs.rast b/crates/syntax/test_data/parser/err/0032_match_arms_inner_attrs.rast similarity index 100% rename from crates/ra_syntax/test_data/parser/err/0032_match_arms_inner_attrs.rast rename to crates/syntax/test_data/parser/err/0032_match_arms_inner_attrs.rast diff --git a/crates/ra_syntax/test_data/parser/err/0032_match_arms_inner_attrs.rs b/crates/syntax/test_data/parser/err/0032_match_arms_inner_attrs.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/err/0032_match_arms_inner_attrs.rs rename to crates/syntax/test_data/parser/err/0032_match_arms_inner_attrs.rs diff --git a/crates/ra_syntax/test_data/parser/err/0033_match_arms_outer_attrs.rast b/crates/syntax/test_data/parser/err/0033_match_arms_outer_attrs.rast similarity index 100% rename from crates/ra_syntax/test_data/parser/err/0033_match_arms_outer_attrs.rast rename to crates/syntax/test_data/parser/err/0033_match_arms_outer_attrs.rast diff --git a/crates/ra_syntax/test_data/parser/err/0033_match_arms_outer_attrs.rs b/crates/syntax/test_data/parser/err/0033_match_arms_outer_attrs.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/err/0033_match_arms_outer_attrs.rs rename to crates/syntax/test_data/parser/err/0033_match_arms_outer_attrs.rs diff --git a/crates/ra_syntax/test_data/parser/err/0034_bad_box_pattern.rast b/crates/syntax/test_data/parser/err/0034_bad_box_pattern.rast similarity index 100% rename from crates/ra_syntax/test_data/parser/err/0034_bad_box_pattern.rast rename to crates/syntax/test_data/parser/err/0034_bad_box_pattern.rast diff --git a/crates/ra_syntax/test_data/parser/err/0034_bad_box_pattern.rs b/crates/syntax/test_data/parser/err/0034_bad_box_pattern.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/err/0034_bad_box_pattern.rs rename to crates/syntax/test_data/parser/err/0034_bad_box_pattern.rs diff --git a/crates/ra_syntax/test_data/parser/err/0035_use_recover.rast b/crates/syntax/test_data/parser/err/0035_use_recover.rast similarity index 100% rename from crates/ra_syntax/test_data/parser/err/0035_use_recover.rast rename to crates/syntax/test_data/parser/err/0035_use_recover.rast diff --git a/crates/ra_syntax/test_data/parser/err/0035_use_recover.rs b/crates/syntax/test_data/parser/err/0035_use_recover.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/err/0035_use_recover.rs rename to crates/syntax/test_data/parser/err/0035_use_recover.rs diff --git a/crates/ra_syntax/test_data/parser/err/0036_partial_use.rast b/crates/syntax/test_data/parser/err/0036_partial_use.rast similarity index 100% rename from crates/ra_syntax/test_data/parser/err/0036_partial_use.rast rename to crates/syntax/test_data/parser/err/0036_partial_use.rast diff --git a/crates/ra_syntax/test_data/parser/err/0036_partial_use.rs b/crates/syntax/test_data/parser/err/0036_partial_use.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/err/0036_partial_use.rs rename to crates/syntax/test_data/parser/err/0036_partial_use.rs diff --git a/crates/ra_syntax/test_data/parser/err/0037_visibility_in_traits.rast b/crates/syntax/test_data/parser/err/0037_visibility_in_traits.rast similarity index 100% rename from crates/ra_syntax/test_data/parser/err/0037_visibility_in_traits.rast rename to crates/syntax/test_data/parser/err/0037_visibility_in_traits.rast diff --git a/crates/ra_syntax/test_data/parser/err/0037_visibility_in_traits.rs b/crates/syntax/test_data/parser/err/0037_visibility_in_traits.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/err/0037_visibility_in_traits.rs rename to crates/syntax/test_data/parser/err/0037_visibility_in_traits.rs diff --git a/crates/ra_syntax/test_data/parser/err/0038_endless_inclusive_range.rast b/crates/syntax/test_data/parser/err/0038_endless_inclusive_range.rast similarity index 100% rename from crates/ra_syntax/test_data/parser/err/0038_endless_inclusive_range.rast rename to crates/syntax/test_data/parser/err/0038_endless_inclusive_range.rast diff --git a/crates/ra_syntax/test_data/parser/err/0038_endless_inclusive_range.rs b/crates/syntax/test_data/parser/err/0038_endless_inclusive_range.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/err/0038_endless_inclusive_range.rs rename to crates/syntax/test_data/parser/err/0038_endless_inclusive_range.rs diff --git a/crates/ra_syntax/test_data/parser/err/0039_lambda_recovery.rast b/crates/syntax/test_data/parser/err/0039_lambda_recovery.rast similarity index 100% rename from crates/ra_syntax/test_data/parser/err/0039_lambda_recovery.rast rename to crates/syntax/test_data/parser/err/0039_lambda_recovery.rast diff --git a/crates/ra_syntax/test_data/parser/err/0039_lambda_recovery.rs b/crates/syntax/test_data/parser/err/0039_lambda_recovery.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/err/0039_lambda_recovery.rs rename to crates/syntax/test_data/parser/err/0039_lambda_recovery.rs diff --git a/crates/ra_syntax/test_data/parser/err/0040_illegal_crate_kw_location.rast b/crates/syntax/test_data/parser/err/0040_illegal_crate_kw_location.rast similarity index 100% rename from crates/ra_syntax/test_data/parser/err/0040_illegal_crate_kw_location.rast rename to crates/syntax/test_data/parser/err/0040_illegal_crate_kw_location.rast diff --git a/crates/ra_syntax/test_data/parser/err/0040_illegal_crate_kw_location.rs b/crates/syntax/test_data/parser/err/0040_illegal_crate_kw_location.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/err/0040_illegal_crate_kw_location.rs rename to crates/syntax/test_data/parser/err/0040_illegal_crate_kw_location.rs diff --git a/crates/ra_syntax/test_data/parser/err/0041_illegal_super_keyword_location.rast b/crates/syntax/test_data/parser/err/0041_illegal_super_keyword_location.rast similarity index 100% rename from crates/ra_syntax/test_data/parser/err/0041_illegal_super_keyword_location.rast rename to crates/syntax/test_data/parser/err/0041_illegal_super_keyword_location.rast diff --git a/crates/ra_syntax/test_data/parser/err/0041_illegal_super_keyword_location.rs b/crates/syntax/test_data/parser/err/0041_illegal_super_keyword_location.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/err/0041_illegal_super_keyword_location.rs rename to crates/syntax/test_data/parser/err/0041_illegal_super_keyword_location.rs diff --git a/crates/ra_syntax/test_data/parser/err/0042_illegal_self_keyword_location.rast b/crates/syntax/test_data/parser/err/0042_illegal_self_keyword_location.rast similarity index 100% rename from crates/ra_syntax/test_data/parser/err/0042_illegal_self_keyword_location.rast rename to crates/syntax/test_data/parser/err/0042_illegal_self_keyword_location.rast diff --git a/crates/ra_syntax/test_data/parser/err/0042_illegal_self_keyword_location.rs b/crates/syntax/test_data/parser/err/0042_illegal_self_keyword_location.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/err/0042_illegal_self_keyword_location.rs rename to crates/syntax/test_data/parser/err/0042_illegal_self_keyword_location.rs diff --git a/crates/ra_syntax/test_data/parser/err/0043_weird_blocks.rast b/crates/syntax/test_data/parser/err/0043_weird_blocks.rast similarity index 100% rename from crates/ra_syntax/test_data/parser/err/0043_weird_blocks.rast rename to crates/syntax/test_data/parser/err/0043_weird_blocks.rast diff --git a/crates/ra_syntax/test_data/parser/err/0043_weird_blocks.rs b/crates/syntax/test_data/parser/err/0043_weird_blocks.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/err/0043_weird_blocks.rs rename to crates/syntax/test_data/parser/err/0043_weird_blocks.rs diff --git a/crates/ra_syntax/test_data/parser/err/0044_unexpected_for_type.rast b/crates/syntax/test_data/parser/err/0044_unexpected_for_type.rast similarity index 100% rename from crates/ra_syntax/test_data/parser/err/0044_unexpected_for_type.rast rename to crates/syntax/test_data/parser/err/0044_unexpected_for_type.rast diff --git a/crates/ra_syntax/test_data/parser/err/0044_unexpected_for_type.rs b/crates/syntax/test_data/parser/err/0044_unexpected_for_type.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/err/0044_unexpected_for_type.rs rename to crates/syntax/test_data/parser/err/0044_unexpected_for_type.rs diff --git a/crates/ra_syntax/test_data/parser/err/0045_item_modifiers.rast b/crates/syntax/test_data/parser/err/0045_item_modifiers.rast similarity index 100% rename from crates/ra_syntax/test_data/parser/err/0045_item_modifiers.rast rename to crates/syntax/test_data/parser/err/0045_item_modifiers.rast diff --git a/crates/ra_syntax/test_data/parser/err/0045_item_modifiers.rs b/crates/syntax/test_data/parser/err/0045_item_modifiers.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/err/0045_item_modifiers.rs rename to crates/syntax/test_data/parser/err/0045_item_modifiers.rs diff --git a/crates/ra_syntax/test_data/parser/fragments/expr/err/0000_truncated_add.rast b/crates/syntax/test_data/parser/fragments/expr/err/0000_truncated_add.rast similarity index 100% rename from crates/ra_syntax/test_data/parser/fragments/expr/err/0000_truncated_add.rast rename to crates/syntax/test_data/parser/fragments/expr/err/0000_truncated_add.rast diff --git a/crates/ra_syntax/test_data/parser/fragments/expr/err/0000_truncated_add.rs b/crates/syntax/test_data/parser/fragments/expr/err/0000_truncated_add.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/fragments/expr/err/0000_truncated_add.rs rename to crates/syntax/test_data/parser/fragments/expr/err/0000_truncated_add.rs diff --git a/crates/ra_syntax/test_data/parser/fragments/expr/ok/0000_add.rast b/crates/syntax/test_data/parser/fragments/expr/ok/0000_add.rast similarity index 100% rename from crates/ra_syntax/test_data/parser/fragments/expr/ok/0000_add.rast rename to crates/syntax/test_data/parser/fragments/expr/ok/0000_add.rast diff --git a/crates/ra_syntax/test_data/parser/fragments/expr/ok/0000_add.rs b/crates/syntax/test_data/parser/fragments/expr/ok/0000_add.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/fragments/expr/ok/0000_add.rs rename to crates/syntax/test_data/parser/fragments/expr/ok/0000_add.rs diff --git a/crates/ra_syntax/test_data/parser/fragments/item/err/0000_extra_keyword.rast b/crates/syntax/test_data/parser/fragments/item/err/0000_extra_keyword.rast similarity index 100% rename from crates/ra_syntax/test_data/parser/fragments/item/err/0000_extra_keyword.rast rename to crates/syntax/test_data/parser/fragments/item/err/0000_extra_keyword.rast diff --git a/crates/ra_syntax/test_data/parser/fragments/item/err/0000_extra_keyword.rs b/crates/syntax/test_data/parser/fragments/item/err/0000_extra_keyword.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/fragments/item/err/0000_extra_keyword.rs rename to crates/syntax/test_data/parser/fragments/item/err/0000_extra_keyword.rs diff --git a/crates/ra_syntax/test_data/parser/fragments/item/ok/0000_fn.rast b/crates/syntax/test_data/parser/fragments/item/ok/0000_fn.rast similarity index 100% rename from crates/ra_syntax/test_data/parser/fragments/item/ok/0000_fn.rast rename to crates/syntax/test_data/parser/fragments/item/ok/0000_fn.rast diff --git a/crates/ra_syntax/test_data/parser/fragments/item/ok/0000_fn.rs b/crates/syntax/test_data/parser/fragments/item/ok/0000_fn.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/fragments/item/ok/0000_fn.rs rename to crates/syntax/test_data/parser/fragments/item/ok/0000_fn.rs diff --git a/crates/ra_syntax/test_data/parser/fragments/path/err/0000_reserved_word.rast b/crates/syntax/test_data/parser/fragments/path/err/0000_reserved_word.rast similarity index 100% rename from crates/ra_syntax/test_data/parser/fragments/path/err/0000_reserved_word.rast rename to crates/syntax/test_data/parser/fragments/path/err/0000_reserved_word.rast diff --git a/crates/ra_syntax/test_data/parser/fragments/path/err/0000_reserved_word.rs b/crates/syntax/test_data/parser/fragments/path/err/0000_reserved_word.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/fragments/path/err/0000_reserved_word.rs rename to crates/syntax/test_data/parser/fragments/path/err/0000_reserved_word.rs diff --git a/crates/ra_syntax/test_data/parser/fragments/path/err/0001_expression.rast b/crates/syntax/test_data/parser/fragments/path/err/0001_expression.rast similarity index 100% rename from crates/ra_syntax/test_data/parser/fragments/path/err/0001_expression.rast rename to crates/syntax/test_data/parser/fragments/path/err/0001_expression.rast diff --git a/crates/ra_syntax/test_data/parser/fragments/path/err/0001_expression.rs b/crates/syntax/test_data/parser/fragments/path/err/0001_expression.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/fragments/path/err/0001_expression.rs rename to crates/syntax/test_data/parser/fragments/path/err/0001_expression.rs diff --git a/crates/ra_syntax/test_data/parser/fragments/path/ok/0000_single_ident.rast b/crates/syntax/test_data/parser/fragments/path/ok/0000_single_ident.rast similarity index 100% rename from crates/ra_syntax/test_data/parser/fragments/path/ok/0000_single_ident.rast rename to crates/syntax/test_data/parser/fragments/path/ok/0000_single_ident.rast diff --git a/crates/ra_syntax/test_data/parser/fragments/path/ok/0000_single_ident.rs b/crates/syntax/test_data/parser/fragments/path/ok/0000_single_ident.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/fragments/path/ok/0000_single_ident.rs rename to crates/syntax/test_data/parser/fragments/path/ok/0000_single_ident.rs diff --git a/crates/ra_syntax/test_data/parser/fragments/path/ok/0001_multipart.rast b/crates/syntax/test_data/parser/fragments/path/ok/0001_multipart.rast similarity index 100% rename from crates/ra_syntax/test_data/parser/fragments/path/ok/0001_multipart.rast rename to crates/syntax/test_data/parser/fragments/path/ok/0001_multipart.rast diff --git a/crates/ra_syntax/test_data/parser/fragments/path/ok/0001_multipart.rs b/crates/syntax/test_data/parser/fragments/path/ok/0001_multipart.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/fragments/path/ok/0001_multipart.rs rename to crates/syntax/test_data/parser/fragments/path/ok/0001_multipart.rs diff --git a/crates/ra_syntax/test_data/parser/fragments/pattern/err/0000_reserved_word.rast b/crates/syntax/test_data/parser/fragments/pattern/err/0000_reserved_word.rast similarity index 100% rename from crates/ra_syntax/test_data/parser/fragments/pattern/err/0000_reserved_word.rast rename to crates/syntax/test_data/parser/fragments/pattern/err/0000_reserved_word.rast diff --git a/crates/ra_syntax/test_data/parser/fragments/pattern/err/0000_reserved_word.rs b/crates/syntax/test_data/parser/fragments/pattern/err/0000_reserved_word.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/fragments/pattern/err/0000_reserved_word.rs rename to crates/syntax/test_data/parser/fragments/pattern/err/0000_reserved_word.rs diff --git a/crates/ra_syntax/test_data/parser/fragments/pattern/err/0001_missing_paren.rast b/crates/syntax/test_data/parser/fragments/pattern/err/0001_missing_paren.rast similarity index 100% rename from crates/ra_syntax/test_data/parser/fragments/pattern/err/0001_missing_paren.rast rename to crates/syntax/test_data/parser/fragments/pattern/err/0001_missing_paren.rast diff --git a/crates/ra_syntax/test_data/parser/fragments/pattern/err/0001_missing_paren.rs b/crates/syntax/test_data/parser/fragments/pattern/err/0001_missing_paren.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/fragments/pattern/err/0001_missing_paren.rs rename to crates/syntax/test_data/parser/fragments/pattern/err/0001_missing_paren.rs diff --git a/crates/ra_syntax/test_data/parser/fragments/pattern/ok/0000_enum.rast b/crates/syntax/test_data/parser/fragments/pattern/ok/0000_enum.rast similarity index 100% rename from crates/ra_syntax/test_data/parser/fragments/pattern/ok/0000_enum.rast rename to crates/syntax/test_data/parser/fragments/pattern/ok/0000_enum.rast diff --git a/crates/ra_syntax/test_data/parser/fragments/pattern/ok/0000_enum.rs b/crates/syntax/test_data/parser/fragments/pattern/ok/0000_enum.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/fragments/pattern/ok/0000_enum.rs rename to crates/syntax/test_data/parser/fragments/pattern/ok/0000_enum.rs diff --git a/crates/ra_syntax/test_data/parser/fragments/type/err/0000_missing_close.rast b/crates/syntax/test_data/parser/fragments/type/err/0000_missing_close.rast similarity index 100% rename from crates/ra_syntax/test_data/parser/fragments/type/err/0000_missing_close.rast rename to crates/syntax/test_data/parser/fragments/type/err/0000_missing_close.rast diff --git a/crates/ra_syntax/test_data/parser/fragments/type/err/0000_missing_close.rs b/crates/syntax/test_data/parser/fragments/type/err/0000_missing_close.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/fragments/type/err/0000_missing_close.rs rename to crates/syntax/test_data/parser/fragments/type/err/0000_missing_close.rs diff --git a/crates/ra_syntax/test_data/parser/fragments/type/ok/0000_result.rast b/crates/syntax/test_data/parser/fragments/type/ok/0000_result.rast similarity index 100% rename from crates/ra_syntax/test_data/parser/fragments/type/ok/0000_result.rast rename to crates/syntax/test_data/parser/fragments/type/ok/0000_result.rast diff --git a/crates/ra_syntax/test_data/parser/fragments/type/ok/0000_result.rs b/crates/syntax/test_data/parser/fragments/type/ok/0000_result.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/fragments/type/ok/0000_result.rs rename to crates/syntax/test_data/parser/fragments/type/ok/0000_result.rs diff --git a/crates/ra_syntax/test_data/parser/fuzz-failures/0000.rs b/crates/syntax/test_data/parser/fuzz-failures/0000.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/fuzz-failures/0000.rs rename to crates/syntax/test_data/parser/fuzz-failures/0000.rs diff --git a/crates/ra_syntax/test_data/parser/fuzz-failures/0001.rs b/crates/syntax/test_data/parser/fuzz-failures/0001.rs similarity index 99% rename from crates/ra_syntax/test_data/parser/fuzz-failures/0001.rs rename to crates/syntax/test_data/parser/fuzz-failures/0001.rs index 099cc5f84a..f1148058ef 100644 --- a/crates/ra_syntax/test_data/parser/fuzz-failures/0001.rs +++ b/crates/syntax/test_data/parser/fuzz-failures/0001.rs @@ -1,4 +1,4 @@ -use ra_syntax::{ +use syntax::{ File, TextRange, SyntaxNodeRef, TextUnit, SyntaxKind::*, algo::{find_leaf_at_offset, LeafAtOffset, find_covering_node, ancestors, Direction, siblings}, diff --git a/crates/ra_syntax/test_data/parser/fuzz-failures/0002.rs b/crates/syntax/test_data/parser/fuzz-failures/0002.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/fuzz-failures/0002.rs rename to crates/syntax/test_data/parser/fuzz-failures/0002.rs diff --git a/crates/ra_syntax/test_data/parser/fuzz-failures/0003.rs b/crates/syntax/test_data/parser/fuzz-failures/0003.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/fuzz-failures/0003.rs rename to crates/syntax/test_data/parser/fuzz-failures/0003.rs diff --git a/crates/ra_syntax/test_data/parser/fuzz-failures/0004.rs b/crates/syntax/test_data/parser/fuzz-failures/0004.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/fuzz-failures/0004.rs rename to crates/syntax/test_data/parser/fuzz-failures/0004.rs diff --git a/crates/ra_syntax/test_data/parser/inline/err/0001_array_type_missing_semi.rast b/crates/syntax/test_data/parser/inline/err/0001_array_type_missing_semi.rast similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/err/0001_array_type_missing_semi.rast rename to crates/syntax/test_data/parser/inline/err/0001_array_type_missing_semi.rast diff --git a/crates/ra_syntax/test_data/parser/inline/err/0001_array_type_missing_semi.rs b/crates/syntax/test_data/parser/inline/err/0001_array_type_missing_semi.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/err/0001_array_type_missing_semi.rs rename to crates/syntax/test_data/parser/inline/err/0001_array_type_missing_semi.rs diff --git a/crates/ra_syntax/test_data/parser/inline/err/0002_misplaced_label_err.rast b/crates/syntax/test_data/parser/inline/err/0002_misplaced_label_err.rast similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/err/0002_misplaced_label_err.rast rename to crates/syntax/test_data/parser/inline/err/0002_misplaced_label_err.rast diff --git a/crates/ra_syntax/test_data/parser/inline/err/0002_misplaced_label_err.rs b/crates/syntax/test_data/parser/inline/err/0002_misplaced_label_err.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/err/0002_misplaced_label_err.rs rename to crates/syntax/test_data/parser/inline/err/0002_misplaced_label_err.rs diff --git a/crates/ra_syntax/test_data/parser/inline/err/0003_pointer_type_no_mutability.rast b/crates/syntax/test_data/parser/inline/err/0003_pointer_type_no_mutability.rast similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/err/0003_pointer_type_no_mutability.rast rename to crates/syntax/test_data/parser/inline/err/0003_pointer_type_no_mutability.rast diff --git a/crates/ra_syntax/test_data/parser/inline/err/0003_pointer_type_no_mutability.rs b/crates/syntax/test_data/parser/inline/err/0003_pointer_type_no_mutability.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/err/0003_pointer_type_no_mutability.rs rename to crates/syntax/test_data/parser/inline/err/0003_pointer_type_no_mutability.rs diff --git a/crates/ra_syntax/test_data/parser/inline/err/0004_impl_type.rast b/crates/syntax/test_data/parser/inline/err/0004_impl_type.rast similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/err/0004_impl_type.rast rename to crates/syntax/test_data/parser/inline/err/0004_impl_type.rast diff --git a/crates/ra_syntax/test_data/parser/inline/err/0004_impl_type.rs b/crates/syntax/test_data/parser/inline/err/0004_impl_type.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/err/0004_impl_type.rs rename to crates/syntax/test_data/parser/inline/err/0004_impl_type.rs diff --git a/crates/ra_syntax/test_data/parser/inline/err/0005_fn_pointer_type_missing_fn.rast b/crates/syntax/test_data/parser/inline/err/0005_fn_pointer_type_missing_fn.rast similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/err/0005_fn_pointer_type_missing_fn.rast rename to crates/syntax/test_data/parser/inline/err/0005_fn_pointer_type_missing_fn.rast diff --git a/crates/ra_syntax/test_data/parser/inline/err/0005_fn_pointer_type_missing_fn.rs b/crates/syntax/test_data/parser/inline/err/0005_fn_pointer_type_missing_fn.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/err/0005_fn_pointer_type_missing_fn.rs rename to crates/syntax/test_data/parser/inline/err/0005_fn_pointer_type_missing_fn.rs diff --git a/crates/ra_syntax/test_data/parser/inline/err/0006_unsafe_block_in_mod.rast b/crates/syntax/test_data/parser/inline/err/0006_unsafe_block_in_mod.rast similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/err/0006_unsafe_block_in_mod.rast rename to crates/syntax/test_data/parser/inline/err/0006_unsafe_block_in_mod.rast diff --git a/crates/ra_syntax/test_data/parser/inline/err/0006_unsafe_block_in_mod.rs b/crates/syntax/test_data/parser/inline/err/0006_unsafe_block_in_mod.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/err/0006_unsafe_block_in_mod.rs rename to crates/syntax/test_data/parser/inline/err/0006_unsafe_block_in_mod.rs diff --git a/crates/ra_syntax/test_data/parser/inline/err/0007_async_without_semicolon.rast b/crates/syntax/test_data/parser/inline/err/0007_async_without_semicolon.rast similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/err/0007_async_without_semicolon.rast rename to crates/syntax/test_data/parser/inline/err/0007_async_without_semicolon.rast diff --git a/crates/ra_syntax/test_data/parser/inline/err/0007_async_without_semicolon.rs b/crates/syntax/test_data/parser/inline/err/0007_async_without_semicolon.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/err/0007_async_without_semicolon.rs rename to crates/syntax/test_data/parser/inline/err/0007_async_without_semicolon.rs diff --git a/crates/ra_syntax/test_data/parser/inline/err/0008_pub_expr.rast b/crates/syntax/test_data/parser/inline/err/0008_pub_expr.rast similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/err/0008_pub_expr.rast rename to crates/syntax/test_data/parser/inline/err/0008_pub_expr.rast diff --git a/crates/ra_syntax/test_data/parser/inline/err/0008_pub_expr.rs b/crates/syntax/test_data/parser/inline/err/0008_pub_expr.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/err/0008_pub_expr.rs rename to crates/syntax/test_data/parser/inline/err/0008_pub_expr.rs diff --git a/crates/ra_syntax/test_data/parser/inline/err/0009_attr_on_expr_not_allowed.rast b/crates/syntax/test_data/parser/inline/err/0009_attr_on_expr_not_allowed.rast similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/err/0009_attr_on_expr_not_allowed.rast rename to crates/syntax/test_data/parser/inline/err/0009_attr_on_expr_not_allowed.rast diff --git a/crates/ra_syntax/test_data/parser/inline/err/0009_attr_on_expr_not_allowed.rs b/crates/syntax/test_data/parser/inline/err/0009_attr_on_expr_not_allowed.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/err/0009_attr_on_expr_not_allowed.rs rename to crates/syntax/test_data/parser/inline/err/0009_attr_on_expr_not_allowed.rs diff --git a/crates/ra_syntax/test_data/parser/inline/err/0010_bad_tuple_index_expr.rast b/crates/syntax/test_data/parser/inline/err/0010_bad_tuple_index_expr.rast similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/err/0010_bad_tuple_index_expr.rast rename to crates/syntax/test_data/parser/inline/err/0010_bad_tuple_index_expr.rast diff --git a/crates/ra_syntax/test_data/parser/inline/err/0010_bad_tuple_index_expr.rs b/crates/syntax/test_data/parser/inline/err/0010_bad_tuple_index_expr.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/err/0010_bad_tuple_index_expr.rs rename to crates/syntax/test_data/parser/inline/err/0010_bad_tuple_index_expr.rs diff --git a/crates/ra_syntax/test_data/parser/inline/err/0013_static_underscore.rast b/crates/syntax/test_data/parser/inline/err/0013_static_underscore.rast similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/err/0013_static_underscore.rast rename to crates/syntax/test_data/parser/inline/err/0013_static_underscore.rast diff --git a/crates/ra_syntax/test_data/parser/inline/err/0013_static_underscore.rs b/crates/syntax/test_data/parser/inline/err/0013_static_underscore.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/err/0013_static_underscore.rs rename to crates/syntax/test_data/parser/inline/err/0013_static_underscore.rs diff --git a/crates/ra_syntax/test_data/parser/inline/err/0014_record_literal_before_ellipsis_recovery.rast b/crates/syntax/test_data/parser/inline/err/0014_record_literal_before_ellipsis_recovery.rast similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/err/0014_record_literal_before_ellipsis_recovery.rast rename to crates/syntax/test_data/parser/inline/err/0014_record_literal_before_ellipsis_recovery.rast diff --git a/crates/ra_syntax/test_data/parser/inline/err/0014_record_literal_before_ellipsis_recovery.rs b/crates/syntax/test_data/parser/inline/err/0014_record_literal_before_ellipsis_recovery.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/err/0014_record_literal_before_ellipsis_recovery.rs rename to crates/syntax/test_data/parser/inline/err/0014_record_literal_before_ellipsis_recovery.rs diff --git a/crates/ra_syntax/test_data/parser/inline/err/0015_empty_segment.rast b/crates/syntax/test_data/parser/inline/err/0015_empty_segment.rast similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/err/0015_empty_segment.rast rename to crates/syntax/test_data/parser/inline/err/0015_empty_segment.rast diff --git a/crates/ra_syntax/test_data/parser/inline/err/0015_empty_segment.rs b/crates/syntax/test_data/parser/inline/err/0015_empty_segment.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/err/0015_empty_segment.rs rename to crates/syntax/test_data/parser/inline/err/0015_empty_segment.rs diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0001_trait_item_list.rast b/crates/syntax/test_data/parser/inline/ok/0001_trait_item_list.rast similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0001_trait_item_list.rast rename to crates/syntax/test_data/parser/inline/ok/0001_trait_item_list.rast diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0001_trait_item_list.rs b/crates/syntax/test_data/parser/inline/ok/0001_trait_item_list.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0001_trait_item_list.rs rename to crates/syntax/test_data/parser/inline/ok/0001_trait_item_list.rs diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0002_use_tree_list.rast b/crates/syntax/test_data/parser/inline/ok/0002_use_tree_list.rast similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0002_use_tree_list.rast rename to crates/syntax/test_data/parser/inline/ok/0002_use_tree_list.rast diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0002_use_tree_list.rs b/crates/syntax/test_data/parser/inline/ok/0002_use_tree_list.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0002_use_tree_list.rs rename to crates/syntax/test_data/parser/inline/ok/0002_use_tree_list.rs diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0003_where_pred_for.rast b/crates/syntax/test_data/parser/inline/ok/0003_where_pred_for.rast similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0003_where_pred_for.rast rename to crates/syntax/test_data/parser/inline/ok/0003_where_pred_for.rast diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0003_where_pred_for.rs b/crates/syntax/test_data/parser/inline/ok/0003_where_pred_for.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0003_where_pred_for.rs rename to crates/syntax/test_data/parser/inline/ok/0003_where_pred_for.rs diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0004_value_parameters_no_patterns.rast b/crates/syntax/test_data/parser/inline/ok/0004_value_parameters_no_patterns.rast similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0004_value_parameters_no_patterns.rast rename to crates/syntax/test_data/parser/inline/ok/0004_value_parameters_no_patterns.rast diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0004_value_parameters_no_patterns.rs b/crates/syntax/test_data/parser/inline/ok/0004_value_parameters_no_patterns.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0004_value_parameters_no_patterns.rs rename to crates/syntax/test_data/parser/inline/ok/0004_value_parameters_no_patterns.rs diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0005_function_type_params.rast b/crates/syntax/test_data/parser/inline/ok/0005_function_type_params.rast similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0005_function_type_params.rast rename to crates/syntax/test_data/parser/inline/ok/0005_function_type_params.rast diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0005_function_type_params.rs b/crates/syntax/test_data/parser/inline/ok/0005_function_type_params.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0005_function_type_params.rs rename to crates/syntax/test_data/parser/inline/ok/0005_function_type_params.rs diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0006_self_param.rast b/crates/syntax/test_data/parser/inline/ok/0006_self_param.rast similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0006_self_param.rast rename to crates/syntax/test_data/parser/inline/ok/0006_self_param.rast diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0006_self_param.rs b/crates/syntax/test_data/parser/inline/ok/0006_self_param.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0006_self_param.rs rename to crates/syntax/test_data/parser/inline/ok/0006_self_param.rs diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0007_type_param_bounds.rast b/crates/syntax/test_data/parser/inline/ok/0007_type_param_bounds.rast similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0007_type_param_bounds.rast rename to crates/syntax/test_data/parser/inline/ok/0007_type_param_bounds.rast diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0007_type_param_bounds.rs b/crates/syntax/test_data/parser/inline/ok/0007_type_param_bounds.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0007_type_param_bounds.rs rename to crates/syntax/test_data/parser/inline/ok/0007_type_param_bounds.rs diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0008_path_part.rast b/crates/syntax/test_data/parser/inline/ok/0008_path_part.rast similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0008_path_part.rast rename to crates/syntax/test_data/parser/inline/ok/0008_path_part.rast diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0008_path_part.rs b/crates/syntax/test_data/parser/inline/ok/0008_path_part.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0008_path_part.rs rename to crates/syntax/test_data/parser/inline/ok/0008_path_part.rs diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0009_loop_expr.rast b/crates/syntax/test_data/parser/inline/ok/0009_loop_expr.rast similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0009_loop_expr.rast rename to crates/syntax/test_data/parser/inline/ok/0009_loop_expr.rast diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0009_loop_expr.rs b/crates/syntax/test_data/parser/inline/ok/0009_loop_expr.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0009_loop_expr.rs rename to crates/syntax/test_data/parser/inline/ok/0009_loop_expr.rs diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0010_extern_block.rast b/crates/syntax/test_data/parser/inline/ok/0010_extern_block.rast similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0010_extern_block.rast rename to crates/syntax/test_data/parser/inline/ok/0010_extern_block.rast diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0010_extern_block.rs b/crates/syntax/test_data/parser/inline/ok/0010_extern_block.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0010_extern_block.rs rename to crates/syntax/test_data/parser/inline/ok/0010_extern_block.rs diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0011_field_expr.rast b/crates/syntax/test_data/parser/inline/ok/0011_field_expr.rast similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0011_field_expr.rast rename to crates/syntax/test_data/parser/inline/ok/0011_field_expr.rast diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0011_field_expr.rs b/crates/syntax/test_data/parser/inline/ok/0011_field_expr.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0011_field_expr.rs rename to crates/syntax/test_data/parser/inline/ok/0011_field_expr.rs diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0012_type_item_where_clause.rast b/crates/syntax/test_data/parser/inline/ok/0012_type_item_where_clause.rast similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0012_type_item_where_clause.rast rename to crates/syntax/test_data/parser/inline/ok/0012_type_item_where_clause.rast diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0012_type_item_where_clause.rs b/crates/syntax/test_data/parser/inline/ok/0012_type_item_where_clause.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0012_type_item_where_clause.rs rename to crates/syntax/test_data/parser/inline/ok/0012_type_item_where_clause.rs diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0013_pointer_type_mut.rast b/crates/syntax/test_data/parser/inline/ok/0013_pointer_type_mut.rast similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0013_pointer_type_mut.rast rename to crates/syntax/test_data/parser/inline/ok/0013_pointer_type_mut.rast diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0013_pointer_type_mut.rs b/crates/syntax/test_data/parser/inline/ok/0013_pointer_type_mut.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0013_pointer_type_mut.rs rename to crates/syntax/test_data/parser/inline/ok/0013_pointer_type_mut.rs diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0014_never_type.rast b/crates/syntax/test_data/parser/inline/ok/0014_never_type.rast similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0014_never_type.rast rename to crates/syntax/test_data/parser/inline/ok/0014_never_type.rast diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0014_never_type.rs b/crates/syntax/test_data/parser/inline/ok/0014_never_type.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0014_never_type.rs rename to crates/syntax/test_data/parser/inline/ok/0014_never_type.rs diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0015_continue_expr.rast b/crates/syntax/test_data/parser/inline/ok/0015_continue_expr.rast similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0015_continue_expr.rast rename to crates/syntax/test_data/parser/inline/ok/0015_continue_expr.rast diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0015_continue_expr.rs b/crates/syntax/test_data/parser/inline/ok/0015_continue_expr.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0015_continue_expr.rs rename to crates/syntax/test_data/parser/inline/ok/0015_continue_expr.rs diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0017_array_type.rast b/crates/syntax/test_data/parser/inline/ok/0017_array_type.rast similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0017_array_type.rast rename to crates/syntax/test_data/parser/inline/ok/0017_array_type.rast diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0017_array_type.rs b/crates/syntax/test_data/parser/inline/ok/0017_array_type.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0017_array_type.rs rename to crates/syntax/test_data/parser/inline/ok/0017_array_type.rs diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0018_arb_self_types.rast b/crates/syntax/test_data/parser/inline/ok/0018_arb_self_types.rast similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0018_arb_self_types.rast rename to crates/syntax/test_data/parser/inline/ok/0018_arb_self_types.rast diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0018_arb_self_types.rs b/crates/syntax/test_data/parser/inline/ok/0018_arb_self_types.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0018_arb_self_types.rs rename to crates/syntax/test_data/parser/inline/ok/0018_arb_self_types.rs diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0019_unary_expr.rast b/crates/syntax/test_data/parser/inline/ok/0019_unary_expr.rast similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0019_unary_expr.rast rename to crates/syntax/test_data/parser/inline/ok/0019_unary_expr.rast diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0019_unary_expr.rs b/crates/syntax/test_data/parser/inline/ok/0019_unary_expr.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0019_unary_expr.rs rename to crates/syntax/test_data/parser/inline/ok/0019_unary_expr.rs diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0020_use_star.rast b/crates/syntax/test_data/parser/inline/ok/0020_use_star.rast similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0020_use_star.rast rename to crates/syntax/test_data/parser/inline/ok/0020_use_star.rast diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0020_use_star.rs b/crates/syntax/test_data/parser/inline/ok/0020_use_star.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0020_use_star.rs rename to crates/syntax/test_data/parser/inline/ok/0020_use_star.rs diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0021_impl_item_list.rast b/crates/syntax/test_data/parser/inline/ok/0021_impl_item_list.rast similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0021_impl_item_list.rast rename to crates/syntax/test_data/parser/inline/ok/0021_impl_item_list.rast diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0021_impl_item_list.rs b/crates/syntax/test_data/parser/inline/ok/0021_impl_item_list.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0021_impl_item_list.rs rename to crates/syntax/test_data/parser/inline/ok/0021_impl_item_list.rs diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0022_crate_visibility.rast b/crates/syntax/test_data/parser/inline/ok/0022_crate_visibility.rast similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0022_crate_visibility.rast rename to crates/syntax/test_data/parser/inline/ok/0022_crate_visibility.rast diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0022_crate_visibility.rs b/crates/syntax/test_data/parser/inline/ok/0022_crate_visibility.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0022_crate_visibility.rs rename to crates/syntax/test_data/parser/inline/ok/0022_crate_visibility.rs diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0023_placeholder_type.rast b/crates/syntax/test_data/parser/inline/ok/0023_placeholder_type.rast similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0023_placeholder_type.rast rename to crates/syntax/test_data/parser/inline/ok/0023_placeholder_type.rast diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0023_placeholder_type.rs b/crates/syntax/test_data/parser/inline/ok/0023_placeholder_type.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0023_placeholder_type.rs rename to crates/syntax/test_data/parser/inline/ok/0023_placeholder_type.rs diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0024_slice_pat.rast b/crates/syntax/test_data/parser/inline/ok/0024_slice_pat.rast similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0024_slice_pat.rast rename to crates/syntax/test_data/parser/inline/ok/0024_slice_pat.rast diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0024_slice_pat.rs b/crates/syntax/test_data/parser/inline/ok/0024_slice_pat.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0024_slice_pat.rs rename to crates/syntax/test_data/parser/inline/ok/0024_slice_pat.rs diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0025_slice_type.rast b/crates/syntax/test_data/parser/inline/ok/0025_slice_type.rast similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0025_slice_type.rast rename to crates/syntax/test_data/parser/inline/ok/0025_slice_type.rast diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0025_slice_type.rs b/crates/syntax/test_data/parser/inline/ok/0025_slice_type.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0025_slice_type.rs rename to crates/syntax/test_data/parser/inline/ok/0025_slice_type.rs diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0026_tuple_pat_fields.rast b/crates/syntax/test_data/parser/inline/ok/0026_tuple_pat_fields.rast similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0026_tuple_pat_fields.rast rename to crates/syntax/test_data/parser/inline/ok/0026_tuple_pat_fields.rast diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0026_tuple_pat_fields.rs b/crates/syntax/test_data/parser/inline/ok/0026_tuple_pat_fields.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0026_tuple_pat_fields.rs rename to crates/syntax/test_data/parser/inline/ok/0026_tuple_pat_fields.rs diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0027_ref_pat.rast b/crates/syntax/test_data/parser/inline/ok/0027_ref_pat.rast similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0027_ref_pat.rast rename to crates/syntax/test_data/parser/inline/ok/0027_ref_pat.rast diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0027_ref_pat.rs b/crates/syntax/test_data/parser/inline/ok/0027_ref_pat.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0027_ref_pat.rs rename to crates/syntax/test_data/parser/inline/ok/0027_ref_pat.rs diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0028_impl_trait_type.rast b/crates/syntax/test_data/parser/inline/ok/0028_impl_trait_type.rast similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0028_impl_trait_type.rast rename to crates/syntax/test_data/parser/inline/ok/0028_impl_trait_type.rast diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0028_impl_trait_type.rs b/crates/syntax/test_data/parser/inline/ok/0028_impl_trait_type.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0028_impl_trait_type.rs rename to crates/syntax/test_data/parser/inline/ok/0028_impl_trait_type.rs diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0029_cast_expr.rast b/crates/syntax/test_data/parser/inline/ok/0029_cast_expr.rast similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0029_cast_expr.rast rename to crates/syntax/test_data/parser/inline/ok/0029_cast_expr.rast diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0029_cast_expr.rs b/crates/syntax/test_data/parser/inline/ok/0029_cast_expr.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0029_cast_expr.rs rename to crates/syntax/test_data/parser/inline/ok/0029_cast_expr.rs diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0030_cond.rast b/crates/syntax/test_data/parser/inline/ok/0030_cond.rast similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0030_cond.rast rename to crates/syntax/test_data/parser/inline/ok/0030_cond.rast diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0030_cond.rs b/crates/syntax/test_data/parser/inline/ok/0030_cond.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0030_cond.rs rename to crates/syntax/test_data/parser/inline/ok/0030_cond.rs diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0031_while_expr.rast b/crates/syntax/test_data/parser/inline/ok/0031_while_expr.rast similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0031_while_expr.rast rename to crates/syntax/test_data/parser/inline/ok/0031_while_expr.rast diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0031_while_expr.rs b/crates/syntax/test_data/parser/inline/ok/0031_while_expr.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0031_while_expr.rs rename to crates/syntax/test_data/parser/inline/ok/0031_while_expr.rs diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0032_fn_pointer_type.rast b/crates/syntax/test_data/parser/inline/ok/0032_fn_pointer_type.rast similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0032_fn_pointer_type.rast rename to crates/syntax/test_data/parser/inline/ok/0032_fn_pointer_type.rast diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0032_fn_pointer_type.rs b/crates/syntax/test_data/parser/inline/ok/0032_fn_pointer_type.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0032_fn_pointer_type.rs rename to crates/syntax/test_data/parser/inline/ok/0032_fn_pointer_type.rs diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0033_reference_type;.rast b/crates/syntax/test_data/parser/inline/ok/0033_reference_type;.rast similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0033_reference_type;.rast rename to crates/syntax/test_data/parser/inline/ok/0033_reference_type;.rast diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0033_reference_type;.rs b/crates/syntax/test_data/parser/inline/ok/0033_reference_type;.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0033_reference_type;.rs rename to crates/syntax/test_data/parser/inline/ok/0033_reference_type;.rs diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0034_break_expr.rast b/crates/syntax/test_data/parser/inline/ok/0034_break_expr.rast similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0034_break_expr.rast rename to crates/syntax/test_data/parser/inline/ok/0034_break_expr.rast diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0034_break_expr.rs b/crates/syntax/test_data/parser/inline/ok/0034_break_expr.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0034_break_expr.rs rename to crates/syntax/test_data/parser/inline/ok/0034_break_expr.rs diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0037_qual_paths.rast b/crates/syntax/test_data/parser/inline/ok/0037_qual_paths.rast similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0037_qual_paths.rast rename to crates/syntax/test_data/parser/inline/ok/0037_qual_paths.rast diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0037_qual_paths.rs b/crates/syntax/test_data/parser/inline/ok/0037_qual_paths.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0037_qual_paths.rs rename to crates/syntax/test_data/parser/inline/ok/0037_qual_paths.rs diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0038_full_range_expr.rast b/crates/syntax/test_data/parser/inline/ok/0038_full_range_expr.rast similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0038_full_range_expr.rast rename to crates/syntax/test_data/parser/inline/ok/0038_full_range_expr.rast diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0038_full_range_expr.rs b/crates/syntax/test_data/parser/inline/ok/0038_full_range_expr.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0038_full_range_expr.rs rename to crates/syntax/test_data/parser/inline/ok/0038_full_range_expr.rs diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0039_type_arg.rast b/crates/syntax/test_data/parser/inline/ok/0039_type_arg.rast similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0039_type_arg.rast rename to crates/syntax/test_data/parser/inline/ok/0039_type_arg.rast diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0039_type_arg.rs b/crates/syntax/test_data/parser/inline/ok/0039_type_arg.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0039_type_arg.rs rename to crates/syntax/test_data/parser/inline/ok/0039_type_arg.rs diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0040_crate_keyword_vis.rast b/crates/syntax/test_data/parser/inline/ok/0040_crate_keyword_vis.rast similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0040_crate_keyword_vis.rast rename to crates/syntax/test_data/parser/inline/ok/0040_crate_keyword_vis.rast diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0040_crate_keyword_vis.rs b/crates/syntax/test_data/parser/inline/ok/0040_crate_keyword_vis.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0040_crate_keyword_vis.rs rename to crates/syntax/test_data/parser/inline/ok/0040_crate_keyword_vis.rs diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0041_trait_item.rast b/crates/syntax/test_data/parser/inline/ok/0041_trait_item.rast similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0041_trait_item.rast rename to crates/syntax/test_data/parser/inline/ok/0041_trait_item.rast diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0041_trait_item.rs b/crates/syntax/test_data/parser/inline/ok/0041_trait_item.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0041_trait_item.rs rename to crates/syntax/test_data/parser/inline/ok/0041_trait_item.rs diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0042_call_expr.rast b/crates/syntax/test_data/parser/inline/ok/0042_call_expr.rast similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0042_call_expr.rast rename to crates/syntax/test_data/parser/inline/ok/0042_call_expr.rast diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0042_call_expr.rs b/crates/syntax/test_data/parser/inline/ok/0042_call_expr.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0042_call_expr.rs rename to crates/syntax/test_data/parser/inline/ok/0042_call_expr.rs diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0043_use_alias.rast b/crates/syntax/test_data/parser/inline/ok/0043_use_alias.rast similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0043_use_alias.rast rename to crates/syntax/test_data/parser/inline/ok/0043_use_alias.rast diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0043_use_alias.rs b/crates/syntax/test_data/parser/inline/ok/0043_use_alias.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0043_use_alias.rs rename to crates/syntax/test_data/parser/inline/ok/0043_use_alias.rs diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0044_block_items.rast b/crates/syntax/test_data/parser/inline/ok/0044_block_items.rast similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0044_block_items.rast rename to crates/syntax/test_data/parser/inline/ok/0044_block_items.rast diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0044_block_items.rs b/crates/syntax/test_data/parser/inline/ok/0044_block_items.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0044_block_items.rs rename to crates/syntax/test_data/parser/inline/ok/0044_block_items.rs diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0045_param_list_opt_patterns.rast b/crates/syntax/test_data/parser/inline/ok/0045_param_list_opt_patterns.rast similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0045_param_list_opt_patterns.rast rename to crates/syntax/test_data/parser/inline/ok/0045_param_list_opt_patterns.rast diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0045_param_list_opt_patterns.rs b/crates/syntax/test_data/parser/inline/ok/0045_param_list_opt_patterns.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0045_param_list_opt_patterns.rs rename to crates/syntax/test_data/parser/inline/ok/0045_param_list_opt_patterns.rs diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0046_singleton_tuple_type.rast b/crates/syntax/test_data/parser/inline/ok/0046_singleton_tuple_type.rast similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0046_singleton_tuple_type.rast rename to crates/syntax/test_data/parser/inline/ok/0046_singleton_tuple_type.rast diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0046_singleton_tuple_type.rs b/crates/syntax/test_data/parser/inline/ok/0046_singleton_tuple_type.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0046_singleton_tuple_type.rs rename to crates/syntax/test_data/parser/inline/ok/0046_singleton_tuple_type.rs diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0048_path_type_with_bounds.rast b/crates/syntax/test_data/parser/inline/ok/0048_path_type_with_bounds.rast similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0048_path_type_with_bounds.rast rename to crates/syntax/test_data/parser/inline/ok/0048_path_type_with_bounds.rast diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0048_path_type_with_bounds.rs b/crates/syntax/test_data/parser/inline/ok/0048_path_type_with_bounds.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0048_path_type_with_bounds.rs rename to crates/syntax/test_data/parser/inline/ok/0048_path_type_with_bounds.rs diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0050_fn_decl.rast b/crates/syntax/test_data/parser/inline/ok/0050_fn_decl.rast similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0050_fn_decl.rast rename to crates/syntax/test_data/parser/inline/ok/0050_fn_decl.rast diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0050_fn_decl.rs b/crates/syntax/test_data/parser/inline/ok/0050_fn_decl.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0050_fn_decl.rs rename to crates/syntax/test_data/parser/inline/ok/0050_fn_decl.rs diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0051_unit_type.rast b/crates/syntax/test_data/parser/inline/ok/0051_unit_type.rast similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0051_unit_type.rast rename to crates/syntax/test_data/parser/inline/ok/0051_unit_type.rast diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0051_unit_type.rs b/crates/syntax/test_data/parser/inline/ok/0051_unit_type.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0051_unit_type.rs rename to crates/syntax/test_data/parser/inline/ok/0051_unit_type.rs diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0052_path_type.rast b/crates/syntax/test_data/parser/inline/ok/0052_path_type.rast similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0052_path_type.rast rename to crates/syntax/test_data/parser/inline/ok/0052_path_type.rast diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0052_path_type.rs b/crates/syntax/test_data/parser/inline/ok/0052_path_type.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0052_path_type.rs rename to crates/syntax/test_data/parser/inline/ok/0052_path_type.rs diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0053_path_expr.rast b/crates/syntax/test_data/parser/inline/ok/0053_path_expr.rast similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0053_path_expr.rast rename to crates/syntax/test_data/parser/inline/ok/0053_path_expr.rast diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0053_path_expr.rs b/crates/syntax/test_data/parser/inline/ok/0053_path_expr.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0053_path_expr.rs rename to crates/syntax/test_data/parser/inline/ok/0053_path_expr.rs diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0054_record_field_attrs.rast b/crates/syntax/test_data/parser/inline/ok/0054_record_field_attrs.rast similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0054_record_field_attrs.rast rename to crates/syntax/test_data/parser/inline/ok/0054_record_field_attrs.rast diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0054_record_field_attrs.rs b/crates/syntax/test_data/parser/inline/ok/0054_record_field_attrs.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0054_record_field_attrs.rs rename to crates/syntax/test_data/parser/inline/ok/0054_record_field_attrs.rs diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0055_literal_pattern.rast b/crates/syntax/test_data/parser/inline/ok/0055_literal_pattern.rast similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0055_literal_pattern.rast rename to crates/syntax/test_data/parser/inline/ok/0055_literal_pattern.rast diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0055_literal_pattern.rs b/crates/syntax/test_data/parser/inline/ok/0055_literal_pattern.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0055_literal_pattern.rs rename to crates/syntax/test_data/parser/inline/ok/0055_literal_pattern.rs diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0056_where_clause.rast b/crates/syntax/test_data/parser/inline/ok/0056_where_clause.rast similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0056_where_clause.rast rename to crates/syntax/test_data/parser/inline/ok/0056_where_clause.rast diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0056_where_clause.rs b/crates/syntax/test_data/parser/inline/ok/0056_where_clause.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0056_where_clause.rs rename to crates/syntax/test_data/parser/inline/ok/0056_where_clause.rs diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0058_range_pat.rast b/crates/syntax/test_data/parser/inline/ok/0058_range_pat.rast similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0058_range_pat.rast rename to crates/syntax/test_data/parser/inline/ok/0058_range_pat.rast diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0058_range_pat.rs b/crates/syntax/test_data/parser/inline/ok/0058_range_pat.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0058_range_pat.rs rename to crates/syntax/test_data/parser/inline/ok/0058_range_pat.rs diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0059_match_arms_commas.rast b/crates/syntax/test_data/parser/inline/ok/0059_match_arms_commas.rast similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0059_match_arms_commas.rast rename to crates/syntax/test_data/parser/inline/ok/0059_match_arms_commas.rast diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0059_match_arms_commas.rs b/crates/syntax/test_data/parser/inline/ok/0059_match_arms_commas.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0059_match_arms_commas.rs rename to crates/syntax/test_data/parser/inline/ok/0059_match_arms_commas.rs diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0060_extern_crate.rast b/crates/syntax/test_data/parser/inline/ok/0060_extern_crate.rast similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0060_extern_crate.rast rename to crates/syntax/test_data/parser/inline/ok/0060_extern_crate.rast diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0060_extern_crate.rs b/crates/syntax/test_data/parser/inline/ok/0060_extern_crate.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0060_extern_crate.rs rename to crates/syntax/test_data/parser/inline/ok/0060_extern_crate.rs diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0061_record_lit.rast b/crates/syntax/test_data/parser/inline/ok/0061_record_lit.rast similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0061_record_lit.rast rename to crates/syntax/test_data/parser/inline/ok/0061_record_lit.rast diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0061_record_lit.rs b/crates/syntax/test_data/parser/inline/ok/0061_record_lit.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0061_record_lit.rs rename to crates/syntax/test_data/parser/inline/ok/0061_record_lit.rs diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0062_mod_contents.rast b/crates/syntax/test_data/parser/inline/ok/0062_mod_contents.rast similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0062_mod_contents.rast rename to crates/syntax/test_data/parser/inline/ok/0062_mod_contents.rast diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0062_mod_contents.rs b/crates/syntax/test_data/parser/inline/ok/0062_mod_contents.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0062_mod_contents.rs rename to crates/syntax/test_data/parser/inline/ok/0062_mod_contents.rs diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0063_impl_def_neg.rast b/crates/syntax/test_data/parser/inline/ok/0063_impl_def_neg.rast similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0063_impl_def_neg.rast rename to crates/syntax/test_data/parser/inline/ok/0063_impl_def_neg.rast diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0063_impl_def_neg.rs b/crates/syntax/test_data/parser/inline/ok/0063_impl_def_neg.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0063_impl_def_neg.rs rename to crates/syntax/test_data/parser/inline/ok/0063_impl_def_neg.rs diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0064_if_expr.rast b/crates/syntax/test_data/parser/inline/ok/0064_if_expr.rast similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0064_if_expr.rast rename to crates/syntax/test_data/parser/inline/ok/0064_if_expr.rast diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0064_if_expr.rs b/crates/syntax/test_data/parser/inline/ok/0064_if_expr.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0064_if_expr.rs rename to crates/syntax/test_data/parser/inline/ok/0064_if_expr.rs diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0065_dyn_trait_type.rast b/crates/syntax/test_data/parser/inline/ok/0065_dyn_trait_type.rast similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0065_dyn_trait_type.rast rename to crates/syntax/test_data/parser/inline/ok/0065_dyn_trait_type.rast diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0065_dyn_trait_type.rs b/crates/syntax/test_data/parser/inline/ok/0065_dyn_trait_type.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0065_dyn_trait_type.rs rename to crates/syntax/test_data/parser/inline/ok/0065_dyn_trait_type.rs diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0066_match_arm.rast b/crates/syntax/test_data/parser/inline/ok/0066_match_arm.rast similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0066_match_arm.rast rename to crates/syntax/test_data/parser/inline/ok/0066_match_arm.rast diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0066_match_arm.rs b/crates/syntax/test_data/parser/inline/ok/0066_match_arm.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0066_match_arm.rs rename to crates/syntax/test_data/parser/inline/ok/0066_match_arm.rs diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0067_crate_path.rast b/crates/syntax/test_data/parser/inline/ok/0067_crate_path.rast similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0067_crate_path.rast rename to crates/syntax/test_data/parser/inline/ok/0067_crate_path.rast diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0067_crate_path.rs b/crates/syntax/test_data/parser/inline/ok/0067_crate_path.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0067_crate_path.rs rename to crates/syntax/test_data/parser/inline/ok/0067_crate_path.rs diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0068_union_items.rast b/crates/syntax/test_data/parser/inline/ok/0068_union_items.rast similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0068_union_items.rast rename to crates/syntax/test_data/parser/inline/ok/0068_union_items.rast diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0068_union_items.rs b/crates/syntax/test_data/parser/inline/ok/0068_union_items.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0068_union_items.rs rename to crates/syntax/test_data/parser/inline/ok/0068_union_items.rs diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0069_use_tree_list_after_path.rast b/crates/syntax/test_data/parser/inline/ok/0069_use_tree_list_after_path.rast similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0069_use_tree_list_after_path.rast rename to crates/syntax/test_data/parser/inline/ok/0069_use_tree_list_after_path.rast diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0069_use_tree_list_after_path.rs b/crates/syntax/test_data/parser/inline/ok/0069_use_tree_list_after_path.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0069_use_tree_list_after_path.rs rename to crates/syntax/test_data/parser/inline/ok/0069_use_tree_list_after_path.rs diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0070_stmt_bin_expr_ambiguity.rast b/crates/syntax/test_data/parser/inline/ok/0070_stmt_bin_expr_ambiguity.rast similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0070_stmt_bin_expr_ambiguity.rast rename to crates/syntax/test_data/parser/inline/ok/0070_stmt_bin_expr_ambiguity.rast diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0070_stmt_bin_expr_ambiguity.rs b/crates/syntax/test_data/parser/inline/ok/0070_stmt_bin_expr_ambiguity.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0070_stmt_bin_expr_ambiguity.rs rename to crates/syntax/test_data/parser/inline/ok/0070_stmt_bin_expr_ambiguity.rs diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0071_match_expr.rast b/crates/syntax/test_data/parser/inline/ok/0071_match_expr.rast similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0071_match_expr.rast rename to crates/syntax/test_data/parser/inline/ok/0071_match_expr.rast diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0071_match_expr.rs b/crates/syntax/test_data/parser/inline/ok/0071_match_expr.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0071_match_expr.rs rename to crates/syntax/test_data/parser/inline/ok/0071_match_expr.rs diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0072_return_expr.rast b/crates/syntax/test_data/parser/inline/ok/0072_return_expr.rast similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0072_return_expr.rast rename to crates/syntax/test_data/parser/inline/ok/0072_return_expr.rast diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0072_return_expr.rs b/crates/syntax/test_data/parser/inline/ok/0072_return_expr.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0072_return_expr.rs rename to crates/syntax/test_data/parser/inline/ok/0072_return_expr.rs diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0073_type_item_type_params.rast b/crates/syntax/test_data/parser/inline/ok/0073_type_item_type_params.rast similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0073_type_item_type_params.rast rename to crates/syntax/test_data/parser/inline/ok/0073_type_item_type_params.rast diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0073_type_item_type_params.rs b/crates/syntax/test_data/parser/inline/ok/0073_type_item_type_params.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0073_type_item_type_params.rs rename to crates/syntax/test_data/parser/inline/ok/0073_type_item_type_params.rs diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0074_stmt_postfix_expr_ambiguity.rast b/crates/syntax/test_data/parser/inline/ok/0074_stmt_postfix_expr_ambiguity.rast similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0074_stmt_postfix_expr_ambiguity.rast rename to crates/syntax/test_data/parser/inline/ok/0074_stmt_postfix_expr_ambiguity.rast diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0074_stmt_postfix_expr_ambiguity.rs b/crates/syntax/test_data/parser/inline/ok/0074_stmt_postfix_expr_ambiguity.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0074_stmt_postfix_expr_ambiguity.rs rename to crates/syntax/test_data/parser/inline/ok/0074_stmt_postfix_expr_ambiguity.rs diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0075_block.rast b/crates/syntax/test_data/parser/inline/ok/0075_block.rast similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0075_block.rast rename to crates/syntax/test_data/parser/inline/ok/0075_block.rast diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0075_block.rs b/crates/syntax/test_data/parser/inline/ok/0075_block.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0075_block.rs rename to crates/syntax/test_data/parser/inline/ok/0075_block.rs diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0076_function_where_clause.rast b/crates/syntax/test_data/parser/inline/ok/0076_function_where_clause.rast similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0076_function_where_clause.rast rename to crates/syntax/test_data/parser/inline/ok/0076_function_where_clause.rast diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0076_function_where_clause.rs b/crates/syntax/test_data/parser/inline/ok/0076_function_where_clause.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0076_function_where_clause.rs rename to crates/syntax/test_data/parser/inline/ok/0076_function_where_clause.rs diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0077_try_expr.rast b/crates/syntax/test_data/parser/inline/ok/0077_try_expr.rast similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0077_try_expr.rast rename to crates/syntax/test_data/parser/inline/ok/0077_try_expr.rast diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0077_try_expr.rs b/crates/syntax/test_data/parser/inline/ok/0077_try_expr.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0077_try_expr.rs rename to crates/syntax/test_data/parser/inline/ok/0077_try_expr.rs diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0078_type_item.rast b/crates/syntax/test_data/parser/inline/ok/0078_type_item.rast similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0078_type_item.rast rename to crates/syntax/test_data/parser/inline/ok/0078_type_item.rast diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0078_type_item.rs b/crates/syntax/test_data/parser/inline/ok/0078_type_item.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0078_type_item.rs rename to crates/syntax/test_data/parser/inline/ok/0078_type_item.rs diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0079_impl_def.rast b/crates/syntax/test_data/parser/inline/ok/0079_impl_def.rast similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0079_impl_def.rast rename to crates/syntax/test_data/parser/inline/ok/0079_impl_def.rast diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0079_impl_def.rs b/crates/syntax/test_data/parser/inline/ok/0079_impl_def.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0079_impl_def.rs rename to crates/syntax/test_data/parser/inline/ok/0079_impl_def.rs diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0080_postfix_range.rast b/crates/syntax/test_data/parser/inline/ok/0080_postfix_range.rast similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0080_postfix_range.rast rename to crates/syntax/test_data/parser/inline/ok/0080_postfix_range.rast diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0080_postfix_range.rs b/crates/syntax/test_data/parser/inline/ok/0080_postfix_range.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0080_postfix_range.rs rename to crates/syntax/test_data/parser/inline/ok/0080_postfix_range.rs diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0081_for_type.rast b/crates/syntax/test_data/parser/inline/ok/0081_for_type.rast similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0081_for_type.rast rename to crates/syntax/test_data/parser/inline/ok/0081_for_type.rast diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0081_for_type.rs b/crates/syntax/test_data/parser/inline/ok/0081_for_type.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0081_for_type.rs rename to crates/syntax/test_data/parser/inline/ok/0081_for_type.rs diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0082_ref_expr.rast b/crates/syntax/test_data/parser/inline/ok/0082_ref_expr.rast similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0082_ref_expr.rast rename to crates/syntax/test_data/parser/inline/ok/0082_ref_expr.rast diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0082_ref_expr.rs b/crates/syntax/test_data/parser/inline/ok/0082_ref_expr.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0082_ref_expr.rs rename to crates/syntax/test_data/parser/inline/ok/0082_ref_expr.rs diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0083_struct_items.rast b/crates/syntax/test_data/parser/inline/ok/0083_struct_items.rast similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0083_struct_items.rast rename to crates/syntax/test_data/parser/inline/ok/0083_struct_items.rast diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0083_struct_items.rs b/crates/syntax/test_data/parser/inline/ok/0083_struct_items.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0083_struct_items.rs rename to crates/syntax/test_data/parser/inline/ok/0083_struct_items.rs diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0084_paren_type.rast b/crates/syntax/test_data/parser/inline/ok/0084_paren_type.rast similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0084_paren_type.rast rename to crates/syntax/test_data/parser/inline/ok/0084_paren_type.rast diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0084_paren_type.rs b/crates/syntax/test_data/parser/inline/ok/0084_paren_type.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0084_paren_type.rs rename to crates/syntax/test_data/parser/inline/ok/0084_paren_type.rs diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0085_expr_literals.rast b/crates/syntax/test_data/parser/inline/ok/0085_expr_literals.rast similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0085_expr_literals.rast rename to crates/syntax/test_data/parser/inline/ok/0085_expr_literals.rast diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0085_expr_literals.rs b/crates/syntax/test_data/parser/inline/ok/0085_expr_literals.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0085_expr_literals.rs rename to crates/syntax/test_data/parser/inline/ok/0085_expr_literals.rs diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0086_function_ret_type.rast b/crates/syntax/test_data/parser/inline/ok/0086_function_ret_type.rast similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0086_function_ret_type.rast rename to crates/syntax/test_data/parser/inline/ok/0086_function_ret_type.rast diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0086_function_ret_type.rs b/crates/syntax/test_data/parser/inline/ok/0086_function_ret_type.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0086_function_ret_type.rs rename to crates/syntax/test_data/parser/inline/ok/0086_function_ret_type.rs diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0088_break_ambiguity.rast b/crates/syntax/test_data/parser/inline/ok/0088_break_ambiguity.rast similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0088_break_ambiguity.rast rename to crates/syntax/test_data/parser/inline/ok/0088_break_ambiguity.rast diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0088_break_ambiguity.rs b/crates/syntax/test_data/parser/inline/ok/0088_break_ambiguity.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0088_break_ambiguity.rs rename to crates/syntax/test_data/parser/inline/ok/0088_break_ambiguity.rs diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0090_type_param_default.rast b/crates/syntax/test_data/parser/inline/ok/0090_type_param_default.rast similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0090_type_param_default.rast rename to crates/syntax/test_data/parser/inline/ok/0090_type_param_default.rast diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0090_type_param_default.rs b/crates/syntax/test_data/parser/inline/ok/0090_type_param_default.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0090_type_param_default.rs rename to crates/syntax/test_data/parser/inline/ok/0090_type_param_default.rs diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0092_fn_pointer_type_with_ret.rast b/crates/syntax/test_data/parser/inline/ok/0092_fn_pointer_type_with_ret.rast similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0092_fn_pointer_type_with_ret.rast rename to crates/syntax/test_data/parser/inline/ok/0092_fn_pointer_type_with_ret.rast diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0092_fn_pointer_type_with_ret.rs b/crates/syntax/test_data/parser/inline/ok/0092_fn_pointer_type_with_ret.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0092_fn_pointer_type_with_ret.rs rename to crates/syntax/test_data/parser/inline/ok/0092_fn_pointer_type_with_ret.rs diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0093_index_expr.rast b/crates/syntax/test_data/parser/inline/ok/0093_index_expr.rast similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0093_index_expr.rast rename to crates/syntax/test_data/parser/inline/ok/0093_index_expr.rast diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0093_index_expr.rs b/crates/syntax/test_data/parser/inline/ok/0093_index_expr.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0093_index_expr.rs rename to crates/syntax/test_data/parser/inline/ok/0093_index_expr.rs diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0095_placeholder_pat.rast b/crates/syntax/test_data/parser/inline/ok/0095_placeholder_pat.rast similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0095_placeholder_pat.rast rename to crates/syntax/test_data/parser/inline/ok/0095_placeholder_pat.rast diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0095_placeholder_pat.rs b/crates/syntax/test_data/parser/inline/ok/0095_placeholder_pat.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0095_placeholder_pat.rs rename to crates/syntax/test_data/parser/inline/ok/0095_placeholder_pat.rs diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0096_no_semi_after_block.rast b/crates/syntax/test_data/parser/inline/ok/0096_no_semi_after_block.rast similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0096_no_semi_after_block.rast rename to crates/syntax/test_data/parser/inline/ok/0096_no_semi_after_block.rast diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0096_no_semi_after_block.rs b/crates/syntax/test_data/parser/inline/ok/0096_no_semi_after_block.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0096_no_semi_after_block.rs rename to crates/syntax/test_data/parser/inline/ok/0096_no_semi_after_block.rs diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0099_param_list.rast b/crates/syntax/test_data/parser/inline/ok/0099_param_list.rast similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0099_param_list.rast rename to crates/syntax/test_data/parser/inline/ok/0099_param_list.rast diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0099_param_list.rs b/crates/syntax/test_data/parser/inline/ok/0099_param_list.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0099_param_list.rs rename to crates/syntax/test_data/parser/inline/ok/0099_param_list.rs diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0100_for_expr.rast b/crates/syntax/test_data/parser/inline/ok/0100_for_expr.rast similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0100_for_expr.rast rename to crates/syntax/test_data/parser/inline/ok/0100_for_expr.rast diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0100_for_expr.rs b/crates/syntax/test_data/parser/inline/ok/0100_for_expr.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0100_for_expr.rs rename to crates/syntax/test_data/parser/inline/ok/0100_for_expr.rs diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0102_record_field_pat_list.rast b/crates/syntax/test_data/parser/inline/ok/0102_record_field_pat_list.rast similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0102_record_field_pat_list.rast rename to crates/syntax/test_data/parser/inline/ok/0102_record_field_pat_list.rast diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0102_record_field_pat_list.rs b/crates/syntax/test_data/parser/inline/ok/0102_record_field_pat_list.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0102_record_field_pat_list.rs rename to crates/syntax/test_data/parser/inline/ok/0102_record_field_pat_list.rs diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0103_array_expr.rast b/crates/syntax/test_data/parser/inline/ok/0103_array_expr.rast similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0103_array_expr.rast rename to crates/syntax/test_data/parser/inline/ok/0103_array_expr.rast diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0103_array_expr.rs b/crates/syntax/test_data/parser/inline/ok/0103_array_expr.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0103_array_expr.rs rename to crates/syntax/test_data/parser/inline/ok/0103_array_expr.rs diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0104_path_fn_trait_args.rast b/crates/syntax/test_data/parser/inline/ok/0104_path_fn_trait_args.rast similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0104_path_fn_trait_args.rast rename to crates/syntax/test_data/parser/inline/ok/0104_path_fn_trait_args.rast diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0104_path_fn_trait_args.rs b/crates/syntax/test_data/parser/inline/ok/0104_path_fn_trait_args.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0104_path_fn_trait_args.rs rename to crates/syntax/test_data/parser/inline/ok/0104_path_fn_trait_args.rs diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0106_lambda_expr.rast b/crates/syntax/test_data/parser/inline/ok/0106_lambda_expr.rast similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0106_lambda_expr.rast rename to crates/syntax/test_data/parser/inline/ok/0106_lambda_expr.rast diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0106_lambda_expr.rs b/crates/syntax/test_data/parser/inline/ok/0106_lambda_expr.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0106_lambda_expr.rs rename to crates/syntax/test_data/parser/inline/ok/0106_lambda_expr.rs diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0107_method_call_expr.rast b/crates/syntax/test_data/parser/inline/ok/0107_method_call_expr.rast similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0107_method_call_expr.rast rename to crates/syntax/test_data/parser/inline/ok/0107_method_call_expr.rast diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0107_method_call_expr.rs b/crates/syntax/test_data/parser/inline/ok/0107_method_call_expr.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0107_method_call_expr.rs rename to crates/syntax/test_data/parser/inline/ok/0107_method_call_expr.rs diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0108_tuple_expr.rast b/crates/syntax/test_data/parser/inline/ok/0108_tuple_expr.rast similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0108_tuple_expr.rast rename to crates/syntax/test_data/parser/inline/ok/0108_tuple_expr.rast diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0108_tuple_expr.rs b/crates/syntax/test_data/parser/inline/ok/0108_tuple_expr.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0108_tuple_expr.rs rename to crates/syntax/test_data/parser/inline/ok/0108_tuple_expr.rs diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0109_label.rast b/crates/syntax/test_data/parser/inline/ok/0109_label.rast similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0109_label.rast rename to crates/syntax/test_data/parser/inline/ok/0109_label.rast diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0109_label.rs b/crates/syntax/test_data/parser/inline/ok/0109_label.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0109_label.rs rename to crates/syntax/test_data/parser/inline/ok/0109_label.rs diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0110_use_path.rast b/crates/syntax/test_data/parser/inline/ok/0110_use_path.rast similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0110_use_path.rast rename to crates/syntax/test_data/parser/inline/ok/0110_use_path.rast diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0110_use_path.rs b/crates/syntax/test_data/parser/inline/ok/0110_use_path.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0110_use_path.rs rename to crates/syntax/test_data/parser/inline/ok/0110_use_path.rs diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0111_tuple_pat.rast b/crates/syntax/test_data/parser/inline/ok/0111_tuple_pat.rast similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0111_tuple_pat.rast rename to crates/syntax/test_data/parser/inline/ok/0111_tuple_pat.rast diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0111_tuple_pat.rs b/crates/syntax/test_data/parser/inline/ok/0111_tuple_pat.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0111_tuple_pat.rs rename to crates/syntax/test_data/parser/inline/ok/0111_tuple_pat.rs diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0112_bind_pat.rast b/crates/syntax/test_data/parser/inline/ok/0112_bind_pat.rast similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0112_bind_pat.rast rename to crates/syntax/test_data/parser/inline/ok/0112_bind_pat.rast diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0112_bind_pat.rs b/crates/syntax/test_data/parser/inline/ok/0112_bind_pat.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0112_bind_pat.rs rename to crates/syntax/test_data/parser/inline/ok/0112_bind_pat.rs diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0113_nocontentexpr.rast b/crates/syntax/test_data/parser/inline/ok/0113_nocontentexpr.rast similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0113_nocontentexpr.rast rename to crates/syntax/test_data/parser/inline/ok/0113_nocontentexpr.rast diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0113_nocontentexpr.rs b/crates/syntax/test_data/parser/inline/ok/0113_nocontentexpr.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0113_nocontentexpr.rs rename to crates/syntax/test_data/parser/inline/ok/0113_nocontentexpr.rs diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0114_tuple_struct_where.rast b/crates/syntax/test_data/parser/inline/ok/0114_tuple_struct_where.rast similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0114_tuple_struct_where.rast rename to crates/syntax/test_data/parser/inline/ok/0114_tuple_struct_where.rast diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0114_tuple_struct_where.rs b/crates/syntax/test_data/parser/inline/ok/0114_tuple_struct_where.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0114_tuple_struct_where.rs rename to crates/syntax/test_data/parser/inline/ok/0114_tuple_struct_where.rs diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0115_tuple_field_attrs.rast b/crates/syntax/test_data/parser/inline/ok/0115_tuple_field_attrs.rast similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0115_tuple_field_attrs.rast rename to crates/syntax/test_data/parser/inline/ok/0115_tuple_field_attrs.rast diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0115_tuple_field_attrs.rs b/crates/syntax/test_data/parser/inline/ok/0115_tuple_field_attrs.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0115_tuple_field_attrs.rs rename to crates/syntax/test_data/parser/inline/ok/0115_tuple_field_attrs.rs diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0117_macro_call_type.rast b/crates/syntax/test_data/parser/inline/ok/0117_macro_call_type.rast similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0117_macro_call_type.rast rename to crates/syntax/test_data/parser/inline/ok/0117_macro_call_type.rast diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0117_macro_call_type.rs b/crates/syntax/test_data/parser/inline/ok/0117_macro_call_type.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0117_macro_call_type.rs rename to crates/syntax/test_data/parser/inline/ok/0117_macro_call_type.rs diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0118_impl_inner_attributes.rast b/crates/syntax/test_data/parser/inline/ok/0118_impl_inner_attributes.rast similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0118_impl_inner_attributes.rast rename to crates/syntax/test_data/parser/inline/ok/0118_impl_inner_attributes.rast diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0118_impl_inner_attributes.rs b/crates/syntax/test_data/parser/inline/ok/0118_impl_inner_attributes.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0118_impl_inner_attributes.rs rename to crates/syntax/test_data/parser/inline/ok/0118_impl_inner_attributes.rs diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0118_match_guard.rast b/crates/syntax/test_data/parser/inline/ok/0118_match_guard.rast similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0118_match_guard.rast rename to crates/syntax/test_data/parser/inline/ok/0118_match_guard.rast diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0118_match_guard.rs b/crates/syntax/test_data/parser/inline/ok/0118_match_guard.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0118_match_guard.rs rename to crates/syntax/test_data/parser/inline/ok/0118_match_guard.rs diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0120_match_arms_inner_attribute.rast b/crates/syntax/test_data/parser/inline/ok/0120_match_arms_inner_attribute.rast similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0120_match_arms_inner_attribute.rast rename to crates/syntax/test_data/parser/inline/ok/0120_match_arms_inner_attribute.rast diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0120_match_arms_inner_attribute.rs b/crates/syntax/test_data/parser/inline/ok/0120_match_arms_inner_attribute.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0120_match_arms_inner_attribute.rs rename to crates/syntax/test_data/parser/inline/ok/0120_match_arms_inner_attribute.rs diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0121_match_arms_outer_attributes.rast b/crates/syntax/test_data/parser/inline/ok/0121_match_arms_outer_attributes.rast similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0121_match_arms_outer_attributes.rast rename to crates/syntax/test_data/parser/inline/ok/0121_match_arms_outer_attributes.rast diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0121_match_arms_outer_attributes.rs b/crates/syntax/test_data/parser/inline/ok/0121_match_arms_outer_attributes.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0121_match_arms_outer_attributes.rs rename to crates/syntax/test_data/parser/inline/ok/0121_match_arms_outer_attributes.rs diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0122_generic_lifetime_type_attribute.rast b/crates/syntax/test_data/parser/inline/ok/0122_generic_lifetime_type_attribute.rast similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0122_generic_lifetime_type_attribute.rast rename to crates/syntax/test_data/parser/inline/ok/0122_generic_lifetime_type_attribute.rast diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0122_generic_lifetime_type_attribute.rs b/crates/syntax/test_data/parser/inline/ok/0122_generic_lifetime_type_attribute.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0122_generic_lifetime_type_attribute.rs rename to crates/syntax/test_data/parser/inline/ok/0122_generic_lifetime_type_attribute.rs diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0123_param_list_vararg.rast b/crates/syntax/test_data/parser/inline/ok/0123_param_list_vararg.rast similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0123_param_list_vararg.rast rename to crates/syntax/test_data/parser/inline/ok/0123_param_list_vararg.rast diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0123_param_list_vararg.rs b/crates/syntax/test_data/parser/inline/ok/0123_param_list_vararg.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0123_param_list_vararg.rs rename to crates/syntax/test_data/parser/inline/ok/0123_param_list_vararg.rs diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0125_crate_keyword_path.rast b/crates/syntax/test_data/parser/inline/ok/0125_crate_keyword_path.rast similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0125_crate_keyword_path.rast rename to crates/syntax/test_data/parser/inline/ok/0125_crate_keyword_path.rast diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0125_crate_keyword_path.rs b/crates/syntax/test_data/parser/inline/ok/0125_crate_keyword_path.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0125_crate_keyword_path.rs rename to crates/syntax/test_data/parser/inline/ok/0125_crate_keyword_path.rs diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0125_record_literal_field_with_attr.rast b/crates/syntax/test_data/parser/inline/ok/0125_record_literal_field_with_attr.rast similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0125_record_literal_field_with_attr.rast rename to crates/syntax/test_data/parser/inline/ok/0125_record_literal_field_with_attr.rast diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0125_record_literal_field_with_attr.rs b/crates/syntax/test_data/parser/inline/ok/0125_record_literal_field_with_attr.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0125_record_literal_field_with_attr.rs rename to crates/syntax/test_data/parser/inline/ok/0125_record_literal_field_with_attr.rs diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0126_attr_on_expr_stmt.rast b/crates/syntax/test_data/parser/inline/ok/0126_attr_on_expr_stmt.rast similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0126_attr_on_expr_stmt.rast rename to crates/syntax/test_data/parser/inline/ok/0126_attr_on_expr_stmt.rast diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0126_attr_on_expr_stmt.rs b/crates/syntax/test_data/parser/inline/ok/0126_attr_on_expr_stmt.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0126_attr_on_expr_stmt.rs rename to crates/syntax/test_data/parser/inline/ok/0126_attr_on_expr_stmt.rs diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0127_attr_on_last_expr_in_block.rast b/crates/syntax/test_data/parser/inline/ok/0127_attr_on_last_expr_in_block.rast similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0127_attr_on_last_expr_in_block.rast rename to crates/syntax/test_data/parser/inline/ok/0127_attr_on_last_expr_in_block.rast diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0127_attr_on_last_expr_in_block.rs b/crates/syntax/test_data/parser/inline/ok/0127_attr_on_last_expr_in_block.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0127_attr_on_last_expr_in_block.rs rename to crates/syntax/test_data/parser/inline/ok/0127_attr_on_last_expr_in_block.rs diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0129_marco_pat.rast b/crates/syntax/test_data/parser/inline/ok/0129_marco_pat.rast similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0129_marco_pat.rast rename to crates/syntax/test_data/parser/inline/ok/0129_marco_pat.rast diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0129_marco_pat.rs b/crates/syntax/test_data/parser/inline/ok/0129_marco_pat.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0129_marco_pat.rs rename to crates/syntax/test_data/parser/inline/ok/0129_marco_pat.rs diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0130_let_stmt.rast b/crates/syntax/test_data/parser/inline/ok/0130_let_stmt.rast similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0130_let_stmt.rast rename to crates/syntax/test_data/parser/inline/ok/0130_let_stmt.rast diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0130_let_stmt.rs b/crates/syntax/test_data/parser/inline/ok/0130_let_stmt.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0130_let_stmt.rs rename to crates/syntax/test_data/parser/inline/ok/0130_let_stmt.rs diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0130_try_block_expr.rast b/crates/syntax/test_data/parser/inline/ok/0130_try_block_expr.rast similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0130_try_block_expr.rast rename to crates/syntax/test_data/parser/inline/ok/0130_try_block_expr.rast diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0130_try_block_expr.rs b/crates/syntax/test_data/parser/inline/ok/0130_try_block_expr.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0130_try_block_expr.rs rename to crates/syntax/test_data/parser/inline/ok/0130_try_block_expr.rs diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0131_existential_type.rast b/crates/syntax/test_data/parser/inline/ok/0131_existential_type.rast similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0131_existential_type.rast rename to crates/syntax/test_data/parser/inline/ok/0131_existential_type.rast diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0131_existential_type.rs b/crates/syntax/test_data/parser/inline/ok/0131_existential_type.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0131_existential_type.rs rename to crates/syntax/test_data/parser/inline/ok/0131_existential_type.rs diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0132_box_expr.rast b/crates/syntax/test_data/parser/inline/ok/0132_box_expr.rast similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0132_box_expr.rast rename to crates/syntax/test_data/parser/inline/ok/0132_box_expr.rast diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0132_box_expr.rs b/crates/syntax/test_data/parser/inline/ok/0132_box_expr.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0132_box_expr.rs rename to crates/syntax/test_data/parser/inline/ok/0132_box_expr.rs diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0134_nocontentexpr_after_item.rast b/crates/syntax/test_data/parser/inline/ok/0134_nocontentexpr_after_item.rast similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0134_nocontentexpr_after_item.rast rename to crates/syntax/test_data/parser/inline/ok/0134_nocontentexpr_after_item.rast diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0134_nocontentexpr_after_item.rs b/crates/syntax/test_data/parser/inline/ok/0134_nocontentexpr_after_item.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0134_nocontentexpr_after_item.rs rename to crates/syntax/test_data/parser/inline/ok/0134_nocontentexpr_after_item.rs diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0137_await_expr.rast b/crates/syntax/test_data/parser/inline/ok/0137_await_expr.rast similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0137_await_expr.rast rename to crates/syntax/test_data/parser/inline/ok/0137_await_expr.rast diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0137_await_expr.rs b/crates/syntax/test_data/parser/inline/ok/0137_await_expr.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0137_await_expr.rs rename to crates/syntax/test_data/parser/inline/ok/0137_await_expr.rs diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0138_associated_type_bounds.rast b/crates/syntax/test_data/parser/inline/ok/0138_associated_type_bounds.rast similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0138_associated_type_bounds.rast rename to crates/syntax/test_data/parser/inline/ok/0138_associated_type_bounds.rast diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0138_associated_type_bounds.rs b/crates/syntax/test_data/parser/inline/ok/0138_associated_type_bounds.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0138_associated_type_bounds.rs rename to crates/syntax/test_data/parser/inline/ok/0138_associated_type_bounds.rs diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0138_expression_after_block.rast b/crates/syntax/test_data/parser/inline/ok/0138_expression_after_block.rast similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0138_expression_after_block.rast rename to crates/syntax/test_data/parser/inline/ok/0138_expression_after_block.rast diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0138_expression_after_block.rs b/crates/syntax/test_data/parser/inline/ok/0138_expression_after_block.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0138_expression_after_block.rs rename to crates/syntax/test_data/parser/inline/ok/0138_expression_after_block.rs diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0138_self_param_outer_attr.rast b/crates/syntax/test_data/parser/inline/ok/0138_self_param_outer_attr.rast similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0138_self_param_outer_attr.rast rename to crates/syntax/test_data/parser/inline/ok/0138_self_param_outer_attr.rast diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0138_self_param_outer_attr.rs b/crates/syntax/test_data/parser/inline/ok/0138_self_param_outer_attr.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0138_self_param_outer_attr.rs rename to crates/syntax/test_data/parser/inline/ok/0138_self_param_outer_attr.rs diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0139_param_outer_arg.rast b/crates/syntax/test_data/parser/inline/ok/0139_param_outer_arg.rast similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0139_param_outer_arg.rast rename to crates/syntax/test_data/parser/inline/ok/0139_param_outer_arg.rast diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0139_param_outer_arg.rs b/crates/syntax/test_data/parser/inline/ok/0139_param_outer_arg.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0139_param_outer_arg.rs rename to crates/syntax/test_data/parser/inline/ok/0139_param_outer_arg.rs diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0142_for_range_from.rast b/crates/syntax/test_data/parser/inline/ok/0142_for_range_from.rast similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0142_for_range_from.rast rename to crates/syntax/test_data/parser/inline/ok/0142_for_range_from.rast diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0142_for_range_from.rs b/crates/syntax/test_data/parser/inline/ok/0142_for_range_from.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0142_for_range_from.rs rename to crates/syntax/test_data/parser/inline/ok/0142_for_range_from.rs diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0143_box_pat.rast b/crates/syntax/test_data/parser/inline/ok/0143_box_pat.rast similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0143_box_pat.rast rename to crates/syntax/test_data/parser/inline/ok/0143_box_pat.rast diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0143_box_pat.rs b/crates/syntax/test_data/parser/inline/ok/0143_box_pat.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0143_box_pat.rs rename to crates/syntax/test_data/parser/inline/ok/0143_box_pat.rs diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0144_dot_dot_pat.rast b/crates/syntax/test_data/parser/inline/ok/0144_dot_dot_pat.rast similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0144_dot_dot_pat.rast rename to crates/syntax/test_data/parser/inline/ok/0144_dot_dot_pat.rast diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0144_dot_dot_pat.rs b/crates/syntax/test_data/parser/inline/ok/0144_dot_dot_pat.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0144_dot_dot_pat.rs rename to crates/syntax/test_data/parser/inline/ok/0144_dot_dot_pat.rs diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0145_record_field_pat.rast b/crates/syntax/test_data/parser/inline/ok/0145_record_field_pat.rast similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0145_record_field_pat.rast rename to crates/syntax/test_data/parser/inline/ok/0145_record_field_pat.rast diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0145_record_field_pat.rs b/crates/syntax/test_data/parser/inline/ok/0145_record_field_pat.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0145_record_field_pat.rs rename to crates/syntax/test_data/parser/inline/ok/0145_record_field_pat.rs diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0146_as_precedence.rast b/crates/syntax/test_data/parser/inline/ok/0146_as_precedence.rast similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0146_as_precedence.rast rename to crates/syntax/test_data/parser/inline/ok/0146_as_precedence.rast diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0146_as_precedence.rs b/crates/syntax/test_data/parser/inline/ok/0146_as_precedence.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0146_as_precedence.rs rename to crates/syntax/test_data/parser/inline/ok/0146_as_precedence.rs diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0147_const_param.rast b/crates/syntax/test_data/parser/inline/ok/0147_const_param.rast similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0147_const_param.rast rename to crates/syntax/test_data/parser/inline/ok/0147_const_param.rast diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0147_const_param.rs b/crates/syntax/test_data/parser/inline/ok/0147_const_param.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0147_const_param.rs rename to crates/syntax/test_data/parser/inline/ok/0147_const_param.rs diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0147_macro_def.rast b/crates/syntax/test_data/parser/inline/ok/0147_macro_def.rast similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0147_macro_def.rast rename to crates/syntax/test_data/parser/inline/ok/0147_macro_def.rast diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0147_macro_def.rs b/crates/syntax/test_data/parser/inline/ok/0147_macro_def.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0147_macro_def.rs rename to crates/syntax/test_data/parser/inline/ok/0147_macro_def.rs diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0148_pub_macro_def.rast b/crates/syntax/test_data/parser/inline/ok/0148_pub_macro_def.rast similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0148_pub_macro_def.rast rename to crates/syntax/test_data/parser/inline/ok/0148_pub_macro_def.rast diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0148_pub_macro_def.rs b/crates/syntax/test_data/parser/inline/ok/0148_pub_macro_def.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0148_pub_macro_def.rs rename to crates/syntax/test_data/parser/inline/ok/0148_pub_macro_def.rs diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0150_array_attrs.rast b/crates/syntax/test_data/parser/inline/ok/0150_array_attrs.rast similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0150_array_attrs.rast rename to crates/syntax/test_data/parser/inline/ok/0150_array_attrs.rast diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0150_array_attrs.rs b/crates/syntax/test_data/parser/inline/ok/0150_array_attrs.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0150_array_attrs.rs rename to crates/syntax/test_data/parser/inline/ok/0150_array_attrs.rs diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0150_impl_type_params.rast b/crates/syntax/test_data/parser/inline/ok/0150_impl_type_params.rast similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0150_impl_type_params.rast rename to crates/syntax/test_data/parser/inline/ok/0150_impl_type_params.rast diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0150_impl_type_params.rs b/crates/syntax/test_data/parser/inline/ok/0150_impl_type_params.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0150_impl_type_params.rs rename to crates/syntax/test_data/parser/inline/ok/0150_impl_type_params.rs diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0151_fn.rast b/crates/syntax/test_data/parser/inline/ok/0151_fn.rast similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0151_fn.rast rename to crates/syntax/test_data/parser/inline/ok/0151_fn.rast diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0151_fn.rs b/crates/syntax/test_data/parser/inline/ok/0151_fn.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0151_fn.rs rename to crates/syntax/test_data/parser/inline/ok/0151_fn.rs diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0151_trait_alias.rast b/crates/syntax/test_data/parser/inline/ok/0151_trait_alias.rast similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0151_trait_alias.rast rename to crates/syntax/test_data/parser/inline/ok/0151_trait_alias.rast diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0151_trait_alias.rs b/crates/syntax/test_data/parser/inline/ok/0151_trait_alias.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0151_trait_alias.rs rename to crates/syntax/test_data/parser/inline/ok/0151_trait_alias.rs diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0152_arg_with_attr.rast b/crates/syntax/test_data/parser/inline/ok/0152_arg_with_attr.rast similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0152_arg_with_attr.rast rename to crates/syntax/test_data/parser/inline/ok/0152_arg_with_attr.rast diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0152_arg_with_attr.rs b/crates/syntax/test_data/parser/inline/ok/0152_arg_with_attr.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0152_arg_with_attr.rs rename to crates/syntax/test_data/parser/inline/ok/0152_arg_with_attr.rs diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0152_impl.rast b/crates/syntax/test_data/parser/inline/ok/0152_impl.rast similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0152_impl.rast rename to crates/syntax/test_data/parser/inline/ok/0152_impl.rast diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0152_impl.rs b/crates/syntax/test_data/parser/inline/ok/0152_impl.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0152_impl.rs rename to crates/syntax/test_data/parser/inline/ok/0152_impl.rs diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0153_trait.rast b/crates/syntax/test_data/parser/inline/ok/0153_trait.rast similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0153_trait.rast rename to crates/syntax/test_data/parser/inline/ok/0153_trait.rast diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0153_trait.rs b/crates/syntax/test_data/parser/inline/ok/0153_trait.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0153_trait.rs rename to crates/syntax/test_data/parser/inline/ok/0153_trait.rs diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0154_fn_pointer_param_ident_path.rast b/crates/syntax/test_data/parser/inline/ok/0154_fn_pointer_param_ident_path.rast similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0154_fn_pointer_param_ident_path.rast rename to crates/syntax/test_data/parser/inline/ok/0154_fn_pointer_param_ident_path.rast diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0154_fn_pointer_param_ident_path.rs b/crates/syntax/test_data/parser/inline/ok/0154_fn_pointer_param_ident_path.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0154_fn_pointer_param_ident_path.rs rename to crates/syntax/test_data/parser/inline/ok/0154_fn_pointer_param_ident_path.rs diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0155_closure_params.rast b/crates/syntax/test_data/parser/inline/ok/0155_closure_params.rast similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0155_closure_params.rast rename to crates/syntax/test_data/parser/inline/ok/0155_closure_params.rast diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0155_closure_params.rs b/crates/syntax/test_data/parser/inline/ok/0155_closure_params.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0155_closure_params.rs rename to crates/syntax/test_data/parser/inline/ok/0155_closure_params.rs diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0156_fn_def_param.rast b/crates/syntax/test_data/parser/inline/ok/0156_fn_def_param.rast similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0156_fn_def_param.rast rename to crates/syntax/test_data/parser/inline/ok/0156_fn_def_param.rast diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0156_fn_def_param.rs b/crates/syntax/test_data/parser/inline/ok/0156_fn_def_param.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0156_fn_def_param.rs rename to crates/syntax/test_data/parser/inline/ok/0156_fn_def_param.rs diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0156_or_pattern.rast b/crates/syntax/test_data/parser/inline/ok/0156_or_pattern.rast similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0156_or_pattern.rast rename to crates/syntax/test_data/parser/inline/ok/0156_or_pattern.rast diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0156_or_pattern.rs b/crates/syntax/test_data/parser/inline/ok/0156_or_pattern.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0156_or_pattern.rs rename to crates/syntax/test_data/parser/inline/ok/0156_or_pattern.rs diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0157_fn_pointer_unnamed_arg.rast b/crates/syntax/test_data/parser/inline/ok/0157_fn_pointer_unnamed_arg.rast similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0157_fn_pointer_unnamed_arg.rast rename to crates/syntax/test_data/parser/inline/ok/0157_fn_pointer_unnamed_arg.rast diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0157_fn_pointer_unnamed_arg.rs b/crates/syntax/test_data/parser/inline/ok/0157_fn_pointer_unnamed_arg.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0157_fn_pointer_unnamed_arg.rs rename to crates/syntax/test_data/parser/inline/ok/0157_fn_pointer_unnamed_arg.rs diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0157_variant_discriminant.rast b/crates/syntax/test_data/parser/inline/ok/0157_variant_discriminant.rast similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0157_variant_discriminant.rast rename to crates/syntax/test_data/parser/inline/ok/0157_variant_discriminant.rast diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0157_variant_discriminant.rs b/crates/syntax/test_data/parser/inline/ok/0157_variant_discriminant.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0157_variant_discriminant.rs rename to crates/syntax/test_data/parser/inline/ok/0157_variant_discriminant.rs diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0158_binop_resets_statementness.rast b/crates/syntax/test_data/parser/inline/ok/0158_binop_resets_statementness.rast similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0158_binop_resets_statementness.rast rename to crates/syntax/test_data/parser/inline/ok/0158_binop_resets_statementness.rast diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0158_binop_resets_statementness.rs b/crates/syntax/test_data/parser/inline/ok/0158_binop_resets_statementness.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0158_binop_resets_statementness.rs rename to crates/syntax/test_data/parser/inline/ok/0158_binop_resets_statementness.rs diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0158_lambda_ret_block.rast b/crates/syntax/test_data/parser/inline/ok/0158_lambda_ret_block.rast similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0158_lambda_ret_block.rast rename to crates/syntax/test_data/parser/inline/ok/0158_lambda_ret_block.rast diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0158_lambda_ret_block.rs b/crates/syntax/test_data/parser/inline/ok/0158_lambda_ret_block.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0158_lambda_ret_block.rs rename to crates/syntax/test_data/parser/inline/ok/0158_lambda_ret_block.rs diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0159_try_macro_fallback.rast b/crates/syntax/test_data/parser/inline/ok/0159_try_macro_fallback.rast similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0159_try_macro_fallback.rast rename to crates/syntax/test_data/parser/inline/ok/0159_try_macro_fallback.rast diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0159_try_macro_fallback.rs b/crates/syntax/test_data/parser/inline/ok/0159_try_macro_fallback.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0159_try_macro_fallback.rs rename to crates/syntax/test_data/parser/inline/ok/0159_try_macro_fallback.rs diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0160_try_macro_rules.rast b/crates/syntax/test_data/parser/inline/ok/0160_try_macro_rules.rast similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0160_try_macro_rules.rast rename to crates/syntax/test_data/parser/inline/ok/0160_try_macro_rules.rast diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0160_try_macro_rules.rs b/crates/syntax/test_data/parser/inline/ok/0160_try_macro_rules.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0160_try_macro_rules.rs rename to crates/syntax/test_data/parser/inline/ok/0160_try_macro_rules.rs diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0161_labeled_block.rast b/crates/syntax/test_data/parser/inline/ok/0161_labeled_block.rast similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0161_labeled_block.rast rename to crates/syntax/test_data/parser/inline/ok/0161_labeled_block.rast diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0161_labeled_block.rs b/crates/syntax/test_data/parser/inline/ok/0161_labeled_block.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0161_labeled_block.rs rename to crates/syntax/test_data/parser/inline/ok/0161_labeled_block.rs diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0162_unsafe_block.rast b/crates/syntax/test_data/parser/inline/ok/0162_unsafe_block.rast similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0162_unsafe_block.rast rename to crates/syntax/test_data/parser/inline/ok/0162_unsafe_block.rast diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0162_unsafe_block.rs b/crates/syntax/test_data/parser/inline/ok/0162_unsafe_block.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0162_unsafe_block.rs rename to crates/syntax/test_data/parser/inline/ok/0162_unsafe_block.rs diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0163_default_unsafe_item.rast b/crates/syntax/test_data/parser/inline/ok/0163_default_unsafe_item.rast similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0163_default_unsafe_item.rast rename to crates/syntax/test_data/parser/inline/ok/0163_default_unsafe_item.rast diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0163_default_unsafe_item.rs b/crates/syntax/test_data/parser/inline/ok/0163_default_unsafe_item.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0163_default_unsafe_item.rs rename to crates/syntax/test_data/parser/inline/ok/0163_default_unsafe_item.rs diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0164_default_item.rast b/crates/syntax/test_data/parser/inline/ok/0164_default_item.rast similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0164_default_item.rast rename to crates/syntax/test_data/parser/inline/ok/0164_default_item.rast diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0164_default_item.rs b/crates/syntax/test_data/parser/inline/ok/0164_default_item.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0164_default_item.rs rename to crates/syntax/test_data/parser/inline/ok/0164_default_item.rs diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0164_type_path_in_pattern.rast b/crates/syntax/test_data/parser/inline/ok/0164_type_path_in_pattern.rast similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0164_type_path_in_pattern.rast rename to crates/syntax/test_data/parser/inline/ok/0164_type_path_in_pattern.rast diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0164_type_path_in_pattern.rs b/crates/syntax/test_data/parser/inline/ok/0164_type_path_in_pattern.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/inline/ok/0164_type_path_in_pattern.rs rename to crates/syntax/test_data/parser/inline/ok/0164_type_path_in_pattern.rs diff --git a/crates/ra_syntax/test_data/parser/ok/0000_empty.rast b/crates/syntax/test_data/parser/ok/0000_empty.rast similarity index 100% rename from crates/ra_syntax/test_data/parser/ok/0000_empty.rast rename to crates/syntax/test_data/parser/ok/0000_empty.rast diff --git a/crates/ra_syntax/test_data/parser/ok/0000_empty.rs b/crates/syntax/test_data/parser/ok/0000_empty.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/ok/0000_empty.rs rename to crates/syntax/test_data/parser/ok/0000_empty.rs diff --git a/crates/ra_syntax/test_data/parser/ok/0001_struct_item.rast b/crates/syntax/test_data/parser/ok/0001_struct_item.rast similarity index 100% rename from crates/ra_syntax/test_data/parser/ok/0001_struct_item.rast rename to crates/syntax/test_data/parser/ok/0001_struct_item.rast diff --git a/crates/ra_syntax/test_data/parser/ok/0001_struct_item.rs b/crates/syntax/test_data/parser/ok/0001_struct_item.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/ok/0001_struct_item.rs rename to crates/syntax/test_data/parser/ok/0001_struct_item.rs diff --git a/crates/ra_syntax/test_data/parser/ok/0002_struct_item_field.rast b/crates/syntax/test_data/parser/ok/0002_struct_item_field.rast similarity index 100% rename from crates/ra_syntax/test_data/parser/ok/0002_struct_item_field.rast rename to crates/syntax/test_data/parser/ok/0002_struct_item_field.rast diff --git a/crates/ra_syntax/test_data/parser/ok/0002_struct_item_field.rs b/crates/syntax/test_data/parser/ok/0002_struct_item_field.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/ok/0002_struct_item_field.rs rename to crates/syntax/test_data/parser/ok/0002_struct_item_field.rs diff --git a/crates/ra_syntax/test_data/parser/ok/0004_file_shebang.rast b/crates/syntax/test_data/parser/ok/0004_file_shebang.rast similarity index 100% rename from crates/ra_syntax/test_data/parser/ok/0004_file_shebang.rast rename to crates/syntax/test_data/parser/ok/0004_file_shebang.rast diff --git a/crates/ra_syntax/test_data/parser/ok/0004_file_shebang.rs b/crates/syntax/test_data/parser/ok/0004_file_shebang.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/ok/0004_file_shebang.rs rename to crates/syntax/test_data/parser/ok/0004_file_shebang.rs diff --git a/crates/ra_syntax/test_data/parser/ok/0005_fn_item.rast b/crates/syntax/test_data/parser/ok/0005_fn_item.rast similarity index 100% rename from crates/ra_syntax/test_data/parser/ok/0005_fn_item.rast rename to crates/syntax/test_data/parser/ok/0005_fn_item.rast diff --git a/crates/ra_syntax/test_data/parser/ok/0005_fn_item.rs b/crates/syntax/test_data/parser/ok/0005_fn_item.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/ok/0005_fn_item.rs rename to crates/syntax/test_data/parser/ok/0005_fn_item.rs diff --git a/crates/ra_syntax/test_data/parser/ok/0006_inner_attributes.rast b/crates/syntax/test_data/parser/ok/0006_inner_attributes.rast similarity index 100% rename from crates/ra_syntax/test_data/parser/ok/0006_inner_attributes.rast rename to crates/syntax/test_data/parser/ok/0006_inner_attributes.rast diff --git a/crates/ra_syntax/test_data/parser/ok/0006_inner_attributes.rs b/crates/syntax/test_data/parser/ok/0006_inner_attributes.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/ok/0006_inner_attributes.rs rename to crates/syntax/test_data/parser/ok/0006_inner_attributes.rs diff --git a/crates/ra_syntax/test_data/parser/ok/0007_extern_crate.rast b/crates/syntax/test_data/parser/ok/0007_extern_crate.rast similarity index 100% rename from crates/ra_syntax/test_data/parser/ok/0007_extern_crate.rast rename to crates/syntax/test_data/parser/ok/0007_extern_crate.rast diff --git a/crates/ra_syntax/test_data/parser/ok/0007_extern_crate.rs b/crates/syntax/test_data/parser/ok/0007_extern_crate.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/ok/0007_extern_crate.rs rename to crates/syntax/test_data/parser/ok/0007_extern_crate.rs diff --git a/crates/ra_syntax/test_data/parser/ok/0008_mod_item.rast b/crates/syntax/test_data/parser/ok/0008_mod_item.rast similarity index 100% rename from crates/ra_syntax/test_data/parser/ok/0008_mod_item.rast rename to crates/syntax/test_data/parser/ok/0008_mod_item.rast diff --git a/crates/ra_syntax/test_data/parser/ok/0008_mod_item.rs b/crates/syntax/test_data/parser/ok/0008_mod_item.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/ok/0008_mod_item.rs rename to crates/syntax/test_data/parser/ok/0008_mod_item.rs diff --git a/crates/ra_syntax/test_data/parser/ok/0009_use_item.rast b/crates/syntax/test_data/parser/ok/0009_use_item.rast similarity index 100% rename from crates/ra_syntax/test_data/parser/ok/0009_use_item.rast rename to crates/syntax/test_data/parser/ok/0009_use_item.rast diff --git a/crates/ra_syntax/test_data/parser/ok/0009_use_item.rs b/crates/syntax/test_data/parser/ok/0009_use_item.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/ok/0009_use_item.rs rename to crates/syntax/test_data/parser/ok/0009_use_item.rs diff --git a/crates/ra_syntax/test_data/parser/ok/0010_use_path_segments.rast b/crates/syntax/test_data/parser/ok/0010_use_path_segments.rast similarity index 100% rename from crates/ra_syntax/test_data/parser/ok/0010_use_path_segments.rast rename to crates/syntax/test_data/parser/ok/0010_use_path_segments.rast diff --git a/crates/ra_syntax/test_data/parser/ok/0010_use_path_segments.rs b/crates/syntax/test_data/parser/ok/0010_use_path_segments.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/ok/0010_use_path_segments.rs rename to crates/syntax/test_data/parser/ok/0010_use_path_segments.rs diff --git a/crates/ra_syntax/test_data/parser/ok/0011_outer_attribute.rast b/crates/syntax/test_data/parser/ok/0011_outer_attribute.rast similarity index 100% rename from crates/ra_syntax/test_data/parser/ok/0011_outer_attribute.rast rename to crates/syntax/test_data/parser/ok/0011_outer_attribute.rast diff --git a/crates/ra_syntax/test_data/parser/ok/0011_outer_attribute.rs b/crates/syntax/test_data/parser/ok/0011_outer_attribute.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/ok/0011_outer_attribute.rs rename to crates/syntax/test_data/parser/ok/0011_outer_attribute.rs diff --git a/crates/ra_syntax/test_data/parser/ok/0012_visibility.rast b/crates/syntax/test_data/parser/ok/0012_visibility.rast similarity index 100% rename from crates/ra_syntax/test_data/parser/ok/0012_visibility.rast rename to crates/syntax/test_data/parser/ok/0012_visibility.rast diff --git a/crates/ra_syntax/test_data/parser/ok/0012_visibility.rs b/crates/syntax/test_data/parser/ok/0012_visibility.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/ok/0012_visibility.rs rename to crates/syntax/test_data/parser/ok/0012_visibility.rs diff --git a/crates/ra_syntax/test_data/parser/ok/0013_use_path_self_super.rast b/crates/syntax/test_data/parser/ok/0013_use_path_self_super.rast similarity index 100% rename from crates/ra_syntax/test_data/parser/ok/0013_use_path_self_super.rast rename to crates/syntax/test_data/parser/ok/0013_use_path_self_super.rast diff --git a/crates/ra_syntax/test_data/parser/ok/0013_use_path_self_super.rs b/crates/syntax/test_data/parser/ok/0013_use_path_self_super.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/ok/0013_use_path_self_super.rs rename to crates/syntax/test_data/parser/ok/0013_use_path_self_super.rs diff --git a/crates/ra_syntax/test_data/parser/ok/0014_use_tree.rast b/crates/syntax/test_data/parser/ok/0014_use_tree.rast similarity index 100% rename from crates/ra_syntax/test_data/parser/ok/0014_use_tree.rast rename to crates/syntax/test_data/parser/ok/0014_use_tree.rast diff --git a/crates/ra_syntax/test_data/parser/ok/0014_use_tree.rs b/crates/syntax/test_data/parser/ok/0014_use_tree.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/ok/0014_use_tree.rs rename to crates/syntax/test_data/parser/ok/0014_use_tree.rs diff --git a/crates/ra_syntax/test_data/parser/ok/0015_use_tree.rast b/crates/syntax/test_data/parser/ok/0015_use_tree.rast similarity index 100% rename from crates/ra_syntax/test_data/parser/ok/0015_use_tree.rast rename to crates/syntax/test_data/parser/ok/0015_use_tree.rast diff --git a/crates/ra_syntax/test_data/parser/ok/0015_use_tree.rs b/crates/syntax/test_data/parser/ok/0015_use_tree.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/ok/0015_use_tree.rs rename to crates/syntax/test_data/parser/ok/0015_use_tree.rs diff --git a/crates/ra_syntax/test_data/parser/ok/0016_struct_flavors.rast b/crates/syntax/test_data/parser/ok/0016_struct_flavors.rast similarity index 100% rename from crates/ra_syntax/test_data/parser/ok/0016_struct_flavors.rast rename to crates/syntax/test_data/parser/ok/0016_struct_flavors.rast diff --git a/crates/ra_syntax/test_data/parser/ok/0016_struct_flavors.rs b/crates/syntax/test_data/parser/ok/0016_struct_flavors.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/ok/0016_struct_flavors.rs rename to crates/syntax/test_data/parser/ok/0016_struct_flavors.rs diff --git a/crates/ra_syntax/test_data/parser/ok/0017_attr_trailing_comma.rast b/crates/syntax/test_data/parser/ok/0017_attr_trailing_comma.rast similarity index 100% rename from crates/ra_syntax/test_data/parser/ok/0017_attr_trailing_comma.rast rename to crates/syntax/test_data/parser/ok/0017_attr_trailing_comma.rast diff --git a/crates/ra_syntax/test_data/parser/ok/0017_attr_trailing_comma.rs b/crates/syntax/test_data/parser/ok/0017_attr_trailing_comma.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/ok/0017_attr_trailing_comma.rs rename to crates/syntax/test_data/parser/ok/0017_attr_trailing_comma.rs diff --git a/crates/ra_syntax/test_data/parser/ok/0018_struct_type_params.rast b/crates/syntax/test_data/parser/ok/0018_struct_type_params.rast similarity index 100% rename from crates/ra_syntax/test_data/parser/ok/0018_struct_type_params.rast rename to crates/syntax/test_data/parser/ok/0018_struct_type_params.rast diff --git a/crates/ra_syntax/test_data/parser/ok/0018_struct_type_params.rs b/crates/syntax/test_data/parser/ok/0018_struct_type_params.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/ok/0018_struct_type_params.rs rename to crates/syntax/test_data/parser/ok/0018_struct_type_params.rs diff --git a/crates/ra_syntax/test_data/parser/ok/0019_enums.rast b/crates/syntax/test_data/parser/ok/0019_enums.rast similarity index 100% rename from crates/ra_syntax/test_data/parser/ok/0019_enums.rast rename to crates/syntax/test_data/parser/ok/0019_enums.rast diff --git a/crates/ra_syntax/test_data/parser/ok/0019_enums.rs b/crates/syntax/test_data/parser/ok/0019_enums.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/ok/0019_enums.rs rename to crates/syntax/test_data/parser/ok/0019_enums.rs diff --git a/crates/ra_syntax/test_data/parser/ok/0020_type_param_bounds.rast b/crates/syntax/test_data/parser/ok/0020_type_param_bounds.rast similarity index 100% rename from crates/ra_syntax/test_data/parser/ok/0020_type_param_bounds.rast rename to crates/syntax/test_data/parser/ok/0020_type_param_bounds.rast diff --git a/crates/ra_syntax/test_data/parser/ok/0020_type_param_bounds.rs b/crates/syntax/test_data/parser/ok/0020_type_param_bounds.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/ok/0020_type_param_bounds.rs rename to crates/syntax/test_data/parser/ok/0020_type_param_bounds.rs diff --git a/crates/ra_syntax/test_data/parser/ok/0022_empty_extern_block.rast b/crates/syntax/test_data/parser/ok/0022_empty_extern_block.rast similarity index 100% rename from crates/ra_syntax/test_data/parser/ok/0022_empty_extern_block.rast rename to crates/syntax/test_data/parser/ok/0022_empty_extern_block.rast diff --git a/crates/ra_syntax/test_data/parser/ok/0022_empty_extern_block.rs b/crates/syntax/test_data/parser/ok/0022_empty_extern_block.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/ok/0022_empty_extern_block.rs rename to crates/syntax/test_data/parser/ok/0022_empty_extern_block.rs diff --git a/crates/ra_syntax/test_data/parser/ok/0023_static_items.rast b/crates/syntax/test_data/parser/ok/0023_static_items.rast similarity index 100% rename from crates/ra_syntax/test_data/parser/ok/0023_static_items.rast rename to crates/syntax/test_data/parser/ok/0023_static_items.rast diff --git a/crates/ra_syntax/test_data/parser/ok/0023_static_items.rs b/crates/syntax/test_data/parser/ok/0023_static_items.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/ok/0023_static_items.rs rename to crates/syntax/test_data/parser/ok/0023_static_items.rs diff --git a/crates/ra_syntax/test_data/parser/ok/0024_const_item.rast b/crates/syntax/test_data/parser/ok/0024_const_item.rast similarity index 100% rename from crates/ra_syntax/test_data/parser/ok/0024_const_item.rast rename to crates/syntax/test_data/parser/ok/0024_const_item.rast diff --git a/crates/ra_syntax/test_data/parser/ok/0024_const_item.rs b/crates/syntax/test_data/parser/ok/0024_const_item.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/ok/0024_const_item.rs rename to crates/syntax/test_data/parser/ok/0024_const_item.rs diff --git a/crates/ra_syntax/test_data/parser/ok/0025_extern_fn_in_block.rast b/crates/syntax/test_data/parser/ok/0025_extern_fn_in_block.rast similarity index 100% rename from crates/ra_syntax/test_data/parser/ok/0025_extern_fn_in_block.rast rename to crates/syntax/test_data/parser/ok/0025_extern_fn_in_block.rast diff --git a/crates/ra_syntax/test_data/parser/ok/0025_extern_fn_in_block.rs b/crates/syntax/test_data/parser/ok/0025_extern_fn_in_block.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/ok/0025_extern_fn_in_block.rs rename to crates/syntax/test_data/parser/ok/0025_extern_fn_in_block.rs diff --git a/crates/ra_syntax/test_data/parser/ok/0026_const_fn_in_block.rast b/crates/syntax/test_data/parser/ok/0026_const_fn_in_block.rast similarity index 100% rename from crates/ra_syntax/test_data/parser/ok/0026_const_fn_in_block.rast rename to crates/syntax/test_data/parser/ok/0026_const_fn_in_block.rast diff --git a/crates/ra_syntax/test_data/parser/ok/0026_const_fn_in_block.rs b/crates/syntax/test_data/parser/ok/0026_const_fn_in_block.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/ok/0026_const_fn_in_block.rs rename to crates/syntax/test_data/parser/ok/0026_const_fn_in_block.rs diff --git a/crates/ra_syntax/test_data/parser/ok/0027_unsafe_fn_in_block.rast b/crates/syntax/test_data/parser/ok/0027_unsafe_fn_in_block.rast similarity index 100% rename from crates/ra_syntax/test_data/parser/ok/0027_unsafe_fn_in_block.rast rename to crates/syntax/test_data/parser/ok/0027_unsafe_fn_in_block.rast diff --git a/crates/ra_syntax/test_data/parser/ok/0027_unsafe_fn_in_block.rs b/crates/syntax/test_data/parser/ok/0027_unsafe_fn_in_block.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/ok/0027_unsafe_fn_in_block.rs rename to crates/syntax/test_data/parser/ok/0027_unsafe_fn_in_block.rs diff --git a/crates/ra_syntax/test_data/parser/ok/0028_operator_binding_power.rast b/crates/syntax/test_data/parser/ok/0028_operator_binding_power.rast similarity index 100% rename from crates/ra_syntax/test_data/parser/ok/0028_operator_binding_power.rast rename to crates/syntax/test_data/parser/ok/0028_operator_binding_power.rast diff --git a/crates/ra_syntax/test_data/parser/ok/0028_operator_binding_power.rs b/crates/syntax/test_data/parser/ok/0028_operator_binding_power.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/ok/0028_operator_binding_power.rs rename to crates/syntax/test_data/parser/ok/0028_operator_binding_power.rs diff --git a/crates/ra_syntax/test_data/parser/ok/0029_range_forms.rast b/crates/syntax/test_data/parser/ok/0029_range_forms.rast similarity index 100% rename from crates/ra_syntax/test_data/parser/ok/0029_range_forms.rast rename to crates/syntax/test_data/parser/ok/0029_range_forms.rast diff --git a/crates/ra_syntax/test_data/parser/ok/0029_range_forms.rs b/crates/syntax/test_data/parser/ok/0029_range_forms.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/ok/0029_range_forms.rs rename to crates/syntax/test_data/parser/ok/0029_range_forms.rs diff --git a/crates/ra_syntax/test_data/parser/ok/0030_string_suffixes.rast b/crates/syntax/test_data/parser/ok/0030_string_suffixes.rast similarity index 100% rename from crates/ra_syntax/test_data/parser/ok/0030_string_suffixes.rast rename to crates/syntax/test_data/parser/ok/0030_string_suffixes.rast diff --git a/crates/ra_syntax/test_data/parser/ok/0030_string_suffixes.rs b/crates/syntax/test_data/parser/ok/0030_string_suffixes.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/ok/0030_string_suffixes.rs rename to crates/syntax/test_data/parser/ok/0030_string_suffixes.rs diff --git a/crates/ra_syntax/test_data/parser/ok/0030_traits.rast b/crates/syntax/test_data/parser/ok/0030_traits.rast similarity index 100% rename from crates/ra_syntax/test_data/parser/ok/0030_traits.rast rename to crates/syntax/test_data/parser/ok/0030_traits.rast diff --git a/crates/ra_syntax/test_data/parser/ok/0030_traits.rs b/crates/syntax/test_data/parser/ok/0030_traits.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/ok/0030_traits.rs rename to crates/syntax/test_data/parser/ok/0030_traits.rs diff --git a/crates/ra_syntax/test_data/parser/ok/0031_extern.rast b/crates/syntax/test_data/parser/ok/0031_extern.rast similarity index 100% rename from crates/ra_syntax/test_data/parser/ok/0031_extern.rast rename to crates/syntax/test_data/parser/ok/0031_extern.rast diff --git a/crates/ra_syntax/test_data/parser/ok/0031_extern.rs b/crates/syntax/test_data/parser/ok/0031_extern.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/ok/0031_extern.rs rename to crates/syntax/test_data/parser/ok/0031_extern.rs diff --git a/crates/ra_syntax/test_data/parser/ok/0032_where_for.rast b/crates/syntax/test_data/parser/ok/0032_where_for.rast similarity index 100% rename from crates/ra_syntax/test_data/parser/ok/0032_where_for.rast rename to crates/syntax/test_data/parser/ok/0032_where_for.rast diff --git a/crates/ra_syntax/test_data/parser/ok/0032_where_for.rs b/crates/syntax/test_data/parser/ok/0032_where_for.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/ok/0032_where_for.rs rename to crates/syntax/test_data/parser/ok/0032_where_for.rs diff --git a/crates/ra_syntax/test_data/parser/ok/0033_label_break.rast b/crates/syntax/test_data/parser/ok/0033_label_break.rast similarity index 100% rename from crates/ra_syntax/test_data/parser/ok/0033_label_break.rast rename to crates/syntax/test_data/parser/ok/0033_label_break.rast diff --git a/crates/ra_syntax/test_data/parser/ok/0033_label_break.rs b/crates/syntax/test_data/parser/ok/0033_label_break.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/ok/0033_label_break.rs rename to crates/syntax/test_data/parser/ok/0033_label_break.rs diff --git a/crates/ra_syntax/test_data/parser/ok/0034_crate_path_in_call.rast b/crates/syntax/test_data/parser/ok/0034_crate_path_in_call.rast similarity index 100% rename from crates/ra_syntax/test_data/parser/ok/0034_crate_path_in_call.rast rename to crates/syntax/test_data/parser/ok/0034_crate_path_in_call.rast diff --git a/crates/ra_syntax/test_data/parser/ok/0034_crate_path_in_call.rs b/crates/syntax/test_data/parser/ok/0034_crate_path_in_call.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/ok/0034_crate_path_in_call.rs rename to crates/syntax/test_data/parser/ok/0034_crate_path_in_call.rs diff --git a/crates/ra_syntax/test_data/parser/ok/0035_weird_exprs.rast b/crates/syntax/test_data/parser/ok/0035_weird_exprs.rast similarity index 100% rename from crates/ra_syntax/test_data/parser/ok/0035_weird_exprs.rast rename to crates/syntax/test_data/parser/ok/0035_weird_exprs.rast diff --git a/crates/ra_syntax/test_data/parser/ok/0035_weird_exprs.rs b/crates/syntax/test_data/parser/ok/0035_weird_exprs.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/ok/0035_weird_exprs.rs rename to crates/syntax/test_data/parser/ok/0035_weird_exprs.rs diff --git a/crates/ra_syntax/test_data/parser/ok/0036_fully_qualified.rast b/crates/syntax/test_data/parser/ok/0036_fully_qualified.rast similarity index 100% rename from crates/ra_syntax/test_data/parser/ok/0036_fully_qualified.rast rename to crates/syntax/test_data/parser/ok/0036_fully_qualified.rast diff --git a/crates/ra_syntax/test_data/parser/ok/0036_fully_qualified.rs b/crates/syntax/test_data/parser/ok/0036_fully_qualified.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/ok/0036_fully_qualified.rs rename to crates/syntax/test_data/parser/ok/0036_fully_qualified.rs diff --git a/crates/ra_syntax/test_data/parser/ok/0037_mod.rast b/crates/syntax/test_data/parser/ok/0037_mod.rast similarity index 100% rename from crates/ra_syntax/test_data/parser/ok/0037_mod.rast rename to crates/syntax/test_data/parser/ok/0037_mod.rast diff --git a/crates/ra_syntax/test_data/parser/ok/0037_mod.rs b/crates/syntax/test_data/parser/ok/0037_mod.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/ok/0037_mod.rs rename to crates/syntax/test_data/parser/ok/0037_mod.rs diff --git a/crates/ra_syntax/test_data/parser/ok/0038_where_pred_type.rast b/crates/syntax/test_data/parser/ok/0038_where_pred_type.rast similarity index 100% rename from crates/ra_syntax/test_data/parser/ok/0038_where_pred_type.rast rename to crates/syntax/test_data/parser/ok/0038_where_pred_type.rast diff --git a/crates/ra_syntax/test_data/parser/ok/0038_where_pred_type.rs b/crates/syntax/test_data/parser/ok/0038_where_pred_type.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/ok/0038_where_pred_type.rs rename to crates/syntax/test_data/parser/ok/0038_where_pred_type.rs diff --git a/crates/ra_syntax/test_data/parser/ok/0039_raw_fn_item.rast b/crates/syntax/test_data/parser/ok/0039_raw_fn_item.rast similarity index 100% rename from crates/ra_syntax/test_data/parser/ok/0039_raw_fn_item.rast rename to crates/syntax/test_data/parser/ok/0039_raw_fn_item.rast diff --git a/crates/ra_syntax/test_data/parser/ok/0039_raw_fn_item.rs b/crates/syntax/test_data/parser/ok/0039_raw_fn_item.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/ok/0039_raw_fn_item.rs rename to crates/syntax/test_data/parser/ok/0039_raw_fn_item.rs diff --git a/crates/ra_syntax/test_data/parser/ok/0040_raw_struct_item_field.rast b/crates/syntax/test_data/parser/ok/0040_raw_struct_item_field.rast similarity index 100% rename from crates/ra_syntax/test_data/parser/ok/0040_raw_struct_item_field.rast rename to crates/syntax/test_data/parser/ok/0040_raw_struct_item_field.rast diff --git a/crates/ra_syntax/test_data/parser/ok/0040_raw_struct_item_field.rs b/crates/syntax/test_data/parser/ok/0040_raw_struct_item_field.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/ok/0040_raw_struct_item_field.rs rename to crates/syntax/test_data/parser/ok/0040_raw_struct_item_field.rs diff --git a/crates/ra_syntax/test_data/parser/ok/0041_raw_keywords.rast b/crates/syntax/test_data/parser/ok/0041_raw_keywords.rast similarity index 100% rename from crates/ra_syntax/test_data/parser/ok/0041_raw_keywords.rast rename to crates/syntax/test_data/parser/ok/0041_raw_keywords.rast diff --git a/crates/ra_syntax/test_data/parser/ok/0041_raw_keywords.rs b/crates/syntax/test_data/parser/ok/0041_raw_keywords.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/ok/0041_raw_keywords.rs rename to crates/syntax/test_data/parser/ok/0041_raw_keywords.rs diff --git a/crates/ra_syntax/test_data/parser/ok/0042_ufcs_call_list.rast b/crates/syntax/test_data/parser/ok/0042_ufcs_call_list.rast similarity index 100% rename from crates/ra_syntax/test_data/parser/ok/0042_ufcs_call_list.rast rename to crates/syntax/test_data/parser/ok/0042_ufcs_call_list.rast diff --git a/crates/ra_syntax/test_data/parser/ok/0042_ufcs_call_list.rs b/crates/syntax/test_data/parser/ok/0042_ufcs_call_list.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/ok/0042_ufcs_call_list.rs rename to crates/syntax/test_data/parser/ok/0042_ufcs_call_list.rs diff --git a/crates/ra_syntax/test_data/parser/ok/0043_complex_assignment.rast b/crates/syntax/test_data/parser/ok/0043_complex_assignment.rast similarity index 100% rename from crates/ra_syntax/test_data/parser/ok/0043_complex_assignment.rast rename to crates/syntax/test_data/parser/ok/0043_complex_assignment.rast diff --git a/crates/ra_syntax/test_data/parser/ok/0043_complex_assignment.rs b/crates/syntax/test_data/parser/ok/0043_complex_assignment.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/ok/0043_complex_assignment.rs rename to crates/syntax/test_data/parser/ok/0043_complex_assignment.rs diff --git a/crates/ra_syntax/test_data/parser/ok/0044_let_attrs.rast b/crates/syntax/test_data/parser/ok/0044_let_attrs.rast similarity index 100% rename from crates/ra_syntax/test_data/parser/ok/0044_let_attrs.rast rename to crates/syntax/test_data/parser/ok/0044_let_attrs.rast diff --git a/crates/ra_syntax/test_data/parser/ok/0044_let_attrs.rs b/crates/syntax/test_data/parser/ok/0044_let_attrs.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/ok/0044_let_attrs.rs rename to crates/syntax/test_data/parser/ok/0044_let_attrs.rs diff --git a/crates/ra_syntax/test_data/parser/ok/0045_block_inner_attrs.rast b/crates/syntax/test_data/parser/ok/0045_block_inner_attrs.rast similarity index 100% rename from crates/ra_syntax/test_data/parser/ok/0045_block_inner_attrs.rast rename to crates/syntax/test_data/parser/ok/0045_block_inner_attrs.rast diff --git a/crates/ra_syntax/test_data/parser/ok/0045_block_inner_attrs.rs b/crates/syntax/test_data/parser/ok/0045_block_inner_attrs.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/ok/0045_block_inner_attrs.rs rename to crates/syntax/test_data/parser/ok/0045_block_inner_attrs.rs diff --git a/crates/ra_syntax/test_data/parser/ok/0046_extern_inner_attributes.rast b/crates/syntax/test_data/parser/ok/0046_extern_inner_attributes.rast similarity index 100% rename from crates/ra_syntax/test_data/parser/ok/0046_extern_inner_attributes.rast rename to crates/syntax/test_data/parser/ok/0046_extern_inner_attributes.rast diff --git a/crates/ra_syntax/test_data/parser/ok/0046_extern_inner_attributes.rs b/crates/syntax/test_data/parser/ok/0046_extern_inner_attributes.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/ok/0046_extern_inner_attributes.rs rename to crates/syntax/test_data/parser/ok/0046_extern_inner_attributes.rs diff --git a/crates/ra_syntax/test_data/parser/ok/0047_minus_in_inner_pattern.rast b/crates/syntax/test_data/parser/ok/0047_minus_in_inner_pattern.rast similarity index 100% rename from crates/ra_syntax/test_data/parser/ok/0047_minus_in_inner_pattern.rast rename to crates/syntax/test_data/parser/ok/0047_minus_in_inner_pattern.rast diff --git a/crates/ra_syntax/test_data/parser/ok/0047_minus_in_inner_pattern.rs b/crates/syntax/test_data/parser/ok/0047_minus_in_inner_pattern.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/ok/0047_minus_in_inner_pattern.rs rename to crates/syntax/test_data/parser/ok/0047_minus_in_inner_pattern.rs diff --git a/crates/ra_syntax/test_data/parser/ok/0048_compound_assignment.rast b/crates/syntax/test_data/parser/ok/0048_compound_assignment.rast similarity index 100% rename from crates/ra_syntax/test_data/parser/ok/0048_compound_assignment.rast rename to crates/syntax/test_data/parser/ok/0048_compound_assignment.rast diff --git a/crates/ra_syntax/test_data/parser/ok/0048_compound_assignment.rs b/crates/syntax/test_data/parser/ok/0048_compound_assignment.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/ok/0048_compound_assignment.rs rename to crates/syntax/test_data/parser/ok/0048_compound_assignment.rs diff --git a/crates/ra_syntax/test_data/parser/ok/0049_async_block.rast b/crates/syntax/test_data/parser/ok/0049_async_block.rast similarity index 100% rename from crates/ra_syntax/test_data/parser/ok/0049_async_block.rast rename to crates/syntax/test_data/parser/ok/0049_async_block.rast diff --git a/crates/ra_syntax/test_data/parser/ok/0049_async_block.rs b/crates/syntax/test_data/parser/ok/0049_async_block.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/ok/0049_async_block.rs rename to crates/syntax/test_data/parser/ok/0049_async_block.rs diff --git a/crates/ra_syntax/test_data/parser/ok/0050_async_block_as_argument.rast b/crates/syntax/test_data/parser/ok/0050_async_block_as_argument.rast similarity index 100% rename from crates/ra_syntax/test_data/parser/ok/0050_async_block_as_argument.rast rename to crates/syntax/test_data/parser/ok/0050_async_block_as_argument.rast diff --git a/crates/ra_syntax/test_data/parser/ok/0050_async_block_as_argument.rs b/crates/syntax/test_data/parser/ok/0050_async_block_as_argument.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/ok/0050_async_block_as_argument.rs rename to crates/syntax/test_data/parser/ok/0050_async_block_as_argument.rs diff --git a/crates/ra_syntax/test_data/parser/ok/0051_parameter_attrs.rast b/crates/syntax/test_data/parser/ok/0051_parameter_attrs.rast similarity index 100% rename from crates/ra_syntax/test_data/parser/ok/0051_parameter_attrs.rast rename to crates/syntax/test_data/parser/ok/0051_parameter_attrs.rast diff --git a/crates/ra_syntax/test_data/parser/ok/0051_parameter_attrs.rs b/crates/syntax/test_data/parser/ok/0051_parameter_attrs.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/ok/0051_parameter_attrs.rs rename to crates/syntax/test_data/parser/ok/0051_parameter_attrs.rs diff --git a/crates/ra_syntax/test_data/parser/ok/0052_for_range_block.rast b/crates/syntax/test_data/parser/ok/0052_for_range_block.rast similarity index 100% rename from crates/ra_syntax/test_data/parser/ok/0052_for_range_block.rast rename to crates/syntax/test_data/parser/ok/0052_for_range_block.rast diff --git a/crates/ra_syntax/test_data/parser/ok/0052_for_range_block.rs b/crates/syntax/test_data/parser/ok/0052_for_range_block.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/ok/0052_for_range_block.rs rename to crates/syntax/test_data/parser/ok/0052_for_range_block.rs diff --git a/crates/ra_syntax/test_data/parser/ok/0053_outer_attribute_on_macro_rules.rast b/crates/syntax/test_data/parser/ok/0053_outer_attribute_on_macro_rules.rast similarity index 100% rename from crates/ra_syntax/test_data/parser/ok/0053_outer_attribute_on_macro_rules.rast rename to crates/syntax/test_data/parser/ok/0053_outer_attribute_on_macro_rules.rast diff --git a/crates/ra_syntax/test_data/parser/ok/0053_outer_attribute_on_macro_rules.rs b/crates/syntax/test_data/parser/ok/0053_outer_attribute_on_macro_rules.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/ok/0053_outer_attribute_on_macro_rules.rs rename to crates/syntax/test_data/parser/ok/0053_outer_attribute_on_macro_rules.rs diff --git a/crates/ra_syntax/test_data/parser/ok/0054_qual_path_in_type_arg.rast b/crates/syntax/test_data/parser/ok/0054_qual_path_in_type_arg.rast similarity index 100% rename from crates/ra_syntax/test_data/parser/ok/0054_qual_path_in_type_arg.rast rename to crates/syntax/test_data/parser/ok/0054_qual_path_in_type_arg.rast diff --git a/crates/ra_syntax/test_data/parser/ok/0054_qual_path_in_type_arg.rs b/crates/syntax/test_data/parser/ok/0054_qual_path_in_type_arg.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/ok/0054_qual_path_in_type_arg.rs rename to crates/syntax/test_data/parser/ok/0054_qual_path_in_type_arg.rs diff --git a/crates/ra_syntax/test_data/parser/ok/0055_dot_dot_dot.rast b/crates/syntax/test_data/parser/ok/0055_dot_dot_dot.rast similarity index 100% rename from crates/ra_syntax/test_data/parser/ok/0055_dot_dot_dot.rast rename to crates/syntax/test_data/parser/ok/0055_dot_dot_dot.rast diff --git a/crates/ra_syntax/test_data/parser/ok/0055_dot_dot_dot.rs b/crates/syntax/test_data/parser/ok/0055_dot_dot_dot.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/ok/0055_dot_dot_dot.rs rename to crates/syntax/test_data/parser/ok/0055_dot_dot_dot.rs diff --git a/crates/ra_syntax/test_data/parser/ok/0056_neq_in_type.rast b/crates/syntax/test_data/parser/ok/0056_neq_in_type.rast similarity index 100% rename from crates/ra_syntax/test_data/parser/ok/0056_neq_in_type.rast rename to crates/syntax/test_data/parser/ok/0056_neq_in_type.rast diff --git a/crates/ra_syntax/test_data/parser/ok/0056_neq_in_type.rs b/crates/syntax/test_data/parser/ok/0056_neq_in_type.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/ok/0056_neq_in_type.rs rename to crates/syntax/test_data/parser/ok/0056_neq_in_type.rs diff --git a/crates/ra_syntax/test_data/parser/ok/0057_loop_in_call.rast b/crates/syntax/test_data/parser/ok/0057_loop_in_call.rast similarity index 100% rename from crates/ra_syntax/test_data/parser/ok/0057_loop_in_call.rast rename to crates/syntax/test_data/parser/ok/0057_loop_in_call.rast diff --git a/crates/ra_syntax/test_data/parser/ok/0057_loop_in_call.rs b/crates/syntax/test_data/parser/ok/0057_loop_in_call.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/ok/0057_loop_in_call.rs rename to crates/syntax/test_data/parser/ok/0057_loop_in_call.rs diff --git a/crates/ra_syntax/test_data/parser/ok/0058_unary_expr_precedence.rast b/crates/syntax/test_data/parser/ok/0058_unary_expr_precedence.rast similarity index 100% rename from crates/ra_syntax/test_data/parser/ok/0058_unary_expr_precedence.rast rename to crates/syntax/test_data/parser/ok/0058_unary_expr_precedence.rast diff --git a/crates/ra_syntax/test_data/parser/ok/0058_unary_expr_precedence.rs b/crates/syntax/test_data/parser/ok/0058_unary_expr_precedence.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/ok/0058_unary_expr_precedence.rs rename to crates/syntax/test_data/parser/ok/0058_unary_expr_precedence.rs diff --git a/crates/ra_syntax/test_data/parser/ok/0059_loops_in_parens.rast b/crates/syntax/test_data/parser/ok/0059_loops_in_parens.rast similarity index 100% rename from crates/ra_syntax/test_data/parser/ok/0059_loops_in_parens.rast rename to crates/syntax/test_data/parser/ok/0059_loops_in_parens.rast diff --git a/crates/ra_syntax/test_data/parser/ok/0059_loops_in_parens.rs b/crates/syntax/test_data/parser/ok/0059_loops_in_parens.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/ok/0059_loops_in_parens.rs rename to crates/syntax/test_data/parser/ok/0059_loops_in_parens.rs diff --git a/crates/ra_syntax/test_data/parser/ok/0060_as_range.rast b/crates/syntax/test_data/parser/ok/0060_as_range.rast similarity index 100% rename from crates/ra_syntax/test_data/parser/ok/0060_as_range.rast rename to crates/syntax/test_data/parser/ok/0060_as_range.rast diff --git a/crates/ra_syntax/test_data/parser/ok/0060_as_range.rs b/crates/syntax/test_data/parser/ok/0060_as_range.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/ok/0060_as_range.rs rename to crates/syntax/test_data/parser/ok/0060_as_range.rs diff --git a/crates/ra_syntax/test_data/parser/ok/0061_match_full_range.rast b/crates/syntax/test_data/parser/ok/0061_match_full_range.rast similarity index 100% rename from crates/ra_syntax/test_data/parser/ok/0061_match_full_range.rast rename to crates/syntax/test_data/parser/ok/0061_match_full_range.rast diff --git a/crates/ra_syntax/test_data/parser/ok/0061_match_full_range.rs b/crates/syntax/test_data/parser/ok/0061_match_full_range.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/ok/0061_match_full_range.rs rename to crates/syntax/test_data/parser/ok/0061_match_full_range.rs diff --git a/crates/ra_syntax/test_data/parser/ok/0062_macro_2.0.rast b/crates/syntax/test_data/parser/ok/0062_macro_2.0.rast similarity index 100% rename from crates/ra_syntax/test_data/parser/ok/0062_macro_2.0.rast rename to crates/syntax/test_data/parser/ok/0062_macro_2.0.rast diff --git a/crates/ra_syntax/test_data/parser/ok/0062_macro_2.0.rs b/crates/syntax/test_data/parser/ok/0062_macro_2.0.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/ok/0062_macro_2.0.rs rename to crates/syntax/test_data/parser/ok/0062_macro_2.0.rs diff --git a/crates/ra_syntax/test_data/parser/ok/0063_trait_fn_patterns.rast b/crates/syntax/test_data/parser/ok/0063_trait_fn_patterns.rast similarity index 100% rename from crates/ra_syntax/test_data/parser/ok/0063_trait_fn_patterns.rast rename to crates/syntax/test_data/parser/ok/0063_trait_fn_patterns.rast diff --git a/crates/ra_syntax/test_data/parser/ok/0063_trait_fn_patterns.rs b/crates/syntax/test_data/parser/ok/0063_trait_fn_patterns.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/ok/0063_trait_fn_patterns.rs rename to crates/syntax/test_data/parser/ok/0063_trait_fn_patterns.rs diff --git a/crates/ra_syntax/test_data/parser/ok/0063_variadic_fun.rast b/crates/syntax/test_data/parser/ok/0063_variadic_fun.rast similarity index 100% rename from crates/ra_syntax/test_data/parser/ok/0063_variadic_fun.rast rename to crates/syntax/test_data/parser/ok/0063_variadic_fun.rast diff --git a/crates/ra_syntax/test_data/parser/ok/0063_variadic_fun.rs b/crates/syntax/test_data/parser/ok/0063_variadic_fun.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/ok/0063_variadic_fun.rs rename to crates/syntax/test_data/parser/ok/0063_variadic_fun.rs diff --git a/crates/ra_syntax/test_data/parser/ok/0064_impl_fn_params.rast b/crates/syntax/test_data/parser/ok/0064_impl_fn_params.rast similarity index 100% rename from crates/ra_syntax/test_data/parser/ok/0064_impl_fn_params.rast rename to crates/syntax/test_data/parser/ok/0064_impl_fn_params.rast diff --git a/crates/ra_syntax/test_data/parser/ok/0064_impl_fn_params.rs b/crates/syntax/test_data/parser/ok/0064_impl_fn_params.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/ok/0064_impl_fn_params.rs rename to crates/syntax/test_data/parser/ok/0064_impl_fn_params.rs diff --git a/crates/ra_syntax/test_data/parser/ok/0065_comment_newline.rast b/crates/syntax/test_data/parser/ok/0065_comment_newline.rast similarity index 100% rename from crates/ra_syntax/test_data/parser/ok/0065_comment_newline.rast rename to crates/syntax/test_data/parser/ok/0065_comment_newline.rast diff --git a/crates/ra_syntax/test_data/parser/ok/0065_comment_newline.rs b/crates/syntax/test_data/parser/ok/0065_comment_newline.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/ok/0065_comment_newline.rs rename to crates/syntax/test_data/parser/ok/0065_comment_newline.rs diff --git a/crates/ra_syntax/test_data/parser/ok/0065_plus_after_fn_trait_bound.rast b/crates/syntax/test_data/parser/ok/0065_plus_after_fn_trait_bound.rast similarity index 100% rename from crates/ra_syntax/test_data/parser/ok/0065_plus_after_fn_trait_bound.rast rename to crates/syntax/test_data/parser/ok/0065_plus_after_fn_trait_bound.rast diff --git a/crates/ra_syntax/test_data/parser/ok/0065_plus_after_fn_trait_bound.rs b/crates/syntax/test_data/parser/ok/0065_plus_after_fn_trait_bound.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/ok/0065_plus_after_fn_trait_bound.rs rename to crates/syntax/test_data/parser/ok/0065_plus_after_fn_trait_bound.rs diff --git a/crates/ra_syntax/test_data/parser/ok/0066_default_modifier.rast b/crates/syntax/test_data/parser/ok/0066_default_modifier.rast similarity index 100% rename from crates/ra_syntax/test_data/parser/ok/0066_default_modifier.rast rename to crates/syntax/test_data/parser/ok/0066_default_modifier.rast diff --git a/crates/ra_syntax/test_data/parser/ok/0066_default_modifier.rs b/crates/syntax/test_data/parser/ok/0066_default_modifier.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/ok/0066_default_modifier.rs rename to crates/syntax/test_data/parser/ok/0066_default_modifier.rs diff --git a/crates/ra_syntax/test_data/parser/ok/0067_where_for_pred.rast b/crates/syntax/test_data/parser/ok/0067_where_for_pred.rast similarity index 100% rename from crates/ra_syntax/test_data/parser/ok/0067_where_for_pred.rast rename to crates/syntax/test_data/parser/ok/0067_where_for_pred.rast diff --git a/crates/ra_syntax/test_data/parser/ok/0067_where_for_pred.rs b/crates/syntax/test_data/parser/ok/0067_where_for_pred.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/ok/0067_where_for_pred.rs rename to crates/syntax/test_data/parser/ok/0067_where_for_pred.rs diff --git a/crates/ra_syntax/test_data/parser/ok/0068_item_modifiers.rast b/crates/syntax/test_data/parser/ok/0068_item_modifiers.rast similarity index 100% rename from crates/ra_syntax/test_data/parser/ok/0068_item_modifiers.rast rename to crates/syntax/test_data/parser/ok/0068_item_modifiers.rast diff --git a/crates/ra_syntax/test_data/parser/ok/0068_item_modifiers.rs b/crates/syntax/test_data/parser/ok/0068_item_modifiers.rs similarity index 100% rename from crates/ra_syntax/test_data/parser/ok/0068_item_modifiers.rs rename to crates/syntax/test_data/parser/ok/0068_item_modifiers.rs diff --git a/crates/ra_syntax/test_data/reparse/fuzz-failures/0000.rs b/crates/syntax/test_data/reparse/fuzz-failures/0000.rs similarity index 100% rename from crates/ra_syntax/test_data/reparse/fuzz-failures/0000.rs rename to crates/syntax/test_data/reparse/fuzz-failures/0000.rs diff --git a/crates/ra_syntax/test_data/reparse/fuzz-failures/0001.rs b/crates/syntax/test_data/reparse/fuzz-failures/0001.rs similarity index 100% rename from crates/ra_syntax/test_data/reparse/fuzz-failures/0001.rs rename to crates/syntax/test_data/reparse/fuzz-failures/0001.rs diff --git a/crates/ra_syntax/test_data/reparse/fuzz-failures/0002.rs b/crates/syntax/test_data/reparse/fuzz-failures/0002.rs similarity index 100% rename from crates/ra_syntax/test_data/reparse/fuzz-failures/0002.rs rename to crates/syntax/test_data/reparse/fuzz-failures/0002.rs diff --git a/crates/ra_syntax/test_data/reparse/fuzz-failures/0003.rs b/crates/syntax/test_data/reparse/fuzz-failures/0003.rs similarity index 100% rename from crates/ra_syntax/test_data/reparse/fuzz-failures/0003.rs rename to crates/syntax/test_data/reparse/fuzz-failures/0003.rs diff --git a/crates/ra_syntax/test_data/reparse/fuzz-failures/0004.rs b/crates/syntax/test_data/reparse/fuzz-failures/0004.rs similarity index 100% rename from crates/ra_syntax/test_data/reparse/fuzz-failures/0004.rs rename to crates/syntax/test_data/reparse/fuzz-failures/0004.rs diff --git a/crates/ra_syntax/test_data/reparse/fuzz-failures/0005.rs b/crates/syntax/test_data/reparse/fuzz-failures/0005.rs similarity index 100% rename from crates/ra_syntax/test_data/reparse/fuzz-failures/0005.rs rename to crates/syntax/test_data/reparse/fuzz-failures/0005.rs diff --git a/docs/dev/README.md b/docs/dev/README.md index 33829c5937..4aab6e2b86 100644 --- a/docs/dev/README.md +++ b/docs/dev/README.md @@ -92,7 +92,7 @@ This is primarily useful for performance optimizations, or for bug minimization. ## Parser Tests -Tests for the parser (`parser`) live in the `ra_syntax` crate (see `test_data` directory). +Tests for the parser (`parser`) live in the `syntax` crate (see `test_data` directory). There are two kinds of tests: * Manually written test cases in `parser/ok` and `parser/err` diff --git a/docs/dev/style.md b/docs/dev/style.md index 1c68f57023..3bbab6da90 100644 --- a/docs/dev/style.md +++ b/docs/dev/style.md @@ -97,13 +97,13 @@ Qualify items from `hir` and `ast`. ```rust // Good -use ra_syntax::ast; +use syntax::ast; fn frobnicate(func: hir::Function, strukt: ast::StructDef) {} // Not as good use hir::Function; -use ra_syntax::ast::StructDef; +use syntax::ast::StructDef; fn frobnicate(func: Function, strukt: StructDef) {} ``` diff --git a/xtask/src/codegen.rs b/xtask/src/codegen.rs index 08e7a10b75..2acd598d1e 100644 --- a/xtask/src/codegen.rs +++ b/xtask/src/codegen.rs @@ -25,12 +25,12 @@ pub use self::{ }; const GRAMMAR_DIR: &str = "crates/parser/src/grammar"; -const OK_INLINE_TESTS_DIR: &str = "crates/ra_syntax/test_data/parser/inline/ok"; -const ERR_INLINE_TESTS_DIR: &str = "crates/ra_syntax/test_data/parser/inline/err"; +const OK_INLINE_TESTS_DIR: &str = "crates/syntax/test_data/parser/inline/ok"; +const ERR_INLINE_TESTS_DIR: &str = "crates/syntax/test_data/parser/inline/err"; const SYNTAX_KINDS: &str = "crates/parser/src/syntax_kind/generated.rs"; -const AST_NODES: &str = "crates/ra_syntax/src/ast/generated/nodes.rs"; -const AST_TOKENS: &str = "crates/ra_syntax/src/ast/generated/tokens.rs"; +const AST_NODES: &str = "crates/syntax/src/ast/generated/nodes.rs"; +const AST_TOKENS: &str = "crates/syntax/src/ast/generated/tokens.rs"; const ASSISTS_DIR: &str = "crates/ra_assists/src/handlers"; const ASSISTS_TESTS: &str = "crates/ra_assists/src/tests/generated.rs"; diff --git a/xtask/src/codegen/gen_syntax.rs b/xtask/src/codegen/gen_syntax.rs index cafad8070d..dd1f4d6a2c 100644 --- a/xtask/src/codegen/gen_syntax.rs +++ b/xtask/src/codegen/gen_syntax.rs @@ -1,7 +1,7 @@ //! This module generates AST datatype used by rust-analyzer. //! //! Specifically, it generates the `SyntaxKind` enum and a number of newtype -//! wrappers around `SyntaxNode` which implement `ra_syntax::AstNode`. +//! wrappers around `SyntaxNode` which implement `syntax::AstNode`. use std::{ collections::{BTreeSet, HashSet}, diff --git a/xtask/src/lib.rs b/xtask/src/lib.rs index 2fdb08f2e1..904a9ee715 100644 --- a/xtask/src/lib.rs +++ b/xtask/src/lib.rs @@ -103,7 +103,7 @@ pub fn run_clippy() -> Result<()> { } pub fn run_fuzzer() -> Result<()> { - let _d = pushd("./crates/ra_syntax"); + let _d = pushd("./crates/syntax"); let _e = pushenv("RUSTUP_TOOLCHAIN", "nightly"); if run!("cargo fuzz --help").is_err() { run!("cargo install cargo-fuzz")?; diff --git a/xtask/tests/tidy.rs b/xtask/tests/tidy.rs index f1a7e8288e..8c608284a4 100644 --- a/xtask/tests/tidy.rs +++ b/xtask/tests/tidy.rs @@ -199,7 +199,7 @@ impl TidyDocs { "parser", "profile", "ra_project_model", - "ra_syntax", + "syntax", "tt", "ra_hir_ty", ];