From a1c187eef3ba08076aedb5154929f7eda8d1b424 Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Wed, 12 Aug 2020 18:26:51 +0200 Subject: Rename ra_syntax -> syntax --- crates/ra_ide/src/call_hierarchy.rs | 2 +- crates/ra_ide/src/call_info.rs | 4 ++-- crates/ra_ide/src/completion/complete_attribute.rs | 2 +- crates/ra_ide/src/completion/complete_fn_param.rs | 4 ++-- crates/ra_ide/src/completion/complete_keyword.rs | 2 +- crates/ra_ide/src/completion/complete_postfix.rs | 2 +- .../ra_ide/src/completion/complete_qualified_path.rs | 2 +- crates/ra_ide/src/completion/complete_trait_impl.rs | 2 +- .../src/completion/complete_unqualified_path.rs | 2 +- crates/ra_ide/src/completion/completion_context.rs | 2 +- crates/ra_ide/src/completion/completion_item.rs | 2 +- crates/ra_ide/src/completion/patterns.rs | 2 +- crates/ra_ide/src/completion/presentation.rs | 2 +- crates/ra_ide/src/completion/test_utils.rs | 2 +- crates/ra_ide/src/diagnostics.rs | 2 +- .../ra_ide/src/diagnostics/diagnostics_with_fix.rs | 2 +- crates/ra_ide/src/display.rs | 2 +- crates/ra_ide/src/display/navigation_target.rs | 2 +- crates/ra_ide/src/display/short_label.rs | 2 +- crates/ra_ide/src/expand_macro.rs | 2 +- crates/ra_ide/src/extend_selection.rs | 2 +- crates/ra_ide/src/file_structure.rs | 2 +- crates/ra_ide/src/folding_ranges.rs | 2 +- crates/ra_ide/src/goto_definition.rs | 4 ++-- crates/ra_ide/src/goto_implementation.rs | 2 +- crates/ra_ide/src/goto_type_definition.rs | 2 +- crates/ra_ide/src/hover.rs | 2 +- crates/ra_ide/src/inlay_hints.rs | 4 ++-- crates/ra_ide/src/join_lines.rs | 20 ++++++++++---------- crates/ra_ide/src/lib.rs | 2 +- crates/ra_ide/src/matching_brace.rs | 2 +- crates/ra_ide/src/parent_module.rs | 2 +- crates/ra_ide/src/references.rs | 2 +- crates/ra_ide/src/references/rename.rs | 4 ++-- crates/ra_ide/src/runnables.rs | 2 +- crates/ra_ide/src/status.rs | 2 +- crates/ra_ide/src/syntax_highlighting.rs | 4 ++-- crates/ra_ide/src/syntax_highlighting/html.rs | 2 +- crates/ra_ide/src/syntax_highlighting/injection.rs | 2 +- crates/ra_ide/src/syntax_highlighting/tests.rs | 2 +- crates/ra_ide/src/syntax_tree.rs | 2 +- crates/ra_ide/src/typing.rs | 2 +- crates/ra_ide/src/typing/on_enter.rs | 2 +- 43 files changed, 58 insertions(+), 58 deletions(-) (limited to 'crates/ra_ide/src') diff --git a/crates/ra_ide/src/call_hierarchy.rs b/crates/ra_ide/src/call_hierarchy.rs index 1fcaf4a32..116e6bf83 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 ff602202f..703cbc6b4 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 2faaae974..603d935de 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 406334257..7c63ce58f 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 b62064797..a80708935 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 42087da8d..05e15d464 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 b08f5b9b4..cb7dd23c1 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 b397baf10..d7edd92cf 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 bd9551f35..824227f31 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 0cb57fb1b..b5efb6cd6 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 1c0684f4e..9377cdc57 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 7c4feff6d..ffc97c076 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 59f1b1424..e1b1ea4ce 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 919177745..1452d7e9e 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 54810d5bb..18def6115 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 8fb25de6c..efcd631b3 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 fd42aa435..41b5bdc49 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 fdbf75abd..683088a74 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 010c34705..ea49d9f97 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 043515f54..c25e068d6 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 7230a0ff9..f30df2bff 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 87cab4503..c90247ba6 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 0fbc9babd..7523aec55 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 45389fd23..77f374ea2 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 9912b7142..91a8c1dd1 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 8f52feea6..3ec2ee59d 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 f66f62bfb..37e68ff7a 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 920b04e8d..46ddc528e 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 caf63933a..35cec87f6 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 09cb5faf6..20967ba99 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 742d70c9c..cb6abb0db 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 e3e0c7639..69af0c86a 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 c4eea3a45..e89dca869 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 9c688fb06..a075618e7 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 3b7162b84..54cb3b309 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 009bb662f..797ead1ad 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 ebdf05127..4b41ceb1d 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 a5e7d2867..418122648 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 6046643ef..43f4e6fea 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 a8087635a..594f61e85 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 07217e808..d05ff2214 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 952429cde..c408b1d52 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 c0c5ce3bc..9cd153f94 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::*, -- cgit v1.2.3