Skip to content

Commit f334221

Browse files
redsun82Copilot
andcommitted
Rust: bump test toolchain to 1.97 and update generated test expectations
The ra_ap 0.0.347 builtin format_args! expander needs a newer std than 0.0.328, so the QL test toolchain is bumped to 1.97 (matching the root dev toolchain). Generated extractor-test expectations are regenerated for the new schema fields (asm attrs, Trait impl_restriction, Struct/TupleField mut_restriction, Visibility visibility_inner, FormatArgsArg name) and for the std sysroot dependency churn that comes with the newer toolchain. Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com> Copilot-Session: 890cb55d-0437-4bd7-9268-87b8897ada01
1 parent dcc9129 commit f334221

11 files changed

Lines changed: 33 additions & 33 deletions

File tree

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

Lines changed: 21 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
#-----| std -> Crate(std@0.0.0)
1818
#-----| test -> Crate(test@0.0.0)
1919

20-
#-----| Crate(cfg_if@1.0.1)
20+
#-----| Crate(cfg_if@1.0.4)
2121
#-----| core -> Crate(core@0.0.0)
2222

2323
#-----| Crate(compiler_builtins@0.1.160)
@@ -43,6 +43,8 @@
4343
#-----| block_buffer -> Crate(block_buffer@0.10.4)
4444
#-----| crypto_common -> Crate(crypto_common@0.1.6)
4545

46+
#-----| Crate(foldhash@0.2.0)
47+
4648
#-----| Crate(generic_array@0.14.7)
4749
#-----| proc_macro -> Crate(proc_macro@0.0.0)
4850
#-----| alloc -> Crate(alloc@0.0.0)
@@ -51,16 +53,16 @@
5153
#-----| test -> Crate(test@0.0.0)
5254
#-----| typenum -> Crate(typenum@1.18.0)
5355

54-
#-----| Crate(getopts@0.2.23)
56+
#-----| Crate(getopts@0.2.24)
5557
#-----| core -> Crate(core@0.0.0)
5658
#-----| std -> Crate(std@0.0.0)
57-
#-----| unicode_width -> Crate(unicode_width@0.2.1)
5859

59-
#-----| Crate(hashbrown@0.15.4)
60+
#-----| Crate(hashbrown@0.17.1)
6061
#-----| alloc -> Crate(alloc@0.0.0)
6162
#-----| core -> Crate(core@0.0.0)
63+
#-----| foldhash -> Crate(foldhash@0.2.0)
6264

63-
#-----| Crate(libc@0.2.174)
65+
#-----| Crate(libc@0.2.185)
6466
#-----| rustc_std_workspace_core -> Crate(core@0.0.0)
6567

6668
main.rs:
@@ -96,14 +98,13 @@ main.rs:
9698
#-----| Crate(panic_unwind@0.0.0)
9799
#-----| alloc -> Crate(alloc@0.0.0)
98100
#-----| core -> Crate(core@0.0.0)
99-
#-----| cfg_if -> Crate(cfg_if@1.0.1)
100-
#-----| libc -> Crate(libc@0.2.174)
101+
#-----| libc -> Crate(libc@0.2.185)
101102
#-----| unwind -> Crate(unwind@0.0.0)
102103

103104
#-----| Crate(proc_macro@0.0.0)
104105
#-----| core -> Crate(core@0.0.0)
105106
#-----| std -> Crate(std@0.0.0)
106-
#-----| rustc_literal_escaper -> Crate(rustc_literal_escaper@0.0.5)
107+
#-----| rustc_literal_escaper -> Crate(rustc_literal_escaper@0.0.7)
107108

108109
#-----| Crate(rand@0.9.2)
109110
#-----| rand_core -> Crate(rand_core@0.9.3)
@@ -113,38 +114,36 @@ main.rs:
113114
#-----| Crate(rand_xorshift@0.4.0)
114115
#-----| rand_core -> Crate(rand_core@0.9.3)
115116

116-
#-----| Crate(rustc_demangle@0.1.25)
117+
#-----| Crate(rustc_demangle@0.1.27)
117118
#-----| core -> Crate(core@0.0.0)
118119

