diff options
| author | bors <bors@rust-lang.org> | 2018-07-11 19:50:14 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2018-07-11 19:50:14 +0000 |
| commit | 704af2d7e1474ba60a0b70a5aa78e29905abb4e1 (patch) | |
| tree | ecccdd7baa7a2aea62eb9fc8f40ffb877ce71903 /src/librustc_codegen_llvm/back/write.rs | |
| parent | d573fe17786b9c2f5a766498d411d54eee5fa19f (diff) | |
| parent | a0b288e1b85424bb3a5b1f89fc904d431d904a1c (diff) | |
Auto merge of #52268 - Mark-Simulacrum:rollup, r=Mark-Simulacrum
Rollup of 14 pull requests Successful merges: - #51614 (Correct suggestion for println) - #51952 ( hygiene: Decouple transparencies from expansion IDs) - #52193 (step_by: leave time of item skip unspecified) - #52207 (improve error message shown for unsafe operations) - #52223 (Deny bare trait objects in in src/liballoc) - #52224 (Deny bare trait objects in in src/libsyntax) - #52239 (Remove sync::Once::call_once 'static bound) - #52247 (Deny bare trait objects in in src/librustc) - #52248 (Deny bare trait objects in in src/librustc_allocator) - #52252 (Deny bare trait objects in in src/librustc_codegen_llvm) - #52253 (Deny bare trait objects in in src/librustc_data_structures) - #52254 (Deny bare trait objects in in src/librustc_metadata) - #52261 (Deny bare trait objects in in src/libpanic_unwind) - #52265 (Deny bare trait objects in in src/librustc_codegen_utils) Failed merges: r? @ghost
Diffstat (limited to 'src/librustc_codegen_llvm/back/write.rs')
| -rw-r--r-- | src/librustc_codegen_llvm/back/write.rs | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/librustc_codegen_llvm/back/write.rs b/src/librustc_codegen_llvm/back/write.rs index 5382bbafcf4..467782518f6 100644 --- a/src/librustc_codegen_llvm/back/write.rs +++ b/src/librustc_codegen_llvm/back/write.rs @@ -140,7 +140,7 @@ pub fn create_target_machine(sess: &Session, find_features: bool) -> TargetMachi // that `is_pie_binary` is false. When we discover LLVM target features // `sess.crate_types` is uninitialized so we cannot access it. pub fn target_machine_factory(sess: &Session, find_features: bool) - -> Arc<Fn() -> Result<TargetMachineRef, String> + Send + Sync> + -> Arc<dyn Fn() -> Result<TargetMachineRef, String> + Send + Sync> { let reloc_model = get_reloc_model(sess); @@ -343,7 +343,7 @@ pub struct CodegenContext { regular_module_config: Arc<ModuleConfig>, metadata_module_config: Arc<ModuleConfig>, allocator_module_config: Arc<ModuleConfig>, - pub tm_factory: Arc<Fn() -> Result<TargetMachineRef, String> + Send + Sync>, + pub tm_factory: Arc<dyn Fn() -> Result<TargetMachineRef, String> + Send + Sync>, pub msvc_imps_needed: bool, pub target_pointer_width: String, debuginfo: config::DebugInfoLevel, @@ -362,7 +362,7 @@ pub struct CodegenContext { // compiling incrementally pub incr_comp_session_dir: Option<PathBuf>, // Channel back to the main control thread to send messages to - coordinator_send: Sender<Box<Any + Send>>, + coordinator_send: Sender<Box<dyn Any + Send>>, // A reference to the TimeGraph so we can register timings. None means that // measuring is disabled. time_graph: Option<TimeGraph>, @@ -884,7 +884,7 @@ pub fn start_async_codegen(tcx: TyCtxt, time_graph: Option<TimeGraph>, link: LinkMeta, metadata: EncodedMetadata, - coordinator_receive: Receiver<Box<Any + Send>>, + coordinator_receive: Receiver<Box<dyn Any + Send>>, total_cgus: usize) -> OngoingCodegen { let sess = tcx.sess; @@ -1412,7 +1412,7 @@ fn start_executing_work(tcx: TyCtxt, crate_info: &CrateInfo, shared_emitter: SharedEmitter, codegen_worker_send: Sender<Message>, - coordinator_receive: Receiver<Box<Any + Send>>, + coordinator_receive: Receiver<Box<dyn Any + Send>>, total_cgus: usize, jobserver: Client, time_graph: Option<TimeGraph>, @@ -1976,7 +1976,7 @@ fn spawn_work(cgcx: CodegenContext, work: WorkItem) { // Set up a destructor which will fire off a message that we're done as // we exit. struct Bomb { - coordinator_send: Sender<Box<Any + Send>>, + coordinator_send: Sender<Box<dyn Any + Send>>, result: Option<WorkItemResult>, worker_id: usize, } @@ -2056,7 +2056,7 @@ pub unsafe fn with_llvm_pmb(llmod: ModuleRef, config: &ModuleConfig, opt_level: llvm::CodeGenOptLevel, prepare_for_thin_lto: bool, - f: &mut FnMut(llvm::PassManagerBuilderRef)) { + f: &mut dyn FnMut(llvm::PassManagerBuilderRef)) { use std::ptr; // Create the PassManagerBuilder for LLVM. We configure it with @@ -2243,7 +2243,7 @@ pub struct OngoingCodegen { linker_info: LinkerInfo, crate_info: CrateInfo, time_graph: Option<TimeGraph>, - coordinator_send: Sender<Box<Any + Send>>, + coordinator_send: Sender<Box<dyn Any + Send>>, codegen_worker_receive: Receiver<Message>, shared_emitter_main: SharedEmitterMain, future: thread::JoinHandle<Result<CompiledModules, ()>>, |
