From 700ac84eae77e95bbc6e8276a4f4ad102d6e83e5 Mon Sep 17 00:00:00 2001
From: Camille GILLOT <gillot.camille@gmail.com>
Date: Tue, 7 Jan 2020 19:36:50 +0100
Subject: [PATCH] Rename traits::drop -> traits::misc.

---
 src/librustc/traits/{drop.rs => misc.rs} | 0
 src/librustc/traits/mod.rs               | 4 ++--
 src/librustc_lint/builtin.rs             | 2 +-
 src/librustc_passes/stability.rs         | 2 +-
 src/librustc_typeck/coherence/builtin.rs | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)
 rename src/librustc/traits/{drop.rs => misc.rs} (100%)

diff --git a/src/librustc/traits/drop.rs b/src/librustc/traits/misc.rs
similarity index 100%
rename from src/librustc/traits/drop.rs
rename to src/librustc/traits/misc.rs
diff --git a/src/librustc/traits/mod.rs b/src/librustc/traits/mod.rs
index 11473dc2a3a6..2d3160dc3e51 100644
--- a/src/librustc/traits/mod.rs
+++ b/src/librustc/traits/mod.rs
@@ -7,10 +7,10 @@
 mod chalk_fulfill;
 pub mod codegen;
 mod coherence;
-pub mod drop;
 mod engine;
 pub mod error_reporting;
 mod fulfill;
+pub mod misc;
 mod object_safety;
 mod on_unimplemented;
 mod project;
@@ -1244,7 +1244,7 @@ fn self_ty(&self) -> ty::Binder<Ty<'tcx>> {
 }
 
 pub fn provide(providers: &mut ty::query::Providers<'_>) {
-    drop::provide(providers);
+    misc::provide(providers);
     *providers = ty::query::Providers {
         is_object_safe: object_safety::is_object_safe_provider,
         specialization_graph_of: specialize::specialization_graph_provider,
diff --git a/src/librustc_lint/builtin.rs b/src/librustc_lint/builtin.rs
index e251e6d6aea7..c2e20d5cf758 100644
--- a/src/librustc_lint/builtin.rs
+++ b/src/librustc_lint/builtin.rs
@@ -27,7 +27,7 @@
 use lint::{LateContext, LintArray, LintContext};
 use rustc::lint;
 use rustc::lint::FutureIncompatibleInfo;
-use rustc::traits::drop::can_type_implement_copy;
+use rustc::traits::misc::can_type_implement_copy;
 use rustc::ty::{self, layout::VariantIdx, Ty, TyCtxt};
 use rustc_data_structures::fx::FxHashSet;
 use rustc_feature::Stability;
diff --git a/src/librustc_passes/stability.rs b/src/librustc_passes/stability.rs
index 35ef7ec148fe..68e2bc532614 100644
--- a/src/librustc_passes/stability.rs
+++ b/src/librustc_passes/stability.rs
@@ -6,7 +6,7 @@
 use rustc::middle::privacy::AccessLevels;
 use rustc::middle::stability::{DeprecationEntry, Index};
 use rustc::session::Session;
-use rustc::traits::drop::can_type_implement_copy;
+use rustc::traits::misc::can_type_implement_copy;
 use rustc::ty::query::Providers;
 use rustc::ty::TyCtxt;
 use rustc_data_structures::fx::{FxHashMap, FxHashSet};
diff --git a/src/librustc_typeck/coherence/builtin.rs b/src/librustc_typeck/coherence/builtin.rs
index 1bb512e350a6..eb1ea679040a 100644
--- a/src/librustc_typeck/coherence/builtin.rs
+++ b/src/librustc_typeck/coherence/builtin.rs
@@ -7,7 +7,7 @@
 use rustc::middle::region;
 
 use rustc::infer;
-use rustc::traits::drop::{can_type_implement_copy, CopyImplementationError};
+use rustc::traits::misc::{can_type_implement_copy, CopyImplementationError};
 use rustc::traits::predicate_for_trait_def;
 use rustc::traits::{self, ObligationCause, TraitEngine};
 use rustc::ty::adjustment::CoerceUnsizedInfo;