Commit ddf9140
committed
Auto merge of #146304 - matthiaskrgr:rollup-69hs07h, r=matthiaskrgr
Rollup of 4 pull requests
Successful merges:
- rust-lang/rust#146170 (fix: offline rustdoc html missing favicon)
- rust-lang/rust#146209 (Misc LTO cleanups)
- rust-lang/rust#146269 (feat(std): emulate flock for solaris via fcntl)
- rust-lang/rust#146297 (Introduce PlaceContext::may_observe_address.)
r? `@ghost`
`@rustbot` modify labels: rollup2 files changed
Lines changed: 4 additions & 14 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
305 | 305 | | |
306 | 306 | | |
307 | 307 | | |
308 | | - | |
309 | | - | |
310 | | - | |
311 | | - | |
| 308 | + | |
312 | 309 | | |
313 | | - | |
| 310 | + | |
314 | 311 | | |
315 | 312 | | |
316 | 313 | | |
| |||
650 | 647 | | |
651 | 648 | | |
652 | 649 | | |
653 | | - | |
654 | | - | |
655 | | - | |
656 | | - | |
657 | 650 | | |
658 | 651 | | |
659 | 652 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
408 | 408 | | |
409 | 409 | | |
410 | 410 | | |
411 | | - | |
412 | | - | |
413 | | - | |
414 | | - | |
415 | | - | |
| 411 | + | |
| 412 | + | |
416 | 413 | | |
417 | 414 | | |
418 | 415 | | |
| |||
0 commit comments