Merge #5729

5729: Rename ra_syntax -> syntax
 r=matklad a=matklad

bors r+
🤖

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

10 files changed, 17 insertions, 17 deletions

diff --git a/crates/ra_hir_expand/Cargo.toml b/crates/ra_hir_expand/Cargo.toml
index 052330fde..153a70bdf 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 703a85b0f..f63629b30 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<N: AstNode> {
diff --git a/crates/ra_hir_expand/src/builtin_derive.rs b/crates/ra_hir_expand/src/builtin_derive.rs
index 95e6977f2..2d2f8bcb8 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 24dc0b4e7..ae4c84382 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 d83c391a9..c275f6b01 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 b138500e7..59d35debe 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 dc83044ea..bd3409f97 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 aefe47bd3..23b5eac27 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 38f0ffff8..af0cc445f 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 969a2e5b8..4dcaff088 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()))
     }