Commit 1e526bd
committed
Auto merge of rust-lang#88165 - GuillaumeGomez:rollup-4o0v2ps, r=GuillaumeGomez
Rollup of 8 pull requests
Successful merges:
- rust-lang#86123 (Preserve more spans in internal `rustc_queries!` macro)
- rust-lang#87874 (Add TcpStream type to TcpListener::incoming docs)
- rust-lang#88034 (rustc_privacy: Replace `HirId`s and `DefId`s with `LocalDefId`s where possible)
- rust-lang#88050 (Remove `HashStable` impls for `FileName` and `RealFileName`)
- rust-lang#88093 ([rustdoc] Wrap code blocks in `<code>` tag)
- rust-lang#88146 (Add tests for some `feature(const_evaluatable_checked)` incr comp issues)
- rust-lang#88153 (Update .mailmap)
- rust-lang#88159 (Use a trait instead of the now disallowed missing trait there)
Failed merges:
r? `@ghost`
`@rustbot` modify labels: rollup1 file changed
+14
-7
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
767 | 767 | | |
768 | 768 | | |
769 | 769 | | |
770 | | - | |
| 770 | + | |
771 | 771 | | |
772 | | - | |
| 772 | + | |
| 773 | + | |
| 774 | + | |
773 | 775 | | |
774 | | - | |
775 | | - | |
776 | | - | |
777 | | - | |
| 776 | + | |
| 777 | + | |
| 778 | + | |
| 779 | + | |
| 780 | + | |
| 781 | + | |
| 782 | + | |
| 783 | + | |
| 784 | + | |
778 | 785 | | |
779 | | - | |
780 | 786 | | |
| 787 | + | |
781 | 788 | | |
782 | 789 | | |
783 | 790 | | |
| |||
0 commit comments