Commit 6232478
committed
Auto merge of rust-lang#51334 - Mark-Simulacrum:rollup, r=Mark-Simulacrum
Rollup of 6 pull requests
Successful merges:
- rust-lang#51288 (Remove rustdoc-specific is_import field from HIR)
- rust-lang#51299 (const fn integer operations)
- rust-lang#51317 (Allow enabling incremental via config.toml)
- rust-lang#51323 (Generate br for all two target SwitchInts)
- rust-lang#51326 (Various minor slice iterator cleanups)
- rust-lang#51329 (Remove the unused `-Z trans-time-graph` flag.)
Failed merges:File tree
14 files changed
+363
-51
lines changed- src
- bootstrap
- libcore
- num
- slice
- librustc_codegen_llvm/mir
- librustc_metadata
- librustc_resolve
- librustc
- hir
- ich
- session
- librustdoc
- test/run-pass
14 files changed
+363
-51
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
279 | 279 | | |
280 | 280 | | |
281 | 281 | | |
| 282 | + | |
| 283 | + | |
| 284 | + | |
282 | 285 | | |
283 | 286 | | |
284 | 287 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
303 | 303 | | |
304 | 304 | | |
305 | 305 | | |
| 306 | + | |
306 | 307 | | |
307 | 308 | | |
308 | 309 | | |
| |||
529 | 530 | | |
530 | 531 | | |
531 | 532 | | |
| 533 | + | |
| 534 | + | |
| 535 | + | |
| 536 | + | |
532 | 537 | | |
533 | 538 | | |
534 | 539 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
81 | 81 | | |
82 | 82 | | |
83 | 83 | | |
| 84 | + | |
84 | 85 | | |
85 | 86 | | |
86 | 87 | | |
| |||
0 commit comments