From 50a02eb3593591a02677e1b56f24d7ff0459b9d0 Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Wed, 12 Aug 2020 17:06:49 +0200 Subject: Rename ra_parser -> parser --- crates/ra_hir_expand/Cargo.toml | 2 +- crates/ra_hir_expand/src/builtin_derive.rs | 2 +- crates/ra_hir_expand/src/builtin_macro.rs | 2 +- crates/ra_hir_expand/src/db.rs | 2 +- crates/ra_hir_expand/src/eager.rs | 2 +- crates/ra_hir_expand/src/lib.rs | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) (limited to 'crates/ra_hir_expand') diff --git a/crates/ra_hir_expand/Cargo.toml b/crates/ra_hir_expand/Cargo.toml index 7d8ccd56f..052330fde 100644 --- a/crates/ra_hir_expand/Cargo.toml +++ b/crates/ra_hir_expand/Cargo.toml @@ -16,7 +16,7 @@ rustc-hash = "1.0.0" arena = { path = "../arena" } ra_db = { path = "../ra_db" } ra_syntax = { path = "../ra_syntax" } -ra_parser = { path = "../ra_parser" } +parser = { path = "../parser" } profile = { path = "../profile" } tt = { path = "../tt" } mbe = { path = "../ra_mbe", package = "ra_mbe" } diff --git a/crates/ra_hir_expand/src/builtin_derive.rs b/crates/ra_hir_expand/src/builtin_derive.rs index 69fa907cb..95e6977f2 100644 --- a/crates/ra_hir_expand/src/builtin_derive.rs +++ b/crates/ra_hir_expand/src/builtin_derive.rs @@ -2,7 +2,7 @@ use log::debug; -use ra_parser::FragmentKind; +use parser::FragmentKind; use ra_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 9f50569dc..24dc0b4e7 100644 --- a/crates/ra_hir_expand/src/builtin_macro.rs +++ b/crates/ra_hir_expand/src/builtin_macro.rs @@ -6,8 +6,8 @@ use crate::{ use either::Either; use mbe::parse_to_token_tree; +use parser::FragmentKind; use ra_db::FileId; -use ra_parser::FragmentKind; use ra_syntax::ast::{self, AstToken, HasStringValue}; macro_rules! register_builtin { diff --git a/crates/ra_hir_expand/src/db.rs b/crates/ra_hir_expand/src/db.rs index f30528b3e..d83c391a9 100644 --- a/crates/ra_hir_expand/src/db.rs +++ b/crates/ra_hir_expand/src/db.rs @@ -3,8 +3,8 @@ use std::sync::Arc; use mbe::{ExpandResult, MacroRules}; +use parser::FragmentKind; use ra_db::{salsa, SourceDatabase}; -use ra_parser::FragmentKind; use ra_syntax::{algo::diff, AstNode, GreenNode, Parse, SyntaxKind::*, SyntaxNode}; use crate::{ diff --git a/crates/ra_hir_expand/src/eager.rs b/crates/ra_hir_expand/src/eager.rs index 302d2b3e0..dc83044ea 100644 --- a/crates/ra_hir_expand/src/eager.rs +++ b/crates/ra_hir_expand/src/eager.rs @@ -25,8 +25,8 @@ use crate::{ EagerCallLoc, EagerMacroId, InFile, MacroCallId, MacroCallKind, MacroDefId, MacroDefKind, }; +use parser::FragmentKind; use ra_db::CrateId; -use ra_parser::FragmentKind; use ra_syntax::{algo::SyntaxRewriter, SyntaxNode}; use std::sync::Arc; diff --git a/crates/ra_hir_expand/src/lib.rs b/crates/ra_hir_expand/src/lib.rs index 8bb735fc6..38f0ffff8 100644 --- a/crates/ra_hir_expand/src/lib.rs +++ b/crates/ra_hir_expand/src/lib.rs @@ -317,7 +317,7 @@ pub struct ExpansionInfo { } pub use mbe::Origin; -use ra_parser::FragmentKind; +use parser::FragmentKind; impl ExpansionInfo { pub fn call_node(&self) -> Option> { -- cgit v1.2.3