Commit 1d5241c
committed
Auto merge of rust-lang#69822 - Centril:rollup-360ca2j, r=Centril
Rollup of 8 pull requests
Successful merges:
- rust-lang#69422 (Remove use of `unwrap()` from save-analysis)
- rust-lang#69548 (Turn trailing tokens in `assert!()` into hard errors)
- rust-lang#69561 (Clean up unstable book)
- rust-lang#69599 (check_binding_alt_eq_ty: improve precision wrt. `if let`)
- rust-lang#69641 (Update books)
- rust-lang#69776 (Fix & test leak of some BTreeMap nodes on panic during `into_iter`)
- rust-lang#69805 (resolve: Modernize some naming)
- rust-lang#69810 (test(bindings_after_at): add dynamic drop tests for bindings_after_at)
Failed merges:
r? @ghostFile tree
44 files changed
+462
-455
lines changed- src
- doc
- unstable-book/src
- language-features
- library-features
- liballoc
- collections/btree
- tests/btree
- librustc_builtin_macros
- librustc_feature
- librustc_resolve
- librustc_save_analysis
- librustc_typeck/check
- test/ui
- consts/min_const_fn
- drop
- feature-gates
- issues
- macros
- methods
- on-unimplemented
- or-patterns
- proc-macro
- reserved
- rust-2018
- suggestions
- tool-attributes
- tools/tidy/src
Some content is hidden
Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
44 files changed
+462
-455
lines changedLines changed: 1 addition & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
2 | 2 | | |
3 | 3 | | |
4 | 4 | | |
5 | | - | |
| 5 | + | |
6 | 6 | | |
7 | 7 | | |
8 | 8 | | |
| |||
Lines changed: 2 additions & 2 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | 1 | | |
2 | 2 | | |
3 | | - | |
| 3 | + | |
4 | 4 | | |
5 | | - | |
| 5 | + | |
6 | 6 | | |
7 | 7 | | |
8 | 8 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
2 | 2 | | |
3 | 3 | | |
4 | 4 | | |
5 | | - | |
| 5 | + | |
6 | 6 | | |
7 | 7 | | |
8 | 8 | | |
| |||
Lines changed: 1 addition & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
2 | 2 | | |
3 | 3 | | |
4 | 4 | | |
5 | | - | |
| 5 | + | |
6 | 6 | | |
7 | 7 | | |
8 | 8 | | |
| |||
Lines changed: 0 additions & 7 deletions
This file was deleted.
0 commit comments