aboutsummaryrefslogtreecommitdiff
path: root/crates/ra_syntax
diff options
context:
space:
mode:
authorbors[bot] <bors[bot]@users.noreply.github.com>2019-03-04 13:40:34 +0000
committerbors[bot] <bors[bot]@users.noreply.github.com>2019-03-04 13:40:34 +0000
commit11e0851dcfddfe2337bb2d404d716dbd8e4c11d7 (patch)
tree5129bcf4ac18ef5a8b012a61c5b806620df1732e /crates/ra_syntax
parentdc8bcc1e42b573a8c315dd42a43c0fc4d5bfa8f8 (diff)
parent0a19f4f1b4a12bd50032249be4c9298284c08e3c (diff)
Merge #927
927: allow aliases in underscores r=matklad a=matklad Co-authored-by: Aleksey Kladov <[email protected]>
Diffstat (limited to 'crates/ra_syntax')
-rw-r--r--crates/ra_syntax/tests/data/parser/inline/ok/0043_use_alias.rs1
-rw-r--r--crates/ra_syntax/tests/data/parser/inline/ok/0043_use_alias.txt17
2 files changed, 17 insertions, 1 deletions
diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0043_use_alias.rs b/crates/ra_syntax/tests/data/parser/inline/ok/0043_use_alias.rs
index 544caa020..9be50f877 100644
--- a/crates/ra_syntax/tests/data/parser/inline/ok/0043_use_alias.rs
+++ b/crates/ra_syntax/tests/data/parser/inline/ok/0043_use_alias.rs
@@ -5,3 +5,4 @@ use some::{
5 yet::another::path, 5 yet::another::path,
6 running::out::of::synonyms::for_::different::* 6 running::out::of::synonyms::for_::different::*
7}; 7};
8use Trait as _;
diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0043_use_alias.txt b/crates/ra_syntax/tests/data/parser/inline/ok/0043_use_alias.txt
index 8ef0ecbc6..0c8dec81d 100644
--- a/crates/ra_syntax/tests/data/parser/inline/ok/0043_use_alias.txt
+++ b/crates/ra_syntax/tests/data/parser/inline/ok/0043_use_alias.txt
@@ -1,4 +1,4 @@
1SOURCE_FILE@[0; 182) 1SOURCE_FILE@[0; 198)
2 USE_ITEM@[0; 28) 2 USE_ITEM@[0; 28)
3 USE_KW@[0; 3) 3 USE_KW@[0; 3)
4 WHITESPACE@[3; 4) 4 WHITESPACE@[3; 4)
@@ -121,3 +121,18 @@ SOURCE_FILE@[0; 182)
121 R_CURLY@[179; 180) 121 R_CURLY@[179; 180)
122 SEMI@[180; 181) 122 SEMI@[180; 181)
123 WHITESPACE@[181; 182) 123 WHITESPACE@[181; 182)
124 USE_ITEM@[182; 197)
125 USE_KW@[182; 185)
126 WHITESPACE@[185; 186)
127 USE_TREE@[186; 196)
128 PATH@[186; 191)
129 PATH_SEGMENT@[186; 191)
130 NAME_REF@[186; 191)
131 IDENT@[186; 191) "Trait"
132 WHITESPACE@[191; 192)
133 ALIAS@[192; 196)
134 AS_KW@[192; 194)
135 WHITESPACE@[194; 195)
136 UNDERSCORE@[195; 196)
137 SEMI@[196; 197)
138 WHITESPACE@[197; 198)