Commit 4b3f235
committed
Auto merge of rust-lang#107328 - matthiaskrgr:rollup-lfqwo0o, r=matthiaskrgr
Rollup of 8 pull requests
Successful merges:
- rust-lang#106904 (Preserve split DWARF files when building archives.)
- rust-lang#106971 (Handle diagnostics customization on the fluent side (for one specific diagnostic))
- rust-lang#106978 (Migrate mir_build's borrow conflicts)
- rust-lang#107150 (`ty::tls` cleanups)
- rust-lang#107168 (Use a type-alias-impl-trait in `ObligationForest`)
- rust-lang#107189 (Encode info for Adt in a single place.)
- rust-lang#107322 (Custom mir: Add support for some remaining, easy to support constructs)
- rust-lang#107323 (Disable ConstGoto opt in cleanup blocks)
Failed merges:
r? `@ghost`
`@rustbot` modify labels: rollup1 file changed
+8
-2
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
211 | 211 | | |
212 | 212 | | |
213 | 213 | | |
214 | | - | |
| 214 | + | |
215 | 215 | | |
216 | 216 | | |
217 | 217 | | |
218 | 218 | | |
219 | 219 | | |
220 | | - | |
| 220 | + | |
| 221 | + | |
| 222 | + | |
| 223 | + | |
221 | 224 | | |
222 | 225 | | |
223 | 226 | | |
| |||
261 | 264 | | |
262 | 265 | | |
263 | 266 | | |
| 267 | + | |
| 268 | + | |
| 269 | + | |
264 | 270 | | |
265 | 271 | | |
266 | 272 | | |
| |||
0 commit comments