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

rustup
rust-lang · Oct 12, 2021 · a32bf4a · a32bf4a
2 parents fa91a89 + f040413
commit a32bf4a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
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
		@@ -1 +1 @@
		0157cc977fd71297ce73e2f249321f5ba2555d42
		9475e609b8458fff9e444934a6017d2e590642cf