Skip to content

Commit ceb87da

Browse files
authored
Upgrade toolchain to 2024-11-28 (#3753)
Update parameter and function indices in LLBC tests (again) that appear to have changed without any of the upstream changes obviously causing this. Those tests will eventually be removed in upcoming changes. Resolves: #3752 By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 and MIT licenses.
1 parent 1765aa5 commit ceb87da

File tree

5 files changed

+16
-24
lines changed

5 files changed

+16
-24
lines changed

rust-toolchain.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@
22
# SPDX-License-Identifier: Apache-2.0 OR MIT
33

44
[toolchain]
5-
channel = "nightly-2024-11-27"
5+
channel = "nightly-2024-11-28"
66
components = ["llvm-tools", "rustc-dev", "rust-src", "rustfmt"]

tests/expected/llbc/enum/expected

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ fn test::main()
2929
let i@2: i32; // local
3030

3131
e@1 := test::MyEnum::A { 0: const (1 : i32) }
32-
i@2 := @Fun0(move (e@1))
32+
i@2 := @Fun1(move (e@1))
3333
drop i@2
3434
@0 := ()
3535
return

tests/expected/llbc/generic/expected

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ fn test::main()
4343

4444
@2 := core::option::Option::Some { 0: const (1 : i32) }
4545
@3 := core::option::Option::Some { 0: const (2 : i32) }
46-
e@1 := @Fun0(move (@2), move (@3))
46+
e@1 := @Fun1(move (@2), move (@3))
4747
drop @3
4848
drop @2
4949
drop e@1

tests/expected/llbc/projection/expected

Lines changed: 12 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -3,31 +3,25 @@ struct test::MyStruct =
33
a: i32,
44
b: i32,
55
}
6-
76
enum test::MyEnum0 =
8-
| A(0: @Adt1, 1: i32)
7+
| A(0: @Adt0, 1: i32)
98
| B()
10-
11-
129
enum test::MyEnum =
13-
| A(0: @Adt1, 1: @Adt2)
10+
| A(0: @Adt0, 1: @Adt2)
1411
| B(0: (i32, i32))
15-
16-
17-
fn test::enum_match(@1: @Adt0) -> i32
12+
fn test::enum_match(@1: @Adt1) -> i32
1813
{
1914
let @0: i32; // return
20-
let e@1: @Adt0; // arg #1
21-
let s@2: @Adt1; // local
15+
let e@1: @Adt1; // arg #1
16+
let s@2: @Adt0; // local
2217
let e0@3: @Adt2; // local
23-
let s1@4: @Adt1; // local
18+
let s1@4: @Adt0; // local
2419
let b@5: i32; // local
2520
let @6: i32; // anonymous local
2621
let @7: i32; // anonymous local
2722
let @8: i32; // anonymous local
2823
let a@9: i32; // local
2924
let b@10: i32; // local
30-
3125
match e@1 {
3226
0 => {
3327
s@2 := move ((e@1 as variant @0).0)
@@ -62,22 +56,20 @@ fn test::enum_match(@1: @Adt0) -> i32
6256
}
6357
return
6458
}
65-
6659
fn test::main()
6760
{
6861
let @0: (); // return
69-
let s@1: @Adt1; // local
70-
let s0@2: @Adt1; // local
71-
let e@3: @Adt0; // local
62+
let s@1: @Adt0; // local
63+
let s0@2: @Adt0; // local
64+
let e@3: @Adt1; // local
7265
let @4: @Adt2; // anonymous local
7366
let i@5: i32; // local
74-
75-
s@1 := @Adt1 { a: const (1 : i32), b: const (2 : i32) }
76-
s0@2 := @Adt1 { a: const (1 : i32), b: const (2 : i32) }
67+
s@1 := @Adt0 { a: const (1 : i32), b: const (2 : i32) }
68+
s0@2 := @Adt0 { a: const (1 : i32), b: const (2 : i32) }
7769
@4 := test::MyEnum0::A { 0: move (s0@2), 1: const (1 : i32) }
7870
e@3 := test::MyEnum::A { 0: move (s@1), 1: move (@4) }
7971
drop @4
80-
i@5 := @Fun0(move (e@3))
72+
i@5 := @Fun1(move (e@3))
8173
drop i@5
8274
@0 := ()
8375
return

tests/expected/llbc/tuple/expected

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ fn test::main()
2020
let @2: (i32, i32); // anonymous local
2121

2222
@2 := (const (1 : i32), const (2 : i32))
23-
s@1 := @Fun0(move (@2))
23+
s@1 := @Fun1(move (@2))
2424
drop @2
2525
drop s@1
2626
@0 := ()

0 commit comments

Comments
 (0)