diff options
| author | Kevin DeLorey <[email protected]> | 2020-02-09 16:25:47 +0000 |
|---|---|---|
| committer | Kevin DeLorey <[email protected]> | 2020-02-09 16:37:43 +0000 |
| commit | a957c473fdb79880c39b73dc9e0c923093cf16ac (patch) | |
| tree | f998b548f530ce604651e0e6af314ed2ec74b3b5 /crates/ra_hir_ty/src/marks.rs | |
| parent | 22caf982b99c54058e2e9200aeea0e61cada284a (diff) | |
| parent | 1b9b13b4b4a75b5531c3f046ce6bf72d681f2732 (diff) | |
Merge branch 'master' into kdelorey/complete-trait-impl
Diffstat (limited to 'crates/ra_hir_ty/src/marks.rs')
| -rw-r--r-- | crates/ra_hir_ty/src/marks.rs | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/crates/ra_hir_ty/src/marks.rs b/crates/ra_hir_ty/src/marks.rs index fe74acf11..0f754eb9c 100644 --- a/crates/ra_hir_ty/src/marks.rs +++ b/crates/ra_hir_ty/src/marks.rs | |||
| @@ -6,5 +6,4 @@ test_utils::marks!( | |||
| 6 | type_var_resolves_to_int_var | 6 | type_var_resolves_to_int_var |
| 7 | match_ergonomics_ref | 7 | match_ergonomics_ref |
| 8 | coerce_merge_fail_fallback | 8 | coerce_merge_fail_fallback |
| 9 | insert_vars_for_impl_trait | ||
| 10 | ); | 9 | ); |