From 968e49279d97cab71e349e724611b8d3c01b1334 Mon Sep 17 00:00:00 2001
From: Michael Tautschnig <tautschn@amazon.com>
Date: Mon, 2 Dec 2024 17:28:04 +0000
Subject: [PATCH 1/2] Upgrade toolchain to 2024-11-27

Update parameter and function indices in LLBC tests that appear to have
changed without any of the upstream changes obviously causing this.
Those tests will eventually be removed in upcoming changes.

Resolves: #3747
---
 rust-toolchain.toml                     | 2 +-
 tests/expected/llbc/enum/expected       | 2 +-
 tests/expected/llbc/projection/expected | 2 +-
 tests/expected/llbc/tuple/expected      | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/rust-toolchain.toml b/rust-toolchain.toml
index e216a29bcbd0..2f76829bb528 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-26"
+channel = "nightly-2024-11-27"
 components = ["llvm-tools", "rustc-dev", "rust-src", "rustfmt"]
diff --git a/tests/expected/llbc/enum/expected b/tests/expected/llbc/enum/expected
index 10409fdab8e8..9d35f16b5205 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 := @Fun1(move (e@1))
+    i@2 := @Fun0(move (e@1))
     drop i@2
     @0 := ()
     return
diff --git a/tests/expected/llbc/projection/expected b/tests/expected/llbc/projection/expected
index 50f7758ad86f..f6979be7067e 100644
--- a/tests/expected/llbc/projection/expected
+++ b/tests/expected/llbc/projection/expected
@@ -5,7 +5,7 @@ struct test::MyStruct =
 }
 
 enum test::MyEnum0 =
-|  A(0: @Adt0, 1: i32)
+|  A(0: @Adt1, 1: i32)
 |  B()
 
 
diff --git a/tests/expected/llbc/tuple/expected b/tests/expected/llbc/tuple/expected
index 1475d136b7cc..d6fa6330ca88 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 := @Fun1(move (@2))
+    s@1 := @Fun0(move (@2))
     drop @2
     drop s@1
     @0 := ()

From baee29c34f83e73d8e5ee5ac99022549dd97a9d5 Mon Sep 17 00:00:00 2001
From: Michael Tautschnig <tautschn@amazon.com>
Date: Mon, 2 Dec 2024 18:41:06 +0000
Subject: [PATCH 2/2] Further updates to patterns

---
 tests/expected/llbc/projection/expected | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/tests/expected/llbc/projection/expected b/tests/expected/llbc/projection/expected
index f6979be7067e..e29781ea64cf 100644
--- a/tests/expected/llbc/projection/expected
+++ b/tests/expected/llbc/projection/expected
@@ -10,17 +10,17 @@ enum test::MyEnum0 =
 
 
 enum test::MyEnum =
-|  A(0: @Adt0, 1: @Adt2)
+|  A(0: @Adt1, 1: @Adt2)
 |  B(0: (i32, i32))
 
 
-fn test::enum_match(@1: @Adt1) -> i32
+fn test::enum_match(@1: @Adt0) -> i32
 {
     let @0: i32; // return
-    let e@1: @Adt1; // arg #1
-    let s@2: @Adt0; // local
+    let e@1: @Adt0; // arg #1
+    let s@2: @Adt1; // local
     let e0@3: @Adt2; // local
-    let s1@4: @Adt0; // local
+    let s1@4: @Adt1; // local
     let b@5: i32; // local
     let @6: i32; // anonymous local
     let @7: i32; // anonymous local
@@ -66,18 +66,18 @@ fn test::enum_match(@1: @Adt1) -> i32
 fn test::main()
 {
     let @0: (); // return
-    let s@1: @Adt0; // local
-    let s0@2: @Adt0; // local
-    let e@3: @Adt1; // local
+    let s@1: @Adt1; // local
+    let s0@2: @Adt1; // local
+    let e@3: @Adt0; // local
     let @4: @Adt2; // anonymous local
     let i@5: i32; // local
 
-    s@1 := @Adt0 { a: const (1 : i32), b: const (2 : i32) }
-    s0@2 := @Adt0 { a: const (1 : i32), b: const (2 : i32) }
+    s@1 := @Adt1 { a: const (1 : i32), b: const (2 : i32) }
+    s0@2 := @Adt1 { 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 := @Fun1(move (e@3))
+    i@5 := @Fun0(move (e@3))
     drop i@5
     @0 := ()
     return