diff options
| author | Mazdak Farrokhzad <twingoow@gmail.com> | 2019-02-25 11:42:25 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-25 11:42:25 +0100 |
| commit | 2a69aec94791d261f47adebea4264671e45bb2d6 (patch) | |
| tree | aa28eecfb5124ba60a3d06ab62ff0466f89cd8d3 /src/librustc_codegen_ssa/back | |
| parent | 77e2e84191fba8dd7a2d633f055ca31786d8f8ab (diff) | |
| parent | 1d34f2c22879886fcd452da096317861f8a0c9e6 (diff) | |
| download | rust-2a69aec94791d261f47adebea4264671e45bb2d6.tar.gz rust-2a69aec94791d261f47adebea4264671e45bb2d6.zip | |
Rollup merge of #58720 - Centril:deny-elided_lifetimes_in_paths-librustc_codegen_ssa, r=oli-obk
librustc_codegen_ssa: #![deny(elided_lifetimes_in_paths)] As part of the Rust 2018 transition, remove `#![allow(elided_lifetimes_in_paths)]` from `librustc_codegen_ssa`. r? @oli-obk
Diffstat (limited to 'src/librustc_codegen_ssa/back')
| -rw-r--r-- | src/librustc_codegen_ssa/back/command.rs | 2 | ||||
| -rw-r--r-- | src/librustc_codegen_ssa/back/linker.rs | 4 | ||||
| -rw-r--r-- | src/librustc_codegen_ssa/back/symbol_export.rs | 10 | ||||
| -rw-r--r-- | src/librustc_codegen_ssa/back/write.rs | 18 |
4 files changed, 17 insertions, 17 deletions
diff --git a/src/librustc_codegen_ssa/back/command.rs b/src/librustc_codegen_ssa/back/command.rs index bc484ace584..78570cce57d 100644 --- a/src/librustc_codegen_ssa/back/command.rs +++ b/src/librustc_codegen_ssa/back/command.rs @@ -159,7 +159,7 @@ impl Command { } impl fmt::Debug for Command { - fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { + fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { self.command().fmt(f) } } diff --git a/src/librustc_codegen_ssa/back/linker.rs b/src/librustc_codegen_ssa/back/linker.rs index 356bb8d50ad..1f4c5543fa9 100644 --- a/src/librustc_codegen_ssa/back/linker.rs +++ b/src/librustc_codegen_ssa/back/linker.rs @@ -25,7 +25,7 @@ pub struct LinkerInfo { } impl LinkerInfo { - pub fn new(tcx: TyCtxt) -> LinkerInfo { + pub fn new(tcx: TyCtxt<'_, '_, '_>) -> LinkerInfo { LinkerInfo { exports: tcx.sess.crate_types.borrow().iter().map(|&c| { (c, exported_symbols(tcx, c)) @@ -1052,7 +1052,7 @@ impl<'a> Linker for WasmLd<'a> { } } -fn exported_symbols(tcx: TyCtxt, crate_type: CrateType) -> Vec<String> { +fn exported_symbols(tcx: TyCtxt<'_, '_, '_>, crate_type: CrateType) -> Vec<String> { if let Some(ref exports) = tcx.sess.target.target.options.override_export_symbols { return exports.clone() } diff --git a/src/librustc_codegen_ssa/back/symbol_export.rs b/src/librustc_codegen_ssa/back/symbol_export.rs index c372892c521..16f5880b13f 100644 --- a/src/librustc_codegen_ssa/back/symbol_export.rs +++ b/src/librustc_codegen_ssa/back/symbol_export.rs @@ -22,7 +22,7 @@ pub type ExportedSymbols = FxHashMap< Arc<Vec<(String, SymbolExportLevel)>>, >; -pub fn threshold(tcx: TyCtxt) -> SymbolExportLevel { +pub fn threshold(tcx: TyCtxt<'_, '_, '_>) -> SymbolExportLevel { crates_export_threshold(&tcx.sess.crate_types.borrow()) } @@ -342,7 +342,7 @@ fn upstream_monomorphizations_for_provider<'a, 'tcx>( .cloned() } -fn is_unreachable_local_definition_provider(tcx: TyCtxt, def_id: DefId) -> bool { +fn is_unreachable_local_definition_provider(tcx: TyCtxt<'_, '_, '_>, def_id: DefId) -> bool { if let Some(node_id) = tcx.hir().as_local_node_id(def_id) { !tcx.reachable_set(LOCAL_CRATE).0.contains(&node_id) } else { @@ -351,7 +351,7 @@ fn is_unreachable_local_definition_provider(tcx: TyCtxt, def_id: DefId) -> bool } } -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; @@ -359,12 +359,12 @@ pub fn provide(providers: &mut Providers) { providers.is_unreachable_local_definition = is_unreachable_local_definition_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; } -fn symbol_export_level(tcx: TyCtxt, sym_def_id: DefId) -> SymbolExportLevel { +fn symbol_export_level(tcx: TyCtxt<'_, '_, '_>, sym_def_id: DefId) -> SymbolExportLevel { // We export anything that's not mangled at the "C" layer as it probably has // to do with ABI concerns. We do not, however, apply such treatment to // special symbols in the standard library for various plumbing between diff --git a/src/librustc_codegen_ssa/back/write.rs b/src/librustc_codegen_ssa/back/write.rs index 20842553c26..908ee95efcb 100644 --- a/src/librustc_codegen_ssa/back/write.rs +++ b/src/librustc_codegen_ssa/back/write.rs @@ -321,7 +321,7 @@ fn need_pre_lto_bitcode_for_incr_comp(sess: &Session) -> bool { pub fn start_async_codegen<B: ExtraBackendMethods>( backend: B, - tcx: TyCtxt, + tcx: TyCtxt<'_, '_, '_>, time_graph: Option<TimeGraph>, metadata: EncodedMetadata, coordinator_receive: Receiver<Box<dyn Any + Send>>, @@ -947,7 +947,7 @@ enum MainThreadWorkerState { fn start_executing_work<B: ExtraBackendMethods>( backend: B, - tcx: TyCtxt, + tcx: TyCtxt<'_, '_, '_>, crate_info: &CrateInfo, shared_emitter: SharedEmitter, codegen_worker_send: Sender<Message<B>>, @@ -1683,7 +1683,7 @@ impl SharedEmitter { } impl Emitter for SharedEmitter { - fn emit(&mut self, db: &DiagnosticBuilder) { + fn emit(&mut self, db: &DiagnosticBuilder<'_>) { drop(self.sender.send(SharedEmitterMessage::Diagnostic(Diagnostic { msg: db.message(), code: db.code.clone(), @@ -1822,7 +1822,7 @@ impl<B: ExtraBackendMethods> OngoingCodegen<B> { } pub fn submit_pre_codegened_module_to_llvm(&self, - tcx: TyCtxt, + tcx: TyCtxt<'_, '_, '_>, module: ModuleCodegen<B::Module>) { self.wait_for_signal_to_codegen_item(); self.check_for_errors(tcx.sess); @@ -1832,7 +1832,7 @@ impl<B: ExtraBackendMethods> OngoingCodegen<B> { submit_codegened_module_to_llvm(&self.backend, tcx, module, cost); } - pub fn codegen_finished(&self, tcx: TyCtxt) { + pub fn codegen_finished(&self, tcx: TyCtxt<'_, '_, '_>) { self.wait_for_signal_to_codegen_item(); self.check_for_errors(tcx.sess); drop(self.coordinator_send.send(Box::new(Message::CodegenComplete::<B>))); @@ -1871,7 +1871,7 @@ impl<B: ExtraBackendMethods> OngoingCodegen<B> { pub fn submit_codegened_module_to_llvm<B: ExtraBackendMethods>( _backend: &B, - tcx: TyCtxt, + tcx: TyCtxt<'_, '_, '_>, module: ModuleCodegen<B::Module>, cost: u64 ) { @@ -1884,7 +1884,7 @@ pub fn submit_codegened_module_to_llvm<B: ExtraBackendMethods>( pub fn submit_post_lto_module_to_llvm<B: ExtraBackendMethods>( _backend: &B, - tcx: TyCtxt, + tcx: TyCtxt<'_, '_, '_>, module: CachedModuleCodegen ) { let llvm_work_item = WorkItem::CopyPostLtoArtifacts(module); @@ -1896,7 +1896,7 @@ pub fn submit_post_lto_module_to_llvm<B: ExtraBackendMethods>( pub fn submit_pre_lto_module_to_llvm<B: ExtraBackendMethods>( _backend: &B, - tcx: TyCtxt, + tcx: TyCtxt<'_, '_, '_>, module: CachedModuleCodegen ) { let filename = pre_lto_bitcode_filename(&module.name); @@ -1921,7 +1921,7 @@ pub fn pre_lto_bitcode_filename(module_name: &str) -> String { format!("{}.{}", module_name, PRE_LTO_BC_EXT) } -fn msvc_imps_needed(tcx: TyCtxt) -> bool { +fn msvc_imps_needed(tcx: TyCtxt<'_, '_, '_>) -> bool { // This should never be true (because it's not supported). If it is true, // something is wrong with commandline arg validation. assert!(!(tcx.sess.opts.cg.linker_plugin_lto.enabled() && |
