mirror of
https://github.com/rust-lang/rust-analyzer.git
synced 2025-11-01 20:31:59 +00:00
chore: Bump Edition::CURRENT to 2024
This commit is contained in:
Lukas Wirth
parent
23e8d13531
commit
a505420751
24 changed files with 277 additions and 244 deletions
|
|
@ -109,8 +109,8 @@ fn unbalanced_brace() {
|
|||
"#,
|
||||
r#""#,
|
||||
expect![[r#"
|
||||
SUBTREE $$ 1:0@0..0#ROOT2021 1:0@0..0#ROOT2021
|
||||
SUBTREE {} 0:0@9..10#ROOT2021 0:0@11..12#ROOT2021
|
||||
SUBTREE $$ 1:0@0..0#ROOT2024 1:0@0..0#ROOT2024
|
||||
SUBTREE {} 0:0@9..10#ROOT2024 0:0@11..12#ROOT2024
|
||||
|
||||
{}"#]],
|
||||
);
|
||||
|
|
@ -132,25 +132,25 @@ fn token_mapping_smoke_test() {
|
|||
struct MyTraitMap2
|
||||
"#,
|
||||
expect![[r#"
|
||||
SUBTREE $$ 1:0@0..20#ROOT2021 1:0@0..20#ROOT2021
|
||||
IDENT struct 0:0@34..40#ROOT2021
|
||||
IDENT MyTraitMap2 1:0@8..19#ROOT2021
|
||||
SUBTREE {} 0:0@48..49#ROOT2021 0:0@100..101#ROOT2021
|
||||
IDENT map 0:0@58..61#ROOT2021
|
||||
PUNCH : [alone] 0:0@61..62#ROOT2021
|
||||
PUNCH : [joint] 0:0@63..64#ROOT2021
|
||||
PUNCH : [alone] 0:0@64..65#ROOT2021
|
||||
IDENT std 0:0@65..68#ROOT2021
|
||||
PUNCH : [joint] 0:0@68..69#ROOT2021
|
||||
PUNCH : [alone] 0:0@69..70#ROOT2021
|
||||
IDENT collections 0:0@70..81#ROOT2021
|
||||
PUNCH : [joint] 0:0@81..82#ROOT2021
|
||||
PUNCH : [alone] 0:0@82..83#ROOT2021
|
||||
IDENT HashSet 0:0@83..90#ROOT2021
|
||||
PUNCH < [alone] 0:0@90..91#ROOT2021
|
||||
SUBTREE () 0:0@91..92#ROOT2021 0:0@92..93#ROOT2021
|
||||
PUNCH > [joint] 0:0@93..94#ROOT2021
|
||||
PUNCH , [alone] 0:0@94..95#ROOT2021
|
||||
SUBTREE $$ 1:0@0..20#ROOT2024 1:0@0..20#ROOT2024
|
||||
IDENT struct 0:0@34..40#ROOT2024
|
||||
IDENT MyTraitMap2 1:0@8..19#ROOT2024
|
||||
SUBTREE {} 0:0@48..49#ROOT2024 0:0@100..101#ROOT2024
|
||||
IDENT map 0:0@58..61#ROOT2024
|
||||
PUNCH : [alone] 0:0@61..62#ROOT2024
|
||||
PUNCH : [joint] 0:0@63..64#ROOT2024
|
||||
PUNCH : [alone] 0:0@64..65#ROOT2024
|
||||
IDENT std 0:0@65..68#ROOT2024
|
||||
PUNCH : [joint] 0:0@68..69#ROOT2024
|
||||
PUNCH : [alone] 0:0@69..70#ROOT2024
|
||||
IDENT collections 0:0@70..81#ROOT2024
|
||||
PUNCH : [joint] 0:0@81..82#ROOT2024
|
||||
PUNCH : [alone] 0:0@82..83#ROOT2024
|
||||
IDENT HashSet 0:0@83..90#ROOT2024
|
||||
PUNCH < [alone] 0:0@90..91#ROOT2024
|
||||
SUBTREE () 0:0@91..92#ROOT2024 0:0@92..93#ROOT2024
|
||||
PUNCH > [joint] 0:0@93..94#ROOT2024
|
||||
PUNCH , [alone] 0:0@94..95#ROOT2024
|
||||
|
||||
struct MyTraitMap2 {
|
||||
map: ::std::collections::HashSet<()>,
|
||||
|
|
@ -179,28 +179,28 @@ fn main() {
|
|||
}
|
||||
"#,
|
||||
expect![[r#"
|
||||
SUBTREE $$ 1:0@0..63#ROOT2021 1:0@0..63#ROOT2021
|
||||
IDENT fn 1:0@1..3#ROOT2021
|
||||
IDENT main 1:0@4..8#ROOT2021
|
||||
SUBTREE () 1:0@8..9#ROOT2021 1:0@9..10#ROOT2021
|
||||
SUBTREE {} 1:0@11..12#ROOT2021 1:0@61..62#ROOT2021
|
||||
LITERAL Integer 1 1:0@17..18#ROOT2021
|
||||
PUNCH ; [alone] 1:0@18..19#ROOT2021
|
||||
LITERAL Float 1.0 1:0@24..27#ROOT2021
|
||||
PUNCH ; [alone] 1:0@27..28#ROOT2021
|
||||
SUBTREE () 1:0@33..34#ROOT2021 1:0@39..40#ROOT2021
|
||||
SUBTREE () 1:0@34..35#ROOT2021 1:0@37..38#ROOT2021
|
||||
LITERAL Integer 1 1:0@35..36#ROOT2021
|
||||
PUNCH , [alone] 1:0@36..37#ROOT2021
|
||||
PUNCH , [alone] 1:0@38..39#ROOT2021
|
||||
PUNCH . [alone] 1:0@40..41#ROOT2021
|
||||
LITERAL Float 0.0 1:0@41..44#ROOT2021
|
||||
PUNCH ; [alone] 1:0@44..45#ROOT2021
|
||||
IDENT let 1:0@50..53#ROOT2021
|
||||
IDENT x 1:0@54..55#ROOT2021
|
||||
PUNCH = [alone] 1:0@56..57#ROOT2021
|
||||
LITERAL Integer 1 1:0@58..59#ROOT2021
|
||||
PUNCH ; [alone] 1:0@59..60#ROOT2021
|
||||
SUBTREE $$ 1:0@0..63#ROOT2024 1:0@0..63#ROOT2024
|
||||
IDENT fn 1:0@1..3#ROOT2024
|
||||
IDENT main 1:0@4..8#ROOT2024
|
||||
SUBTREE () 1:0@8..9#ROOT2024 1:0@9..10#ROOT2024
|
||||
SUBTREE {} 1:0@11..12#ROOT2024 1:0@61..62#ROOT2024
|
||||
LITERAL Integer 1 1:0@17..18#ROOT2024
|
||||
PUNCH ; [alone] 1:0@18..19#ROOT2024
|
||||
LITERAL Float 1.0 1:0@24..27#ROOT2024
|
||||
PUNCH ; [alone] 1:0@27..28#ROOT2024
|
||||
SUBTREE () 1:0@33..34#ROOT2024 1:0@39..40#ROOT2024
|
||||
SUBTREE () 1:0@34..35#ROOT2024 1:0@37..38#ROOT2024
|
||||
LITERAL Integer 1 1:0@35..36#ROOT2024
|
||||
PUNCH , [alone] 1:0@36..37#ROOT2024
|
||||
PUNCH , [alone] 1:0@38..39#ROOT2024
|
||||
PUNCH . [alone] 1:0@40..41#ROOT2024
|
||||
LITERAL Float 0.0 1:0@41..44#ROOT2024
|
||||
PUNCH ; [alone] 1:0@44..45#ROOT2024
|
||||
IDENT let 1:0@50..53#ROOT2024
|
||||
IDENT x 1:0@54..55#ROOT2024
|
||||
PUNCH = [alone] 1:0@56..57#ROOT2024
|
||||
LITERAL Integer 1 1:0@58..59#ROOT2024
|
||||
PUNCH ; [alone] 1:0@59..60#ROOT2024
|
||||
|
||||
fn main(){
|
||||
1;
|
||||
|
|
@ -226,14 +226,14 @@ fn expr_2021() {
|
|||
const { 1 },
|
||||
"#,
|
||||
expect![[r#"
|
||||
SUBTREE $$ 1:0@0..25#ROOT2021 1:0@0..25#ROOT2021
|
||||
IDENT _ 1:0@5..6#ROOT2021
|
||||
PUNCH ; [joint] 0:0@36..37#ROOT2021
|
||||
SUBTREE () 0:0@34..35#ROOT2021 0:0@34..35#ROOT2021
|
||||
IDENT const 1:0@12..17#ROOT2021
|
||||
SUBTREE {} 1:0@18..19#ROOT2021 1:0@22..23#ROOT2021
|
||||
LITERAL Integer 1 1:0@20..21#ROOT2021
|
||||
PUNCH ; [alone] 0:0@39..40#ROOT2021
|
||||
SUBTREE $$ 1:0@0..25#ROOT2024 1:0@0..25#ROOT2024
|
||||
IDENT _ 1:0@5..6#ROOT2024
|
||||
PUNCH ; [joint] 0:0@36..37#ROOT2024
|
||||
SUBTREE () 0:0@34..35#ROOT2024 0:0@34..35#ROOT2024
|
||||
IDENT const 1:0@12..17#ROOT2024
|
||||
SUBTREE {} 1:0@18..19#ROOT2024 1:0@22..23#ROOT2024
|
||||
LITERAL Integer 1 1:0@20..21#ROOT2024
|
||||
PUNCH ; [alone] 0:0@39..40#ROOT2024
|
||||
|
||||
_;
|
||||
(const {
|
||||
|
|
@ -254,13 +254,13 @@ fn expr_2021() {
|
|||
expect![[r#"
|
||||
ExpandError {
|
||||
inner: (
|
||||
1:0@5..6#ROOT2021,
|
||||
1:0@5..6#ROOT2024,
|
||||
NoMatchingRule,
|
||||
),
|
||||
}
|
||||
|
||||
SUBTREE $$ 1:0@0..8#ROOT2021 1:0@0..8#ROOT2021
|
||||
PUNCH ; [alone] 0:0@39..40#ROOT2021
|
||||
SUBTREE $$ 1:0@0..8#ROOT2024 1:0@0..8#ROOT2024
|
||||
PUNCH ; [alone] 0:0@39..40#ROOT2024
|
||||
|
||||
;"#]],
|
||||
);
|
||||
|
|
@ -278,13 +278,13 @@ fn expr_2021() {
|
|||
expect![[r#"
|
||||
ExpandError {
|
||||
inner: (
|
||||
1:0@5..10#ROOT2021,
|
||||
1:0@5..10#ROOT2024,
|
||||
NoMatchingRule,
|
||||
),
|
||||
}
|
||||
|
||||
SUBTREE $$ 1:0@0..18#ROOT2021 1:0@0..18#ROOT2021
|
||||
PUNCH ; [alone] 0:0@39..40#ROOT2021
|
||||
SUBTREE $$ 1:0@0..18#ROOT2024 1:0@0..18#ROOT2024
|
||||
PUNCH ; [alone] 0:0@39..40#ROOT2024
|
||||
|
||||
;"#]],
|
||||
);
|
||||
|
|
@ -304,26 +304,26 @@ fn expr_2021() {
|
|||
break 'foo bar,
|
||||
"#,
|
||||
expect![[r#"
|
||||
SUBTREE $$ 1:0@0..76#ROOT2021 1:0@0..76#ROOT2021
|
||||
LITERAL Integer 4 1:0@5..6#ROOT2021
|
||||
PUNCH ; [joint] 0:0@41..42#ROOT2021
|
||||
LITERAL Str literal 1:0@12..21#ROOT2021
|
||||
PUNCH ; [joint] 0:0@41..42#ROOT2021
|
||||
SUBTREE () 0:0@39..40#ROOT2021 0:0@39..40#ROOT2021
|
||||
IDENT funcall 1:0@27..34#ROOT2021
|
||||
SUBTREE () 1:0@34..35#ROOT2021 1:0@35..36#ROOT2021
|
||||
PUNCH ; [joint] 0:0@41..42#ROOT2021
|
||||
SUBTREE () 0:0@39..40#ROOT2021 0:0@39..40#ROOT2021
|
||||
IDENT future 1:0@42..48#ROOT2021
|
||||
PUNCH . [alone] 1:0@48..49#ROOT2021
|
||||
IDENT await 1:0@49..54#ROOT2021
|
||||
PUNCH ; [joint] 0:0@41..42#ROOT2021
|
||||
SUBTREE () 0:0@39..40#ROOT2021 0:0@39..40#ROOT2021
|
||||
IDENT break 1:0@60..65#ROOT2021
|
||||
PUNCH ' [joint] 1:0@66..67#ROOT2021
|
||||
IDENT foo 1:0@67..70#ROOT2021
|
||||
IDENT bar 1:0@71..74#ROOT2021
|
||||
PUNCH ; [alone] 0:0@44..45#ROOT2021
|
||||
SUBTREE $$ 1:0@0..76#ROOT2024 1:0@0..76#ROOT2024
|
||||
LITERAL Integer 4 1:0@5..6#ROOT2024
|
||||
PUNCH ; [joint] 0:0@41..42#ROOT2024
|
||||
LITERAL Str literal 1:0@12..21#ROOT2024
|
||||
PUNCH ; [joint] 0:0@41..42#ROOT2024
|
||||
SUBTREE () 0:0@39..40#ROOT2024 0:0@39..40#ROOT2024
|
||||
IDENT funcall 1:0@27..34#ROOT2024
|
||||
SUBTREE () 1:0@34..35#ROOT2024 1:0@35..36#ROOT2024
|
||||
PUNCH ; [joint] 0:0@41..42#ROOT2024
|
||||
SUBTREE () 0:0@39..40#ROOT2024 0:0@39..40#ROOT2024
|
||||
IDENT future 1:0@42..48#ROOT2024
|
||||
PUNCH . [alone] 1:0@48..49#ROOT2024
|
||||
IDENT await 1:0@49..54#ROOT2024
|
||||
PUNCH ; [joint] 0:0@41..42#ROOT2024
|
||||
SUBTREE () 0:0@39..40#ROOT2024 0:0@39..40#ROOT2024
|
||||
IDENT break 1:0@60..65#ROOT2024
|
||||
PUNCH ' [joint] 1:0@66..67#ROOT2024
|
||||
IDENT foo 1:0@67..70#ROOT2024
|
||||
IDENT bar 1:0@71..74#ROOT2024
|
||||
PUNCH ; [alone] 0:0@44..45#ROOT2024
|
||||
|
||||
4;
|
||||
"literal";
|
||||
|
|
@ -345,13 +345,13 @@ fn expr_2021() {
|
|||
expect![[r#"
|
||||
ExpandError {
|
||||
inner: (
|
||||
1:0@5..6#ROOT2021,
|
||||
1:0@5..6#ROOT2024,
|
||||
NoMatchingRule,
|
||||
),
|
||||
}
|
||||
|
||||
SUBTREE $$ 1:0@0..8#ROOT2021 1:0@0..8#ROOT2021
|
||||
PUNCH ; [alone] 0:0@44..45#ROOT2021
|
||||
SUBTREE $$ 1:0@0..8#ROOT2024 1:0@0..8#ROOT2024
|
||||
PUNCH ; [alone] 0:0@44..45#ROOT2024
|
||||
|
||||
;"#]],
|
||||
);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue