diff options
author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2020-08-12 17:31:42 +0100 |
---|---|---|
committer | GitHub <[email protected]> | 2020-08-12 17:31:42 +0100 |
commit | d583f2c46d22cf8d643ebf98be9cb7059a304431 (patch) | |
tree | 9d898eb9600b0c36a74e4f95238f679c683fa566 /crates/ra_cfg | |
parent | 3d6889cba72a9d02199f7adaa2ecc69bc30af834 (diff) | |
parent | a1c187eef3ba08076aedb5154929f7eda8d1b424 (diff) |
Merge #5729
5729: Rename ra_syntax -> syntax
r=matklad a=matklad
bors r+
🤖
Co-authored-by: Aleksey Kladov <[email protected]>
Diffstat (limited to 'crates/ra_cfg')
-rw-r--r-- | crates/ra_cfg/Cargo.toml | 2 | ||||
-rw-r--r-- | crates/ra_cfg/src/cfg_expr.rs | 4 | ||||
-rw-r--r-- | crates/ra_cfg/src/lib.rs | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/crates/ra_cfg/Cargo.toml b/crates/ra_cfg/Cargo.toml index 770a40742..cb0d2b9d7 100644 --- a/crates/ra_cfg/Cargo.toml +++ b/crates/ra_cfg/Cargo.toml | |||
@@ -11,7 +11,7 @@ doctest = false | |||
11 | [dependencies] | 11 | [dependencies] |
12 | rustc-hash = "1.1.0" | 12 | rustc-hash = "1.1.0" |
13 | 13 | ||
14 | ra_syntax = { path = "../ra_syntax" } | 14 | syntax = { path = "../syntax" } |
15 | tt = { path = "../tt" } | 15 | tt = { path = "../tt" } |
16 | 16 | ||
17 | [dev-dependencies] | 17 | [dev-dependencies] |
diff --git a/crates/ra_cfg/src/cfg_expr.rs b/crates/ra_cfg/src/cfg_expr.rs index f48928aee..940091465 100644 --- a/crates/ra_cfg/src/cfg_expr.rs +++ b/crates/ra_cfg/src/cfg_expr.rs | |||
@@ -4,7 +4,7 @@ | |||
4 | 4 | ||
5 | use std::slice::Iter as SliceIter; | 5 | use std::slice::Iter as SliceIter; |
6 | 6 | ||
7 | use ra_syntax::SmolStr; | 7 | use syntax::SmolStr; |
8 | 8 | ||
9 | #[derive(Debug, Clone, PartialEq, Eq)] | 9 | #[derive(Debug, Clone, PartialEq, Eq)] |
10 | pub enum CfgExpr { | 10 | pub enum CfgExpr { |
@@ -87,7 +87,7 @@ mod tests { | |||
87 | use super::*; | 87 | use super::*; |
88 | 88 | ||
89 | use mbe::{ast_to_token_tree, TokenMap}; | 89 | use mbe::{ast_to_token_tree, TokenMap}; |
90 | use ra_syntax::ast::{self, AstNode}; | 90 | use syntax::ast::{self, AstNode}; |
91 | 91 | ||
92 | fn get_token_tree_generated(input: &str) -> (tt::Subtree, TokenMap) { | 92 | fn get_token_tree_generated(input: &str) -> (tt::Subtree, TokenMap) { |
93 | let source_file = ast::SourceFile::parse(input).ok().unwrap(); | 93 | let source_file = ast::SourceFile::parse(input).ok().unwrap(); |
diff --git a/crates/ra_cfg/src/lib.rs b/crates/ra_cfg/src/lib.rs index cd5a0a7b6..7e025143b 100644 --- a/crates/ra_cfg/src/lib.rs +++ b/crates/ra_cfg/src/lib.rs | |||
@@ -2,8 +2,8 @@ | |||
2 | 2 | ||
3 | mod cfg_expr; | 3 | mod cfg_expr; |
4 | 4 | ||
5 | use ra_syntax::SmolStr; | ||
6 | use rustc_hash::FxHashSet; | 5 | use rustc_hash::FxHashSet; |
6 | use syntax::SmolStr; | ||
7 | 7 | ||
8 | pub use cfg_expr::CfgExpr; | 8 | pub use cfg_expr::CfgExpr; |
9 | 9 | ||