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_db/src/defs.rs | 2 +- crates/ra_ide_db/src/imports_locator.rs | 2 +- crates/ra_ide_db/src/line_index.rs | 2 +- crates/ra_ide_db/src/search.rs | 2 +- crates/ra_ide_db/src/symbol_index.rs | 6 +++--- 5 files changed, 7 insertions(+), 7 deletions(-) (limited to 'crates/ra_ide_db/src') diff --git a/crates/ra_ide_db/src/defs.rs b/crates/ra_ide_db/src/defs.rs index d46d1fe71..7b5d6ac49 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 d510ce3b7..1d0c20291 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 2ab662098..a381f7fb8 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 d90b830d0..7827cc71c 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 6ca8bb516..896092b46 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; -- cgit v1.2.3