Merge #426

426: Rename ImplItem to ImplBlock r=flodiebold a=flodiebold rustc uses the name ImplItem for items in impls, not the impl {} block itself, which could lead to confusion. Extracted from #370. Co-authored-by: Florian Diebold <[email protected]>
author: bors[bot] <bors[bot]@users.noreply.github.com> 2019-01-04 17:30:42 +0000
committer: bors[bot] <bors[bot]@users.noreply.github.com> 2019-01-04 17:30:42 +0000
commit: 03e70711e69fbec175ee3eabe923fd84f1f50ed8 (patch)
tree: f3f06509c39c3cbeadd0e82d534834270c8fc395 /crates/ra_syntax/tests/data/parser/inline
parent: a0d483011d5f84747fcc5d5fe9c82f4405d24db9 (diff)
parent: fe6c4115f6c8bb5b5f276bafcbd9cc3fc1d504d1 (diff)
11 files changed, 16 insertions, 16 deletions
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)
author	bors[bot] <bors[bot]@users.noreply.github.com>	2019-01-04 17:30:42 +0000
committer	bors[bot] <bors[bot]@users.noreply.github.com>	2019-01-04 17:30:42 +0000
commit	03e70711e69fbec175ee3eabe923fd84f1f50ed8 (patch)
tree	f3f06509c39c3cbeadd0e82d534834270c8fc395 /crates/ra_syntax/tests/data/parser/inline
parent	a0d483011d5f84747fcc5d5fe9c82f4405d24db9 (diff)
parent	fe6c4115f6c8bb5b5f276bafcbd9cc3fc1d504d1 (diff)

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)
19	err: `expected a loop`	19	err: `expected a loop`
20	err: `expected SEMI`	20	err: `expected SEMI`
21	WHITESPACE@[22; 23)	21	WHITESPACE@[22; 23)
22	IMPL_ITEM@[23; 27)	22	IMPL_BLOCK@[23; 27)
23	IMPL_KW@[23; 27)	23	IMPL_KW@[23; 27)
24	err: `expected type`	24	err: `expected type`
25	err: `expected `{``	25	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 @@
1	SOURCE_FILE@[0; 87)	1	SOURCE_FILE@[0; 87)
2	IMPL_ITEM@[0; 12)	2	IMPL_BLOCK@[0; 12)
3	IMPL_KW@[0; 4)	3	IMPL_KW@[0; 4)
4	WHITESPACE@[4; 5)	4	WHITESPACE@[4; 5)
5	PATH_TYPE@[5; 9)	5	PATH_TYPE@[5; 9)
@@ -12,7 +12,7 @@ SOURCE_FILE@[0; 87)
12	L_CURLY@[10; 11)	12	L_CURLY@[10; 11)
13	R_CURLY@[11; 12)	13	R_CURLY@[11; 12)
14	WHITESPACE@[12; 13)	14	WHITESPACE@[12; 13)
15	IMPL_ITEM@[13; 33)	15	IMPL_BLOCK@[13; 33)
16	IMPL_KW@[13; 17)	16	IMPL_KW@[13; 17)
17	WHITESPACE@[17; 18)	17	WHITESPACE@[17; 18)
18	PATH_TYPE@[18; 24)	18	PATH_TYPE@[18; 24)
@@ -33,12 +33,12 @@ SOURCE_FILE@[0; 87)
33	L_CURLY@[31; 32)	33	L_CURLY@[31; 32)
34	R_CURLY@[32; 33)	34	R_CURLY@[32; 33)
35	WHITESPACE@[33; 34)	35	WHITESPACE@[33; 34)
36	IMPL_ITEM@[34; 38)	36	IMPL_BLOCK@[34; 38)
37	IMPL_KW@[34; 38)	37	IMPL_KW@[34; 38)
38	err: `expected trait or type`	38	err: `expected trait or type`
39	err: `expected `{``	39	err: `expected `{``
40	WHITESPACE@[38; 39)	40	WHITESPACE@[38; 39)
41	IMPL_ITEM@[39; 54)	41	IMPL_BLOCK@[39; 54)
42	IMPL_KW@[39; 43)	42	IMPL_KW@[39; 43)
43	WHITESPACE@[43; 44)	43	WHITESPACE@[43; 44)
44	PATH_TYPE@[44; 51)	44	PATH_TYPE@[44; 51)
@@ -51,7 +51,7 @@ SOURCE_FILE@[0; 87)
51	L_CURLY@[52; 53)	51	L_CURLY@[52; 53)
52	R_CURLY@[53; 54)	52	R_CURLY@[53; 54)
53	WHITESPACE@[54; 55)	53	WHITESPACE@[54; 55)
54	IMPL_ITEM@[55; 70)	54	IMPL_BLOCK@[55; 70)
55	IMPL_KW@[55; 59)	55	IMPL_KW@[55; 59)
56	WHITESPACE@[59; 60)	56	WHITESPACE@[59; 60)
57	PATH_TYPE@[60; 66)	57	PATH_TYPE@[60; 66)
@@ -64,7 +64,7 @@ SOURCE_FILE@[0; 87)
64	err: `expected trait or type`	64	err: `expected trait or type`
65	err: `expected `{``	65	err: `expected `{``
66	WHITESPACE@[70; 71)	66	WHITESPACE@[70; 71)
67	IMPL_ITEM@[71; 86)	67	IMPL_BLOCK@[71; 86)
68	IMPL_KW@[71; 75)	68	IMPL_KW@[71; 75)
69	WHITESPACE@[75; 76)	69	WHITESPACE@[75; 76)
70	PATH_TYPE@[76; 83)	70	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 @@
1	SOURCE_FILE@[0; 83)	1	SOURCE_FILE@[0; 83)
2	IMPL_ITEM@[0; 82)	2	IMPL_BLOCK@[0; 82)
3	IMPL_KW@[0; 4)	3	IMPL_KW@[0; 4)
4	WHITESPACE@[4; 5)	4	WHITESPACE@[4; 5)
5	PATH_TYPE@[5; 6)	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 @@
1	SOURCE_FILE@[0; 128)	1	SOURCE_FILE@[0; 128)
2	IMPL_ITEM@[0; 127)	2	IMPL_BLOCK@[0; 127)
3	IMPL_KW@[0; 4)	3	IMPL_KW@[0; 4)
4	WHITESPACE@[4; 5)	4	WHITESPACE@[4; 5)
5	PATH_TYPE@[5; 6)	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 @@
1	SOURCE_FILE@[0; 69)	1	SOURCE_FILE@[0; 69)
2	IMPL_ITEM@[0; 68)	2	IMPL_BLOCK@[0; 68)
3	IMPL_KW@[0; 4)	3	IMPL_KW@[0; 4)
4	WHITESPACE@[4; 5)	4	WHITESPACE@[4; 5)
5	PATH_TYPE@[5; 6)	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 @@
1	SOURCE_FILE@[0; 89)	1	SOURCE_FILE@[0; 89)
2	IMPL_ITEM@[0; 88)	2	IMPL_BLOCK@[0; 88)
3	IMPL_KW@[0; 4)	3	IMPL_KW@[0; 4)
4	WHITESPACE@[4; 5)	4	WHITESPACE@[4; 5)
5	PATH_TYPE@[5; 6)	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 @@
1	SOURCE_FILE@[0; 27)	1	SOURCE_FILE@[0; 27)
2	IMPL_ITEM@[0; 26)	2	IMPL_BLOCK@[0; 26)
3	UNSAFE_KW@[0; 6)	3	UNSAFE_KW@[0; 6)
4	WHITESPACE@[6; 7)	4	WHITESPACE@[6; 7)
5	DEFAULT_KW@[7; 14)	5	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 @@
1	SOURCE_FILE@[0; 20)	1	SOURCE_FILE@[0; 20)
2	IMPL_ITEM@[0; 19)	2	IMPL_BLOCK@[0; 19)
3	IMPL_KW@[0; 4)	3	IMPL_KW@[0; 4)
4	WHITESPACE@[4; 5)	4	WHITESPACE@[4; 5)
5	EXCL@[5; 6)	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 @@
1	SOURCE_FILE@[0; 12)	1	SOURCE_FILE@[0; 12)
2	IMPL_ITEM@[0; 11)	2	IMPL_BLOCK@[0; 11)
3	IMPL_KW@[0; 4)	3	IMPL_KW@[0; 4)
4	WHITESPACE@[4; 5)	4	WHITESPACE@[4; 5)
5	PATH_TYPE@[5; 8)	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 @@
1	SOURCE_FILE@[0; 19)	1	SOURCE_FILE@[0; 19)
2	IMPL_ITEM@[0; 18)	2	IMPL_BLOCK@[0; 18)
3	UNSAFE_KW@[0; 6)	3	UNSAFE_KW@[0; 6)
4	WHITESPACE@[6; 7)	4	WHITESPACE@[6; 7)
5	IMPL_KW@[7; 11)	5	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 @@
1	SOURCE_FILE@[0; 20)	1	SOURCE_FILE@[0; 20)
2	IMPL_ITEM@[0; 19)	2	IMPL_BLOCK@[0; 19)
3	DEFAULT_KW@[0; 7)	3	DEFAULT_KW@[0; 7)
4	WHITESPACE@[7; 8)	4	WHITESPACE@[7; 8)
5	IMPL_KW@[8; 12)	5	IMPL_KW@[8; 12)