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/ok
parent: a0d483011d5f84747fcc5d5fe9c82f4405d24db9 (diff)
parent: fe6c4115f6c8bb5b5f276bafcbd9cc3fc1d504d1 (diff)
9 files changed, 9 insertions, 9 deletions
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/ok
parent	a0d483011d5f84747fcc5d5fe9c82f4405d24db9 (diff)
parent	fe6c4115f6c8bb5b5f276bafcbd9cc3fc1d504d1 (diff)

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)