Skip to content

Commit e1b27ae

Browse files
redsun82Copilot
redsun82
and
Copilot
committed
Rust: pin test toolchain to 1.95 for use Struct::{self}
1.96 turned `use SomeStruct::{self};` into a hard error (E0432), which broke the path-resolution test. 1.95 is the newest stable that still accepts it while also expanding the builtin `format_args!` macro against std. Re-accept the std-snapshot and format-arg/panic expansion changes that follow from the ra_ap 0.0.347 upgrade at this toolchain. Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com> Copilot-Session: 890cb55d-0437-4bd7-9268-87b8897ada01
1 parent f656e39 commit e1b27ae

5 files changed

Lines changed: 26 additions & 37 deletions

File tree

‎rust/ql/test/extractor-tests/crate_graph/crates.expected‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -57,12 +57,12 @@
5757
#-----| core -> Crate(core@0.0.0)
5858
#-----| std -> Crate(std@0.0.0)
5959

60-
#-----| Crate(hashbrown@0.17.1)
60+
#-----| Crate(hashbrown@0.16.1)
6161
#-----| alloc -> Crate(alloc@0.0.0)
6262
#-----| core -> Crate(core@0.0.0)
6363
#-----| foldhash -> Crate(foldhash@0.2.0)
6464

65-
#-----| Crate(libc@0.2.185)
65+
#-----| Crate(libc@0.2.178)
6666
#-----| rustc_std_workspace_core -> Crate(core@0.0.0)
6767

6868
main.rs:
@@ -98,7 +98,7 @@ main.rs:
9898
#-----| Crate(panic_unwind@0.0.0)
9999
#-----| alloc -> Crate(alloc@0.0.0)
100100
#-----| core -> Crate(core@0.0.0)
101-
#-----| libc -> Crate(libc@0.2.185)
101+
#-----| libc -> Crate(libc@0.2.178)
102102
#-----| unwind -> Crate(unwind@0.0.0)
103103

104104
#-----| Crate(proc_macro@0.0.0)
@@ -123,27 +123,27 @@ main.rs:
123123
#-----| Crate(std@0.0.0)
124124
#-----| alloc -> Crate(alloc@0.0.0)
125125
#-----| core -> Crate(core@0.0.0)
126-
#-----| panic_abort -> Crate(panic_abort@0.0.0)
127-
#-----| libc -> Crate(libc@0.2.185)
128-
#-----| unwind -> Crate(unwind@0.0.0)
129-
#-----| panic_unwind -> Crate(panic_unwind@0.0.0)
130-
#-----| std_detect -> Crate(std_detect@0.1.5)
131126
#-----| cfg_if -> Crate(cfg_if@1.0.4)
132-
#-----| hashbrown -> Crate(hashbrown@0.17.1)
127+
#-----| hashbrown -> Crate(hashbrown@0.16.1)
128+
#-----| libc -> Crate(libc@0.2.178)
133129
#-----| rand -> Crate(rand@0.9.2)
134130
#-----| rand_xorshift -> Crate(rand_xorshift@0.4.0)
135131
#-----| rustc_demangle -> Crate(rustc_demangle@0.1.27)
132+
#-----| panic_abort -> Crate(panic_abort@0.0.0)
133+
#-----| unwind -> Crate(unwind@0.0.0)
134+
#-----| panic_unwind -> Crate(panic_unwind@0.0.0)
135+
#-----| std_detect -> Crate(std_detect@0.1.5)
136136

137137
#-----| Crate(std_detect@0.1.5)
138138
#-----| alloc -> Crate(alloc@0.0.0)
139139
#-----| core -> Crate(core@0.0.0)
140-
#-----| libc -> Crate(libc@0.2.185)
140+
#-----| libc -> Crate(libc@0.2.178)
141141

