From fe6c4115f6c8bb5b5f276bafcbd9cc3fc1d504d1 Mon Sep 17 00:00:00 2001 From: Florian Diebold Date: Wed, 26 Dec 2018 21:24:49 +0100 Subject: Rename ImplItem to ImplBlock rustc uses the name ImplItem for items in impls, not the impl {} block itself, which could lead to confusion. --- .../ra_syntax/tests/data/parser/err/0018_incomplete_fn.txt | 2 +- crates/ra_syntax/tests/data/parser/err/0022_bad_exprs.txt | 2 +- crates/ra_syntax/tests/data/parser/err/0026_imp_recovery.txt | 4 ++-- .../data/parser/inline/err/0002_misplaced_label_err.txt | 2 +- .../tests/data/parser/inline/err/0004_impl_type.txt | 12 ++++++------ .../tests/data/parser/inline/ok/0001_trait_item_list.txt | 2 +- .../tests/data/parser/inline/ok/0006_self_param.txt | 2 +- .../tests/data/parser/inline/ok/0018_arb_self_types.txt | 2 +- .../tests/data/parser/inline/ok/0021_impl_item_list.txt | 2 +- .../tests/data/parser/inline/ok/0047_unsafe_default_impl.txt | 2 +- .../tests/data/parser/inline/ok/0063_impl_item_neg.txt | 2 +- .../ra_syntax/tests/data/parser/inline/ok/0079_impl_item.txt | 2 +- .../tests/data/parser/inline/ok/0087_unsafe_impl.txt | 2 +- .../tests/data/parser/inline/ok/0097_default_impl.txt | 2 +- crates/ra_syntax/tests/data/parser/ok/0037_mod.txt | 1 - 15 files changed, 20 insertions(+), 21 deletions(-) (limited to 'crates/ra_syntax/tests/data') diff --git a/crates/ra_syntax/tests/data/parser/err/0018_incomplete_fn.txt b/crates/ra_syntax/tests/data/parser/err/0018_incomplete_fn.txt index 3937be255..262cbba1e 100644 --- a/crates/ra_syntax/tests/data/parser/err/0018_incomplete_fn.txt +++ b/crates/ra_syntax/tests/data/parser/err/0018_incomplete_fn.txt @@ -1,5 +1,5 @@ SOURCE_FILE@[0; 183) - IMPL_ITEM@[0; 182) + IMPL_BLOCK@[0; 182) IMPL_KW@[0; 4) WHITESPACE@[4; 5) PATH_TYPE@[5; 13) diff --git a/crates/ra_syntax/tests/data/parser/err/0022_bad_exprs.txt b/crates/ra_syntax/tests/data/parser/err/0022_bad_exprs.txt index 55999c160..da3894133 100644 --- a/crates/ra_syntax/tests/data/parser/err/0022_bad_exprs.txt +++ b/crates/ra_syntax/tests/data/parser/err/0022_bad_exprs.txt @@ -94,7 +94,7 @@ SOURCE_FILE@[0; 112) COMMA@[54; 55) err: `expected SEMI` WHITESPACE@[55; 56) - IMPL_ITEM@[56; 60) + IMPL_BLOCK@[56; 60) IMPL_KW@[56; 60) err: `expected type` err: `expected `{`` diff --git a/crates/ra_syntax/tests/data/parser/err/0026_imp_recovery.txt b/crates/ra_syntax/tests/data/parser/err/0026_imp_recovery.txt index 82683f6ee..9b5fadcf7 100644 --- a/crates/ra_syntax/tests/data/parser/err/0026_imp_recovery.txt +++ b/crates/ra_syntax/tests/data/parser/err/0026_imp_recovery.txt @@ -1,5 +1,5 @@ SOURCE_FILE@[0; 38) - IMPL_ITEM@[0; 14) + IMPL_BLOCK@[0; 14) IMPL_KW@[0; 4) TYPE_PARAM_LIST@[4; 14) L_ANGLE@[4; 5) @@ -17,7 +17,7 @@ SOURCE_FILE@[0; 38) err: `expected trait or type` err: `expected `{`` WHITESPACE@[14; 15) - IMPL_ITEM@[15; 37) + IMPL_BLOCK@[15; 37) IMPL_KW@[15; 19) TYPE_PARAM_LIST@[19; 22) L_ANGLE@[19; 20) diff --git a/crates/ra_syntax/tests/data/parser/inline/err/0002_misplaced_label_err.txt b/crates/ra_syntax/tests/data/parser/inline/err/0002_misplaced_label_err.txt index 75533ecc1..8021aee00 100644 --- a/crates/ra_syntax/tests/data/parser/inline/err/0002_misplaced_label_err.txt +++ b/crates/ra_syntax/tests/data/parser/inline/err/0002_misplaced_label_err.txt @@ -19,7 +19,7 @@ SOURCE_FILE@[0; 30) err: `expected a loop` err: `expected SEMI` WHITESPACE@[22; 23) - IMPL_ITEM@[23; 27) + IMPL_BLOCK@[23; 27) IMPL_KW@[23; 27) err: `expected type` err: `expected `{`` diff --git a/crates/ra_syntax/tests/data/parser/inline/err/0004_impl_type.txt b/crates/ra_syntax/tests/data/parser/inline/err/0004_impl_type.txt index 7279d5cae..6875ed016 100644 --- a/crates/ra_syntax/tests/data/parser/inline/err/0004_impl_type.txt +++ b/crates/ra_syntax/tests/data/parser/inline/err/0004_impl_type.txt @@ -1,5 +1,5 @@ SOURCE_FILE@[0; 87) - IMPL_ITEM@[0; 12) + IMPL_BLOCK@[0; 12) IMPL_KW@[0; 4) WHITESPACE@[4; 5) PATH_TYPE@[5; 9) @@ -12,7 +12,7 @@ SOURCE_FILE@[0; 87) L_CURLY@[10; 11) R_CURLY@[11; 12) WHITESPACE@[12; 13) - IMPL_ITEM@[13; 33) + IMPL_BLOCK@[13; 33) IMPL_KW@[13; 17) WHITESPACE@[17; 18) PATH_TYPE@[18; 24) @@ -33,12 +33,12 @@ SOURCE_FILE@[0; 87) L_CURLY@[31; 32) R_CURLY@[32; 33) WHITESPACE@[33; 34) - IMPL_ITEM@[34; 38) + IMPL_BLOCK@[34; 38) IMPL_KW@[34; 38) err: `expected trait or type` err: `expected `{`` WHITESPACE@[38; 39) - IMPL_ITEM@[39; 54) + IMPL_BLOCK@[39; 54) IMPL_KW@[39; 43) WHITESPACE@[43; 44) PATH_TYPE@[44; 51) @@ -51,7 +51,7 @@ SOURCE_FILE@[0; 87) L_CURLY@[52; 53) R_CURLY@[53; 54) WHITESPACE@[54; 55) - IMPL_ITEM@[55; 70) + IMPL_BLOCK@[55; 70) IMPL_KW@[55; 59) WHITESPACE@[59; 60) PATH_TYPE@[60; 66) @@ -64,7 +64,7 @@ SOURCE_FILE@[0; 87) err: `expected trait or type` err: `expected `{`` WHITESPACE@[70; 71) - IMPL_ITEM@[71; 86) + IMPL_BLOCK@[71; 86) IMPL_KW@[71; 75) WHITESPACE@[75; 76) PATH_TYPE@[76; 83) diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0001_trait_item_list.txt b/crates/ra_syntax/tests/data/parser/inline/ok/0001_trait_item_list.txt index 998ac3da9..de7df7312 100644 --- a/crates/ra_syntax/tests/data/parser/inline/ok/0001_trait_item_list.txt +++ b/crates/ra_syntax/tests/data/parser/inline/ok/0001_trait_item_list.txt @@ -1,5 +1,5 @@ SOURCE_FILE@[0; 83) - IMPL_ITEM@[0; 82) + IMPL_BLOCK@[0; 82) IMPL_KW@[0; 4) WHITESPACE@[4; 5) PATH_TYPE@[5; 6) diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0006_self_param.txt b/crates/ra_syntax/tests/data/parser/inline/ok/0006_self_param.txt index 53027c852..4df01c6e5 100644 --- a/crates/ra_syntax/tests/data/parser/inline/ok/0006_self_param.txt +++ b/crates/ra_syntax/tests/data/parser/inline/ok/0006_self_param.txt @@ -1,5 +1,5 @@ SOURCE_FILE@[0; 128) - IMPL_ITEM@[0; 127) + IMPL_BLOCK@[0; 127) IMPL_KW@[0; 4) WHITESPACE@[4; 5) PATH_TYPE@[5; 6) diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0018_arb_self_types.txt b/crates/ra_syntax/tests/data/parser/inline/ok/0018_arb_self_types.txt index b2f04ea7b..03139f7a4 100644 --- a/crates/ra_syntax/tests/data/parser/inline/ok/0018_arb_self_types.txt +++ b/crates/ra_syntax/tests/data/parser/inline/ok/0018_arb_self_types.txt @@ -1,5 +1,5 @@ SOURCE_FILE@[0; 69) - IMPL_ITEM@[0; 68) + IMPL_BLOCK@[0; 68) IMPL_KW@[0; 4) WHITESPACE@[4; 5) PATH_TYPE@[5; 6) diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0021_impl_item_list.txt b/crates/ra_syntax/tests/data/parser/inline/ok/0021_impl_item_list.txt index b15f93cd2..50426bdfe 100644 --- a/crates/ra_syntax/tests/data/parser/inline/ok/0021_impl_item_list.txt +++ b/crates/ra_syntax/tests/data/parser/inline/ok/0021_impl_item_list.txt @@ -1,5 +1,5 @@ SOURCE_FILE@[0; 89) - IMPL_ITEM@[0; 88) + IMPL_BLOCK@[0; 88) IMPL_KW@[0; 4) WHITESPACE@[4; 5) PATH_TYPE@[5; 6) diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0047_unsafe_default_impl.txt b/crates/ra_syntax/tests/data/parser/inline/ok/0047_unsafe_default_impl.txt index 6003ba645..5d68e88d6 100644 --- a/crates/ra_syntax/tests/data/parser/inline/ok/0047_unsafe_default_impl.txt +++ b/crates/ra_syntax/tests/data/parser/inline/ok/0047_unsafe_default_impl.txt @@ -1,5 +1,5 @@ SOURCE_FILE@[0; 27) - IMPL_ITEM@[0; 26) + IMPL_BLOCK@[0; 26) UNSAFE_KW@[0; 6) WHITESPACE@[6; 7) DEFAULT_KW@[7; 14) diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0063_impl_item_neg.txt b/crates/ra_syntax/tests/data/parser/inline/ok/0063_impl_item_neg.txt index b83db380e..563e43508 100644 --- a/crates/ra_syntax/tests/data/parser/inline/ok/0063_impl_item_neg.txt +++ b/crates/ra_syntax/tests/data/parser/inline/ok/0063_impl_item_neg.txt @@ -1,5 +1,5 @@ SOURCE_FILE@[0; 20) - IMPL_ITEM@[0; 19) + IMPL_BLOCK@[0; 19) IMPL_KW@[0; 4) WHITESPACE@[4; 5) EXCL@[5; 6) diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0079_impl_item.txt b/crates/ra_syntax/tests/data/parser/inline/ok/0079_impl_item.txt index 1b9a8aa0e..a2c218aa9 100644 --- a/crates/ra_syntax/tests/data/parser/inline/ok/0079_impl_item.txt +++ b/crates/ra_syntax/tests/data/parser/inline/ok/0079_impl_item.txt @@ -1,5 +1,5 @@ SOURCE_FILE@[0; 12) - IMPL_ITEM@[0; 11) + IMPL_BLOCK@[0; 11) IMPL_KW@[0; 4) WHITESPACE@[4; 5) PATH_TYPE@[5; 8) diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0087_unsafe_impl.txt b/crates/ra_syntax/tests/data/parser/inline/ok/0087_unsafe_impl.txt index f9c96c242..d93c0df4d 100644 --- a/crates/ra_syntax/tests/data/parser/inline/ok/0087_unsafe_impl.txt +++ b/crates/ra_syntax/tests/data/parser/inline/ok/0087_unsafe_impl.txt @@ -1,5 +1,5 @@ SOURCE_FILE@[0; 19) - IMPL_ITEM@[0; 18) + IMPL_BLOCK@[0; 18) UNSAFE_KW@[0; 6) WHITESPACE@[6; 7) IMPL_KW@[7; 11) diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0097_default_impl.txt b/crates/ra_syntax/tests/data/parser/inline/ok/0097_default_impl.txt index f45b6251f..0b9af800b 100644 --- a/crates/ra_syntax/tests/data/parser/inline/ok/0097_default_impl.txt +++ b/crates/ra_syntax/tests/data/parser/inline/ok/0097_default_impl.txt @@ -1,5 +1,5 @@ SOURCE_FILE@[0; 20) - IMPL_ITEM@[0; 19) + IMPL_BLOCK@[0; 19) DEFAULT_KW@[0; 7) WHITESPACE@[7; 8) IMPL_KW@[8; 12) diff --git a/crates/ra_syntax/tests/data/parser/ok/0037_mod.txt b/crates/ra_syntax/tests/data/parser/ok/0037_mod.txt index e11c4a06d..f8a20ac53 100644 --- a/crates/ra_syntax/tests/data/parser/ok/0037_mod.txt +++ b/crates/ra_syntax/tests/data/parser/ok/0037_mod.txt @@ -14,4 +14,3 @@ SOURCE_FILE@[0; 93) ITEM_LIST@[91; 93) L_CURLY@[91; 92) R_CURLY@[92; 93) - -- cgit v1.2.3