Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rollup of 8 pull requests #69822

Merged
merged 21 commits into from
Mar 8, 2020
Merged

Rollup of 8 pull requests #69822

merged 21 commits into from
Mar 8, 2020

Conversation

Centril
Copy link
Contributor

@Centril Centril commented Mar 8, 2020

Successful merges:

Failed merges:

r? @ghost

JohnTitor and others added 21 commits February 24, 2020 18:06
`ImportDirectiveSubclass` -> `ImportKind`
`ImportKind::SingleImport` -> `ImportKind::Single`
`ImportKind::GlobImport` -> `ImportKind::Glob`
…trochenkov

Turn trailing tokens in `assert!()` into hard errors

I didn't have time to build the compiler and thus edited the tests manually, I hope it will still pass.

Closes rust-lang#69531
r? @Centril do you want to queue the Crater experiment?
…=Mark-Simulacrum

Clean up unstable book

- rust-lang#58402's feature was renamed to `tidy_test_never_used_anywhere_else` and it is now used for tidy only
- `read_initializer` link is wrong and the doc should be auto-generated so removed
- Add dummy doc for `link_cfg`
- Stop generating `compiler_builtins_lib` doc in favor of b8ccc0f
- Make `rustc_attrs` tracking issue "None"
…idtwco

check_binding_alt_eq_ty: improve precision wrt. `if let`

Follow up to rust-lang#69452 -- this tweaks the `check_binding_alt_eq_ty` logic wrt. wording so that `if let` doesn't include "in this arm" (because there can only ever be one arm).

r? @estebank
Update books

## nomicon

8 commits in 3e6e1001dc6e095dbd5c88005e80969f60e384e1..9f797e65e6bcc79419975b17aff8e21c9adc039f
2019-12-14 22:08:52 +0000 to 2020-03-04 03:45:13 +0100
- Rustup to latest rustc (rust-lang/nomicon#203)
- (minor) Add backticks around type names (rust-lang/nomicon#197)
- Add book.toml (rust-lang/nomicon#185)
- Rename `Alloc` to `AllocRef` (rust-lang/nomicon#188)
- Lifetimes: explain how to fix destructor example (rust-lang/nomicon#195)
- mention soundness (rust-lang/nomicon#194)
- Fix example in FFI section Calling Rust from C (rust-lang/nomicon#193)
- Removed repeated word (rust-lang/nomicon#191)

## reference

8 commits in 64239df..559e09c
2020-02-10 19:05:13 +0100 to 2020-03-02 01:17:14 +0100
- Syntax error fix (rust-lang/reference#769)
- Fix incorrect pseudocode for #[repr(C)] struct alignment (rust-lang/reference#766)
- Replace "Field-Less" with "Fieldless" (rust-lang/reference#768)
- Removed repeated word (rust-lang/reference#767)
- Update for change in const lint name. (rust-lang/reference#764)
- semantic type -> resolved type (rust-lang/reference#761)
- add behavior change of relative paths without `self` in 2018 edition (rust-lang/reference#757)
- assignment operator expressions -> compound assignment expressions (rust-lang/reference#759)

## rust-by-example

3 commits in 32facd5522ddbbf37baf01e4e4b6562bc55c071a..db57f899ea2a56a544c8d280cbf033438666273d
2020-02-11 09:25:06 -0300 to 2020-02-18 17:46:46 -0300
- Minor typo fix in src/mod/visibility (rust-lang/rust-by-example#1309)
- Don't suggest Into implements a reverse conversion (rust-lang/rust-by-example#1307)
- Improve grammar in example of 'in let' section (rust-lang/rust-by-example#1308)

## embedded-book

2 commits in b2e1092bf67bd4d7686c4553f186edbb7f5f92db..b81ffb7a6f4c5aaed92786e770e99db116aa4ebd
2020-01-30 08:45:46 +0000 to 2020-02-27 08:06:04 +0000
- Setting output to `high` needs a `true` argument  (rust-embedded/book#227)
- Add licence notes to index.md  (rust-embedded/book#226)
Fix & test leak of some BTreeMap nodes on panic during `into_iter`

Fixes rust-lang#69769
resolve: Modernize some naming

`ImportDirective` -> `Import`
`ImportDirectiveSubclass` -> `ImportKind`
`ImportKind::SingleImport` -> `ImportKind::Single`
`ImportKind::GlobImport` -> `ImportKind::Glob`
…s-bindings-after-at, r=Centril

test(bindings_after_at): add dynamic drop tests for bindings_after_at

Fixes rust-lang#67523.
Working towards rust-lang#65490.
@Centril
Copy link
Contributor Author

Centril commented Mar 8, 2020

@bors r+ p=1001 rollup=never

@bors
Copy link
Contributor

bors commented Mar 8, 2020

📌 Commit 49c82d1 has been approved by Centril

@bors
Copy link
Contributor

bors commented Mar 8, 2020

🌲 The tree is currently closed for pull requests below priority 1000, this pull request will be tested once the tree is reopened

@bors bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Mar 8, 2020
@Centril Centril added rollup A PR which is a rollup and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Mar 8, 2020
@bors
Copy link
Contributor

bors commented Mar 8, 2020

⌛ Testing commit 49c82d1 with merge 1d5241c...

@bors
Copy link
Contributor

bors commented Mar 8, 2020

☀️ Test successful - checks-azure
Approved by: Centril
Pushing 1d5241c to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Mar 8, 2020
@bors bors merged commit 1d5241c into rust-lang:master Mar 8, 2020
@rust-highfive
Copy link
Collaborator

📣 Toolstate changed by #69822!

Tested on commit 1d5241c.
Direct link to PR: #69822

🎉 nomicon on windows: test-fail → test-pass (cc @Gankra @frewsxcv).
🎉 nomicon on linux: test-fail → test-pass (cc @Gankra @frewsxcv).
🎉 reference on windows: test-fail → test-pass (cc @matthewjasper @Havvy @steveklabnik @ehuss).
🎉 reference on linux: test-fail → test-pass (cc @matthewjasper @Havvy @steveklabnik @ehuss).

rust-highfive added a commit to rust-lang-nursery/rust-toolstate that referenced this pull request Mar 8, 2020
Tested on commit rust-lang/rust@1d5241c.
Direct link to PR: <rust-lang/rust#69822>

🎉 nomicon on windows: test-fail → test-pass (cc @Gankra @frewsxcv).
🎉 nomicon on linux: test-fail → test-pass (cc @Gankra @frewsxcv).
🎉 reference on windows: test-fail → test-pass (cc @matthewjasper @Havvy @steveklabnik @ehuss).
🎉 reference on linux: test-fail → test-pass (cc @matthewjasper @Havvy @steveklabnik @ehuss).
@Centril Centril deleted the rollup-360ca2j branch March 8, 2020 15:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
merged-by-bors This PR was explicitly merged by bors. rollup A PR which is a rollup
Projects
None yet
Development

Successfully merging this pull request may close these issues.

9 participants