Commit 4f074de
committed
Auto merge of rust-lang#67964 - JohnTitor:rollup-pu5kosl, r=JohnTitor
Rollup of 13 pull requests
Successful merges:
- rust-lang#67566 (Add an unstable conversion from thread ID to u64)
- rust-lang#67671 (Account for `type X = impl Trait;` in lifetime suggestion)
- rust-lang#67727 (Stabilise vec::remove_item)
- rust-lang#67877 (Omit underscore constants from rustdoc)
- rust-lang#67880 (Handle multiple error fix suggestions carefuly)
- rust-lang#67898 (Improve hygiene of `newtype_index`)
- rust-lang#67908 (rustdoc: HTML escape const values)
- rust-lang#67909 (Fix ICE in const pretty printing and resolve FIXME)
- rust-lang#67929 (Formatting an example for method Vec.retain)
- rust-lang#67934 (Clean up E0178 explanation)
- rust-lang#67936 (fire "non_camel_case_types" for associated types)
- rust-lang#67943 (Missing module std in example.)
- rust-lang#67962 (Update books)
Failed merges:
r? @ghostFile tree
46 files changed
+237
-117
lines changed- src
- doc
- liballoc
- tests
- librustc_error_codes/error_codes
- librustc_errors
- librustc_hir
- librustc_index
- vec
- librustc_lint
- librustc_mir
- borrow_check
- constraints
- diagnostics
- type_check/liveness
- dataflow
- impls
- move_paths
- librustc_session
- librustc_span
- librustc
- dep_graph
- middle
- ty/print
- librustdoc
- html
- libstd
- net
- thread
- test
- rustdoc
- const-generics
- ui-fulldeps
- ui
- impl-trait/multiple-lifetimes
- issues
- lint
- type
- tools/compiletest/src
Some content is hidden
Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
46 files changed
+237
-117
lines changedSubmodule embedded-book updated 1 file
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
11 | 11 | | |
12 | 12 | | |
13 | 13 | | |
14 | | - | |
15 | 14 | | |
16 | 15 | | |
17 | 16 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1054 | 1054 | | |
1055 | 1055 | | |
1056 | 1056 | | |
1057 | | - | |
| 1057 | + | |
1058 | 1058 | | |
1059 | 1059 | | |
1060 | 1060 | | |
| |||
1696 | 1696 | | |
1697 | 1697 | | |
1698 | 1698 | | |
1699 | | - | |
1700 | 1699 | | |
1701 | 1700 | | |
1702 | 1701 | | |
1703 | 1702 | | |
1704 | 1703 | | |
1705 | 1704 | | |
1706 | | - | |
| 1705 | + | |
1707 | 1706 | | |
1708 | 1707 | | |
1709 | 1708 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
2 | 2 | | |
3 | 3 | | |
4 | 4 | | |
5 | | - | |
| 5 | + | |
6 | 6 | | |
7 | 7 | | |
8 | 8 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
50 | 50 | | |
51 | 51 | | |
52 | 52 | | |
53 | | - | |
54 | 53 | | |
55 | 54 | | |
56 | 55 | | |
| |||
0 commit comments