about summary refs log tree commit diff
diff options
context:
space:
mode:
-rwxr-xr-xsrc/tools/miri/miri2
-rw-r--r--src/tools/miri/src/shims/unix/linux/fd/epoll.rs2
-rw-r--r--src/tools/miri/src/shims/unix/linux/fd/event.rs2
-rw-r--r--src/tools/miri/src/shims/unix/linux/fd/socketpair.rs2
4 files changed, 4 insertions, 4 deletions
diff --git a/src/tools/miri/miri b/src/tools/miri/miri
index a259576ed42..0c0bbbc7020 100755
--- a/src/tools/miri/miri
+++ b/src/tools/miri/miri
@@ -243,7 +243,7 @@ if [ -z "$CARGO_PROFILE_DEV_OPT_LEVEL" ]; then
     export CARGO_PROFILE_DEV_OPT_LEVEL=2
 fi
 # Enable rustc-specific lints (ignored without `-Zunstable-options`).
-export RUSTFLAGS="-Zunstable-options -Wrustc::internal $RUSTFLAGS"
+export RUSTFLAGS="-Zunstable-options -Wrustc::internal -Wrust_2018_idioms -Wunused_lifetimes -Wsemicolon_in_expressions_from_macros $RUSTFLAGS"
 # We set the rpath so that Miri finds the private rustc libraries it needs.
 export RUSTFLAGS="-C link-args=-Wl,-rpath,$LIBDIR $RUSTFLAGS"
 
diff --git a/src/tools/miri/src/shims/unix/linux/fd/epoll.rs b/src/tools/miri/src/shims/unix/linux/fd/epoll.rs
index eb86773e6b6..e33673fecf6 100644
--- a/src/tools/miri/src/shims/unix/linux/fd/epoll.rs
+++ b/src/tools/miri/src/shims/unix/linux/fd/epoll.rs
@@ -36,7 +36,7 @@ impl FileDescriptor for Epoll {
         Ok(self)
     }
 
-    fn dup<'tcx>(&mut self) -> io::Result<Box<dyn FileDescriptor>> {
+    fn dup(&mut self) -> io::Result<Box<dyn FileDescriptor>> {
         Ok(Box::new(self.clone()))
     }
 
diff --git a/src/tools/miri/src/shims/unix/linux/fd/event.rs b/src/tools/miri/src/shims/unix/linux/fd/event.rs
index e87ff56bee3..239eb462a1d 100644
--- a/src/tools/miri/src/shims/unix/linux/fd/event.rs
+++ b/src/tools/miri/src/shims/unix/linux/fd/event.rs
@@ -21,7 +21,7 @@ impl FileDescriptor for Event {
         "event"
     }
 
-    fn dup<'tcx>(&mut self) -> io::Result<Box<dyn FileDescriptor>> {
+    fn dup(&mut self) -> io::Result<Box<dyn FileDescriptor>> {
         Ok(Box::new(Event { val: self.val }))
     }
 
diff --git a/src/tools/miri/src/shims/unix/linux/fd/socketpair.rs b/src/tools/miri/src/shims/unix/linux/fd/socketpair.rs
index 036d3a2e31e..f9e56b4a2b4 100644
--- a/src/tools/miri/src/shims/unix/linux/fd/socketpair.rs
+++ b/src/tools/miri/src/shims/unix/linux/fd/socketpair.rs
@@ -15,7 +15,7 @@ impl FileDescriptor for SocketPair {
         "socketpair"
     }
 
-    fn dup<'tcx>(&mut self) -> io::Result<Box<dyn FileDescriptor>> {
+    fn dup(&mut self) -> io::Result<Box<dyn FileDescriptor>> {
         Ok(Box::new(SocketPair))
     }