142142
#-----| Crate(test@0.0.0)
143143
#-----| core -> Crate(core@0.0.0)
144144
#-----| std -> Crate(std@0.0.0)
145-
#-----| libc -> Crate(libc@0.2.185)
146145
#-----| getopts -> Crate(getopts@0.2.24)
146+
#-----| libc -> Crate(libc@0.2.178)
147147

148148
lib.rs:
149149
# 0| Crate(test@0.0.1)
@@ -164,7 +164,7 @@ lib.rs:
164164

165165
#-----| Crate(unwind@0.0.0)
166166
#-----| core -> Crate(core@0.0.0)
167-
#-----| libc -> Crate(libc@0.2.185)
167+
#-----| libc -> Crate(libc@0.2.178)
168168

169169
#-----| Crate(version_check@0.9.5)
170170
#-----| proc_macro -> Crate(proc_macro@0.0.0)

‎rust/ql/test/library-tests/controlflow/BasicBlocks.expected‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -743,15 +743,13 @@ dominates
743743
| test.rs:529:5:537:5 | enter fn const_block_assert | test.rs:533:21:533:48 | [boolean(true)] ! ... |
744744
| test.rs:529:5:537:5 | enter fn const_block_assert | test.rs:533:21:533:48 | if ... {...} |
745745
| test.rs:533:13:533:19 | ExprStmt | test.rs:533:13:533:19 | ExprStmt |
746-
| test.rs:533:13:533:19 | enter fn panic_cold_explicit | test.rs:533:13:533:19 | enter fn panic_cold_explicit |
747746
| test.rs:533:21:533:48 | [boolean(false)] ! ... | test.rs:533:21:533:48 | [boolean(false)] ! ... |
748747
| test.rs:533:21:533:48 | [boolean(true)] ! ... | test.rs:533:13:533:19 | ExprStmt |
749748
| test.rs:533:21:533:48 | [boolean(true)] ! ... | test.rs:533:21:533:48 | [boolean(true)] ! ... |
750749
| test.rs:533:21:533:48 | if ... {...} | test.rs:533:21:533:48 | if ... {...} |
751750
| test.rs:539:5:548:5 | enter fn const_block_panic | test.rs:539:5:548:5 | enter fn const_block_panic |
752751
| test.rs:539:5:548:5 | enter fn const_block_panic | test.rs:541:9:546:9 | if false {...} |
753752
| test.rs:541:9:546:9 | if false {...} | test.rs:541:9:546:9 | if false {...} |
754-
| test.rs:544:17:544:22 | enter fn panic_cold_explicit | test.rs:544:17:544:22 | enter fn panic_cold_explicit |
755753
| test.rs:551:1:556:1 | enter fn dead_code | test.rs:551:1:556:1 | enter fn dead_code |
756754
| test.rs:551:1:556:1 | enter fn dead_code | test.rs:553:9:553:17 | ExprStmt |
757755
| test.rs:553:9:553:17 | ExprStmt | test.rs:553:9:553:17 | ExprStmt |
@@ -1424,7 +1422,6 @@ postDominance
14241422
| test.rs:529:5:537:5 | enter fn const_block_assert | test.rs:529:5:537:5 | enter fn const_block_assert |
14251423
| test.rs:533:13:533:19 | ExprStmt | test.rs:533:13:533:19 | ExprStmt |
14261424
| test.rs:533:13:533:19 | ExprStmt | test.rs:533:21:533:48 | [boolean(true)] ! ... |
1427-
| test.rs:533:13:533:19 | enter fn panic_cold_explicit | test.rs:533:13:533:19 | enter fn panic_cold_explicit |
14281425
| test.rs:533:21:533:48 | [boolean(false)] ! ... | test.rs:533:21:533:48 | [boolean(false)] ! ... |
14291426
| test.rs:533:21:533:48 | [boolean(true)] ! ... | test.rs:533:21:533:48 | [boolean(true)] ! ... |
14301427
| test.rs:533:21:533:48 | if ... {...} | test.rs:529:5:537:5 | enter fn const_block_assert |
@@ -1435,7 +1432,6 @@ postDominance
14351432
| test.rs:539:5:548:5 | enter fn const_block_panic | test.rs:539:5:548:5 | enter fn const_block_panic |
14361433
| test.rs:541:9:546:9 | if false {...} | test.rs:539:5:548:5 | enter fn const_block_panic |
14371434
| test.rs:541:9:546:9 | if false {...} | test.rs:541:9:546:9 | if false {...} |
1438-
| test.rs:544:17:544:22 | enter fn panic_cold_explicit | test.rs:544:17:544:22 | enter fn panic_cold_explicit |
14391435
| test.rs:551:1:556:1 | enter fn dead_code | test.rs:551:1:556:1 | enter fn dead_code |
14401436
| test.rs:553:9:553:17 | ExprStmt | test.rs:551:1:556:1 | enter fn dead_code |
14411437
| test.rs:553:9:553:17 | ExprStmt | test.rs:553:9:553:17 | ExprStmt |

