From 310f4707e59f696814e0e800be0b5ec6e81353d5 Mon Sep 17 00:00:00 2001 From: Camille GILLOT Date: Wed, 19 Feb 2020 17:59:24 +0100 Subject: [PATCH] Make is_object_safe a method. --- src/librustc/query/mod.rs | 3 --- src/librustc/ty/mod.rs | 4 ++++ src/librustc_incremental/persist/dirty_clean.rs | 2 +- src/librustc_infer/traits/object_safety.rs | 6 +----- 4 files changed, 6 insertions(+), 9 deletions(-) diff --git a/src/librustc/query/mod.rs b/src/librustc/query/mod.rs index df08501f007..8c40c28bb47 100644 --- a/src/librustc/query/mod.rs +++ b/src/librustc/query/mod.rs @@ -653,9 +653,6 @@ rustc_queries! { desc { |tcx| "building specialization graph of trait `{}`", tcx.def_path_str(key) } cache_on_disk_if { true } } - query is_object_safe(key: DefId) -> bool { - desc { |tcx| "determine object safety of trait `{}`", tcx.def_path_str(key) } - } query object_safety_violations(key: DefId) -> Vec { desc { |tcx| "determine object safety of trait `{}`", tcx.def_path_str(key) } } diff --git a/src/librustc/ty/mod.rs b/src/librustc/ty/mod.rs index 45ea05efd4a..b76c637e3f1 100644 --- a/src/librustc/ty/mod.rs +++ b/src/librustc/ty/mod.rs @@ -2998,6 +2998,10 @@ impl<'tcx> TyCtxt<'tcx> { }; (ident, scope) } + + pub fn is_object_safe(self, key: DefId) -> bool { + self.object_safety_violations(key).is_empty() + } } #[derive(Clone, HashStable)] diff --git a/src/librustc_incremental/persist/dirty_clean.rs b/src/librustc_incremental/persist/dirty_clean.rs index c5e74868bda..1fa57f1ecf2 100644 --- a/src/librustc_incremental/persist/dirty_clean.rs +++ b/src/librustc_incremental/persist/dirty_clean.rs @@ -78,7 +78,7 @@ const BASE_STRUCT: &[&str] = const BASE_TRAIT_DEF: &[&str] = &[ label_strs::associated_item_def_ids, label_strs::generics_of, - label_strs::is_object_safe, + label_strs::object_safety_violations, label_strs::predicates_of, label_strs::specialization_graph_of, label_strs::trait_def, diff --git a/src/librustc_infer/traits/object_safety.rs b/src/librustc_infer/traits/object_safety.rs index f409c22831f..f2770720346 100644 --- a/src/librustc_infer/traits/object_safety.rs +++ b/src/librustc_infer/traits/object_safety.rs @@ -772,10 +772,6 @@ fn contains_illegal_self_type_reference<'tcx>( error } -fn is_object_safe(tcx: TyCtxt<'_>, trait_def_id: DefId) -> bool { - tcx.object_safety_violations(trait_def_id).is_empty() -} - pub fn provide(providers: &mut ty::query::Providers<'_>) { - *providers = ty::query::Providers { is_object_safe, object_safety_violations, ..*providers }; + *providers = ty::query::Providers { object_safety_violations, ..*providers }; }