119-
#-----| Crate(rustc_literal_escaper@0.0.5)
120+
#-----| Crate(rustc_literal_escaper@0.0.7)
120121
#-----| core -> Crate(core@0.0.0)
121-
#-----| std -> Crate(std@0.0.0)
122122

123123
#-----| Crate(std@0.0.0)
124124
#-----| alloc -> Crate(alloc@0.0.0)
125125
#-----| core -> Crate(core@0.0.0)
126-
#-----| cfg_if -> Crate(cfg_if@1.0.1)
127-
#-----| hashbrown -> Crate(hashbrown@0.15.4)
128-
#-----| libc -> Crate(libc@0.2.174)
129-
#-----| rand -> Crate(rand@0.9.2)
130-
#-----| rand_xorshift -> Crate(rand_xorshift@0.4.0)
131-
#-----| rustc_demangle -> Crate(rustc_demangle@0.1.25)
132126
#-----| panic_abort -> Crate(panic_abort@0.0.0)
127+
#-----| libc -> Crate(libc@0.2.185)
133128
#-----| unwind -> Crate(unwind@0.0.0)
134129
#-----| panic_unwind -> Crate(panic_unwind@0.0.0)
135130
#-----| std_detect -> Crate(std_detect@0.1.5)
131+
#-----| cfg_if -> Crate(cfg_if@1.0.4)
132+
#-----| hashbrown -> Crate(hashbrown@0.17.1)
133+
#-----| rand -> Crate(rand@0.9.2)
134+
#-----| rand_xorshift -> Crate(rand_xorshift@0.4.0)
135+
#-----| rustc_demangle -> Crate(rustc_demangle@0.1.27)
136136

137137
#-----| Crate(std_detect@0.1.5)
138138
#-----| alloc -> Crate(alloc@0.0.0)
139139
#-----| core -> Crate(core@0.0.0)
140-
#-----| cfg_if -> Crate(cfg_if@1.0.1)
141-
#-----| libc -> Crate(libc@0.2.174)
140+
#-----| libc -> Crate(libc@0.2.185)
142141

143142
#-----| Crate(test@0.0.0)
144143
#-----| core -> Crate(core@0.0.0)
145144
#-----| std -> Crate(std@0.0.0)
146-
#-----| getopts -> Crate(getopts@0.2.23)
147-
#-----| libc -> Crate(libc@0.2.174)
145+
#-----| libc -> Crate(libc@0.2.185)
146+
#-----| getopts -> Crate(getopts@0.2.24)
148147

149148
lib.rs:
150149
# 0| Crate(test@0.0.1)
@@ -163,14 +162,9 @@ lib.rs:
163162
#-----| std -> Crate(std@0.0.0)
164163
#-----| test -> Crate(test@0.0.0)
165164

166-
#-----| Crate(unicode_width@0.2.1)
167-
#-----| core -> Crate(core@0.0.0)
168-
#-----| std -> Crate(std@0.0.0)
169-
170165
#-----| Crate(unwind@0.0.0)
171166
#-----| core -> Crate(core@0.0.0)
172-
#-----| cfg_if -> Crate(cfg_if@1.0.1)
173-
#-----| libc -> Crate(libc@0.2.174)
167+
#-----| libc -> Crate(libc@0.2.185)
174168

175169
#-----| Crate(version_check@0.9.5)
176170
#-----| proc_macro -> Crate(proc_macro@0.0.0)
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,3 @@
1+
instances
12
| gen_asm_clobber_abi.rs:8:14:8:29 | AsmClobberAbi |
3+
getAttr

‎rust/ql/test/extractor-tests/generated/AsmOperandNamed/AsmOperandNamed.expected‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,6 @@ instances
44
getAsmOperand
55
| gen_asm_operand_named.rs:8:34:8:43 | AsmOperandNamed | gen_asm_operand_named.rs:8:34:8:43 | AsmRegOperand |
66
| gen_asm_operand_named.rs:8:46:8:62 | AsmOperandNamed | gen_asm_operand_named.rs:8:54:8:62 | AsmRegOperand |
7+
getAttr
78
getName
89
| gen_asm_operand_named.rs:8:46:8:62 | AsmOperandNamed | gen_asm_operand_named.rs:8:46:8:50 | input |

