Auto merge of #1899 - RalfJung:rustup, r=RalfJung

bors · bors · commit a32bf4a6eb74 · 2021-10-12T15:39:54.000Z
rustup
diff --git a/rust-version b/rust-version
@@ -1 +1 @@
-0157cc977fd71297ce73e2f249321f5ba2555d42
+9475e609b8458fff9e444934a6017d2e590642cf
diff --git a/tests/run-pass/too-large-primval-write-problem.rs b/tests/run-pass/too-large-primval-write-problem.rs
@@ -16,7 +16,7 @@ fn main() {
     let bad = unsafe { transmute::<i32, *const u8>(-x) };
 
     // Force it through the Memory::write_primval code.
-    Box::new(bad);
+    drop(Box::new(bad));
 }
 
 #[cfg(not(target_pointer_width = "32"))]

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ fn main() {`
`16`	`16`	`let bad = unsafe { transmute::<i32, *const u8>(-x) };`
`17`	`17`
`18`	`18`	`// Force it through the Memory::write_primval code.`
`19`		`- Box::new(bad);`
	`19`	`+ drop(Box::new(bad));`
`20`	`20`	`}`
`21`	`21`
`22`	`22`	`#[cfg(not(target_pointer_width = "32"))]`