diff options
author | bors[bot] <bors[bot]@users.noreply.github.com> | 2019-01-23 13:25:44 +0000 |
---|---|---|
committer | bors[bot] <bors[bot]@users.noreply.github.com> | 2019-01-23 13:25:44 +0000 |
commit | 81fcfc55d247bfe6090741f2e4ae9aa89947bf32 (patch) | |
tree | 407c0ed2edf70d73c78224a9934c4a8c9e7eac2c /crates/ra_hir | |
parent | 86507c0626eb07485b21c61638673acbb3c2a9ad (diff) | |
parent | 71b9f06c89735b78439d0720e314b71969c17eb3 (diff) |
Merge #608
608: Complete parens r=matklad a=matklad
Co-authored-by: Aleksey Kladov <[email protected]>
Diffstat (limited to 'crates/ra_hir')
-rw-r--r-- | crates/ra_hir/src/lib.rs | 5 | ||||
-rw-r--r-- | crates/ra_hir/src/marks.rs | 4 |
2 files changed, 6 insertions, 3 deletions
diff --git a/crates/ra_hir/src/lib.rs b/crates/ra_hir/src/lib.rs index 33a9ba605..a861ee88e 100644 --- a/crates/ra_hir/src/lib.rs +++ b/crates/ra_hir/src/lib.rs | |||
@@ -8,8 +8,6 @@ | |||
8 | pub mod db; | 8 | pub mod db; |
9 | #[cfg(test)] | 9 | #[cfg(test)] |
10 | mod mock; | 10 | mod mock; |
11 | #[cfg(test)] | ||
12 | mod marks; | ||
13 | mod query_definitions; | 11 | mod query_definitions; |
14 | mod path; | 12 | mod path; |
15 | pub mod source_binder; | 13 | pub mod source_binder; |
@@ -29,6 +27,9 @@ mod generics; | |||
29 | mod code_model_api; | 27 | mod code_model_api; |
30 | mod code_model_impl; | 28 | mod code_model_impl; |
31 | 29 | ||
30 | #[cfg(test)] | ||
31 | mod marks; | ||
32 | |||
32 | use crate::{ | 33 | use crate::{ |
33 | db::HirDatabase, | 34 | db::HirDatabase, |
34 | name::{AsName, KnownName}, | 35 | name::{AsName, KnownName}, |
diff --git a/crates/ra_hir/src/marks.rs b/crates/ra_hir/src/marks.rs index 6aff2c4e1..f4d0c3e59 100644 --- a/crates/ra_hir/src/marks.rs +++ b/crates/ra_hir/src/marks.rs | |||
@@ -1 +1,3 @@ | |||
1 | test_utils::mark!(name_res_works_for_broken_modules); | 1 | use test_utils::mark; |
2 | |||
3 | mark!(name_res_works_for_broken_modules); | ||