From 432015d1f64d3a8065464c29e5af7396fc666c94 Mon Sep 17 00:00:00 2001
From: Ralf Jung <post@ralfj.de>
Date: Wed, 20 Apr 2022 17:41:09 -0400
Subject: [PATCH] rustup

---
 rust-version                               |  2 +-
 tests/compile-fail/never_transmute_void.rs | 15 +++++++++------
 tests/run-pass/async-fn.rs                 |  2 +-
 3 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/rust-version b/rust-version
index fa9ce8aca8..7cc913cf86 100644
--- a/rust-version
+++ b/rust-version
@@ -1 +1 @@
-27af5175497936ea3413bef5816e7c0172514b9c
+51ea9bb29b07d76c5a7167d054b54f4eb7f5b44e
diff --git a/tests/compile-fail/never_transmute_void.rs b/tests/compile-fail/never_transmute_void.rs
index 5e9e2ac204..e5aa04dfec 100644
--- a/tests/compile-fail/never_transmute_void.rs
+++ b/tests/compile-fail/never_transmute_void.rs
@@ -4,15 +4,18 @@
 #![feature(never_type)]
 #![allow(unused, invalid_value)]
 
-enum Void {}
+mod m {
+    enum VoidI {}
+    pub struct Void(VoidI);
 
-fn f(v: Void) -> ! {
-    match v {} //~ ERROR entering unreachable code
+    pub fn f(v: Void) -> ! {
+        match v.0 {} //~ ERROR entering unreachable code
+    }
 }
 
 fn main() {
-    let v: Void = unsafe {
-        std::mem::transmute::<(), Void>(())
+    let v = unsafe {
+        std::mem::transmute::<(), m::Void>(())
     };
-    f(v); //~ inside `main`
+    m::f(v); //~ inside `main`
 }
diff --git a/tests/run-pass/async-fn.rs b/tests/run-pass/async-fn.rs
index 1602b5638e..1d5d9a27cc 100644
--- a/tests/run-pass/async-fn.rs
+++ b/tests/run-pass/async-fn.rs
@@ -29,7 +29,7 @@ fn never() -> Never {
 }
 
 async fn includes_never(crash: bool, x: u32) -> u32 {
-    let mut result = async { x * x }.await;
+    let result = async { x * x }.await;
     if !crash {
         return result;
     }