Commit 5c4a9c1
committed
Auto merge of #152035 - Zalathar:rollup-Ur7QmrJ, r=Zalathar
Rollup of 7 pull requests
Successful merges:
- rust-lang/rust#152008 (`rust-analyzer` subtree update)
- rust-lang/rust#151109 (fN::BITS constants for feature float_bits_const)
- rust-lang/rust#151976 (Rename `collect_active_jobs` to several distinct names)
- rust-lang/rust#151691 (compiletest: Don't assume `aux-crate` becomes a `*.so` with `no-prefer-dynamic`)
- rust-lang/rust#151919 (fix: Make `--color always` always print color with `--explain`)
- rust-lang/rust#152017 (Remove `with_no_trimmed_paths` use in query macro)
- rust-lang/rust#152028 (Convert to inline diagnostics in `rustc_driver_impl`)1 file changed
Lines changed: 1 addition & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
11 | 11 | | |
12 | 12 | | |
13 | 13 | | |
| 14 | + | |
14 | 15 | | |
15 | 16 | | |
16 | 17 | | |
| |||
0 commit comments