‎rust/ql/test/library-tests/controlflow/Cfg.expected‎

Lines changed: 4 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1288,20 +1288,13 @@ edges
12881288
| test.rs:529:41:537:5 | { ... } | test.rs:529:5:537:5 | exit fn const_block_assert (normal) | |
12891289
| test.rs:532:9:534:9 | ExprStmt | test.rs:533:13:533:50 | ExprStmt | |
12901290
| test.rs:532:9:534:9 | { ... } | test.rs:536:9:536:10 | 42 | |
1291+
| test.rs:533:13:533:19 | "explicit panic" | test.rs:533:13:533:19 | ...::panic(...) | |
1292+
| test.rs:533:13:533:19 | ...::panic | test.rs:533:13:533:19 | "explicit panic" | |
1293+
| test.rs:533:13:533:19 | ...::panic(...) | test.rs:533:13:533:19 | { ... } | |
12911294
| test.rs:533:13:533:19 | ...::panic_2021!... | test.rs:533:13:533:19 | MacroExpr | |
1292-
| test.rs:533:13:533:19 | ...::panic_explicit | test.rs:533:13:533:19 | ...::panic_explicit(...) | |
1293-
| test.rs:533:13:533:19 | ...::panic_explicit(...) | test.rs:533:13:533:19 | { ... } | |
1294-
| test.rs:533:13:533:19 | ExprStmt | test.rs:533:13:533:19 | fn panic_cold_explicit | |
1295-
| test.rs:533:13:533:19 | ExprStmt | test.rs:533:13:533:19 | panic_cold_explicit | |
1295+
| test.rs:533:13:533:19 | ExprStmt | test.rs:533:13:533:19 | ...::panic | |
12961296
| test.rs:533:13:533:19 | MacroExpr | test.rs:533:13:533:19 | { ... } | |
1297-
| test.rs:533:13:533:19 | enter fn panic_cold_explicit | test.rs:533:13:533:19 | ...::panic_explicit | |
1298-
| test.rs:533:13:533:19 | exit fn panic_cold_explicit (normal) | test.rs:533:13:533:19 | exit fn panic_cold_explicit | |
1299-
| test.rs:533:13:533:19 | fn panic_cold_explicit | test.rs:533:13:533:19 | ExprStmt | |
1300-
| test.rs:533:13:533:19 | panic_cold_explicit | test.rs:533:13:533:19 | panic_cold_explicit(...) | |
1301-
| test.rs:533:13:533:19 | panic_cold_explicit(...) | test.rs:533:13:533:19 | { ... } | |
13021297
| test.rs:533:13:533:19 | { ... } | test.rs:533:13:533:19 | ...::panic_2021!... | |
1303-
| test.rs:533:13:533:19 | { ... } | test.rs:533:13:533:19 | exit fn panic_cold_explicit (normal) | |
1304-
| test.rs:533:13:533:19 | { ... } | test.rs:533:13:533:19 | { ... } | |
13051298
| test.rs:533:13:533:19 | { ... } | test.rs:533:21:533:48 | if ... {...} | |
13061299
| test.rs:533:13:533:49 | MacroExpr | test.rs:532:9:534:9 | { ... } | |
13071300
| test.rs:533:13:533:49 | assert!... | test.rs:533:13:533:49 | MacroExpr | |
@@ -1323,11 +1316,6 @@ edges
13231316
| test.rs:541:9:546:9 | ExprStmt | test.rs:541:12:541:16 | false | |
13241317
| test.rs:541:9:546:9 | if false {...} | test.rs:547:9:547:9 | N | |
13251318
| test.rs:541:12:541:16 | false | test.rs:541:9:546:9 | if false {...} | false |
1326-
| test.rs:544:17:544:22 | ...::panic_explicit | test.rs:544:17:544:22 | ...::panic_explicit(...) | |
1327-
| test.rs:544:17:544:22 | ...::panic_explicit(...) | test.rs:544:17:544:22 | { ... } | |
1328-
| test.rs:544:17:544:22 | enter fn panic_cold_explicit | test.rs:544:17:544:22 | ...::panic_explicit | |
1329-
| test.rs:544:17:544:22 | exit fn panic_cold_explicit (normal) | test.rs:544:17:544:22 | exit fn panic_cold_explicit | |
1330-
| test.rs:544:17:544:22 | { ... } | test.rs:544:17:544:22 | exit fn panic_cold_explicit (normal) | |
13311319
| test.rs:547:9:547:9 | N | test.rs:539:35:548:5 | { ... } | |
13321320
| test.rs:551:1:556:1 | enter fn dead_code | test.rs:552:5:554:5 | ExprStmt | |
13331321
| test.rs:551:1:556:1 | exit fn dead_code (normal) | test.rs:551:1:556:1 | exit fn dead_code | |

