diff --git a/rust-toolchain b/rust-toolchain
index cd37a8d267e..876125317a9 100644
--- a/rust-toolchain
+++ b/rust-toolchain
@@ -1 +1 @@
-nightly-2020-03-31
+nightly-2020-04-02
diff --git a/src/constant.rs b/src/constant.rs
index 1d98404c75f..f94ccae8185 100644
--- a/src/constant.rs
+++ b/src/constant.rs
@@ -171,7 +171,6 @@ fn trans_const_place<'tcx>(
         );
         ecx.push_stack_frame(
             fx.instance,
-            DUMMY_SP,
             fx.mir,
             None,
             StackPopCleanup::None { cleanup: false },
@@ -412,7 +411,6 @@ impl<'mir, 'tcx> Machine<'mir, 'tcx> for TransPlaceInterpreter {
 
     fn find_mir_or_eval_fn(
         _: &mut InterpCx<'mir, 'tcx, Self>,
-        _: Span,
         _: Instance<'tcx>,
         _: &[OpTy<'tcx>],
         _: Option<(PlaceTy<'tcx>, BasicBlock)>,
@@ -423,7 +421,6 @@ impl<'mir, 'tcx> Machine<'mir, 'tcx> for TransPlaceInterpreter {
 
     fn call_intrinsic(
         _: &mut InterpCx<'mir, 'tcx, Self>,
-        _: Span,
         _: Instance<'tcx>,
         _: &[OpTy<'tcx>],
         _: Option<(PlaceTy<'tcx>, BasicBlock)>,
diff --git a/src/intrinsics/mod.rs b/src/intrinsics/mod.rs
index feacb3e6e9e..e5a1e218825 100644
--- a/src/intrinsics/mod.rs
+++ b/src/intrinsics/mod.rs
@@ -144,7 +144,7 @@ fn lane_type_and_count<'tcx>(
 ) -> (TyAndLayout<'tcx>, u16) {
     assert!(layout.ty.is_simd());
     let lane_count = match layout.fields {
-        layout::FieldPlacement::Array { stride: _, count } => u16::try_from(count).unwrap(),
+        layout::FieldsShape::Array { stride: _, count } => u16::try_from(count).unwrap(),
         _ => unreachable!("lane_type_and_count({:?})", layout),
     };
     let lane_layout = layout.field(&ty::layout::LayoutCx {