‎rust/ql/test/extractor-tests/generated/AsmOptionsList/AsmOptionsList.expected‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,4 @@ instances
33
getAsmOption
44
| gen_asm_options_list.rs:8:14:8:36 | AsmOptionsList | 0 | gen_asm_options_list.rs:8:22:8:28 | AsmOption |
55
| gen_asm_options_list.rs:8:14:8:36 | AsmOptionsList | 1 | gen_asm_options_list.rs:8:31:8:35 | AsmOption |
6+
getAttr

‎rust/ql/test/extractor-tests/generated/FormatArgsExpr/FormatArgsArg.expected‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,6 @@ instances
1515
| gen_format_argument.rs:7:34:7:38 | FormatArgsArg |
1616
| gen_format_argument.rs:7:41:7:45 | FormatArgsArg |
1717
| gen_format_argument.rs:7:48:7:56 | FormatArgsArg |
18-
getArgName
19-
| gen_format_args_expr.rs:7:35:7:37 | FormatArgsArg | gen_format_args_expr.rs:7:35:7:36 | FormatArgsArgName |
20-
| gen_format_args_expr.rs:7:40:7:42 | FormatArgsArg | gen_format_args_expr.rs:7:40:7:41 | FormatArgsArgName |
2118
getExpr
2219
| gen_format.rs:5:26:5:32 | FormatArgsArg | gen_format.rs:5:26:5:32 | "world" |
2320
| gen_format.rs:12:35:12:38 | FormatArgsArg | gen_format.rs:12:35:12:38 | name |
@@ -35,3 +32,6 @@ getExpr
3532
| gen_format_argument.rs:7:34:7:38 | FormatArgsArg | gen_format_argument.rs:7:34:7:38 | value |
3633
| gen_format_argument.rs:7:41:7:45 | FormatArgsArg | gen_format_argument.rs:7:41:7:45 | width |
3734
| gen_format_argument.rs:7:48:7:56 | FormatArgsArg | gen_format_argument.rs:7:48:7:56 | precision |
35+
getName
36+
| gen_format_args_expr.rs:7:35:7:37 | FormatArgsArg | gen_format_args_expr.rs:7:35:7:35 | a |
37+
| gen_format_args_expr.rs:7:40:7:42 | FormatArgsArg | gen_format_args_expr.rs:7:40:7:40 | b |
Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1 @@
11
| gen_never_type_repr.rs:7:17:7:17 | ! |
2-
| gen_never_type_repr.rs:7:21:7:26 | ! |

‎rust/ql/test/extractor-tests/generated/StructField/StructField.expected‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ instances
22
| gen_struct_field.rs:7:16:7:21 | x: i32 | isUnsafe: | no |
33
getAttr
44
getDefaultVal
5+
getMutRestriction
56
getName
67
| gen_struct_field.rs:7:16:7:21 | x: i32 | gen_struct_field.rs:7:16:7:16 | x |
78
getTypeRepr

‎rust/ql/test/extractor-tests/generated/Trait/Trait.expected‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ getAssocItemList
88
getAttr
99
getGenericParamList
1010
| gen_trait.rs:10:1:10:57 | trait Foo | gen_trait.rs:10:14:10:30 | <...> |
11+
getImplRestriction
1112
getName
1213
| gen_trait.rs:3:1:8:1 | trait Frobinizable | gen_trait.rs:4:7:4:18 | Frobinizable |
1314
| gen_trait.rs:10:1:10:57 | trait Foo | gen_trait.rs:10:11:10:13 | Foo |

‎rust/ql/test/extractor-tests/generated/TupleField/TupleField.expected‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ instances
22
| gen_tuple_field.rs:7:14:7:16 | TupleField |
33
| gen_tuple_field.rs:7:19:7:24 | TupleField |
44
getAttr
5+
getMutRestriction
56
getTypeRepr
67
| gen_tuple_field.rs:7:14:7:16 | TupleField | gen_tuple_field.rs:7:14:7:16 | i32 |
78
| gen_tuple_field.rs:7:19:7:24 | TupleField | gen_tuple_field.rs:7:19:7:24 | String |
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
instances
22
| gen_visibility.rs:7:7:7:9 | pub |
33
| lib.rs:1:1:1:3 | pub |
4-
getPath
4+
getVisibilityInner

0 commit comments

Comments
 (0)