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

bors · bors · commit c65fbc49d7b9 · 2019-06-22T09:49:32.000Z
fix compilation with latest rustc
diff --git a/rust-version b/rust-version
@@ -1 +1 @@
-56a12b2ad058f22f1ef090713df15598525ba4a4
+305930cffeac1da0fd73a08d9f5680e4a49bfb9f
diff --git a/src/intrinsic.rs b/src/intrinsic.rs
@@ -505,7 +505,7 @@ pub trait EvalContextExt<'mir, 'tcx: 'mir>: crate::MiriEvalContextExt<'mir, 'tcx
                             let ptr = mplace.ptr.to_ptr()?;
                             this.memory_mut()
                                 .get_mut(ptr.alloc_id)?
-                                .mark_definedness(ptr, dest.layout.size, false)?;
+                                .mark_definedness(ptr, dest.layout.size, false);
                         }
                     }
                 }

Original file line number	Diff line number	Diff line change
`@@ -505,7 +505,7 @@ pub trait EvalContextExt<'mir, 'tcx: 'mir>: crate::MiriEvalContextExt<'mir, 'tcx`
`505`	`505`	`let ptr = mplace.ptr.to_ptr()?;`
`506`	`506`	`this.memory_mut()`
`507`	`507`	`.get_mut(ptr.alloc_id)?`
`508`		`- .mark_definedness(ptr, dest.layout.size, false)?;`
	`508`	`+ .mark_definedness(ptr, dest.layout.size, false);`
`509`	`509`	`}`
`510`	`510`	`}`
`511`	`511`	`}`