Commit 37d001e
committed
Auto merge of rust-lang#61317 - oli-obk:rollup-tm5qivq, r=oli-obk
Rollup of 7 pull requests
Successful merges:
- rust-lang#60549 (do not print panic message on doctest failures)
- rust-lang#60885 (strip synstructure consts from compiler docs)
- rust-lang#61217 (Account for short-hand init structs when suggesting conversion)
- rust-lang#61261 (is_union returns ty to avoid computing it twice)
- rust-lang#61293 (Print const generics properly in rustdoc)
- rust-lang#61310 (split libcore::mem into multiple files)
- rust-lang#61313 (Simplify Set1::insert)
Failed merges:
r? @ghostFile tree
28 files changed
+1761
-1507
lines changed- src
- bootstrap
- libcore
- mem
- librustc_macros
- librustc_mir/borrow_check
- librustc_typeck/check
- librustc/middle
- librustdoc
- clean
- test
- rustdoc-ui
- rustdoc/const-generics
- ui
- consts
- suggestions
28 files changed
+1761
-1507
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
860 | 860 | | |
861 | 861 | | |
862 | 862 | | |
863 | | - | |
| 863 | + | |
864 | 864 | | |
865 | 865 | | |
866 | 866 | | |
| |||
2875 | 2875 | | |
2876 | 2876 | | |
2877 | 2877 | | |
2878 | | - | |
| 2878 | + | |
2879 | 2879 | | |
2880 | 2880 | | |
2881 | 2881 | | |
| |||
3428 | 3428 | | |
3429 | 3429 | | |
3430 | 3430 | | |
3431 | | - | |
| 3431 | + | |
3432 | 3432 | | |
3433 | 3433 | | |
3434 | 3434 | | |
| |||
4367 | 4367 | | |
4368 | 4368 | | |
4369 | 4369 | | |
4370 | | - | |
| 4370 | + | |
4371 | 4371 | | |
4372 | 4372 | | |
4373 | 4373 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
728 | 728 | | |
729 | 729 | | |
730 | 730 | | |
731 | | - | |
| 731 | + | |
732 | 732 | | |
733 | 733 | | |
734 | 734 | | |
| |||
0 commit comments