From 2f7edccb036ee4c6a63664b622d9355ef594979f Mon Sep 17 00:00:00 2001
From: Oliver Schneider <github35764891676564198441@oli-obk.de>
Date: Sat, 21 Jul 2018 12:36:18 +0200
Subject: [PATCH] Don't invent new magic keywords

---
 src/librustc/lint/builtin.rs | 4 ++--
 src/librustc/lint/mod.rs     | 4 ++--
 src/tools/clippy             | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/librustc/lint/builtin.rs b/src/librustc/lint/builtin.rs
index 430e06ecbdf..0ab10bf223f 100644
--- a/src/librustc/lint/builtin.rs
+++ b/src/librustc/lint/builtin.rs
@@ -78,7 +78,7 @@
     pub UNREACHABLE_CODE,
     Warn,
     "detects unreachable code paths",
-    report_in_external_macro
+    report_in_external_macro: true
 }
 
 declare_lint! {
@@ -218,7 +218,7 @@
     pub DEPRECATED,
     Warn,
     "detects use of deprecated items",
-    report_in_external_macro
+    report_in_external_macro: true
 }
 
 declare_lint! {
diff --git a/src/librustc/lint/mod.rs b/src/librustc/lint/mod.rs
index 6fa6c31c742..8161dcf675d 100644
--- a/src/librustc/lint/mod.rs
+++ b/src/librustc/lint/mod.rs
@@ -105,8 +105,8 @@ macro_rules! declare_lint {
     ($vis: vis $NAME: ident, $Level: ident, $desc: expr) => (
         declare_lint!{$vis $NAME, $Level, $desc, false}
     );
-    ($vis: vis $NAME: ident, $Level: ident, $desc: expr, report_in_external_macro) => (
-        declare_lint!{$vis $NAME, $Level, $desc, true}
+    ($vis: vis $NAME: ident, $Level: ident, $desc: expr, report_in_external_macro: $rep: expr) => (
+        declare_lint!{$vis $NAME, $Level, $desc, $rep}
     );
     ($vis: vis $NAME: ident, $Level: ident, $desc: expr, $external: expr) => (
         $vis static $NAME: &$crate::lint::Lint = &$crate::lint::Lint {
diff --git a/src/tools/clippy b/src/tools/clippy
index 2fa85d86e0c..8085ed733fe 160000
--- a/src/tools/clippy
+++ b/src/tools/clippy
@@ -1 +1 @@
-Subproject commit 2fa85d86e0cbd5fc0c17d1cbcca2005454b86cd4
+Subproject commit 8085ed733fefeaf37aca0a39da93344326de5d57
-- 
2.44.0