rustup

RalfJung · RalfJung · commit 35b64447f385 · 2021-08-30T10:35:34.000-04:00
diff --git a/rust-version b/rust-version
@@ -1 +1 @@
-c4be230b4a30eb74e3a3908455731ebc2f731d3d
+6cfa773583bb5123e630668f5bfe466716225546
diff --git a/src/shims/intrinsics.rs b/src/shims/intrinsics.rs
@@ -518,15 +518,15 @@ pub trait EvalContextExt<'mir, 'tcx: 'mir>: crate::MiriEvalContextExt<'mir, 'tcx
                     )))
                 }
                 if intrinsic_name == "assert_zero_valid"
-                    && !layout.might_permit_raw_init(this, /*zero:*/ true).unwrap()
+                    && !layout.might_permit_raw_init(this, /*zero:*/ true)
                 {
                     throw_machine_stop!(TerminationInfo::Abort(format!(
                         "aborted execution: attempted to zero-initialize type `{}`, which is invalid",
                         ty
                     )))
                 }
                 if intrinsic_name == "assert_uninit_valid"
-                    && !layout.might_permit_raw_init(this, /*zero:*/ false).unwrap()
+                    && !layout.might_permit_raw_init(this, /*zero:*/ false)
                 {
                     throw_machine_stop!(TerminationInfo::Abort(format!(
                         "aborted execution: attempted to leave type `{}` uninitialized, which is invalid",

Original file line number	Diff line number	Diff line change
`@@ -518,15 +518,15 @@ pub trait EvalContextExt<'mir, 'tcx: 'mir>: crate::MiriEvalContextExt<'mir, 'tcx`
`518`	`518`	`)))`
`519`	`519`	`}`
`520`	`520`	`if intrinsic_name == "assert_zero_valid"`
`521`		`- && !layout.might_permit_raw_init(this, /zero:/ true).unwrap()`
	`521`	`+ && !layout.might_permit_raw_init(this, /zero:/ true)`
`522`	`522`	`{`
`523`	`523`	`throw_machine_stop!(TerminationInfo::Abort(format!(`
`524`	`524`	"aborted execution: attempted to zero-initialize type `{}`, which is invalid",
`525`	`525`	`ty`
`526`	`526`	`)))`
`527`	`527`	`}`
`528`	`528`	`if intrinsic_name == "assert_uninit_valid"`
`529`		`- && !layout.might_permit_raw_init(this, /zero:/ false).unwrap()`
	`529`	`+ && !layout.might_permit_raw_init(this, /zero:/ false)`
`530`	`530`	`{`
`531`	`531`	`throw_machine_stop!(TerminationInfo::Abort(format!(`
`532`	`532`	"aborted execution: attempted to leave type `{}` uninitialized, which is invalid",