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 6 pull requests #61105

Merged
merged 41 commits into from
May 24, 2019
Merged

Rollup of 6 pull requests #61105

merged 41 commits into from
May 24, 2019

Conversation

Centril
Copy link
Contributor

@Centril Centril commented May 23, 2019

Successful merges:

Failed merges:

r? @ghost

estebank and others added 30 commits May 22, 2019 13:10
Adds notes pointing at the non-nullary variants, and uses "custom
discriminant" language to be consistent with the Reference.
…d_lang_items, missing_lang_items, postorder_cnums and maybe_unused_extern_crates
…avis

Suggest dereferencing on assignment to mutable borrow

Fix rust-lang#33570
…=estebank

tweak discriminant on non-nullary enum diagnostic

Adds notes pointing at the non-nullary variants, and uses "custom
discriminant" language to be consistent with the Reference.

Fixes rust-lang#61039.

r? @estebank
fix dangling reference in Vec::append

Turns out I forgot to enable Miri again for the Vec tests. And there was a dangling reference hiding in there!  `get_unchecked_mut` is UB to call on an empty vector (there is no memory to get a reference to), and yet this code did it.
Box::into_unique: do the reborrow-to-raw *after* destroying the Box

Currently we first "reborrow" the box to a raw pointer, and then `forget` it. When tracking raw pointers more strictly (something I am experimenting with locally in Miri), the "use" induced by passing the box to `forget` invalidates the previously created raw pointer.

So adjust my hack from rust-lang#58429 to reorder the two operations.
…oop, r=estebank

Fix overflowing literal lint in loops

Fixes rust-lang#60459.

r? @estebank
@Centril
Copy link
Contributor Author

Centril commented May 23, 2019

@bors r+ p=6 rollup=never

@bors
Copy link
Contributor

bors commented May 23, 2019

📌 Commit 92fda92 has been approved by Centril

@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 May 23, 2019
@bors
Copy link
Contributor

bors commented May 23, 2019

⌛ Testing commit 92fda92 with merge e447304dfb00505ac0f2c4accb339d1a2f0eb6a9...

@bors
Copy link
Contributor

bors commented May 24, 2019

💔 Test failed - checks-travis

@rust-highfive
Copy link
Collaborator

Your PR failed on Travis (raw log). Through arcane magic we have determined that the following fragments from the build log may contain information about the problem.

Click to expand the log.
[00:00:00] Submodule 'src/tools/rls' (https://github.com/rust-lang-nursery/rls.git) registered for path 'src/tools/rls'
[00:00:00] Submodule 'src/rust-installer' (https://github.com/rust-lang/rust-installer.git) registered for path 'src/tools/rust-installer'
[00:00:00] Submodule 'src/tools/rustfmt' (https://github.com/rust-lang-nursery/rustfmt.git) registered for path 'src/tools/rustfmt'
[00:00:00] Cloning into '/home/travis/build/rust-lang/rust/src/doc/edition-guide'...
No output has been received in the last 30m0s, this potentially indicates a stalled build or something wrong with the build itself.
Check the details on how to adjust your build configuration on: https://docs.travis-ci.com/user/common-build-problems/#Build-times-out-because-no-output-was-received
The build has been terminated

I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact @TimNN. (Feature Requests)

@bors bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels May 24, 2019
@Centril
Copy link
Contributor Author

Centril commented May 24, 2019

@bors retry

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels May 24, 2019
@bors
Copy link
Contributor

bors commented May 24, 2019

⌛ Testing commit 92fda92 with merge fd8e23c...

bors added a commit that referenced this pull request May 24, 2019
Rollup of 6 pull requests

Successful merges:

 - #59545 (Use arenas to avoid Lrc in queries #2)
 - #61054 (Suggest dereferencing on assignment to mutable borrow)
 - #61056 (tweak discriminant on non-nullary enum diagnostic)
 - #61082 (fix dangling reference in Vec::append)
 - #61086 (Box::into_unique: do the reborrow-to-raw *after* destroying the Box)
 - #61098 (Fix overflowing literal lint in loops)

Failed merges:

r? @ghost
@bors
Copy link
Contributor

bors commented May 24, 2019

☀️ Test successful - checks-travis, status-appveyor
Approved by: Centril
Pushing fd8e23c to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label May 24, 2019
@bors bors merged commit 92fda92 into rust-lang:master May 24, 2019
@rust-highfive
Copy link
Collaborator

📣 Toolstate changed by #61105!

Tested on commit fd8e23c.
Direct link to PR: #61105

🎉 edition-guide on windows: test-fail → test-pass (cc @ehuss @Centril @steveklabnik, @rust-lang/infra).
🎉 edition-guide on linux: test-fail → test-pass (cc @ehuss @Centril @steveklabnik, @rust-lang/infra).

rust-highfive added a commit to rust-lang-nursery/rust-toolstate that referenced this pull request May 24, 2019
Tested on commit rust-lang/rust@fd8e23c.
Direct link to PR: <rust-lang/rust#61105>

🎉 edition-guide on windows: test-fail → test-pass (cc @ehuss @Centril @steveklabnik, @rust-lang/infra).
🎉 edition-guide on linux: test-fail → test-pass (cc @ehuss @Centril @steveklabnik, @rust-lang/infra).
@Centril Centril deleted the rollup-t9lemjf branch May 24, 2019 03:08
@Centril Centril added the rollup A PR which is a rollup label Oct 2, 2019
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 S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

8 participants