diff options
author | Seivan Heidari <[email protected]> | 2019-11-04 12:45:27 +0000 |
---|---|---|
committer | Seivan Heidari <[email protected]> | 2019-11-04 12:45:27 +0000 |
commit | dad9bc6caad71e6aebb92ad9883c08d30431e9b1 (patch) | |
tree | 6495d47108bc56ab0fbb358125fe65ebece8934f /crates/ra_hir/src/marks.rs | |
parent | 1d8bb4c6c1fef1f8ea513e07d0a7d4c5483129d2 (diff) | |
parent | cc2d75d0f88bdcb1b3e20db36decb6ee6eca517a (diff) |
Merge branch 'master' into feature/themes
Diffstat (limited to 'crates/ra_hir/src/marks.rs')
-rw-r--r-- | crates/ra_hir/src/marks.rs | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/crates/ra_hir/src/marks.rs b/crates/ra_hir/src/marks.rs index b423489a1..0d4fa5b67 100644 --- a/crates/ra_hir/src/marks.rs +++ b/crates/ra_hir/src/marks.rs | |||
@@ -1,21 +1,10 @@ | |||
1 | //! See test_utils/src/marks.rs | 1 | //! See test_utils/src/marks.rs |
2 | 2 | ||
3 | test_utils::marks!( | 3 | test_utils::marks!( |
4 | bogus_paths | ||
5 | // FIXME: restore this mark once hir is split | ||
6 | name_res_works_for_broken_modules | ||
7 | can_import_enum_variant | ||
8 | type_var_cycles_resolve_completely | 4 | type_var_cycles_resolve_completely |
9 | type_var_cycles_resolve_as_possible | 5 | type_var_cycles_resolve_as_possible |
10 | type_var_resolves_to_int_var | 6 | type_var_resolves_to_int_var |
11 | glob_enum | ||
12 | glob_across_crates | ||
13 | std_prelude | ||
14 | match_ergonomics_ref | 7 | match_ergonomics_ref |
15 | infer_while_let | 8 | infer_while_let |
16 | macro_rules_from_other_crates_are_visible_with_macro_use | ||
17 | prelude_is_macro_use | ||
18 | coerce_merge_fail_fallback | 9 | coerce_merge_fail_fallback |
19 | macro_dollar_crate_self | ||
20 | macro_dollar_crate_other | ||
21 | ); | 10 | ); |