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_hir/Cargo.toml | 2 +- crates/ra_hir/src/code_model.rs | 6 +++--- crates/ra_hir/src/has_source.rs | 2 +- crates/ra_hir/src/semantics.rs | 4 ++-- crates/ra_hir/src/semantics/source_to_def.rs | 6 +++--- crates/ra_hir/src/source_analyzer.rs | 2 +- 6 files changed, 11 insertions(+), 11 deletions(-) (limited to 'crates/ra_hir') diff --git a/crates/ra_hir/Cargo.toml b/crates/ra_hir/Cargo.toml index 903406e84..ee5622a7d 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 5c0c6184a..98724c146 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 1c691d961..a50d4ff02 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 7e3ec6315..2e0ef4408 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 a6ff8b0bf..ab2fd0957 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 d3d62debf..6b2de3a06 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, }; -- cgit v1.2.3