From f0141eb89f43b24bfc78697201b190a2a4624677 Mon Sep 17 00:00:00 2001 From: Eduard-Mihai Burtescu Date: Mon, 13 Jul 2020 00:42:39 +0300 Subject: [PATCH] Compute `query::Providers` almost entirely at compile-time. --- src/librustc_codegen_llvm/attributes.rs | 4 +- src/librustc_codegen_llvm/lib.rs | 2 + .../back/symbol_export.rs | 4 +- src/librustc_codegen_ssa/base.rs | 2 +- src/librustc_codegen_ssa/lib.rs | 6 +- src/librustc_interface/lib.rs | 3 + src/librustc_interface/passes.rs | 74 ++++++++++++------- src/librustc_interface/proc_macro_decls.rs | 2 +- src/librustc_lint/levels.rs | 2 +- src/librustc_lint/lib.rs | 4 +- src/librustc_metadata/lib.rs | 2 + .../rmeta/decoder/cstore_impl.rs | 4 +- src/librustc_middle/hir/map/mod.rs | 2 +- src/librustc_middle/hir/mod.rs | 2 +- src/librustc_middle/lib.rs | 1 + src/librustc_middle/ty/context.rs | 2 +- src/librustc_middle/ty/erase_regions.rs | 2 +- src/librustc_middle/ty/layout.rs | 2 +- src/librustc_middle/ty/mod.rs | 2 +- src/librustc_middle/ty/query/plumbing.rs | 16 ++-- src/librustc_middle/util/bug.rs | 2 +- src/librustc_mir/borrow_check/mod.rs | 2 +- src/librustc_mir/const_eval/fn_queries.rs | 2 +- src/librustc_mir/lib.rs | 3 +- src/librustc_mir/monomorphize/partitioning.rs | 2 +- src/librustc_mir/shim.rs | 2 +- src/librustc_mir/transform/check_unsafety.rs | 2 +- .../transform/instrument_coverage.rs | 2 +- src/librustc_mir/transform/mod.rs | 2 +- src/librustc_mir_build/lib.rs | 5 +- src/librustc_passes/check_attr.rs | 2 +- src/librustc_passes/check_const.rs | 2 +- src/librustc_passes/diagnostic_items.rs | 2 +- src/librustc_passes/entry.rs | 2 +- src/librustc_passes/intrinsicck.rs | 2 +- src/librustc_passes/lang_items.rs | 2 +- src/librustc_passes/lib.rs | 4 +- src/librustc_passes/lib_features.rs | 2 +- src/librustc_passes/liveness.rs | 2 +- src/librustc_passes/loops.rs | 2 +- src/librustc_passes/reachable.rs | 2 +- src/librustc_passes/region.rs | 2 +- src/librustc_passes/stability.rs | 2 +- src/librustc_passes/upvars.rs | 2 +- src/librustc_plugin_impl/build.rs | 2 +- src/librustc_plugin_impl/lib.rs | 2 + src/librustc_privacy/lib.rs | 4 +- src/librustc_resolve/late/lifetimes.rs | 2 +- src/librustc_resolve/lib.rs | 4 +- src/librustc_symbol_mangling/lib.rs | 4 +- src/librustc_trait_selection/lib.rs | 2 + src/librustc_trait_selection/traits/mod.rs | 2 +- .../traits/object_safety.rs | 2 +- .../traits/structural_match.rs | 2 +- src/librustc_traits/chalk/mod.rs | 2 +- src/librustc_traits/dropck_outlives.rs | 2 +- src/librustc_traits/evaluate_obligation.rs | 2 +- .../implied_outlives_bounds.rs | 2 +- src/librustc_traits/lib.rs | 4 +- .../normalize_erasing_regions.rs | 2 +- .../normalize_projection_ty.rs | 2 +- src/librustc_traits/type_op.rs | 2 +- src/librustc_ty/common_traits.rs | 2 +- src/librustc_ty/instance.rs | 2 +- src/librustc_ty/lib.rs | 4 +- src/librustc_ty/needs_drop.rs | 2 +- src/librustc_ty/ty.rs | 2 +- src/librustc_typeck/check/method/mod.rs | 2 +- src/librustc_typeck/check/method/probe.rs | 2 +- src/librustc_typeck/check/method/suggest.rs | 2 +- src/librustc_typeck/check/mod.rs | 2 +- src/librustc_typeck/coherence/mod.rs | 2 +- src/librustc_typeck/collect.rs | 2 +- src/librustc_typeck/impl_wf_check.rs | 2 +- src/librustc_typeck/lib.rs | 4 +- src/librustc_typeck/outlives/mod.rs | 2 +- src/librustc_typeck/variance/mod.rs | 2 +- 77 files changed, 160 insertions(+), 110 deletions(-) diff --git a/src/librustc_codegen_llvm/attributes.rs b/src/librustc_codegen_llvm/attributes.rs index 89b548a9c5ab2..9fc8c6079478b 100644 --- a/src/librustc_codegen_llvm/attributes.rs +++ b/src/librustc_codegen_llvm/attributes.rs @@ -342,7 +342,7 @@ pub fn from_fn_attrs(cx: &CodegenCx<'ll, 'tcx>, llfn: &'ll Value, instance: ty:: } } -pub fn provide(providers: &mut Providers) { +pub const fn provide(providers: &mut Providers) { providers.supported_target_features = |tcx, cnum| { assert_eq!(cnum, LOCAL_CRATE); if tcx.sess.opts.actually_rustdoc { @@ -360,7 +360,7 @@ pub fn provide(providers: &mut Providers) { provide_extern(providers); } -pub fn provide_extern(providers: &mut Providers) { +pub const fn provide_extern(providers: &mut Providers) { providers.wasm_import_module_map = |tcx, cnum| { // Build up a map from DefId to a `NativeLib` structure, where // `NativeLib` internally contains information about diff --git a/src/librustc_codegen_llvm/lib.rs b/src/librustc_codegen_llvm/lib.rs index 67d4b2642c058..790cea7a726e7 100644 --- a/src/librustc_codegen_llvm/lib.rs +++ b/src/librustc_codegen_llvm/lib.rs @@ -7,6 +7,8 @@ #![doc(html_root_url = "https://doc.rust-lang.org/nightly/")] #![feature(bool_to_option)] #![feature(const_cstr_unchecked)] +#![feature(const_fn)] +#![feature(const_mut_refs)] #![feature(crate_visibility_modifier)] #![feature(extern_types)] #![feature(in_band_lifetimes)] diff --git a/src/librustc_codegen_ssa/back/symbol_export.rs b/src/librustc_codegen_ssa/back/symbol_export.rs index 2efbfcb995027..1874f1006e847 100644 --- a/src/librustc_codegen_ssa/back/symbol_export.rs +++ b/src/librustc_codegen_ssa/back/symbol_export.rs @@ -366,7 +366,7 @@ fn is_unreachable_local_definition_provider(tcx: TyCtxt<'_>, def_id: DefId) -> b } } -pub fn provide(providers: &mut Providers) { +pub const fn provide(providers: &mut Providers) { providers.reachable_non_generics = reachable_non_generics_provider; providers.is_reachable_non_generic = is_reachable_non_generic_provider_local; providers.exported_symbols = exported_symbols_provider_local; @@ -375,7 +375,7 @@ pub fn provide(providers: &mut Providers) { providers.upstream_drop_glue_for = upstream_drop_glue_for_provider; } -pub fn provide_extern(providers: &mut Providers) { +pub const fn provide_extern(providers: &mut Providers) { providers.is_reachable_non_generic = is_reachable_non_generic_provider_extern; providers.upstream_monomorphizations_for = upstream_monomorphizations_for_provider; } diff --git a/src/librustc_codegen_ssa/base.rs b/src/librustc_codegen_ssa/base.rs index b28cb071de659..7b38ce5160fc6 100644 --- a/src/librustc_codegen_ssa/base.rs +++ b/src/librustc_codegen_ssa/base.rs @@ -852,7 +852,7 @@ impl CrateInfo { } } -pub fn provide_both(providers: &mut Providers) { +pub const fn provide_both(providers: &mut Providers) { providers.backend_optimization_level = |tcx, cratenum| { let for_speed = match tcx.sess.opts.optimize { // If globally no optimisation is done, #[optimize] has no effect. diff --git a/src/librustc_codegen_ssa/lib.rs b/src/librustc_codegen_ssa/lib.rs index bdd73c0831352..d78b63f355653 100644 --- a/src/librustc_codegen_ssa/lib.rs +++ b/src/librustc_codegen_ssa/lib.rs @@ -1,6 +1,8 @@ #![doc(html_root_url = "https://doc.rust-lang.org/nightly/")] #![feature(bool_to_option)] #![feature(box_patterns)] +#![feature(const_fn)] +#![feature(const_mut_refs)] #![feature(try_blocks)] #![feature(in_band_lifetimes)] #![feature(nll)] @@ -138,12 +140,12 @@ pub struct CodegenResults { pub crate_info: CrateInfo, } -pub fn provide(providers: &mut Providers) { +pub const fn provide(providers: &mut Providers) { crate::back::symbol_export::provide(providers); crate::base::provide_both(providers); } -pub fn provide_extern(providers: &mut Providers) { +pub const fn provide_extern(providers: &mut Providers) { crate::back::symbol_export::provide_extern(providers); crate::base::provide_both(providers); } diff --git a/src/librustc_interface/lib.rs b/src/librustc_interface/lib.rs index 0650d09003486..bde4194a7eccc 100644 --- a/src/librustc_interface/lib.rs +++ b/src/librustc_interface/lib.rs @@ -1,5 +1,7 @@ #![feature(bool_to_option)] #![feature(box_syntax)] +#![feature(const_fn)] +#![feature(const_mut_refs)] #![feature(set_stdio)] #![feature(nll)] #![feature(generator_trait)] @@ -14,6 +16,7 @@ mod queries; pub mod util; pub use interface::{run_compiler, Config}; +pub use passes::{DEFAULT_EXTERN_QUERY_PROVIDERS, DEFAULT_QUERY_PROVIDERS}; pub use queries::Queries; #[cfg(test)] diff --git a/src/librustc_interface/passes.rs b/src/librustc_interface/passes.rs index 6d85c2f182544..345b65cbaf6ec 100644 --- a/src/librustc_interface/passes.rs +++ b/src/librustc_interface/passes.rs @@ -19,6 +19,7 @@ use rustc_middle::arena::Arena; use rustc_middle::dep_graph::DepGraph; use rustc_middle::middle; use rustc_middle::middle::cstore::{CrateStore, MetadataLoader, MetadataLoaderDyn}; +use rustc_middle::ty::query::Providers; use rustc_middle::ty::steal::Steal; use rustc_middle::ty::{self, GlobalCtxt, ResolverOutputs, TyCtxt}; use rustc_mir as mir; @@ -719,31 +720,49 @@ pub fn prepare_outputs( Ok(outputs) } -pub fn default_provide(providers: &mut ty::query::Providers) { - providers.analysis = analysis; - proc_macro_decls::provide(providers); - plugin::build::provide(providers); - rustc_middle::hir::provide(providers); - mir::provide(providers); - mir_build::provide(providers); - rustc_privacy::provide(providers); - typeck::provide(providers); - ty::provide(providers); - traits::provide(providers); - rustc_passes::provide(providers); - rustc_resolve::provide(providers); - rustc_traits::provide(providers); - rustc_ty::provide(providers); - rustc_metadata::provide(providers); - rustc_lint::provide(providers); - rustc_symbol_mangling::provide(providers); - rustc_codegen_ssa::provide(providers); -} +pub const DEFAULT_QUERY_PROVIDERS: Providers = { + // FIXME(eddyb) the `const fn` shouldn't be needed, but mutable references + // were disallowed in constants even when not escaping as `&'static mut T`. + const fn default_providers() -> Providers { + let mut providers = &mut Providers::EMPTY; + + providers.analysis = analysis; + proc_macro_decls::provide(providers); + plugin::build::provide(providers); + rustc_middle::hir::provide(providers); + mir::provide(providers); + mir_build::provide(providers); + rustc_privacy::provide(providers); + typeck::provide(providers); + ty::provide(providers); + traits::provide(providers); + rustc_passes::provide(providers); + rustc_resolve::provide(providers); + rustc_traits::provide(providers); + rustc_ty::provide(providers); + rustc_metadata::provide(providers); + rustc_lint::provide(providers); + rustc_symbol_mangling::provide(providers); + rustc_codegen_ssa::provide(providers); + + *providers + } + default_providers() +}; -pub fn default_provide_extern(providers: &mut ty::query::Providers) { - rustc_metadata::provide_extern(providers); - rustc_codegen_ssa::provide_extern(providers); -} +pub const DEFAULT_EXTERN_QUERY_PROVIDERS: Providers = { + // FIXME(eddyb) the `const fn` shouldn't be needed, but mutable references + // were disallowed in constants even when not escaping as `&'static mut T`. + const fn default_extern_providers() -> Providers { + let providers = &mut DEFAULT_QUERY_PROVIDERS; + + rustc_metadata::provide_extern(providers); + rustc_codegen_ssa::provide_extern(providers); + + *providers + } + default_extern_providers() +}; pub struct QueryContext<'tcx>(&'tcx GlobalCtxt<'tcx>); @@ -780,12 +799,11 @@ pub fn create_global_ctxt<'tcx>( let query_result_on_disk_cache = rustc_incremental::load_query_result_cache(sess); let codegen_backend = compiler.codegen_backend(); - let mut local_providers = ty::query::Providers::default(); - default_provide(&mut local_providers); + let mut local_providers = DEFAULT_QUERY_PROVIDERS; codegen_backend.provide(&mut local_providers); - let mut extern_providers = local_providers; - default_provide_extern(&mut extern_providers); + let mut extern_providers = DEFAULT_EXTERN_QUERY_PROVIDERS; + codegen_backend.provide(&mut extern_providers); codegen_backend.provide_extern(&mut extern_providers); if let Some(callback) = compiler.override_queries { diff --git a/src/librustc_interface/proc_macro_decls.rs b/src/librustc_interface/proc_macro_decls.rs index e91003b450c3c..a0a71594a0492 100644 --- a/src/librustc_interface/proc_macro_decls.rs +++ b/src/librustc_interface/proc_macro_decls.rs @@ -35,6 +35,6 @@ impl<'v> ItemLikeVisitor<'v> for Finder { fn visit_impl_item(&mut self, _impl_item: &hir::ImplItem<'_>) {} } -pub(crate) fn provide(providers: &mut Providers) { +pub(crate) const fn provide(providers: &mut Providers) { *providers = Providers { proc_macro_decls_static, ..*providers }; } diff --git a/src/librustc_lint/levels.rs b/src/librustc_lint/levels.rs index 2e9cd962a7401..b25226d28db8a 100644 --- a/src/librustc_lint/levels.rs +++ b/src/librustc_lint/levels.rs @@ -571,6 +571,6 @@ impl<'tcx> intravisit::Visitor<'tcx> for LintLevelMapBuilder<'_, 'tcx> { } } -pub fn provide(providers: &mut Providers) { +pub const fn provide(providers: &mut Providers) { providers.lint_levels = lint_levels; } diff --git a/src/librustc_lint/lib.rs b/src/librustc_lint/lib.rs index 6b5353e033fc8..343f94ef96c20 100644 --- a/src/librustc_lint/lib.rs +++ b/src/librustc_lint/lib.rs @@ -29,6 +29,8 @@ #![cfg_attr(test, feature(test))] #![feature(bool_to_option)] #![feature(box_syntax)] +#![feature(const_fn)] +#![feature(const_mut_refs)] #![feature(crate_visibility_modifier)] #![feature(iter_order_by)] #![feature(never_type)] @@ -88,7 +90,7 @@ pub use rustc_session::lint::Level::{self, *}; pub use rustc_session::lint::{BufferedEarlyLint, FutureIncompatibleInfo, Lint, LintId}; pub use rustc_session::lint::{LintArray, LintPass}; -pub fn provide(providers: &mut Providers) { +pub const fn provide(providers: &mut Providers) { levels::provide(providers); *providers = Providers { lint_mod, ..*providers }; } diff --git a/src/librustc_metadata/lib.rs b/src/librustc_metadata/lib.rs index 76e39a476c6d8..05a6007c17b32 100644 --- a/src/librustc_metadata/lib.rs +++ b/src/librustc_metadata/lib.rs @@ -1,5 +1,7 @@ #![doc(html_root_url = "https://doc.rust-lang.org/nightly/")] #![feature(bool_to_option)] +#![feature(const_fn)] +#![feature(const_mut_refs)] #![feature(core_intrinsics)] #![feature(crate_visibility_modifier)] #![feature(drain_filter)] diff --git a/src/librustc_metadata/rmeta/decoder/cstore_impl.rs b/src/librustc_metadata/rmeta/decoder/cstore_impl.rs index 201a32d387779..0d719f7330f2b 100644 --- a/src/librustc_metadata/rmeta/decoder/cstore_impl.rs +++ b/src/librustc_metadata/rmeta/decoder/cstore_impl.rs @@ -30,7 +30,7 @@ use std::any::Any; macro_rules! provide { (<$lt:tt> $tcx:ident, $def_id:ident, $other:ident, $cdata:ident, $($name:ident => $compute:block)*) => { - pub fn provide_extern(providers: &mut Providers) { + pub const fn provide_extern(providers: &mut Providers) { $(fn $name<$lt>( $tcx: TyCtxt<$lt>, def_id_arg: ty::query::query_keys::$name<$lt>, @@ -240,7 +240,7 @@ provide! { <'tcx> tcx, def_id, other, cdata, crate_extern_paths => { cdata.source().paths().cloned().collect() } } -pub fn provide(providers: &mut Providers) { +pub const fn provide(providers: &mut Providers) { // FIXME(#44234) - almost all of these queries have no sub-queries and // therefore no actual inputs, they're just reading tables calculated in // resolve! Does this work? Unsure! That's what the issue is about diff --git a/src/librustc_middle/hir/map/mod.rs b/src/librustc_middle/hir/map/mod.rs index 250f4d5187f2f..b4f2b685cdd02 100644 --- a/src/librustc_middle/hir/map/mod.rs +++ b/src/librustc_middle/hir/map/mod.rs @@ -1067,6 +1067,6 @@ fn hir_id_to_string(map: &Map<'_>, id: HirId) -> String { } } -pub fn provide(providers: &mut Providers) { +pub const fn provide(providers: &mut Providers) { providers.def_kind = |tcx, def_id| tcx.hir().def_kind(def_id.expect_local()); } diff --git a/src/librustc_middle/hir/mod.rs b/src/librustc_middle/hir/mod.rs index 485f9b7ce8a6c..e6105a9385d81 100644 --- a/src/librustc_middle/hir/mod.rs +++ b/src/librustc_middle/hir/mod.rs @@ -62,7 +62,7 @@ impl<'tcx> TyCtxt<'tcx> { } } -pub fn provide(providers: &mut Providers) { +pub const fn provide(providers: &mut Providers) { providers.parent_module_from_def_id = |tcx, id| { let hir = tcx.hir(); hir.local_def_id(hir.get_module_parent_node(hir.as_local_hir_id(id))) diff --git a/src/librustc_middle/lib.rs b/src/librustc_middle/lib.rs index 96b8ca27183ed..721b8d6aa5471 100644 --- a/src/librustc_middle/lib.rs +++ b/src/librustc_middle/lib.rs @@ -29,6 +29,7 @@ #![feature(box_syntax)] #![cfg_attr(bootstrap, feature(const_if_match))] #![feature(const_fn)] +#![feature(const_mut_refs)] #![feature(const_panic)] #![feature(const_transmute)] #![feature(core_intrinsics)] diff --git a/src/librustc_middle/ty/context.rs b/src/librustc_middle/ty/context.rs index c4a5bc302227d..b0f2ee8cc0f53 100644 --- a/src/librustc_middle/ty/context.rs +++ b/src/librustc_middle/ty/context.rs @@ -2699,7 +2699,7 @@ fn ptr_eq(t: *const T, u: *const U) -> bool { t as *const () == u as *const () } -pub fn provide(providers: &mut ty::query::Providers) { +pub const fn provide(providers: &mut ty::query::Providers) { providers.in_scope_traits_map = |tcx, id| tcx.gcx.trait_map.get(&id); providers.module_exports = |tcx, id| tcx.gcx.export_map.get(&id).map(|v| &v[..]); providers.crate_name = |tcx, id| { diff --git a/src/librustc_middle/ty/erase_regions.rs b/src/librustc_middle/ty/erase_regions.rs index 48d0fc1839e2f..f3702fb910327 100644 --- a/src/librustc_middle/ty/erase_regions.rs +++ b/src/librustc_middle/ty/erase_regions.rs @@ -1,7 +1,7 @@ use crate::ty::fold::{TypeFoldable, TypeFolder}; use crate::ty::{self, Ty, TyCtxt, TypeFlags}; -pub(super) fn provide(providers: &mut ty::query::Providers) { +pub(super) const fn provide(providers: &mut ty::query::Providers) { *providers = ty::query::Providers { erase_regions_ty, ..*providers }; } diff --git a/src/librustc_middle/ty/layout.rs b/src/librustc_middle/ty/layout.rs index 66ad923b8c007..b2f1dd82426b2 100644 --- a/src/librustc_middle/ty/layout.rs +++ b/src/librustc_middle/ty/layout.rs @@ -210,7 +210,7 @@ fn layout_raw<'tcx>( }) } -pub fn provide(providers: &mut ty::query::Providers) { +pub const fn provide(providers: &mut ty::query::Providers) { *providers = ty::query::Providers { layout_raw, ..*providers }; } diff --git a/src/librustc_middle/ty/mod.rs b/src/librustc_middle/ty/mod.rs index bec1200d7aa0f..9f55d72f11c9d 100644 --- a/src/librustc_middle/ty/mod.rs +++ b/src/librustc_middle/ty/mod.rs @@ -2966,7 +2966,7 @@ pub fn is_impl_trait_defn(tcx: TyCtxt<'_>, def_id: DefId) -> Option { None } -pub fn provide(providers: &mut ty::query::Providers) { +pub const fn provide(providers: &mut ty::query::Providers) { context::provide(providers); erase_regions::provide(providers); layout::provide(providers); diff --git a/src/librustc_middle/ty/query/plumbing.rs b/src/librustc_middle/ty/query/plumbing.rs index f3fa3634026fd..7d91f4470271e 100644 --- a/src/librustc_middle/ty/query/plumbing.rs +++ b/src/librustc_middle/ty/query/plumbing.rs @@ -496,11 +496,6 @@ macro_rules! define_queries_inner { tcx: $tcx, input: ($(([$($modifiers)*] [$name] [$($K)*] [$V]))*) } - - impl Copy for Providers {} - impl Clone for Providers { - fn clone(&self) -> Self { *self } - } } } @@ -565,14 +560,19 @@ macro_rules! define_provider_struct { $(pub $name: for<$tcx> fn(TyCtxt<$tcx>, $K) -> $R,)* } - impl Default for Providers { - fn default() -> Self { + impl Copy for Providers {} + impl Clone for Providers { + fn clone(&self) -> Self { *self } + } + + impl Providers { + pub const EMPTY: Self = { $(fn $name<$tcx>(_: TyCtxt<$tcx>, key: $K) -> $R { bug!("`tcx.{}({:?})` unsupported by its crate", stringify!($name), key); })* Providers { $($name),* } - } + }; } }; } diff --git a/src/librustc_middle/util/bug.rs b/src/librustc_middle/util/bug.rs index 0903ef5089861..aeadb1281a4fc 100644 --- a/src/librustc_middle/util/bug.rs +++ b/src/librustc_middle/util/bug.rs @@ -47,6 +47,6 @@ pub fn trigger_delay_span_bug(tcx: TyCtxt<'_>, key: rustc_hir::def_id::DefId) { ); } -pub fn provide(providers: &mut crate::ty::query::Providers) { +pub const fn provide(providers: &mut crate::ty::query::Providers) { *providers = crate::ty::query::Providers { trigger_delay_span_bug, ..*providers }; } diff --git a/src/librustc_mir/borrow_check/mod.rs b/src/librustc_mir/borrow_check/mod.rs index beb5f1fe924ec..4a74eb0dafee9 100644 --- a/src/librustc_mir/borrow_check/mod.rs +++ b/src/librustc_mir/borrow_check/mod.rs @@ -86,7 +86,7 @@ crate struct Upvar { const DEREF_PROJECTION: &[PlaceElem<'_>; 1] = &[ProjectionElem::Deref]; -pub fn provide(providers: &mut Providers) { +pub const fn provide(providers: &mut Providers) { *providers = Providers { mir_borrowck, ..*providers }; } diff --git a/src/librustc_mir/const_eval/fn_queries.rs b/src/librustc_mir/const_eval/fn_queries.rs index 70ddd79ee40b0..b95898b930b53 100644 --- a/src/librustc_mir/const_eval/fn_queries.rs +++ b/src/librustc_mir/const_eval/fn_queries.rs @@ -156,7 +156,7 @@ fn const_fn_is_allowed_fn_ptr(tcx: TyCtxt<'_>, def_id: DefId) -> bool { && tcx.lookup_const_stability(def_id).map(|stab| stab.allow_const_fn_ptr).unwrap_or(false) } -pub fn provide(providers: &mut Providers) { +pub const fn provide(providers: &mut Providers) { *providers = Providers { is_const_fn_raw, is_const_impl_raw: |tcx, def_id| is_const_impl_raw(tcx, def_id.expect_local()), diff --git a/src/librustc_mir/lib.rs b/src/librustc_mir/lib.rs index eff1dc135554f..88446568a6b11 100644 --- a/src/librustc_mir/lib.rs +++ b/src/librustc_mir/lib.rs @@ -12,6 +12,7 @@ Rust MIR: a lowered representation of Rust. #![feature(const_fn)] #![cfg_attr(bootstrap, feature(const_if_match))] #![cfg_attr(bootstrap, feature(const_loop))] +#![feature(const_mut_refs)] #![feature(const_panic)] #![feature(crate_visibility_modifier)] #![feature(decl_macro)] @@ -47,7 +48,7 @@ pub mod util; use rustc_middle::ty::query::Providers; -pub fn provide(providers: &mut Providers) { +pub const fn provide(providers: &mut Providers) { borrow_check::provide(providers); const_eval::provide(providers); shim::provide(providers); diff --git a/src/librustc_mir/monomorphize/partitioning.rs b/src/librustc_mir/monomorphize/partitioning.rs index ebea65c8f96f2..7b598f1def633 100644 --- a/src/librustc_mir/monomorphize/partitioning.rs +++ b/src/librustc_mir/monomorphize/partitioning.rs @@ -994,7 +994,7 @@ fn collect_and_partition_mono_items( (tcx.arena.alloc(mono_items), codegen_units) } -pub fn provide(providers: &mut Providers) { +pub const fn provide(providers: &mut Providers) { providers.collect_and_partition_mono_items = collect_and_partition_mono_items; providers.is_codegened_item = |tcx, def_id| { diff --git a/src/librustc_mir/shim.rs b/src/librustc_mir/shim.rs index 98286cddea68b..eb6bdfd84a814 100644 --- a/src/librustc_mir/shim.rs +++ b/src/librustc_mir/shim.rs @@ -23,7 +23,7 @@ use crate::util::elaborate_drops::{self, DropElaborator, DropFlagMode, DropStyle use crate::util::expand_aggregate; use crate::util::patch::MirPatch; -pub fn provide(providers: &mut Providers) { +pub const fn provide(providers: &mut Providers) { providers.mir_shims = make_shim; } diff --git a/src/librustc_mir/transform/check_unsafety.rs b/src/librustc_mir/transform/check_unsafety.rs index f218dd397c0c8..3588f9b4ef8cf 100644 --- a/src/librustc_mir/transform/check_unsafety.rs +++ b/src/librustc_mir/transform/check_unsafety.rs @@ -488,7 +488,7 @@ impl<'a, 'tcx> UnsafetyChecker<'a, 'tcx> { } } -pub(crate) fn provide(providers: &mut Providers) { +pub(crate) const fn provide(providers: &mut Providers) { *providers = Providers { unsafety_check_result, unsafe_derive_on_repr_packed, ..*providers }; } diff --git a/src/librustc_mir/transform/instrument_coverage.rs b/src/librustc_mir/transform/instrument_coverage.rs index 76904b7edd533..57b3a8cf14829 100644 --- a/src/librustc_mir/transform/instrument_coverage.rs +++ b/src/librustc_mir/transform/instrument_coverage.rs @@ -25,7 +25,7 @@ pub struct InstrumentCoverage; /// The `query` provider for `CoverageInfo`, requested by `codegen_intrinsic_call()` when /// constructing the arguments for `llvm.instrprof.increment`. -pub(crate) fn provide(providers: &mut Providers) { +pub(crate) const fn provide(providers: &mut Providers) { providers.coverageinfo = |tcx, def_id| coverageinfo_from_mir(tcx, def_id); } diff --git a/src/librustc_mir/transform/mod.rs b/src/librustc_mir/transform/mod.rs index 816cf08a6da48..7484a51cfb598 100644 --- a/src/librustc_mir/transform/mod.rs +++ b/src/librustc_mir/transform/mod.rs @@ -43,7 +43,7 @@ pub mod uninhabited_enum_branching; pub mod unreachable_prop; pub mod validate; -pub(crate) fn provide(providers: &mut Providers) { +pub(crate) const fn provide(providers: &mut Providers) { self::check_unsafety::provide(providers); *providers = Providers { mir_keys, diff --git a/src/librustc_mir_build/lib.rs b/src/librustc_mir_build/lib.rs index be495e431eb3c..75d98200d2abe 100644 --- a/src/librustc_mir_build/lib.rs +++ b/src/librustc_mir_build/lib.rs @@ -4,8 +4,9 @@ #![feature(box_patterns)] #![feature(box_syntax)] -#![cfg_attr(bootstrap, feature(const_if_match))] #![feature(const_fn)] +#![cfg_attr(bootstrap, feature(const_if_match))] +#![feature(const_mut_refs)] #![feature(const_panic)] #![feature(crate_visibility_modifier)] #![feature(bool_to_option)] @@ -23,7 +24,7 @@ mod lints; use rustc_middle::ty::query::Providers; -pub fn provide(providers: &mut Providers) { +pub const fn provide(providers: &mut Providers) { providers.check_match = hair::pattern::check_match; providers.lit_to_const = hair::constant::lit_to_const; providers.mir_built = build::mir_built; diff --git a/src/librustc_passes/check_attr.rs b/src/librustc_passes/check_attr.rs index 46aa5a4dcdff5..2fe7d3b4fc920 100644 --- a/src/librustc_passes/check_attr.rs +++ b/src/librustc_passes/check_attr.rs @@ -471,6 +471,6 @@ fn check_mod_attrs(tcx: TyCtxt<'_>, module_def_id: LocalDefId) { .visit_item_likes_in_module(module_def_id, &mut CheckAttrVisitor { tcx }.as_deep_visitor()); } -pub(crate) fn provide(providers: &mut Providers) { +pub(crate) const fn provide(providers: &mut Providers) { *providers = Providers { check_mod_attrs, ..*providers }; } diff --git a/src/librustc_passes/check_const.rs b/src/librustc_passes/check_const.rs index b1ebab3f2f806..ed54e1dc31556 100644 --- a/src/librustc_passes/check_const.rs +++ b/src/librustc_passes/check_const.rs @@ -62,7 +62,7 @@ fn check_mod_const_bodies(tcx: TyCtxt<'_>, module_def_id: LocalDefId) { tcx.hir().visit_item_likes_in_module(module_def_id, &mut vis.as_deep_visitor()); } -pub(crate) fn provide(providers: &mut Providers) { +pub(crate) const fn provide(providers: &mut Providers) { *providers = Providers { check_mod_const_bodies, ..*providers }; } diff --git a/src/librustc_passes/diagnostic_items.rs b/src/librustc_passes/diagnostic_items.rs index 3cce4b8d00e8b..53f32c5ef1602 100644 --- a/src/librustc_passes/diagnostic_items.rs +++ b/src/librustc_passes/diagnostic_items.rs @@ -118,7 +118,7 @@ fn collect_all<'tcx>(tcx: TyCtxt<'tcx>) -> FxHashMap { collector } -pub fn provide(providers: &mut Providers) { +pub const fn provide(providers: &mut Providers) { providers.diagnostic_items = |tcx, id| { assert_eq!(id, LOCAL_CRATE); collect(tcx) diff --git a/src/librustc_passes/entry.rs b/src/librustc_passes/entry.rs index 11612101e3771..efcc57e960c90 100644 --- a/src/librustc_passes/entry.rs +++ b/src/librustc_passes/entry.rs @@ -217,6 +217,6 @@ pub fn find_entry_point(tcx: TyCtxt<'_>) -> Option<(LocalDefId, EntryFnType)> { tcx.entry_fn(LOCAL_CRATE) } -pub fn provide(providers: &mut Providers) { +pub const fn provide(providers: &mut Providers) { *providers = Providers { entry_fn, ..*providers }; } diff --git a/src/librustc_passes/intrinsicck.rs b/src/librustc_passes/intrinsicck.rs index 25edfad86e8ec..1cb92f5cbaa6e 100644 --- a/src/librustc_passes/intrinsicck.rs +++ b/src/librustc_passes/intrinsicck.rs @@ -18,7 +18,7 @@ fn check_mod_intrinsics(tcx: TyCtxt<'_>, module_def_id: LocalDefId) { tcx.hir().visit_item_likes_in_module(module_def_id, &mut ItemVisitor { tcx }.as_deep_visitor()); } -pub fn provide(providers: &mut Providers) { +pub const fn provide(providers: &mut Providers) { *providers = Providers { check_mod_intrinsics, ..*providers }; } diff --git a/src/librustc_passes/lang_items.rs b/src/librustc_passes/lang_items.rs index 809697134b759..23a779eea8db8 100644 --- a/src/librustc_passes/lang_items.rs +++ b/src/librustc_passes/lang_items.rs @@ -205,7 +205,7 @@ fn collect(tcx: TyCtxt<'_>) -> LanguageItems { items } -pub fn provide(providers: &mut Providers) { +pub const fn provide(providers: &mut Providers) { providers.get_lang_items = |tcx, id| { assert_eq!(id, LOCAL_CRATE); collect(tcx) diff --git a/src/librustc_passes/lib.rs b/src/librustc_passes/lib.rs index 3f10c418811b7..cd6eede95dc84 100644 --- a/src/librustc_passes/lib.rs +++ b/src/librustc_passes/lib.rs @@ -5,6 +5,8 @@ //! This API is completely unstable and subject to change. #![doc(html_root_url = "https://doc.rust-lang.org/nightly/")] +#![feature(const_fn)] +#![feature(const_mut_refs)] #![feature(in_band_lifetimes)] #![feature(nll)] #![feature(or_patterns)] @@ -37,7 +39,7 @@ pub mod stability; mod upvars; mod weak_lang_items; -pub fn provide(providers: &mut Providers) { +pub const fn provide(providers: &mut Providers) { check_attr::provide(providers); check_const::provide(providers); diagnostic_items::provide(providers); diff --git a/src/librustc_passes/lib_features.rs b/src/librustc_passes/lib_features.rs index 922a475e5f4e4..bf3a2836d1dac 100644 --- a/src/librustc_passes/lib_features.rs +++ b/src/librustc_passes/lib_features.rs @@ -135,7 +135,7 @@ fn collect(tcx: TyCtxt<'_>) -> LibFeatures { collector.lib_features } -pub fn provide(providers: &mut Providers) { +pub const fn provide(providers: &mut Providers) { providers.get_lib_features = |tcx, id| { assert_eq!(id, LOCAL_CRATE); collect(tcx) diff --git a/src/librustc_passes/liveness.rs b/src/librustc_passes/liveness.rs index 3675a987644da..1cd7637033685 100644 --- a/src/librustc_passes/liveness.rs +++ b/src/librustc_passes/liveness.rs @@ -179,7 +179,7 @@ fn check_mod_liveness(tcx: TyCtxt<'_>, module_def_id: LocalDefId) { ); } -pub fn provide(providers: &mut Providers) { +pub const fn provide(providers: &mut Providers) { *providers = Providers { check_mod_liveness, ..*providers }; } diff --git a/src/librustc_passes/loops.rs b/src/librustc_passes/loops.rs index 9b4da71e5e961..03a8687f4b56a 100644 --- a/src/librustc_passes/loops.rs +++ b/src/librustc_passes/loops.rs @@ -36,7 +36,7 @@ fn check_mod_loops(tcx: TyCtxt<'_>, module_def_id: LocalDefId) { ); } -pub(crate) fn provide(providers: &mut Providers) { +pub(crate) const fn provide(providers: &mut Providers) { *providers = Providers { check_mod_loops, ..*providers }; } diff --git a/src/librustc_passes/reachable.rs b/src/librustc_passes/reachable.rs index c46f4856cfe3a..5f70971e50807 100644 --- a/src/librustc_passes/reachable.rs +++ b/src/librustc_passes/reachable.rs @@ -425,6 +425,6 @@ fn reachable_set<'tcx>(tcx: TyCtxt<'tcx>, crate_num: CrateNum) -> &'tcx HirIdSet tcx.arena.alloc(reachable_context.reachable_symbols) } -pub fn provide(providers: &mut Providers) { +pub const fn provide(providers: &mut Providers) { *providers = Providers { reachable_set, ..*providers }; } diff --git a/src/librustc_passes/region.rs b/src/librustc_passes/region.rs index b2a89651881e5..04a111290cf03 100644 --- a/src/librustc_passes/region.rs +++ b/src/librustc_passes/region.rs @@ -842,6 +842,6 @@ fn region_scope_tree(tcx: TyCtxt<'_>, def_id: DefId) -> &ScopeTree { tcx.arena.alloc(scope_tree) } -pub fn provide(providers: &mut Providers) { +pub const fn provide(providers: &mut Providers) { *providers = Providers { region_scope_tree, ..*providers }; } diff --git a/src/librustc_passes/stability.rs b/src/librustc_passes/stability.rs index 5bacab671ec14..98114f44e086a 100644 --- a/src/librustc_passes/stability.rs +++ b/src/librustc_passes/stability.rs @@ -476,7 +476,7 @@ fn check_mod_unstable_api_usage(tcx: TyCtxt<'_>, module_def_id: LocalDefId) { tcx.hir().visit_item_likes_in_module(module_def_id, &mut Checker { tcx }.as_deep_visitor()); } -pub(crate) fn provide(providers: &mut Providers) { +pub(crate) const fn provide(providers: &mut Providers) { *providers = Providers { check_mod_unstable_api_usage, ..*providers }; providers.stability_index = |tcx, cnum| { assert_eq!(cnum, LOCAL_CRATE); diff --git a/src/librustc_passes/upvars.rs b/src/librustc_passes/upvars.rs index 3aed4942563dd..a60d1a71557b6 100644 --- a/src/librustc_passes/upvars.rs +++ b/src/librustc_passes/upvars.rs @@ -9,7 +9,7 @@ use rustc_middle::ty::query::Providers; use rustc_middle::ty::TyCtxt; use rustc_span::Span; -pub fn provide(providers: &mut Providers) { +pub const fn provide(providers: &mut Providers) { providers.upvars_mentioned = |tcx, def_id| { if !tcx.is_closure(def_id) { return None; diff --git a/src/librustc_plugin_impl/build.rs b/src/librustc_plugin_impl/build.rs index db2363316cd1a..6324d6c76c8f4 100644 --- a/src/librustc_plugin_impl/build.rs +++ b/src/librustc_plugin_impl/build.rs @@ -57,6 +57,6 @@ fn plugin_registrar_fn(tcx: TyCtxt<'_>, cnum: CrateNum) -> Option { } } -pub fn provide(providers: &mut Providers) { +pub const fn provide(providers: &mut Providers) { *providers = Providers { plugin_registrar_fn, ..*providers }; } diff --git a/src/librustc_plugin_impl/lib.rs b/src/librustc_plugin_impl/lib.rs index 10712eb60b9e3..3703bf348994b 100644 --- a/src/librustc_plugin_impl/lib.rs +++ b/src/librustc_plugin_impl/lib.rs @@ -7,6 +7,8 @@ //! of the Unstable Book for some examples. #![doc(html_root_url = "https://doc.rust-lang.org/nightly/")] +#![feature(const_fn)] +#![feature(const_mut_refs)] #![feature(nll)] use rustc_lint::LintStore; diff --git a/src/librustc_privacy/lib.rs b/src/librustc_privacy/lib.rs index 2c5cbed2192ef..3a5946f5a12b4 100644 --- a/src/librustc_privacy/lib.rs +++ b/src/librustc_privacy/lib.rs @@ -1,4 +1,6 @@ #![doc(html_root_url = "https://doc.rust-lang.org/nightly/")] +#![feature(const_fn)] +#![feature(const_mut_refs)] #![feature(in_band_lifetimes)] #![feature(nll)] #![feature(or_patterns)] @@ -2029,7 +2031,7 @@ impl<'a, 'tcx> Visitor<'tcx> for PrivateItemsInPublicInterfacesVisitor<'a, 'tcx> } } -pub fn provide(providers: &mut Providers) { +pub const fn provide(providers: &mut Providers) { *providers = Providers { privacy_access_levels, check_private_in_public, diff --git a/src/librustc_resolve/late/lifetimes.rs b/src/librustc_resolve/late/lifetimes.rs index 1467bf537eb49..b083fd99279b0 100644 --- a/src/librustc_resolve/late/lifetimes.rs +++ b/src/librustc_resolve/late/lifetimes.rs @@ -278,7 +278,7 @@ type ScopeRef<'a> = &'a Scope<'a>; const ROOT_SCOPE: ScopeRef<'static> = &Scope::Root; -pub fn provide(providers: &mut ty::query::Providers) { +pub const fn provide(providers: &mut ty::query::Providers) { *providers = ty::query::Providers { resolve_lifetimes, diff --git a/src/librustc_resolve/lib.rs b/src/librustc_resolve/lib.rs index 0f1618031d034..4f3b1704d49e3 100644 --- a/src/librustc_resolve/lib.rs +++ b/src/librustc_resolve/lib.rs @@ -10,6 +10,8 @@ #![doc(html_root_url = "https://doc.rust-lang.org/nightly/")] #![feature(bool_to_option)] +#![feature(const_fn)] +#![feature(const_mut_refs)] #![feature(crate_visibility_modifier)] #![feature(nll)] #![feature(or_patterns)] @@ -3102,6 +3104,6 @@ impl CrateLint { } } -pub fn provide(providers: &mut Providers) { +pub const fn provide(providers: &mut Providers) { late::lifetimes::provide(providers); } diff --git a/src/librustc_symbol_mangling/lib.rs b/src/librustc_symbol_mangling/lib.rs index 012321026938e..0bc7cb5575fd9 100644 --- a/src/librustc_symbol_mangling/lib.rs +++ b/src/librustc_symbol_mangling/lib.rs @@ -88,6 +88,8 @@ //! DefPaths which are much more robust in the face of changes to the code base. #![doc(html_root_url = "https://doc.rust-lang.org/nightly/")] +#![feature(const_fn)] +#![feature(const_mut_refs)] #![feature(never_type)] #![feature(nll)] #![feature(or_patterns)] @@ -126,7 +128,7 @@ pub fn symbol_name_for_instance_in_crate( compute_symbol_name(tcx, instance, || instantiating_crate) } -pub fn provide(providers: &mut Providers) { +pub const fn provide(providers: &mut Providers) { *providers = Providers { symbol_name: symbol_name_provider, ..*providers }; } diff --git a/src/librustc_trait_selection/lib.rs b/src/librustc_trait_selection/lib.rs index 4692fa04ed587..4b83ff2d1ea1a 100644 --- a/src/librustc_trait_selection/lib.rs +++ b/src/librustc_trait_selection/lib.rs @@ -12,6 +12,8 @@ #![doc(html_root_url = "https://doc.rust-lang.org/nightly/")] #![feature(bool_to_option)] +#![feature(const_fn)] +#![feature(const_mut_refs)] #![feature(drain_filter)] #![feature(in_band_lifetimes)] #![feature(crate_visibility_modifier)] diff --git a/src/librustc_trait_selection/traits/mod.rs b/src/librustc_trait_selection/traits/mod.rs index e8006129e3ef8..1d5d107a4918b 100644 --- a/src/librustc_trait_selection/traits/mod.rs +++ b/src/librustc_trait_selection/traits/mod.rs @@ -550,7 +550,7 @@ fn type_implements_trait<'tcx>( tcx.infer_ctxt().enter(|infcx| infcx.predicate_must_hold_modulo_regions(&obligation)) } -pub fn provide(providers: &mut ty::query::Providers) { +pub const fn provide(providers: &mut ty::query::Providers) { object_safety::provide(providers); structural_match::provide(providers); *providers = ty::query::Providers { diff --git a/src/librustc_trait_selection/traits/object_safety.rs b/src/librustc_trait_selection/traits/object_safety.rs index f00d668e1ae50..8f41bf0b93aed 100644 --- a/src/librustc_trait_selection/traits/object_safety.rs +++ b/src/librustc_trait_selection/traits/object_safety.rs @@ -792,6 +792,6 @@ fn contains_illegal_self_type_reference<'tcx>( }) } -pub fn provide(providers: &mut ty::query::Providers) { +pub const fn provide(providers: &mut ty::query::Providers) { *providers = ty::query::Providers { object_safety_violations, ..*providers }; } diff --git a/src/librustc_trait_selection/traits/structural_match.rs b/src/librustc_trait_selection/traits/structural_match.rs index 377d163d10439..64ffdfc095ca9 100644 --- a/src/librustc_trait_selection/traits/structural_match.rs +++ b/src/librustc_trait_selection/traits/structural_match.rs @@ -271,7 +271,7 @@ impl<'a, 'tcx> TypeVisitor<'tcx> for Search<'a, 'tcx> { } } -pub fn provide(providers: &mut Providers) { +pub const fn provide(providers: &mut Providers) { providers.has_structural_eq_impls = |tcx, ty| { tcx.infer_ctxt().enter(|infcx| { let cause = ObligationCause::dummy(); diff --git a/src/librustc_traits/chalk/mod.rs b/src/librustc_traits/chalk/mod.rs index 0c5d57551f9c5..e81eed86c028f 100644 --- a/src/librustc_traits/chalk/mod.rs +++ b/src/librustc_traits/chalk/mod.rs @@ -29,7 +29,7 @@ use crate::chalk::lowering::{LowerInto, ParamsSubstitutor}; use chalk_solve::Solution; -crate fn provide(p: &mut Providers) { +crate const fn provide(p: &mut Providers) { *p = Providers { evaluate_goal, ..*p }; } diff --git a/src/librustc_traits/dropck_outlives.rs b/src/librustc_traits/dropck_outlives.rs index ce00060b9b172..20e3aa4b4c375 100644 --- a/src/librustc_traits/dropck_outlives.rs +++ b/src/librustc_traits/dropck_outlives.rs @@ -17,7 +17,7 @@ use rustc_trait_selection::traits::{ Normalized, ObligationCause, TraitEngine, TraitEngineExt as _, }; -crate fn provide(p: &mut Providers) { +crate const fn provide(p: &mut Providers) { *p = Providers { dropck_outlives, adt_dtorck_constraint, ..*p }; } diff --git a/src/librustc_traits/evaluate_obligation.rs b/src/librustc_traits/evaluate_obligation.rs index 2404b7ff4b54a..94a8d8c741184 100644 --- a/src/librustc_traits/evaluate_obligation.rs +++ b/src/librustc_traits/evaluate_obligation.rs @@ -7,7 +7,7 @@ use rustc_trait_selection::traits::{ EvaluationResult, Obligation, ObligationCause, OverflowError, SelectionContext, TraitQueryMode, }; -crate fn provide(p: &mut Providers) { +crate const fn provide(p: &mut Providers) { *p = Providers { evaluate_obligation, ..*p }; } diff --git a/src/librustc_traits/implied_outlives_bounds.rs b/src/librustc_traits/implied_outlives_bounds.rs index bda3da120e958..a1175e3dc7b08 100644 --- a/src/librustc_traits/implied_outlives_bounds.rs +++ b/src/librustc_traits/implied_outlives_bounds.rs @@ -18,7 +18,7 @@ use rustc_trait_selection::traits::FulfillmentContext; use rustc_trait_selection::traits::TraitEngine; use smallvec::{smallvec, SmallVec}; -crate fn provide(p: &mut Providers) { +crate const fn provide(p: &mut Providers) { *p = Providers { implied_outlives_bounds, ..*p }; } diff --git a/src/librustc_traits/lib.rs b/src/librustc_traits/lib.rs index b8e23760ba5d4..c7d472b92d245 100644 --- a/src/librustc_traits/lib.rs +++ b/src/librustc_traits/lib.rs @@ -1,6 +1,8 @@ //! New recursive solver modeled on Chalk's recursive solver. Most of //! the guts are broken up into modules; see the comments in those modules. +#![feature(const_fn)] +#![feature(const_mut_refs)] #![feature(crate_visibility_modifier)] #![feature(in_band_lifetimes)] #![feature(nll)] @@ -22,7 +24,7 @@ mod type_op; use rustc_middle::ty::query::Providers; -pub fn provide(p: &mut Providers) { +pub const fn provide(p: &mut Providers) { dropck_outlives::provide(p); evaluate_obligation::provide(p); implied_outlives_bounds::provide(p); diff --git a/src/librustc_traits/normalize_erasing_regions.rs b/src/librustc_traits/normalize_erasing_regions.rs index 7092515af0882..46db18318d02d 100644 --- a/src/librustc_traits/normalize_erasing_regions.rs +++ b/src/librustc_traits/normalize_erasing_regions.rs @@ -7,7 +7,7 @@ use rustc_trait_selection::traits::query::normalize::AtExt; use rustc_trait_selection::traits::{Normalized, ObligationCause}; use std::sync::atomic::Ordering; -crate fn provide(p: &mut Providers) { +crate const fn provide(p: &mut Providers) { *p = Providers { normalize_generic_arg_after_erasing_regions, ..*p }; } diff --git a/src/librustc_traits/normalize_projection_ty.rs b/src/librustc_traits/normalize_projection_ty.rs index a8e376838e218..373a20502977e 100644 --- a/src/librustc_traits/normalize_projection_ty.rs +++ b/src/librustc_traits/normalize_projection_ty.rs @@ -10,7 +10,7 @@ use rustc_trait_selection::traits::query::{ use rustc_trait_selection::traits::{self, ObligationCause, SelectionContext}; use std::sync::atomic::Ordering; -crate fn provide(p: &mut Providers) { +crate const fn provide(p: &mut Providers) { *p = Providers { normalize_projection_ty, ..*p }; } diff --git a/src/librustc_traits/type_op.rs b/src/librustc_traits/type_op.rs index 9cc9a35b38b8a..4c38d0ae98f66 100644 --- a/src/librustc_traits/type_op.rs +++ b/src/librustc_traits/type_op.rs @@ -21,7 +21,7 @@ use rustc_trait_selection::traits::query::{Fallible, NoSolution}; use rustc_trait_selection::traits::{Normalized, Obligation, ObligationCause, TraitEngine}; use std::fmt; -crate fn provide(p: &mut Providers) { +crate const fn provide(p: &mut Providers) { *p = Providers { type_op_ascribe_user_type, type_op_eq, diff --git a/src/librustc_ty/common_traits.rs b/src/librustc_ty/common_traits.rs index 8d153e77f0b7d..4bc332a15abaa 100644 --- a/src/librustc_ty/common_traits.rs +++ b/src/librustc_ty/common_traits.rs @@ -36,6 +36,6 @@ fn is_item_raw<'tcx>( }) } -pub(crate) fn provide(providers: &mut ty::query::Providers) { +pub(crate) const fn provide(providers: &mut ty::query::Providers) { *providers = ty::query::Providers { is_copy_raw, is_sized_raw, is_freeze_raw, ..*providers }; } diff --git a/src/librustc_ty/instance.rs b/src/librustc_ty/instance.rs index 9f5ab7f8e4a02..863d23c240e2a 100644 --- a/src/librustc_ty/instance.rs +++ b/src/librustc_ty/instance.rs @@ -243,6 +243,6 @@ fn resolve_associated_item<'tcx>( }) } -pub fn provide(providers: &mut ty::query::Providers) { +pub const fn provide(providers: &mut ty::query::Providers) { *providers = ty::query::Providers { resolve_instance, ..*providers }; } diff --git a/src/librustc_ty/lib.rs b/src/librustc_ty/lib.rs index 8f3b20c7aaf40..307e1137b3344 100644 --- a/src/librustc_ty/lib.rs +++ b/src/librustc_ty/lib.rs @@ -6,6 +6,8 @@ #![doc(html_root_url = "https://doc.rust-lang.org/nightly/")] #![feature(bool_to_option)] +#![feature(const_fn)] +#![feature(const_mut_refs)] #![feature(nll)] #![recursion_limit = "256"] @@ -21,7 +23,7 @@ pub mod instance; mod needs_drop; mod ty; -pub fn provide(providers: &mut Providers) { +pub const fn provide(providers: &mut Providers) { common_traits::provide(providers); needs_drop::provide(providers); ty::provide(providers); diff --git a/src/librustc_ty/needs_drop.rs b/src/librustc_ty/needs_drop.rs index c4af95205fe27..a5c4c4fc97312 100644 --- a/src/librustc_ty/needs_drop.rs +++ b/src/librustc_ty/needs_drop.rs @@ -183,6 +183,6 @@ fn adt_drop_tys(tcx: TyCtxt<'_>, def_id: DefId) -> Result<&ty::List>, Alw res.map(|components| tcx.intern_type_list(&components)) } -pub(crate) fn provide(providers: &mut ty::query::Providers) { +pub(crate) const fn provide(providers: &mut ty::query::Providers) { *providers = ty::query::Providers { needs_drop_raw, adt_drop_tys, ..*providers }; } diff --git a/src/librustc_ty/ty.rs b/src/librustc_ty/ty.rs index c99bc8a47e33b..0e0535beb2a29 100644 --- a/src/librustc_ty/ty.rs +++ b/src/librustc_ty/ty.rs @@ -494,7 +494,7 @@ fn projection_predicates(tcx: TyCtxt<'_>, def_id: DefId) -> &'_ ty::List FnCtxt<'a, 'tcx> { } } -pub fn provide(providers: &mut ty::query::Providers) { +pub const fn provide(providers: &mut ty::query::Providers) { providers.method_autoderef_steps = method_autoderef_steps; } diff --git a/src/librustc_typeck/check/method/suggest.rs b/src/librustc_typeck/check/method/suggest.rs index 44ffabc4c2662..48a3872356526 100644 --- a/src/librustc_typeck/check/method/suggest.rs +++ b/src/librustc_typeck/check/method/suggest.rs @@ -1292,7 +1292,7 @@ fn compute_all_traits(tcx: TyCtxt<'_>) -> Vec { traits } -pub fn provide(providers: &mut ty::query::Providers) { +pub const fn provide(providers: &mut ty::query::Providers) { providers.all_traits = |tcx, cnum| { assert_eq!(cnum, LOCAL_CRATE); &tcx.arena.alloc(compute_all_traits(tcx))[..] diff --git a/src/librustc_typeck/check/mod.rs b/src/librustc_typeck/check/mod.rs index fa7360ce90051..3578ff98d7345 100644 --- a/src/librustc_typeck/check/mod.rs +++ b/src/librustc_typeck/check/mod.rs @@ -760,7 +760,7 @@ fn check_impl_item_well_formed(tcx: TyCtxt<'_>, def_id: LocalDefId) { wfcheck::check_impl_item(tcx, def_id); } -pub fn provide(providers: &mut Providers) { +pub const fn provide(providers: &mut Providers) { method::provide(providers); *providers = Providers { typeck_item_bodies, diff --git a/src/librustc_typeck/coherence/mod.rs b/src/librustc_typeck/coherence/mod.rs index 1483244717b4f..0ac6ff5519b30 100644 --- a/src/librustc_typeck/coherence/mod.rs +++ b/src/librustc_typeck/coherence/mod.rs @@ -151,7 +151,7 @@ fn enforce_empty_impls_for_marker_traits( struct_span_err!(tcx.sess, span, E0715, "impls for marker traits cannot contain items").emit(); } -pub fn provide(providers: &mut Providers) { +pub const fn provide(providers: &mut Providers) { use self::builtin::coerce_unsized_info; use self::inherent_impls::{crate_inherent_impls, inherent_impls}; use self::inherent_impls_overlap::crate_inherent_impls_overlap_check; diff --git a/src/librustc_typeck/collect.rs b/src/librustc_typeck/collect.rs index 15481660a5218..28bf01d4a57bb 100644 --- a/src/librustc_typeck/collect.rs +++ b/src/librustc_typeck/collect.rs @@ -62,7 +62,7 @@ fn collect_mod_item_types(tcx: TyCtxt<'_>, module_def_id: LocalDefId) { ); } -pub fn provide(providers: &mut Providers) { +pub const fn provide(providers: &mut Providers) { *providers = Providers { type_of: type_of::type_of, generics_of, diff --git a/src/librustc_typeck/impl_wf_check.rs b/src/librustc_typeck/impl_wf_check.rs index 891e482b43133..9b80fc5c143d2 100644 --- a/src/librustc_typeck/impl_wf_check.rs +++ b/src/librustc_typeck/impl_wf_check.rs @@ -69,7 +69,7 @@ fn check_mod_impl_wf(tcx: TyCtxt<'_>, module_def_id: LocalDefId) { .visit_item_likes_in_module(module_def_id, &mut ImplWfCheck { tcx, min_specialization }); } -pub fn provide(providers: &mut Providers) { +pub const fn provide(providers: &mut Providers) { *providers = Providers { check_mod_impl_wf, ..*providers }; } diff --git a/src/librustc_typeck/lib.rs b/src/librustc_typeck/lib.rs index 9ba2545ba63cb..a4e5feaea8c54 100644 --- a/src/librustc_typeck/lib.rs +++ b/src/librustc_typeck/lib.rs @@ -59,6 +59,8 @@ This API is completely unstable and subject to change. #![allow(non_camel_case_types)] #![feature(bool_to_option)] #![feature(box_syntax)] +#![feature(const_fn)] +#![feature(const_mut_refs)] #![feature(crate_visibility_modifier)] #![feature(in_band_lifetimes)] #![feature(nll)] @@ -309,7 +311,7 @@ fn check_for_entry_fn(tcx: TyCtxt<'_>) { } } -pub fn provide(providers: &mut Providers) { +pub const fn provide(providers: &mut Providers) { collect::provide(providers); coherence::provide(providers); check::provide(providers); diff --git a/src/librustc_typeck/outlives/mod.rs b/src/librustc_typeck/outlives/mod.rs index cc5858314597c..8a64685d959f6 100644 --- a/src/librustc_typeck/outlives/mod.rs +++ b/src/librustc_typeck/outlives/mod.rs @@ -13,7 +13,7 @@ mod implicit_infer; pub mod test; mod utils; -pub fn provide(providers: &mut Providers) { +pub const fn provide(providers: &mut Providers) { *providers = Providers { inferred_outlives_of, inferred_outlives_crate, ..*providers }; } diff --git a/src/librustc_typeck/variance/mod.rs b/src/librustc_typeck/variance/mod.rs index b307363dc3ab0..1663b842619b7 100644 --- a/src/librustc_typeck/variance/mod.rs +++ b/src/librustc_typeck/variance/mod.rs @@ -26,7 +26,7 @@ pub mod test; /// Code for transforming variances. mod xform; -pub fn provide(providers: &mut Providers) { +pub const fn provide(providers: &mut Providers) { *providers = Providers { variances_of, crate_variances, ..*providers }; }