diff options
| author | bors <bors@rust-lang.org> | 2021-12-15 03:28:55 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2021-12-15 03:28:55 +0000 |
| commit | 195e931b02b69bbce1bcf4632f4e2d5603ef006b (patch) | |
| tree | f56ab523ec6f2a40e2ed60e80fc27f420bfe24f9 /compiler/rustc_codegen_cranelift/src/lib.rs | |
| parent | d594910a2da12f158477b4c7281716f535cfa3de (diff) | |
| parent | 22fc403757b4e1bbe91375781b33fe51db8030c2 (diff) | |
| download | rust-195e931b02b69bbce1bcf4632f4e2d5603ef006b.tar.gz rust-195e931b02b69bbce1bcf4632f4e2d5603ef006b.zip | |
Auto merge of #91945 - matthiaskrgr:rollup-jszf9zp, r=matthiaskrgr
Rollup of 7 pull requests Successful merges: - #90939 (Tweak errors coming from `for`-loop, `?` and `.await` desugaring) - #91859 (Iterator::cycle() — document empty iterator special case) - #91868 (Use `OutputFilenames` to generate output file for `-Zllvm-time-trace`) - #91870 (Revert setting a default for the MACOSX_DEPLOYMENT_TARGET env var for linking) - #91881 (Stabilize `iter::zip`) - #91882 (Remove `in_band_lifetimes` from `rustc_typeck`) - #91940 (Update cargo) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_codegen_cranelift/src/lib.rs')
| -rw-r--r-- | compiler/rustc_codegen_cranelift/src/lib.rs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/compiler/rustc_codegen_cranelift/src/lib.rs b/compiler/rustc_codegen_cranelift/src/lib.rs index beb97edf09e..fcdf6b50764 100644 --- a/compiler/rustc_codegen_cranelift/src/lib.rs +++ b/compiler/rustc_codegen_cranelift/src/lib.rs @@ -205,6 +205,7 @@ impl CodegenBackend for CraneliftCodegenBackend { &self, ongoing_codegen: Box<dyn Any>, _sess: &Session, + _outputs: &OutputFilenames, ) -> Result<(CodegenResults, FxHashMap<WorkProductId, WorkProduct>), ErrorReported> { Ok(*ongoing_codegen .downcast::<(CodegenResults, FxHashMap<WorkProductId, WorkProduct>)>() |
