Update tests

matklad · matklad · commit 02cac962e133 · 2020-07-30T14:18:12.000+02:00
diff --git a/crates/ra_hir_def/src/item_tree/tests.rs b/crates/ra_hir_def/src/item_tree/tests.rs
@@ -228,9 +228,9 @@ fn smoke() {
 
             top-level items:
             #[Attrs { entries: Some([Attr { path: ModPath { kind: Plain, segments: [Name(Text("attr_on_use"))] }, input: None }]) }]
-            Import { path: ModPath { kind: Plain, segments: [Name(Text("a"))] }, alias: None, visibility: RawVisibilityId("pub(self)"), is_glob: false, is_prelude: false, ast_id: FileAstId::<ra_syntax::ast::generated::nodes::UseItem>(0) }
+            Import { path: ModPath { kind: Plain, segments: [Name(Text("a"))] }, alias: None, visibility: RawVisibilityId("pub(self)"), is_glob: false, is_prelude: false, ast_id: FileAstId::<ra_syntax::ast::generated::nodes::Use>(0) }
             #[Attrs { entries: Some([Attr { path: ModPath { kind: Plain, segments: [Name(Text("attr_on_use"))] }, input: None }]) }]
-            Import { path: ModPath { kind: Plain, segments: [Name(Text("b"))] }, alias: None, visibility: RawVisibilityId("pub(self)"), is_glob: true, is_prelude: false, ast_id: FileAstId::<ra_syntax::ast::generated::nodes::UseItem>(0) }
+            Import { path: ModPath { kind: Plain, segments: [Name(Text("b"))] }, alias: None, visibility: RawVisibilityId("pub(self)"), is_glob: true, is_prelude: false, ast_id: FileAstId::<ra_syntax::ast::generated::nodes::Use>(0) }
             #[Attrs { entries: Some([Attr { path: ModPath { kind: Plain, segments: [Name(Text("ext_crate"))] }, input: None }]) }]
             ExternCrate { path: ModPath { kind: Plain, segments: [Name(Text("krate"))] }, alias: None, visibility: RawVisibilityId("pub(self)"), is_macro_use: false, ast_id: FileAstId::<ra_syntax::ast::generated::nodes::ExternCrate>(1) }
             #[Attrs { entries: Some([Attr { path: ModPath { kind: Plain, segments: [Name(Text("on_trait"))] }, input: None }]) }]
diff --git a/crates/ra_syntax/test_data/parser/err/0002_duplicate_shebang.rast b/crates/ra_syntax/test_data/parser/err/0002_duplicate_shebang.rast
@@ -6,7 +6,7 @@ SOURCE_FILE@0..42
     BANG@22..23 "!"
   ERROR@23..24
     SLASH@23..24 "/"
-  USE_ITEM@24..28
+  USE@24..28
     USE_KW@24..27 "use"
     ERROR@27..28
       SLASH@27..28 "/"
diff --git a/crates/ra_syntax/test_data/parser/err/0004_use_path_bad_segment.rast b/crates/ra_syntax/test_data/parser/err/0004_use_path_bad_segment.rast
@@ -1,5 +1,5 @@
 SOURCE_FILE@0..12
-  USE_ITEM@0..12
+  USE@0..12
     USE_KW@0..3 "use"
     WHITESPACE@3..4 " "
     USE_TREE@4..11
diff --git a/crates/ra_syntax/test_data/parser/err/0035_use_recover.rast b/crates/ra_syntax/test_data/parser/err/0035_use_recover.rast
@@ -1,5 +1,5 @@
 SOURCE_FILE@0..48
-  USE_ITEM@0..13
+  USE@0..13
     USE_KW@0..3 "use"
     WHITESPACE@3..4 " "
     USE_TREE@4..12
@@ -14,10 +14,10 @@ SOURCE_FILE@0..48
             IDENT@9..12 "bar"
     SEMICOLON@12..13 ";"
   WHITESPACE@13..14 "\n"
-  USE_ITEM@14..17
+  USE@14..17
     USE_KW@14..17 "use"
   WHITESPACE@17..18 "\n"
-  USE_ITEM@18..33
+  USE@18..33
     USE_KW@18..21 "use"
     WHITESPACE@21..22 " "
     USE_TREE@22..32
@@ -31,7 +31,7 @@ SOURCE_FILE@0..48
             IDENT@29..32 "baz"
     SEMICOLON@32..33 ";"
   WHITESPACE@33..34 "\n"
-  USE_ITEM@34..37
+  USE@34..37
     USE_KW@34..37 "use"
   WHITESPACE@37..38 "\n"
   FN_DEF@38..47
diff --git a/crates/ra_syntax/test_data/parser/err/0036_partial_use.rast b/crates/ra_syntax/test_data/parser/err/0036_partial_use.rast
@@ -1,5 +1,5 @@
 SOURCE_FILE@0..37
-  USE_ITEM@0..36
+  USE@0..36
     USE_KW@0..3 "use"
     WHITESPACE@3..4 " "
     USE_TREE@4..36
diff --git a/crates/ra_syntax/test_data/parser/err/0040_illegal_crate_kw_location.rast b/crates/ra_syntax/test_data/parser/err/0040_illegal_crate_kw_location.rast
@@ -1,5 +1,5 @@
 SOURCE_FILE@0..98
-  USE_ITEM@0..12
+  USE@0..12
     USE_KW@0..3 "use"
     WHITESPACE@3..4 " "
     USE_TREE@4..11
@@ -9,7 +9,7 @@ SOURCE_FILE@0..98
           CRATE_KW@6..11 "crate"
     SEMICOLON@11..12 ";"
   WHITESPACE@12..13 "\n"
-  USE_ITEM@13..54
+  USE@13..54
     USE_KW@13..16 "use"
     WHITESPACE@16..17 " "
     USE_TREE@17..53
@@ -52,7 +52,7 @@ SOURCE_FILE@0..98
         R_CURLY@52..53 "}"
     SEMICOLON@53..54 ";"
   WHITESPACE@54..55 "\n"
-  USE_ITEM@55..72
+  USE@55..72
     USE_KW@55..58 "use"
     WHITESPACE@58..59 " "
     USE_TREE@59..71
@@ -66,7 +66,7 @@ SOURCE_FILE@0..98
           CRATE_KW@66..71 "crate"
     SEMICOLON@71..72 ";"
   WHITESPACE@72..73 "\n"
-  USE_ITEM@73..97
+  USE@73..97
     USE_KW@73..76 "use"
     WHITESPACE@76..77 " "
     USE_TREE@77..96
diff --git a/crates/ra_syntax/test_data/parser/err/0041_illegal_super_keyword_location.rast b/crates/ra_syntax/test_data/parser/err/0041_illegal_super_keyword_location.rast
@@ -1,5 +1,5 @@
 SOURCE_FILE@0..67
-  USE_ITEM@0..12
+  USE@0..12
     USE_KW@0..3 "use"
     WHITESPACE@3..4 " "
     USE_TREE@4..11
@@ -9,7 +9,7 @@ SOURCE_FILE@0..67
           SUPER_KW@6..11 "super"
     SEMICOLON@11..12 ";"
   WHITESPACE@12..13 "\n"
-  USE_ITEM@13..26
+  USE@13..26
     USE_KW@13..16 "use"
     WHITESPACE@16..17 " "
     USE_TREE@17..25
@@ -23,7 +23,7 @@ SOURCE_FILE@0..67
           SUPER_KW@20..25 "super"
     SEMICOLON@25..26 ";"
   WHITESPACE@26..27 "\n"
-  USE_ITEM@27..47
+  USE@27..47
     USE_KW@27..30 "use"
     WHITESPACE@30..31 " "
     USE_TREE@31..46
@@ -41,7 +41,7 @@ SOURCE_FILE@0..67
           SUPER_KW@41..46 "super"
     SEMICOLON@46..47 ";"
   WHITESPACE@47..48 "\n"
-  USE_ITEM@48..66
+  USE@48..66
     USE_KW@48..51 "use"
     WHITESPACE@51..52 " "
     USE_TREE@52..65
diff --git a/crates/ra_syntax/test_data/parser/err/0042_illegal_self_keyword_location.rast b/crates/ra_syntax/test_data/parser/err/0042_illegal_self_keyword_location.rast
@@ -1,5 +1,5 @@
 SOURCE_FILE@0..25
-  USE_ITEM@0..11
+  USE@0..11
     USE_KW@0..3 "use"
     WHITESPACE@3..4 " "
     USE_TREE@4..10
@@ -9,7 +9,7 @@ SOURCE_FILE@0..25
           SELF_KW@6..10 "self"
     SEMICOLON@10..11 ";"
   WHITESPACE@11..12 "\n"
-  USE_ITEM@12..24
+  USE@12..24
     USE_KW@12..15 "use"
     WHITESPACE@15..16 " "
     USE_TREE@16..23
diff --git a/crates/ra_syntax/test_data/parser/inline/err/0015_empty_segment.rast b/crates/ra_syntax/test_data/parser/inline/err/0015_empty_segment.rast
@@ -1,5 +1,5 @@
 SOURCE_FILE@0..13
-  USE_ITEM@0..12
+  USE@0..12
     USE_KW@0..3 "use"
     WHITESPACE@3..4 " "
     USE_TREE@4..12
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0002_use_tree_list.rast b/crates/ra_syntax/test_data/parser/inline/ok/0002_use_tree_list.rast
@@ -1,5 +1,5 @@
 SOURCE_FILE@0..249
-  USE_ITEM@0..58
+  USE@0..58
     USE_KW@0..3 "use"
     WHITESPACE@3..4 " "
     USE_TREE@4..57
@@ -51,7 +51,7 @@ SOURCE_FILE@0..249
   WHITESPACE@58..59 " "
   COMMENT@59..97 "// Rust 2018 (with a  ..."
   WHITESPACE@97..98 "\n"
-  USE_ITEM@98..121
+  USE@98..121
     USE_KW@98..101 "use"
     WHITESPACE@101..102 " "
     USE_TREE@102..120
@@ -77,7 +77,7 @@ SOURCE_FILE@0..249
   WHITESPACE@121..122 " "
   COMMENT@122..134 "// Rust 2015"
   WHITESPACE@134..135 "\n"
-  USE_ITEM@135..166
+  USE@135..166
     USE_KW@135..138 "use"
     WHITESPACE@138..139 " "
     USE_TREE@139..165
@@ -104,7 +104,7 @@ SOURCE_FILE@0..249
   WHITESPACE@166..167 " "
   COMMENT@167..179 "// Rust 2015"
   WHITESPACE@179..180 "\n"
-  USE_ITEM@180..205
+  USE@180..205
     USE_KW@180..183 "use"
     WHITESPACE@183..184 " "
     USE_TREE@184..204
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0020_use_star.rast b/crates/ra_syntax/test_data/parser/inline/ok/0020_use_star.rast
@@ -1,20 +1,20 @@
 SOURCE_FILE@0..60
-  USE_ITEM@0..6
+  USE@0..6
     USE_KW@0..3 "use"
     WHITESPACE@3..4 " "
     USE_TREE@4..5
       STAR@4..5 "*"
     SEMICOLON@5..6 ";"
   WHITESPACE@6..7 "\n"
-  USE_ITEM@7..15
+  USE@7..15
     USE_KW@7..10 "use"
     WHITESPACE@10..11 " "
     USE_TREE@11..14
       COLON2@11..13 "::"
       STAR@13..14 "*"
     SEMICOLON@14..15 ";"
   WHITESPACE@15..16 "\n"
-  USE_ITEM@16..36
+  USE@16..36
     USE_KW@16..19 "use"
     WHITESPACE@19..20 " "
     USE_TREE@20..35
@@ -35,7 +35,7 @@ SOURCE_FILE@0..60
         R_CURLY@34..35 "}"
     SEMICOLON@35..36 ";"
   WHITESPACE@36..37 "\n"
-  USE_ITEM@37..59
+  USE@37..59
     USE_KW@37..40 "use"
     WHITESPACE@40..41 " "
     USE_TREE@41..58
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0043_use_alias.rast b/crates/ra_syntax/test_data/parser/inline/ok/0043_use_alias.rast
@@ -1,5 +1,5 @@
 SOURCE_FILE@0..198
-  USE_ITEM@0..28
+  USE@0..28
     USE_KW@0..3 "use"
     WHITESPACE@3..4 " "
     USE_TREE@4..27
@@ -20,7 +20,7 @@ SOURCE_FILE@0..198
           IDENT@18..27 "some_name"
     SEMICOLON@27..28 ";"
   WHITESPACE@28..29 "\n"
-  USE_ITEM@29..181
+  USE@29..181
     USE_KW@29..32 "use"
     WHITESPACE@32..33 " "
     USE_TREE@33..180
@@ -121,7 +121,7 @@ SOURCE_FILE@0..198
         R_CURLY@179..180 "}"
     SEMICOLON@180..181 ";"
   WHITESPACE@181..182 "\n"
-  USE_ITEM@182..197
+  USE@182..197
     USE_KW@182..185 "use"
     WHITESPACE@185..186 " "
     USE_TREE@186..196
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0067_crate_path.rast b/crates/ra_syntax/test_data/parser/inline/ok/0067_crate_path.rast
@@ -1,5 +1,5 @@
 SOURCE_FILE@0..16
-  USE_ITEM@0..15
+  USE@0..15
     USE_KW@0..3 "use"
     WHITESPACE@3..4 " "
     USE_TREE@4..14
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0069_use_tree_list_after_path.rast b/crates/ra_syntax/test_data/parser/inline/ok/0069_use_tree_list_after_path.rast
@@ -1,5 +1,5 @@
 SOURCE_FILE@0..37
-  USE_ITEM@0..18
+  USE@0..18
     USE_KW@0..3 "use"
     WHITESPACE@3..4 " "
     USE_TREE@4..17
@@ -17,7 +17,7 @@ SOURCE_FILE@0..37
         R_CURLY@16..17 "}"
     SEMICOLON@17..18 ";"
   WHITESPACE@18..19 "\n"
-  USE_ITEM@19..36
+  USE@19..36
     USE_KW@19..22 "use"
     WHITESPACE@22..23 " "
     USE_TREE@23..35
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0110_use_path.rast b/crates/ra_syntax/test_data/parser/inline/ok/0110_use_path.rast
@@ -1,5 +1,5 @@
 SOURCE_FILE@0..154
-  USE_ITEM@0..17
+  USE@0..17
     USE_KW@0..3 "use"
     WHITESPACE@3..4 " "
     USE_TREE@4..16
@@ -12,7 +12,7 @@ SOURCE_FILE@0..154
   WHITESPACE@17..18 " "
   COMMENT@18..45 "// Rust 2018 - All fl ..."
   WHITESPACE@45..46 "\n"
-  USE_ITEM@46..61
+  USE@46..61
     USE_KW@46..49 "use"
     WHITESPACE@49..50 " "
     USE_TREE@50..60
@@ -24,7 +24,7 @@ SOURCE_FILE@0..154
   WHITESPACE@61..62 " "
   COMMENT@62..91 "// Rust 2018 - Anchor ..."
   WHITESPACE@91..92 "\n"
-  USE_ITEM@92..124
+  USE@92..124
     USE_KW@92..95 "use"
     WHITESPACE@95..96 " "
     USE_TREE@96..123
diff --git a/crates/ra_syntax/test_data/parser/ok/0009_use_item.rast b/crates/ra_syntax/test_data/parser/ok/0009_use_item.rast
@@ -1,5 +1,5 @@
 SOURCE_FILE@0..19
-  USE_ITEM@0..8
+  USE@0..8
     USE_KW@0..3 "use"
     WHITESPACE@3..4 " "
     USE_TREE@4..7
@@ -9,7 +9,7 @@ SOURCE_FILE@0..19
             IDENT@4..7 "foo"
     SEMICOLON@7..8 ";"
   WHITESPACE@8..9 "\n"
-  USE_ITEM@9..19
+  USE@9..19
     USE_KW@9..12 "use"
     WHITESPACE@12..13 " "
     USE_TREE@13..18
diff --git a/crates/ra_syntax/test_data/parser/ok/0010_use_path_segments.rast b/crates/ra_syntax/test_data/parser/ok/0010_use_path_segments.rast
@@ -1,5 +1,5 @@
 SOURCE_FILE@0..40
-  USE_ITEM@0..20
+  USE@0..20
     USE_KW@0..3 "use"
     WHITESPACE@3..4 " "
     USE_TREE@4..19
@@ -20,7 +20,7 @@ SOURCE_FILE@0..40
             IDENT@16..19 "baz"
     SEMICOLON@19..20 ";"
   WHITESPACE@20..21 "\n"
-  USE_ITEM@21..39
+  USE@21..39
     USE_KW@21..24 "use"
     WHITESPACE@24..25 " "
     USE_TREE@25..38
diff --git a/crates/ra_syntax/test_data/parser/ok/0013_use_path_self_super.rast b/crates/ra_syntax/test_data/parser/ok/0013_use_path_self_super.rast
@@ -1,5 +1,5 @@
 SOURCE_FILE@0..38
-  USE_ITEM@0..14
+  USE@0..14
     USE_KW@0..3 "use"
     WHITESPACE@3..4 " "
     USE_TREE@4..13
@@ -13,7 +13,7 @@ SOURCE_FILE@0..38
             IDENT@10..13 "foo"
     SEMICOLON@13..14 ";"
   WHITESPACE@14..15 "\n"
-  USE_ITEM@15..37
+  USE@15..37
     USE_KW@15..18 "use"
     WHITESPACE@18..19 " "
     USE_TREE@19..36
diff --git a/crates/ra_syntax/test_data/parser/ok/0014_use_tree.rast b/crates/ra_syntax/test_data/parser/ok/0014_use_tree.rast
diff --git a/crates/ra_syntax/test_data/parser/ok/0015_use_tree.rast b/crates/ra_syntax/test_data/parser/ok/0015_use_tree.rast
diff --git a/crates/ra_syntax/test_data/parser/ok/0035_weird_exprs.rast b/crates/ra_syntax/test_data/parser/ok/0035_weird_exprs.rast

-Original file line number
+Diff line change
     [email protected] "!"
   [email protected]
     [email protected] "/"
 -  USE_ITEM@24..28
 +  USE@24..28
     [email protected] "use"
     [email protected]
       [email protected] "/"