‎rust/ql/test/library-tests/definitions/Definitions.expected‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@
1010
| main.rs:20:13:20:14 | S2 | main.rs:16:5:16:24 | struct S2 | path |
1111
| main.rs:20:16:20:16 | x | main.rs:19:20:19:20 | x | local variable |
1212
| main.rs:29:5:29:11 | println | {EXTERNAL LOCATION} | MacroRules | path |
13-
| main.rs:29:22:29:26 | value | main.rs:29:50:29:56 | FormatArgsArgName | format argument |
14-
| main.rs:29:29:29:33 | width | main.rs:29:50:29:56 | FormatArgsArgName | format argument |
15-
| main.rs:29:36:29:44 | precision | main.rs:29:50:29:56 | FormatArgsArgName | format argument |
13+
| main.rs:29:22:29:26 | value | main.rs:29:50:29:54 | value | format argument |
14+
| main.rs:29:29:29:33 | width | main.rs:29:50:29:54 | value | format argument |
15+
| main.rs:29:36:29:44 | precision | main.rs:29:50:29:54 | value | format argument |
1616
| main.rs:30:5:30:11 | println | {EXTERNAL LOCATION} | MacroRules | path |
1717
| main.rs:30:22:30:22 | 0 | main.rs:30:34:30:38 | value | format argument |
1818
| main.rs:30:25:30:25 | 1 | main.rs:30:41:30:45 | width | format argument |

‎rust/ql/test/rust-toolchain.toml‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,12 @@
11
# This file specifies the Rust version used to test the rust extractor.
22
# IMPORTANT: this can also have an impact on QL test results
3-
3+
#
4+
# Pinned to 1.95: this is the newest stable that both expands the builtin
5+
# `format_args!` macro against std (needs >= ~1.94) and still accepts
6+
# `use SomeStruct::{self};`, which became a hard error (E0432) in 1.96 and is
7+
# exercised by the path-resolution test. Do not bump past 1.95 without
8+
# adapting that test.
49
[toolchain]
5-
channel = "1.97"
10+
channel = "1.95.0"
611
profile = "minimal"
712
components = [ "rust-src" ]

0 commit comments

Comments
 (0)