Commit 3aea48a
committed
Auto merge of rust-lang#104481 - matthiaskrgr:rollup-hf8rev0, r=matthiaskrgr
Rollup of 10 pull requests
Successful merges:
- rust-lang#103484 (Add `rust` to `let_underscore_lock` example)
- rust-lang#103489 (Make `pointer::byte_offset_from` more generic)
- rust-lang#104193 (Shift no characters when using raw string literals)
- rust-lang#104348 (Respect visibility & stability of inherent associated types)
- rust-lang#104401 (avoid memory leak in mpsc test)
- rust-lang#104419 (Fix test/ui/issues/issue-30490.rs)
- rust-lang#104424 (rustdoc: remove no-op CSS `.popover { font-size: 1rem }`)
- rust-lang#104425 (rustdoc: remove no-op CSS `.main-header { justify-content }`)
- rust-lang#104450 (Fuchsia test suite script fix)
- rust-lang#104471 (Update PROBLEMATIC_CONSTS in style.rs)
Failed merges:
r? `@ghost`
`@rustbot` modify labels: rollupFile tree
3 files changed
+5
-4
lines changed- core/src/ptr
- std/src/sync/mpsc
3 files changed
+5
-4
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
709 | 709 | | |
710 | 710 | | |
711 | 711 | | |
712 | | - | |
| 712 | + | |
713 | 713 | | |
714 | 714 | | |
715 | 715 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
889 | 889 | | |
890 | 890 | | |
891 | 891 | | |
892 | | - | |
| 892 | + | |
893 | 893 | | |
894 | 894 | | |
895 | 895 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
713 | 713 | | |
714 | 714 | | |
715 | 715 | | |
716 | | - | |
| 716 | + | |
| 717 | + | |
717 | 718 | | |
718 | 719 | | |
719 | 720 | | |
720 | | - | |
| 721 | + | |
721 | 722 | | |
722 | 723 | | |
0 commit comments