From e6a677fe63286dac484714282da7bb873dd2dbd3 Mon Sep 17 00:00:00 2001
From: Lzu Tao <taolzu@gmail.com>
Date: Wed, 24 Jul 2019 21:24:26 +0700
Subject: [PATCH] build: Warn if not use 2018 idioms

---
 src/eval.rs            | 2 +-
 src/lib.rs             | 1 +
 src/stacked_borrows.rs | 8 ++++----
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/eval.rs b/src/eval.rs
index 83307c99f9c5..e688d3594718 100644
--- 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 20c24ad54fe8..0265fbf15cc5 100644
--- 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/stacked_borrows.rs b/src/stacked_borrows.rs
index 90656180150f..0fe42f7974fb 100644
--- 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)"),