diff --git a/rust-toolchain.toml b/rust-toolchain.toml index 2f76829bb528..9d51f9566f61 100644 --- a/rust-toolchain.toml +++ b/rust-toolchain.toml @@ -2,5 +2,5 @@ # SPDX-License-Identifier: Apache-2.0 OR MIT [toolchain] -channel = "nightly-2024-11-27" +channel = "nightly-2024-11-28" components = ["llvm-tools", "rustc-dev", "rust-src", "rustfmt"] diff --git a/tests/expected/llbc/enum/expected b/tests/expected/llbc/enum/expected index 9d35f16b5205..10409fdab8e8 100644 --- a/tests/expected/llbc/enum/expected +++ b/tests/expected/llbc/enum/expected @@ -29,7 +29,7 @@ fn test::main() let i@2: i32; // local e@1 := test::MyEnum::A { 0: const (1 : i32) } - i@2 := @Fun0(move (e@1)) + i@2 := @Fun1(move (e@1)) drop i@2 @0 := () return diff --git a/tests/expected/llbc/generic/expected b/tests/expected/llbc/generic/expected index 8345efd371d4..c0ef3c1939e0 100644 --- a/tests/expected/llbc/generic/expected +++ b/tests/expected/llbc/generic/expected @@ -43,7 +43,7 @@ fn test::main() @2 := core::option::Option::Some { 0: const (1 : i32) } @3 := core::option::Option::Some { 0: const (2 : i32) } - e@1 := @Fun0(move (@2), move (@3)) + e@1 := @Fun1(move (@2), move (@3)) drop @3 drop @2 drop e@1 diff --git a/tests/expected/llbc/projection/expected b/tests/expected/llbc/projection/expected index e29781ea64cf..378fef9659c6 100644 --- a/tests/expected/llbc/projection/expected +++ b/tests/expected/llbc/projection/expected @@ -3,31 +3,25 @@ struct test::MyStruct = a: i32, b: i32, } - enum test::MyEnum0 = -| A(0: @Adt1, 1: i32) +| A(0: @Adt0, 1: i32) | B() - - enum test::MyEnum = -| A(0: @Adt1, 1: @Adt2) +| A(0: @Adt0, 1: @Adt2) | B(0: (i32, i32)) - - -fn test::enum_match(@1: @Adt0) -> i32 +fn test::enum_match(@1: @Adt1) -> i32 { let @0: i32; // return - let e@1: @Adt0; // arg #1 - let s@2: @Adt1; // local + let e@1: @Adt1; // arg #1 + let s@2: @Adt0; // local let e0@3: @Adt2; // local - let s1@4: @Adt1; // local + let s1@4: @Adt0; // local let b@5: i32; // local let @6: i32; // anonymous local let @7: i32; // anonymous local let @8: i32; // anonymous local let a@9: i32; // local let b@10: i32; // local - match e@1 { 0 => { s@2 := move ((e@1 as variant @0).0) @@ -62,22 +56,20 @@ fn test::enum_match(@1: @Adt0) -> i32 } return } - fn test::main() { let @0: (); // return - let s@1: @Adt1; // local - let s0@2: @Adt1; // local - let e@3: @Adt0; // local + let s@1: @Adt0; // local + let s0@2: @Adt0; // local + let e@3: @Adt1; // local let @4: @Adt2; // anonymous local let i@5: i32; // local - - s@1 := @Adt1 { a: const (1 : i32), b: const (2 : i32) } - s0@2 := @Adt1 { a: const (1 : i32), b: const (2 : i32) } + s@1 := @Adt0 { a: const (1 : i32), b: const (2 : i32) } + s0@2 := @Adt0 { a: const (1 : i32), b: const (2 : i32) } @4 := test::MyEnum0::A { 0: move (s0@2), 1: const (1 : i32) } e@3 := test::MyEnum::A { 0: move (s@1), 1: move (@4) } drop @4 - i@5 := @Fun0(move (e@3)) + i@5 := @Fun1(move (e@3)) drop i@5 @0 := () return diff --git a/tests/expected/llbc/tuple/expected b/tests/expected/llbc/tuple/expected index d6fa6330ca88..1475d136b7cc 100644 --- a/tests/expected/llbc/tuple/expected +++ b/tests/expected/llbc/tuple/expected @@ -20,7 +20,7 @@ fn test::main() let @2: (i32, i32); // anonymous local @2 := (const (1 : i32), const (2 : i32)) - s@1 := @Fun0(move (@2)) + s@1 := @Fun1(move (@2)) drop @2 drop s@1 @0 := ()