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

bors · bors · commit 0a4ecfc22511 · 2020-09-01T08:58:35.000Z
rustup, fix test Cc rust-lang/rust#76190
diff --git a/rust-version b/rust-version
@@ -1 +1 @@
-18b0585b52741ca158dfebef7968326e2704352e
+d9cd4a33f53689bc0847775669a14f666a138fd7
diff --git a/tests/run-pass/stacked-borrows/interior_mutability.rs b/tests/run-pass/stacked-borrows/interior_mutability.rs
@@ -54,7 +54,7 @@ fn into_interior_mutability() {
     let mut x: MaybeUninit<(Cell<u32>, u32)> = MaybeUninit::uninit();
     x.as_ptr();
     x.write((Cell::new(0), 1));
-    let ptr = unsafe { x.get_ref() };
+    let ptr = unsafe { x.assume_init_ref() };
     assert_eq!(ptr.1, 1);
 }
 

Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ fn into_interior_mutability() {`
`54`	`54`	`let mut x: MaybeUninit<(Cell<u32>, u32)> = MaybeUninit::uninit();`
`55`	`55`	`x.as_ptr();`
`56`	`56`	`x.write((Cell::new(0), 1));`
`57`		`- let ptr = unsafe { x.get_ref() };`
	`57`	`+ let ptr = unsafe { x.assume_init_ref() };`
`58`	`58`	`assert_eq!(ptr.1, 1);`
`59`	`59`	`}`
`60`	`60`