Commit 7130fc5
committed
Auto merge of rust-lang#64972 - Centril:rollup-gcawast, r=Centril
Rollup of 7 pull requests
Successful merges:
- rust-lang#63416 (apfloat: improve doc comments)
- rust-lang#64820 (BTreeSet intersection, is_subset & difference optimizations)
- rust-lang#64910 (syntax: cleanup param, method, and misc parsing)
- rust-lang#64912 (Remove unneeded `fn main` blocks from docs)
- rust-lang#64933 (Fixes rust-lang#64919. Suggest fix based on operator precendence.)
- rust-lang#64943 (Add lower bound doctests for `saturating_{add,sub}` signed ints)
- rust-lang#64950 (Simplify interners)
Failed merges:
r? @ghostFile tree
36 files changed
+1093
-1092
lines changed- src
- liballoc
- collections/btree
- tests/btree
- libcore
- char
- fmt
- num
- ptr
- librustc_apfloat
- librustc_typeck/check
- librustc/ty
- libstd
- collections/hash
- net
- libsyntax/parse
- parser
- test/ui
- async-await
- infinite
- mismatched_types
- span
36 files changed
+1093
-1092
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
29 | 29 | | |
30 | 30 | | |
31 | 31 | | |
32 | | - | |
33 | | - | |
34 | | - | |
35 | | - | |
| 32 | + | |
| 33 | + | |
36 | 34 | | |
37 | 35 | | |
38 | 36 | | |
| |||
375 | 373 | | |
376 | 374 | | |
377 | 375 | | |
378 | | - | |
379 | | - | |
380 | | - | |
| 376 | + | |
| 377 | + | |
381 | 378 | | |
382 | | - | |
383 | | - | |
384 | | - | |
385 | | - | |
| 379 | + | |
| 380 | + | |
| 381 | + | |
386 | 382 | | |
387 | 383 | | |
388 | 384 | | |
| |||
428 | 424 | | |
429 | 425 | | |
430 | 426 | | |
431 | | - | |
432 | | - | |
433 | | - | |
434 | | - | |
435 | | - | |
436 | | - | |
| 427 | + | |
| 428 | + | |
| 429 | + | |
| 430 | + | |
437 | 431 | | |
438 | 432 | | |
439 | 433 | | |
440 | 434 | | |
441 | 435 | | |
442 | | - | |
443 | | - | |
444 | | - | |
445 | | - | |
446 | | - | |
447 | | - | |
| 436 | + | |
| 437 | + | |
| 438 | + | |
| 439 | + | |
448 | 440 | | |
449 | 441 | | |
450 | 442 | | |
| |||
780 | 772 | | |
781 | 773 | | |
782 | 774 | | |
783 | | - | |
784 | | - | |
785 | | - | |
786 | | - | |
787 | | - | |
| 775 | + | |
| 776 | + | |
| 777 | + | |
788 | 778 | | |
789 | 779 | | |
790 | 780 | | |
| |||
814 | 804 | | |
815 | 805 | | |
816 | 806 | | |
817 | | - | |
818 | | - | |
819 | | - | |
820 | | - | |
821 | | - | |
| 807 | + | |
| 808 | + | |
| 809 | + | |
822 | 810 | | |
823 | 811 | | |
824 | 812 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
2226 | 2226 | | |
2227 | 2227 | | |
2228 | 2228 | | |
2229 | | - | |
2230 | 2229 | | |
2231 | 2230 | | |
2232 | 2231 | | |
2233 | 2232 | | |
2234 | 2233 | | |
2235 | 2234 | | |
2236 | | - | |
2237 | 2235 | | |
2238 | 2236 | | |
2239 | 2237 | | |
| |||
0 commit comments