diff options
author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2020-08-12 16:04:52 +0100 |
---|---|---|
committer | GitHub <[email protected]> | 2020-08-12 16:04:52 +0100 |
commit | a573e088ac64eeeb19e4fc74be2ff019be510477 (patch) | |
tree | 392c214055eab6a713814d46435bc0d91cf84e6c /crates/ra_syntax | |
parent | 6dba0e1c4de3b225556f7fce70518c8ebff170a6 (diff) | |
parent | 6dafc13f5f776980cd2560fb79d3d4790811c96d (diff) |
Merge #5726
5726: Rename ra_text_edit -> text_edit
r=matklad a=matklad
bors r+
🤖
Co-authored-by: Aleksey Kladov <[email protected]>
Diffstat (limited to 'crates/ra_syntax')
-rw-r--r-- | crates/ra_syntax/Cargo.toml | 2 | ||||
-rw-r--r-- | crates/ra_syntax/fuzz/Cargo.toml | 2 | ||||
-rw-r--r-- | crates/ra_syntax/src/algo.rs | 2 | ||||
-rw-r--r-- | crates/ra_syntax/src/fuzz.rs | 2 | ||||
-rw-r--r-- | crates/ra_syntax/src/lib.rs | 2 | ||||
-rw-r--r-- | crates/ra_syntax/src/parsing/reparsing.rs | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/crates/ra_syntax/Cargo.toml b/crates/ra_syntax/Cargo.toml index fc4d7aa04..f2789e6a3 100644 --- a/crates/ra_syntax/Cargo.toml +++ b/crates/ra_syntax/Cargo.toml | |||
@@ -20,7 +20,7 @@ once_cell = "1.3.1" | |||
20 | 20 | ||
21 | stdx = { path = "../stdx" } | 21 | stdx = { path = "../stdx" } |
22 | 22 | ||
23 | ra_text_edit = { path = "../ra_text_edit" } | 23 | text_edit = { path = "../text_edit" } |
24 | ra_parser = { path = "../ra_parser" } | 24 | ra_parser = { path = "../ra_parser" } |
25 | 25 | ||
26 | # This crate transitively depends on `smol_str` via `rowan`. | 26 | # This crate transitively depends on `smol_str` via `rowan`. |
diff --git a/crates/ra_syntax/fuzz/Cargo.toml b/crates/ra_syntax/fuzz/Cargo.toml index 613ad2857..4cec3c4cd 100644 --- a/crates/ra_syntax/fuzz/Cargo.toml +++ b/crates/ra_syntax/fuzz/Cargo.toml | |||
@@ -11,7 +11,7 @@ cargo-fuzz = true | |||
11 | 11 | ||
12 | [dependencies] | 12 | [dependencies] |
13 | ra_syntax = { path = ".." } | 13 | ra_syntax = { path = ".." } |
14 | ra_text_edit = { path = "../../ra_text_edit" } | 14 | text_edit = { path = "../../text_edit" } |
15 | libfuzzer-sys = { git = "https://github.com/rust-fuzz/libfuzzer-sys.git" } | 15 | libfuzzer-sys = { git = "https://github.com/rust-fuzz/libfuzzer-sys.git" } |
16 | 16 | ||
17 | # Prevent this from interfering with workspaces | 17 | # Prevent this from interfering with workspaces |
diff --git a/crates/ra_syntax/src/algo.rs b/crates/ra_syntax/src/algo.rs index 26b3c813a..6254b38ba 100644 --- a/crates/ra_syntax/src/algo.rs +++ b/crates/ra_syntax/src/algo.rs | |||
@@ -6,8 +6,8 @@ use std::{ | |||
6 | }; | 6 | }; |
7 | 7 | ||
8 | use itertools::Itertools; | 8 | use itertools::Itertools; |
9 | use ra_text_edit::TextEditBuilder; | ||
10 | use rustc_hash::FxHashMap; | 9 | use rustc_hash::FxHashMap; |
10 | use text_edit::TextEditBuilder; | ||
11 | 11 | ||
12 | use crate::{ | 12 | use crate::{ |
13 | AstNode, Direction, NodeOrToken, SyntaxElement, SyntaxKind, SyntaxNode, SyntaxNodePtr, | 13 | AstNode, Direction, NodeOrToken, SyntaxElement, SyntaxKind, SyntaxNode, SyntaxNodePtr, |
diff --git a/crates/ra_syntax/src/fuzz.rs b/crates/ra_syntax/src/fuzz.rs index 39f9b12ab..fbb97aa27 100644 --- a/crates/ra_syntax/src/fuzz.rs +++ b/crates/ra_syntax/src/fuzz.rs | |||
@@ -5,7 +5,7 @@ use std::{ | |||
5 | str::{self, FromStr}, | 5 | str::{self, FromStr}, |
6 | }; | 6 | }; |
7 | 7 | ||
8 | use ra_text_edit::Indel; | 8 | use text_edit::Indel; |
9 | 9 | ||
10 | use crate::{validation, AstNode, SourceFile, TextRange}; | 10 | use crate::{validation, AstNode, SourceFile, TextRange}; |
11 | 11 | ||
diff --git a/crates/ra_syntax/src/lib.rs b/crates/ra_syntax/src/lib.rs index 8a4d45386..465607f55 100644 --- a/crates/ra_syntax/src/lib.rs +++ b/crates/ra_syntax/src/lib.rs | |||
@@ -39,8 +39,8 @@ pub mod fuzz; | |||
39 | 39 | ||
40 | use std::{marker::PhantomData, sync::Arc}; | 40 | use std::{marker::PhantomData, sync::Arc}; |
41 | 41 | ||
42 | use ra_text_edit::Indel; | ||
43 | use stdx::format_to; | 42 | use stdx::format_to; |
43 | use text_edit::Indel; | ||
44 | 44 | ||
45 | pub use crate::{ | 45 | pub use crate::{ |
46 | algo::InsertPosition, | 46 | algo::InsertPosition, |
diff --git a/crates/ra_syntax/src/parsing/reparsing.rs b/crates/ra_syntax/src/parsing/reparsing.rs index ed5a42ea3..6644ffca4 100644 --- a/crates/ra_syntax/src/parsing/reparsing.rs +++ b/crates/ra_syntax/src/parsing/reparsing.rs | |||
@@ -7,7 +7,7 @@ | |||
7 | //! and try to parse only this block. | 7 | //! and try to parse only this block. |
8 | 8 | ||
9 | use ra_parser::Reparser; | 9 | use ra_parser::Reparser; |
10 | use ra_text_edit::Indel; | 10 | use text_edit::Indel; |
11 | 11 | ||
12 | use crate::{ | 12 | use crate::{ |
13 | algo, | 13 | algo, |