Rollup of 15 pull requests #62335
Merged
Rollup of 15 pull requests #62335
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
wip nth_back for chunks_exact working nth_back for chunks exact Signed-off-by: wizAmit <amitforfriends_dns@yahoo.com>
This commit moves a test out of libstd which is causing deadlocks on musl on CI. Looks like the recent update in musl versions brings in some internal updates to musl which makes `setgid` and `setuid` invalid to call after a `fork` in a multithreaded program. The issue seen here is that the child thread was attempting to grab a lock held by a nonexistent thread, meaning that the child process simply deadlocked causing the whole test to deadlock. This commit moves the test to its own file with no threads which should work.
Fixes rust-lang#62301, a regression in 1.36.0 which was caused by hashbrown using `NonZero<T>` where the older hashmap used `Unique<T>`.
…r=alexcrichton MSVC link output improve Resolves rust-lang#35785. However i haven't come up with a idea to add test case for this :( r? @retep998
…ck, r=scottmcm nth_back for chunks_exact wip nth_back for chunks_exact working nth_back for chunks exact Signed-off-by: wizAmit <amitforfriends_dns@yahoo.com> r? @timvermeulen r? @scottmcm
…thewjasper Adjust warning of -C extra-filename with -o. If `--emit` includes multiple unnamed outputs, and `-o` was specified, and `-C extra-filename` was specified, the compiler would warn that `-C extra-filename` was ignored, but this is not true. The "adapting" of the filenames includes the extra-filename info. Since this is a little convoluted and hard to follow, here is a little chart to summarize when running with `rustc foo.rs -o xyz -C extra-filename=asdf` `--emit` | Result ---------|-------- `link` | `xyz` (extra-filename ignored) `link,dep-info` | `xyzasdf`, `xyzasdf.d` (this PR removes the incorrect warning) As to whether or not this behavior is the best choice is another question.
…links, r=docs Add missing links for TryFrom docs r? @rust-lang/docs
std: Move a process test out of libstd This commit moves a test out of libstd which is causing deadlocks on musl on CI. Looks like the recent update in musl versions brings in some internal updates to musl which makes `setgid` and `setuid` invalid to call after a `fork` in a multithreaded program. The issue seen here is that the child thread was attempting to grab a lock held by a nonexistent thread, meaning that the child process simply deadlocked causing the whole test to deadlock. This commit moves the test to its own file with no threads which should work.
…ks-into, r=docs Add missing type urls in Into trait r? @rust-lang/docs
…tboats Add Vec::leak
import gdb for explicit access to gdb.current_objfile()
…-casts, r=RalfJung Enable intptrcast for explicit casts I checked locally that this does not break miri on master. r? @RalfJung
…, r=GuillaumeGomez Improve box clone doctests to ensure the documentation is valid
…, r=varkor Switch tracking issue for `#![feature(slice_patterns)]` Switches the tracking issue for `#![feature(slice_patterns)]` to a fresh one in rust-lang#62254 due to new RFCs. Closes rust-lang#23121. r? @varkor
Fix michaelwoerister's mailmap Noticed while going through some changes to thanks. cc @michaelwoerister r? @Centril
HashMap is UnwindSafe Fixes rust-lang#62301, a regression in 1.36.0-pre which was caused by hashbrown using `NonZero<T>` where the older hashmap used `Unique<T>`.
Fix mismatching Kleene operators
Fixed document bug, those replaced each other Originally reported by rust-lang#57686, introduced by rust-lang#58005
| @bors r+ p=10 |
| 📌 Commit 6b43b50 has been approved by |
bors added the S-waiting-on-bors bors added a commit that referenced this pull request Jul 3, 2019
Rollup of 15 pull requests Successful merges: - #62021 (MSVC link output improve) - #62064 (nth_back for chunks_exact) - #62128 (Adjust warning of -C extra-filename with -o.) - #62161 (Add missing links for TryFrom docs) - #62183 (std: Move a process test out of libstd) - #62186 (Add missing type urls in Into trait) - #62196 (Add Vec::leak) - #62199 (import gdb for explicit access to gdb.current_objfile()) - #62229 (Enable intptrcast for explicit casts) - #62250 (Improve box clone doctests to ensure the documentation is valid) - #62255 (Switch tracking issue for `#![feature(slice_patterns)]`) - #62285 (Fix michaelwoerister's mailmap) - #62304 (HashMap is UnwindSafe) - #62319 (Fix mismatching Kleene operators) - #62327 (Fixed document bug, those replaced each other) Failed merges: r? @ghost
| ☀️ Test successful - checks-azure, checks-travis, status-appveyor |
rust-highfive added a commit to rust-lang-nursery/rust-toolstate that referenced this pull request Jul 3, 2019
Tested on commit rust-lang/rust@088b987. Direct link to PR: <rust-lang/rust#62335> 💔 miri on windows: test-pass → test-fail (cc @oli-obk @RalfJung @eddyb, @rust-lang/infra).
This was referenced Jul 3, 2019
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
15 participants
Add this suggestion to a batch that can be applied as a single commit. This suggestion is invalid because no changes were made to the code. Suggestions cannot be applied while the pull request is closed. Suggestions cannot be applied while viewing a subset of changes. Only one suggestion per line can be applied in a batch. Add this suggestion to a batch that can be applied as a single commit. Applying suggestions on deleted lines is not supported. You must change the existing code in this line in order to create a valid suggestion. Outdated suggestions cannot be applied. This suggestion has been applied or marked resolved. Suggestions cannot be applied from pending reviews. Suggestions cannot be applied on multi-line comments. Suggestions cannot be applied while the pull request is queued to merge. Suggestion cannot be applied right now. Please check back later.
Successful merges:
#![feature(slice_patterns)]#62255 (Switch tracking issue for#![feature(slice_patterns)])Failed merges:
r? @ghost