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 #61886

Merged
merged 18 commits into from
Jun 16, 2019
Merged

Rollup of 6 pull requests #61886

merged 18 commits into from
Jun 16, 2019

Conversation

Centril
Copy link
Contributor

@Centril Centril commented Jun 16, 2019

Successful merges:

Failed merges:

r? @ghost

scottmcm and others added 18 commits June 8, 2019 22:38
These are more than just `.into_iter().collect()`, so talk about some of their nuances.
Co-Authored-By: Mazdak Farrokhzad <twingoow@gmail.com>
Since simulacrum suggested (on Discord) they're better there.
Co-Authored-By: Joe ST <joe@fbstj.net>
Let's try the auto-linking instead, since the relative ones don't work.
Some -L and -l flags may be needed even when building librustc_llvm,
for example when using static libc++ on Linux we may need to manually
specify the library search path and -ldl -lpthread as additional link
dependencies. We pass LLVM linker flags from config to librustc_llvm
build to make sure these cases are handled.
Signed-off-by: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>
Add some Vec <-> VecDeque documentation

These are more than just `.into_iter().collect()`, so talk about some of their nuances.

For VecDeque -> Vec I'm trying to intentionally not write a guarantee for people making their own `Vec`s, since the rules are more complicated than I think we want to commit to forever.

The "Vec -> VecDeque doesn't reallocate" guarantee seems reasonable, though.  (And I'm intentionally ambiguous about when it's O(1) instead of O(n).)
…crichton

Pass LLVM linker flags to librustc_llvm build

Some -L and -l flags may be needed even when building librustc_llvm,
for example when using static libc++ on Linux we may need to manually
specify the library search path and -ldl -lpthread as additional link
dependencies. We pass LLVM linker flags from config to librustc_llvm
build to make sure these cases are handled.
rustbuild: include llvm-libunwind in dist tarball

Without this we cannot build with llvm-libunwind enabled from a release tarball.

Could it be backported in a beta rollup somehow so that this gets fixed before 1.36 is released?
…exreg

Cleanup some new active feature gates

r? @alexreg
@Centril
Copy link
Contributor Author

Centril commented Jun 16, 2019

@bors r+ p=6 rollup=never

@bors
Copy link
Contributor

bors commented Jun 16, 2019

📌 Commit cd9bb48 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 Jun 16, 2019
@bors
Copy link
Contributor

bors commented Jun 16, 2019

⌛ Testing commit cd9bb48 with merge 374c63e...

bors added a commit that referenced this pull request Jun 16, 2019
Rollup of 6 pull requests

Successful merges:

 - #61447 (Add some Vec <-> VecDeque documentation)
 - #61704 (Pass LLVM linker flags to librustc_llvm build)
 - #61829 (rustbuild: include llvm-libunwind in dist tarball)
 - #61832 (update miri)
 - #61866 (Remove redundant `clone()`s)
 - #61869 (Cleanup some new active feature gates)

Failed merges:

r? @ghost
@bors
Copy link
Contributor

bors commented Jun 16, 2019

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

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Jun 16, 2019
@bors bors merged commit cd9bb48 into rust-lang:master Jun 16, 2019
@rust-highfive
Copy link
Collaborator

📣 Toolstate changed by #61886!

Tested on commit 374c63e.
Direct link to PR: #61886

🎉 miri on windows: build-fail → test-pass (cc @oli-obk @RalfJung @eddyb, @rust-lang/infra).
🎉 miri on linux: build-fail → test-pass (cc @oli-obk @RalfJung @eddyb, @rust-lang/infra).

rust-highfive added a commit to rust-lang-nursery/rust-toolstate that referenced this pull request Jun 16, 2019
Tested on commit rust-lang/rust@374c63e.
Direct link to PR: <rust-lang/rust#61886>

🎉 miri on windows: build-fail → test-pass (cc @oli-obk @RalfJung @eddyb, @rust-lang/infra).
🎉 miri on linux: build-fail → test-pass (cc @oli-obk @RalfJung @eddyb, @rust-lang/infra).
@Centril Centril deleted the rollup-3p3m2fu branch June 16, 2019 07:39
@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.

8 participants