Rustup to rustc 1.30.0-nightly (2ab3eba30 2018-09-14)

diff --git a/Cargo.toml b/Cargo.toml
index 5a3da6179bef45d292edc51345c91f4de6ceb3d6..89fe97f05ecdb42b2646e139daac616f9c9902e6 100644 (file)
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,5 +1,3 @@
-cargo-features = ["edition"]
-
 [package]
 name = "rustc_codegen_cranelift"
 version = "0.1.0"

diff --git a/src/abi.rs b/src/abi.rs
index 8ae0136d00c529aa3dd0371cc4431876946fc441..bc61ba5a70897f2ba212253f91cdd2d30f1b566e 100644 (file)
--- a/src/abi.rs
+++ b/src/abi.rs
@@ -33,7 +33,7 @@ fn get_pass_mode<'a, 'tcx: 'a>(
             .unwrap()
             .is_unsized()
     );
-    if ty.sty == tcx.mk_nil().sty {
+    if ty.sty == tcx.mk_unit().sty {
         if is_return {
             //if false {
             PassMode::NoPass
@@ -609,7 +609,7 @@ fn codegen_intrinsic_call<'a, 'tcx: 'a>(
                 }
             };
 
-            let nil_ty = fx.tcx.mk_nil();
+            let nil_ty = fx.tcx.mk_unit();
             let u64_layout = fx.layout_of(fx.tcx.types.u64);
             let usize_layout = fx.layout_of(fx.tcx.types.usize);