Skip to content

Commit a38289f

Browse files
committed
Auto merge of #3286 - rust-lang:rustup-2024-01-31, r=saethlin
Automatic Rustup
2 parents d85d147 + d8ac1c7 commit a38289f

File tree

3 files changed

+18
-5
lines changed

3 files changed

+18
-5
lines changed

rust-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
dd2559e08e1530806740931037d6bb83ef956161
1+
80deabd0987201e1b8d060400f50e03309a0105e

src/diagnostics.rs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -102,10 +102,7 @@ impl MachineStopType for TerminationInfo {
102102
}
103103
fn add_args(
104104
self: Box<Self>,
105-
_: &mut dyn FnMut(
106-
std::borrow::Cow<'static, str>,
107-
rustc_errors::DiagnosticArgValue<'static>,
108-
),
105+
_: &mut dyn FnMut(std::borrow::Cow<'static, str>, rustc_errors::DiagnosticArgValue),
109106
) {
110107
}
111108
}
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
// Validation stops the test before the ICE we used to hit
2+
//@compile-flags: -Zmiri-disable-validation
3+
4+
#![feature(never_type)]
5+
#[derive(Copy, Clone)]
6+
pub enum E {
7+
A(!),
8+
}
9+
pub union U {
10+
u: (),
11+
e: E,
12+
}
13+
14+
fn main() {
15+
let E::A(ref _a) = unsafe { &(&U { u: () }).e };
16+
}

0 commit comments

Comments
 (0)