Commit c3e91ae
committed
Auto merge of rust-lang#109538 - matthiaskrgr:rollup-ct58npj, r=matthiaskrgr
Rollup of 8 pull requests
Successful merges:
- rust-lang#106964 (Clarify `Error::last_os_error` can be weird)
- rust-lang#107718 (Add `-Z time-passes-format` to allow specifying a JSON output for `-Z time-passes`)
- rust-lang#107880 (Lint ambiguous glob re-exports)
- rust-lang#108549 (Remove issue number for `link_cfg`)
- rust-lang#108588 (Fix the ffi_unwind_calls lint documentation)
- rust-lang#109231 (Add `try_canonicalize` to `rustc_fs_util` and use it over `fs::canonicalize`)
- rust-lang#109472 (Add parentheses properly for method calls)
- rust-lang#109487 (Move useless_anynous_reexport lint into unused_imports)
Failed merges:
r? `@ghost`
`@rustbot` modify labels: rollup1 file changed
+10
-2
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
370 | 370 | | |
371 | 371 | | |
372 | 372 | | |
373 | | - | |
| 373 | + | |
374 | 374 | | |
375 | 375 | | |
376 | 376 | | |
| |||
882 | 882 | | |
883 | 883 | | |
884 | 884 | | |
| 885 | + | |
| 886 | + | |
| 887 | + | |
| 888 | + | |
| 889 | + | |
| 890 | + | |
| 891 | + | |
885 | 892 | | |
886 | 893 | | |
887 | 894 | | |
| |||
892 | 899 | | |
893 | 900 | | |
894 | 901 | | |
895 | | - | |
| 902 | + | |
| 903 | + | |
896 | 904 | | |
897 | 905 | | |
898 | 906 | | |
| |||
0 commit comments