Auto merge of #853 - RalfJung:readme, r=RalfJung

readme: move flags and env vars up above dev

diff --git a/rust-version b/rust-version
index b247139d09b3657b355c148ead2438c64dfc99e5..973a5105980c8e767272389aafb8174a0a4b8c6e 100644 (file)
--- a/rust-version
+++ b/rust-version
@@ -1 +1 @@
-1301422a6c2e8916560b8cc2f0564f38d8858a75
+a7f28678bbf4e16893bb6a718e427504167a9494

diff --git a/src/eval.rs b/src/eval.rs
index 83307c99f9c59bb7a166aebddc1a449b1a893e17..e688d3594718607f8d0ac89c5bc40d5f8665d2c3 100644 (file)
--- a/src/eval.rs
+++ b/src/eval.rs
@@ -179,7 +179,7 @@ pub fn eval_main<'tcx>(
     };
 
     // Perform the main execution.
-    let res: InterpResult = (|| {
+    let res: InterpResult<'_> = (|| {
         ecx.run()?;
         ecx.run_tls_dtors()
     })();

diff --git a/src/lib.rs b/src/lib.rs
index 20c24ad54fe846a62b4fd89fd3963b3c53f3d576..0265fbf15cc5b5af3befd07fe4d7facbdf17464a 100644 (file)
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -1,5 +1,6 @@
 #![feature(rustc_private)]
 
+#![warn(rust_2018_idioms)]
 #![allow(clippy::cast_lossless)]
 
 #[macro_use]

diff --git a/src/operator.rs b/src/operator.rs
index 5eeed5eac635d14e75cd6833bc883466d8271fa3..1ce485682c770df2b681660aea927dc2a54184d6 100644 (file)
--- a/src/operator.rs
+++ b/src/operator.rs
@@ -64,12 +64,12 @@ fn ptr_op(
             assert!(right.layout.ty.is_integral());
             let l_bits = self.force_bits(left.imm.to_scalar()?, left.layout.size)?;
             let r_bits = self.force_bits(right.imm.to_scalar()?, right.layout.size)?;
-            
+
             let left = ImmTy::from_scalar(Scalar::from_uint(l_bits, left.layout.size), left.layout);
             let right = ImmTy::from_scalar(Scalar::from_uint(r_bits, left.layout.size), right.layout);
 
             return self.binary_op(bin_op, left, right);
-        } 
+        }
 
         // Operations that support fat pointers
         match bin_op {
@@ -298,11 +298,12 @@ fn pointer_offset_inbounds(
         pointee_ty: Ty<'tcx>,
         offset: i64,
     ) -> InterpResult<'tcx, Scalar<Tag>> {
+        use rustc::mir::interpret::InterpError::Panic;
         // FIXME: assuming here that type size is less than `i64::max_value()`.
         let pointee_size = self.layout_of(pointee_ty)?.size.bytes() as i64;
         let offset = offset
             .checked_mul(pointee_size)
-            .ok_or_else(|| InterpError::Overflow(mir::BinOp::Mul))?;
+            .ok_or_else(|| Panic(PanicMessage::Overflow(mir::BinOp::Mul)))?;
         // Now let's see what kind of pointer this is.
         let ptr = if offset == 0 {
             match ptr {

diff --git a/src/shims/foreign_items.rs b/src/shims/foreign_items.rs
index 1deaf521ca66fe63dfb166b03082f6eb7b19fbe0..bcfcda2fd01c57d72e77307fa10c42cfce4e35a5 100644 (file)
--- a/src/shims/foreign_items.rs
+++ b/src/shims/foreign_items.rs
@@ -128,6 +128,7 @@ fn emulate_foreign_item(
         dest: Option<PlaceTy<'tcx, Tag>>,
         ret: Option<mir::BasicBlock>,
     ) -> InterpResult<'tcx> {
+        use rustc::mir::interpret::InterpError::Panic;
         let this = self.eval_context_mut();
         let attrs = this.tcx.get_attrs(def_id);
         let link_name = match attr::first_attr_value_str_by_name(&attrs, sym::link_name) {
@@ -167,7 +168,7 @@ fn emulate_foreign_item(
             "calloc" => {
                 let items = this.read_scalar(args[0])?.to_usize(this)?;
                 let len = this.read_scalar(args[1])?.to_usize(this)?;
-                let size = items.checked_mul(len).ok_or_else(|| InterpError::Overflow(mir::BinOp::Mul))?;
+                let size = items.checked_mul(len).ok_or_else(|| Panic(PanicMessage::Overflow(mir::BinOp::Mul)))?;
                 let res = this.malloc(size, /*zero_init:*/ true, MiriMemoryKind::C);
                 this.write_scalar(res, dest)?;
             }

diff --git a/src/stacked_borrows.rs b/src/stacked_borrows.rs
index 90656180150f18ea2d39ac5a1fafc16509be27b7..0fe42f7974fbdc0a9ccadaf9810f4fdcfb432c6e 100644 (file)
--- a/src/stacked_borrows.rs
+++ b/src/stacked_borrows.rs
@@ -28,7 +28,7 @@ pub enum Tag {
 }
 
 impl fmt::Debug for Tag {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         match self {
             Tag::Tagged(id) => write!(f, "<{}>", id),
             Tag::Untagged => write!(f, "<untagged>"),
@@ -62,7 +62,7 @@ pub struct Item {
 }
 
 impl fmt::Debug for Item {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         write!(f, "[{:?} for {:?}", self.perm, self.tag)?;
         if let Some(call) = self.protector {
             write!(f, " (call {})", call)?;
@@ -117,7 +117,7 @@ pub enum AccessKind {
 }
 
 impl fmt::Display for AccessKind {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         match self {
             AccessKind::Read => write!(f, "read access"),
             AccessKind::Write => write!(f, "write access"),
@@ -139,7 +139,7 @@ pub enum RefKind {
 }
 
 impl fmt::Display for RefKind {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         match self {
             RefKind::Unique { two_phase: false } => write!(f, "unique"),
             RefKind::Unique { two_phase: true } => write!(f, "unique (two-phase)"),