Commit ae661ce
committed
Auto merge of #111287 - matthiaskrgr:rollup-9lzax2c, r=matthiaskrgr
Rollup of 7 pull requests
Successful merges:
- #110577 (Use fulfillment to check `Drop` impl compatibility)
- #110610 (Add Terminator conversion from MIR to SMIR, part #1)
- #110985 (Fix spans in LLVM-generated inline asm errors)
- #110989 (Make the BUG_REPORT_URL configurable by tools )
- #111167 (debuginfo: split method declaration and definition)
- #111230 (add hint for =< as <=)
- #111279 (More robust debug assertions for `Instance::resolve` on built-in traits with non-standard trait items)
Failed merges:
r? `@ghost`
`@rustbot` modify labels: rollup1 file changed
+5
-3
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
286 | 286 | | |
287 | 287 | | |
288 | 288 | | |
289 | | - | |
290 | | - | |
291 | | - | |
292 | 289 | | |
293 | 290 | | |
| 291 | + | |
| 292 | + | |
294 | 293 | | |
295 | 294 | | |
296 | 295 | | |
| |||
309 | 308 | | |
310 | 309 | | |
311 | 310 | | |
| 311 | + | |
| 312 | + | |
| 313 | + | |
312 | 314 | | |
313 | 315 | | |
314 | 316 | | |
| |||
0 commit comments