Commit 63cc785
committed
Auto merge of #152213 - JonathanBrouwer:rollup-trjCgZZ, r=JonathanBrouwer
Rollup of 13 pull requests
Successful merges:
- rust-lang/rust#152191 (Convert to inline diagnostics in `rustc_hir_analysis`)
- rust-lang/rust#149329 (Mark match arms in try and for as being from desugarings.)
- rust-lang/rust#151474 (Minor structural improvements)
- rust-lang/rust#152107 (Convert to inline diagnostics in `rustc_borrowck`)
- rust-lang/rust#152117 (Convert to inline diagnostics in `rustc_trait_selection`)
- rust-lang/rust#152136 (Consolidate type const checks on `tcx.is_type_const`)
- rust-lang/rust#152140 (Hard code the error code registry for custom drivers)
- rust-lang/rust#152155 (Fix typos in riscv64a23-unknown-linux-gnu.md)
- rust-lang/rust#152170 (Port `rustc_effective_visibility` to the new attribute parser)
- rust-lang/rust#152182 (update compiler stable backport zulip msg)
- rust-lang/rust#152184 (Port rustc_abi to the attribute parser)
- rust-lang/rust#152195 (update openmp/offload builds to LLVM 22, Part 1)
- rust-lang/rust#152202 (chore: clearify tidy's error message)
Failed merges:
- rust-lang/rust#151744 (fix refining_impl_trait suggestion with return_type_notation)
- rust-lang/rust#152212 (Port some attributes to the attr parser)2 files changed
Lines changed: 1 addition & 6 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
4 | 4 | | |
5 | 5 | | |
6 | 6 | | |
7 | | - | |
8 | 7 | | |
9 | 8 | | |
10 | 9 | | |
11 | 10 | | |
12 | 11 | | |
13 | 12 | | |
14 | | - | |
15 | 13 | | |
16 | 14 | | |
17 | 15 | | |
| |||
50 | 48 | | |
51 | 49 | | |
52 | 50 | | |
53 | | - | |
54 | | - | |
55 | 51 | | |
56 | 52 | | |
57 | 53 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
15 | 15 | | |
16 | 16 | | |
17 | 17 | | |
18 | | - | |
| 18 | + | |
19 | 19 | | |
20 | 20 | | |
21 | 21 | | |
| |||
76 | 76 | | |
77 | 77 | | |
78 | 78 | | |
79 | | - | |
80 | 79 | | |
81 | 80 | | |
82 | 81 | | |
| |||
0 commit comments