diff options
| -rw-r--r-- | src/librustc/traits/misc.rs (renamed from src/librustc/traits/drop.rs) | 0 | ||||
| -rw-r--r-- | src/librustc/traits/mod.rs | 4 | ||||
| -rw-r--r-- | src/librustc_lint/builtin.rs | 2 | ||||
| -rw-r--r-- | src/librustc_passes/stability.rs | 2 | ||||
| -rw-r--r-- | src/librustc_typeck/coherence/builtin.rs | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/src/librustc/traits/drop.rs b/src/librustc/traits/misc.rs index 08c3a77bf3a..08c3a77bf3a 100644 --- a/src/librustc/traits/drop.rs +++ b/src/librustc/traits/misc.rs diff --git a/src/librustc/traits/mod.rs b/src/librustc/traits/mod.rs index 11473dc2a3a..2d3160dc3e5 100644 --- a/src/librustc/traits/mod.rs +++ b/src/librustc/traits/mod.rs @@ -7,10 +7,10 @@ pub mod auto_trait; 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 @@ impl<'tcx> TraitObligation<'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 e251e6d6aea..c2e20d5cf75 100644 --- a/src/librustc_lint/builtin.rs +++ b/src/librustc_lint/builtin.rs @@ -27,7 +27,7 @@ use lint::{EarlyContext, EarlyLintPass, LateLintPass, LintPass}; 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 35ef7ec148f..68e2bc53261 100644 --- a/src/librustc_passes/stability.rs +++ b/src/librustc_passes/stability.rs @@ -6,7 +6,7 @@ use rustc::lint; 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 1bb512e350a..eb1ea679040 100644 --- a/src/librustc_typeck/coherence/builtin.rs +++ b/src/librustc_typeck/coherence/builtin.rs @@ -7,7 +7,7 @@ use rustc::middle::lang_items::UnsizeTraitLangItem; 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; |
