diff options
| author | bors <bors@rust-lang.org> | 2023-03-23 21:16:57 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2023-03-23 21:16:57 +0000 |
| commit | 1459b3128e288a85fcc4dd1fee7ada2cdcf28794 (patch) | |
| tree | f31be534855b77ac6d4ac49aeb9374499be2fe0e /compiler/rustc_codegen_ssa | |
| parent | e2163008763c326ec4003e07b8e6eef0c98f6204 (diff) | |
| parent | 3961ef5bc84f8f6057e34bf61b92561bef5c8e64 (diff) | |
| download | rust-1459b3128e288a85fcc4dd1fee7ada2cdcf28794.tar.gz rust-1459b3128e288a85fcc4dd1fee7ada2cdcf28794.zip | |
Auto merge of #109538 - matthiaskrgr:rollup-ct58npj, r=matthiaskrgr
Rollup of 8 pull requests Successful merges: - #106964 (Clarify `Error::last_os_error` can be weird) - #107718 (Add `-Z time-passes-format` to allow specifying a JSON output for `-Z time-passes`) - #107880 (Lint ambiguous glob re-exports) - #108549 (Remove issue number for `link_cfg`) - #108588 (Fix the ffi_unwind_calls lint documentation) - #109231 (Add `try_canonicalize` to `rustc_fs_util` and use it over `fs::canonicalize`) - #109472 (Add parentheses properly for method calls) - #109487 (Move useless_anynous_reexport lint into unused_imports) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_codegen_ssa')
| -rw-r--r-- | compiler/rustc_codegen_ssa/src/base.rs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/compiler/rustc_codegen_ssa/src/base.rs b/compiler/rustc_codegen_ssa/src/base.rs index 4d34b3da5f5..c3c8649dbff 100644 --- a/compiler/rustc_codegen_ssa/src/base.rs +++ b/compiler/rustc_codegen_ssa/src/base.rs @@ -786,6 +786,7 @@ pub fn codegen_crate<B: ExtraBackendMethods>( total_codegen_time, start_rss.unwrap(), end_rss, + tcx.sess.opts.unstable_opts.time_passes_format, ); } |