diff options
author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2020-08-12 16:15:00 +0100 |
---|---|---|
committer | GitHub <[email protected]> | 2020-08-12 16:15:00 +0100 |
commit | 3d6889cba72a9d02199f7adaa2ecc69bc30af834 (patch) | |
tree | a17351b1e3addea0a719f38990fea9289b6ef65e /crates/ra_hir_expand | |
parent | a573e088ac64eeeb19e4fc74be2ff019be510477 (diff) | |
parent | 50a02eb3593591a02677e1b56f24d7ff0459b9d0 (diff) |
Merge #5727
5727: Rename ra_parser -> parser
r=matklad a=matklad
bors r+
🤖
Co-authored-by: Aleksey Kladov <[email protected]>
Diffstat (limited to 'crates/ra_hir_expand')
-rw-r--r-- | crates/ra_hir_expand/Cargo.toml | 2 | ||||
-rw-r--r-- | crates/ra_hir_expand/src/builtin_derive.rs | 2 | ||||
-rw-r--r-- | crates/ra_hir_expand/src/builtin_macro.rs | 2 | ||||
-rw-r--r-- | crates/ra_hir_expand/src/db.rs | 2 | ||||
-rw-r--r-- | crates/ra_hir_expand/src/eager.rs | 2 | ||||
-rw-r--r-- | crates/ra_hir_expand/src/lib.rs | 2 |
6 files changed, 6 insertions, 6 deletions
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" | |||
16 | arena = { path = "../arena" } | 16 | arena = { path = "../arena" } |
17 | ra_db = { path = "../ra_db" } | 17 | ra_db = { path = "../ra_db" } |
18 | ra_syntax = { path = "../ra_syntax" } | 18 | ra_syntax = { path = "../ra_syntax" } |
19 | ra_parser = { path = "../ra_parser" } | 19 | parser = { path = "../parser" } |
20 | profile = { path = "../profile" } | 20 | profile = { path = "../profile" } |
21 | tt = { path = "../tt" } | 21 | tt = { path = "../tt" } |
22 | mbe = { path = "../ra_mbe", package = "ra_mbe" } | 22 | 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 @@ | |||
2 | 2 | ||
3 | use log::debug; | 3 | use log::debug; |
4 | 4 | ||
5 | use ra_parser::FragmentKind; | 5 | use parser::FragmentKind; |
6 | use ra_syntax::{ | 6 | use ra_syntax::{ |
7 | ast::{self, AstNode, GenericParamsOwner, ModuleItemOwner, NameOwner}, | 7 | ast::{self, AstNode, GenericParamsOwner, ModuleItemOwner, NameOwner}, |
8 | match_ast, | 8 | 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::{ | |||
6 | 6 | ||
7 | use either::Either; | 7 | use either::Either; |
8 | use mbe::parse_to_token_tree; | 8 | use mbe::parse_to_token_tree; |
9 | use parser::FragmentKind; | ||
9 | use ra_db::FileId; | 10 | use ra_db::FileId; |
10 | use ra_parser::FragmentKind; | ||
11 | use ra_syntax::ast::{self, AstToken, HasStringValue}; | 11 | use ra_syntax::ast::{self, AstToken, HasStringValue}; |
12 | 12 | ||
13 | macro_rules! register_builtin { | 13 | 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 @@ | |||
3 | use std::sync::Arc; | 3 | use std::sync::Arc; |
4 | 4 | ||
5 | use mbe::{ExpandResult, MacroRules}; | 5 | use mbe::{ExpandResult, MacroRules}; |
6 | use parser::FragmentKind; | ||
6 | use ra_db::{salsa, SourceDatabase}; | 7 | use ra_db::{salsa, SourceDatabase}; |
7 | use ra_parser::FragmentKind; | ||
8 | use ra_syntax::{algo::diff, AstNode, GreenNode, Parse, SyntaxKind::*, SyntaxNode}; | 8 | use ra_syntax::{algo::diff, AstNode, GreenNode, Parse, SyntaxKind::*, SyntaxNode}; |
9 | 9 | ||
10 | use crate::{ | 10 | 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::{ | |||
25 | EagerCallLoc, EagerMacroId, InFile, MacroCallId, MacroCallKind, MacroDefId, MacroDefKind, | 25 | EagerCallLoc, EagerMacroId, InFile, MacroCallId, MacroCallKind, MacroDefId, MacroDefKind, |
26 | }; | 26 | }; |
27 | 27 | ||
28 | use parser::FragmentKind; | ||
28 | use ra_db::CrateId; | 29 | use ra_db::CrateId; |
29 | use ra_parser::FragmentKind; | ||
30 | use ra_syntax::{algo::SyntaxRewriter, SyntaxNode}; | 30 | use ra_syntax::{algo::SyntaxRewriter, SyntaxNode}; |
31 | use std::sync::Arc; | 31 | use std::sync::Arc; |
32 | 32 | ||
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 { | |||
317 | } | 317 | } |
318 | 318 | ||
319 | pub use mbe::Origin; | 319 | pub use mbe::Origin; |
320 | use ra_parser::FragmentKind; | 320 | use parser::FragmentKind; |
321 | 321 | ||
322 | impl ExpansionInfo { | 322 | impl ExpansionInfo { |
323 | pub fn call_node(&self) -> Option<InFile<SyntaxNode>> { | 323 | pub fn call_node(&self) -> Option<InFile<SyntaxNode>> { |