From 38825674b2fcf43cf147ab752da3d5762759ba78 Mon Sep 17 00:00:00 2001
From: Ariel Ben-Yehuda <ariel.byd@gmail.com>
Date: Mon, 3 Dec 2018 23:27:22 +0200
Subject: [PATCH] add the ORDER_DEPENDENT_TRAIT_OBJECTS lint

---
 src/librustc/lint/builtin.rs | 8 ++++++++
 src/librustc_lint/lib.rs     | 5 +++++
 2 files changed, 13 insertions(+)

diff --git a/src/librustc/lint/builtin.rs b/src/librustc/lint/builtin.rs
index b7759a8c92b0..cf7b07170ace 100644
--- a/src/librustc/lint/builtin.rs
+++ b/src/librustc/lint/builtin.rs
@@ -208,6 +208,13 @@ declare_lint! {
     "potentially-conflicting impls were erroneously allowed"
 }
 
+declare_lint! {
+    pub ORDER_DEPENDENT_TRAIT_OBJECTS,
+    Deny,
+    // FIXME: ENG
+    "trait-object types are different depending on marker-trait order"
+}
+
 declare_lint! {
     pub BAD_REPR,
     Warn,
@@ -405,6 +412,7 @@ impl LintPass for HardwiredLints {
             PARENTHESIZED_PARAMS_IN_TYPES_AND_MODULES,
             LATE_BOUND_LIFETIME_ARGUMENTS,
             INCOHERENT_FUNDAMENTAL_IMPLS,
+            ORDER_DEPENDENT_TRAIT_OBJECTS,
             DEPRECATED,
             UNUSED_UNSAFE,
             UNUSED_MUT,
diff --git a/src/librustc_lint/lib.rs b/src/librustc_lint/lib.rs
index b1e44ea761c8..e12f05275fba 100644
--- a/src/librustc_lint/lib.rs
+++ b/src/librustc_lint/lib.rs
@@ -293,6 +293,11 @@ pub fn register_builtins(store: &mut lint::LintStore, sess: Option<&Session>) {
             reference: "issue #46205 <https://github.com/rust-lang/rust/issues/46205>",
             edition: None,
         },
+        FutureIncompatibleInfo {
+            id: LintId::of(ORDER_DEPENDENT_TRAIT_OBJECTS),
+            reference: "issue #33140 <https://github.com/rust-lang/rust/issues/33140>",
+            edition: None,
+        },
         FutureIncompatibleInfo {
             id: LintId::of(TYVAR_BEHIND_RAW_POINTER),
             reference: "issue #46906 <https://github.com/rust-lang/rust/issues/46906>",