diff options
author | Aleksey Kladov <[email protected]> | 2018-12-06 18:16:37 +0000 |
---|---|---|
committer | Aleksey Kladov <[email protected]> | 2018-12-06 18:16:37 +0000 |
commit | 28ddecf6c99ef23bc96b9eb7bc8ee049f1732e76 (patch) | |
tree | 7912f80008f47e240be2ed8c88f923824409f396 /crates/ra_editor | |
parent | f6e8b376d1d21b8b697de5ef1e35a341855202ed (diff) |
modernize even more
Diffstat (limited to 'crates/ra_editor')
-rw-r--r-- | crates/ra_editor/src/lib.rs | 11 | ||||
-rw-r--r-- | crates/ra_editor/src/test_utils.rs | 5 | ||||
-rw-r--r-- | crates/ra_editor/src/typing.rs | 2 |
3 files changed, 5 insertions, 13 deletions
diff --git a/crates/ra_editor/src/lib.rs b/crates/ra_editor/src/lib.rs index c6b116159..ce080ee97 100644 --- a/crates/ra_editor/src/lib.rs +++ b/crates/ra_editor/src/lib.rs | |||
@@ -1,12 +1,3 @@ | |||
1 | extern crate itertools; | ||
2 | extern crate join_to_string; | ||
3 | extern crate ra_syntax; | ||
4 | extern crate rustc_hash; | ||
5 | extern crate superslice; | ||
6 | #[cfg(test)] | ||
7 | #[macro_use] | ||
8 | extern crate test_utils as _test_utils; | ||
9 | |||
10 | mod code_actions; | 1 | mod code_actions; |
11 | mod edit; | 2 | mod edit; |
12 | mod extend_selection; | 3 | mod extend_selection; |
@@ -154,7 +145,7 @@ pub fn find_node_at_offset<'a, N: AstNode<'a>>( | |||
154 | #[cfg(test)] | 145 | #[cfg(test)] |
155 | mod tests { | 146 | mod tests { |
156 | use super::*; | 147 | use super::*; |
157 | use crate::test_utils::{add_cursor, assert_eq_dbg, extract_offset}; | 148 | use crate::test_utils::{add_cursor, assert_eq_dbg, extract_offset, assert_eq_text}; |
158 | 149 | ||
159 | #[test] | 150 | #[test] |
160 | fn test_highlighting() { | 151 | fn test_highlighting() { |
diff --git a/crates/ra_editor/src/test_utils.rs b/crates/ra_editor/src/test_utils.rs index cbeb6433b..f0a4f250a 100644 --- a/crates/ra_editor/src/test_utils.rs +++ b/crates/ra_editor/src/test_utils.rs | |||
@@ -1,7 +1,8 @@ | |||
1 | use crate::LocalEdit; | ||
2 | pub use crate::_test_utils::*; | ||
3 | use ra_syntax::{SourceFileNode, TextRange, TextUnit}; | 1 | use ra_syntax::{SourceFileNode, TextRange, TextUnit}; |
4 | 2 | ||
3 | use crate::LocalEdit; | ||
4 | pub use test_utils::*; | ||
5 | |||
5 | pub fn check_action<F: Fn(&SourceFileNode, TextUnit) -> Option<LocalEdit>>( | 6 | pub fn check_action<F: Fn(&SourceFileNode, TextUnit) -> Option<LocalEdit>>( |
6 | before: &str, | 7 | before: &str, |
7 | after: &str, | 8 | after: &str, |
diff --git a/crates/ra_editor/src/typing.rs b/crates/ra_editor/src/typing.rs index f894d8392..9703e0371 100644 --- a/crates/ra_editor/src/typing.rs +++ b/crates/ra_editor/src/typing.rs | |||
@@ -238,7 +238,7 @@ fn compute_ws(left: SyntaxNodeRef, right: SyntaxNodeRef) -> &'static str { | |||
238 | #[cfg(test)] | 238 | #[cfg(test)] |
239 | mod tests { | 239 | mod tests { |
240 | use super::*; | 240 | use super::*; |
241 | use crate::test_utils::{add_cursor, check_action, extract_offset, extract_range}; | 241 | use crate::test_utils::{add_cursor, check_action, extract_offset, extract_range, assert_eq_text}; |
242 | 242 | ||
243 | fn check_join_lines(before: &str, after: &str) { | 243 | fn check_join_lines(before: &str, after: &str) { |
244 | check_action(before, after, |file, offset| { | 244 | check_action(before, after, |file, offset| { |