diff options
| author | Eduard-Mihai Burtescu <edy.burt@gmail.com> | 2020-07-05 23:00:14 +0300 |
|---|---|---|
| committer | Eduard-Mihai Burtescu <edy.burt@gmail.com> | 2020-07-05 23:00:14 +0300 |
| commit | f07100afc8650101ac924d728521e1a5d0ce9080 (patch) | |
| tree | 82e8f3dfe9a9e76aa68e70af7f33dea56bdea743 /src/librustc_codegen_ssa | |
| parent | f25811e34bf89c3dde760d826ad4662c245be202 (diff) | |
| download | rust-f07100afc8650101ac924d728521e1a5d0ce9080.tar.gz rust-f07100afc8650101ac924d728521e1a5d0ce9080.zip | |
Use for<'tcx> fn pointers in Providers, instead of having Providers<'tcx>.
Diffstat (limited to 'src/librustc_codegen_ssa')
| -rw-r--r-- | src/librustc_codegen_ssa/back/symbol_export.rs | 8 | ||||
| -rw-r--r-- | src/librustc_codegen_ssa/base.rs | 2 | ||||
| -rw-r--r-- | src/librustc_codegen_ssa/lib.rs | 4 | ||||
| -rw-r--r-- | src/librustc_codegen_ssa/traits/backend.rs | 4 |
4 files changed, 9 insertions, 9 deletions
diff --git a/src/librustc_codegen_ssa/back/symbol_export.rs b/src/librustc_codegen_ssa/back/symbol_export.rs index 217ad57ddc9..2efbfcb9950 100644 --- a/src/librustc_codegen_ssa/back/symbol_export.rs +++ b/src/librustc_codegen_ssa/back/symbol_export.rs @@ -161,9 +161,9 @@ fn is_reachable_non_generic_provider_extern(tcx: TyCtxt<'_>, def_id: DefId) -> b } fn exported_symbols_provider_local( - tcx: TyCtxt<'_>, + tcx: TyCtxt<'tcx>, cnum: CrateNum, -) -> &'tcx [(ExportedSymbol<'_>, SymbolExportLevel)] { +) -> &'tcx [(ExportedSymbol<'tcx>, SymbolExportLevel)] { assert_eq!(cnum, LOCAL_CRATE); if !tcx.sess.opts.output_types.should_codegen() { @@ -366,7 +366,7 @@ fn is_unreachable_local_definition_provider(tcx: TyCtxt<'_>, def_id: DefId) -> b } } -pub fn provide(providers: &mut Providers<'_>) { +pub 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 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 5b14258bd25..4e257fba44a 100644 --- a/src/librustc_codegen_ssa/base.rs +++ b/src/librustc_codegen_ssa/base.rs @@ -853,7 +853,7 @@ impl CrateInfo { } } -pub fn provide_both(providers: &mut Providers<'_>) { +pub 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 618df15f5bc..bdd73c08313 100644 --- a/src/librustc_codegen_ssa/lib.rs +++ b/src/librustc_codegen_ssa/lib.rs @@ -138,12 +138,12 @@ pub struct CodegenResults { pub crate_info: CrateInfo, } -pub fn provide(providers: &mut Providers<'_>) { +pub fn provide(providers: &mut Providers) { crate::back::symbol_export::provide(providers); crate::base::provide_both(providers); } -pub fn provide_extern(providers: &mut Providers<'_>) { +pub fn provide_extern(providers: &mut Providers) { crate::back::symbol_export::provide_extern(providers); crate::base::provide_both(providers); } diff --git a/src/librustc_codegen_ssa/traits/backend.rs b/src/librustc_codegen_ssa/traits/backend.rs index 6cbb47efa99..3522ea01153 100644 --- a/src/librustc_codegen_ssa/traits/backend.rs +++ b/src/librustc_codegen_ssa/traits/backend.rs @@ -55,8 +55,8 @@ pub trait CodegenBackend { fn print_version(&self) {} fn metadata_loader(&self) -> Box<MetadataLoaderDyn>; - fn provide(&self, _providers: &mut Providers<'_>); - fn provide_extern(&self, _providers: &mut Providers<'_>); + fn provide(&self, _providers: &mut Providers); + fn provide_extern(&self, _providers: &mut Providers); fn codegen_crate<'tcx>( &self, tcx: TyCtxt<'tcx>, |
