Rollup of 8 pull requests #30555
Merged
Rollup of 8 pull requests #30555
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
Member
Manishearth
commented
Dec 25, 2015
Manishearth
commented
- Successful merges: Implement RFC 1328 Custom Panic Handlers #30485, libstd: unix process spawning: fix bug with setting stdio #30490, std: Ensure AssertRecoverSafe indeed is more often #30513, add openbsd snapshot #30518, Fix def paths creation for items inlined from external crates. #30528, Some operator fixes for the syntax index #30545, Properly convert and translate unit structs into MIR #30551, Fix whitespace alignment #30552
- Failed merges:
Types like `&AssertRecoverSafe<T>` and `Rc<AssertRecoverSafe<T>>` were mistakenly not considered recover safe, but the point of the assertion wrapper is that it indeed is! This was caused by an interaction between the `RecoverSafe` and `NoUnsafeCell` marker traits, and this is updated by adding an impl of the `NoUnsafeCell` marker trait for `AssertRecoverSafe` to ensure that it never interacts with the other negative impls of `RecoverSafe`. cc rust-lang#30510
Avoid duplicating the last element of the def path which led to paths like "std::slice::into_vec::into_vec".
- Correct the names of the comparison traits (PartialOrd) - Mention only the traits that overload the operator (PartialOrd, PartialEq), not operator-unrelated traits (Ord, Eq). - Add `!=` operator.
Trivial, but my eye is twitching.
|
r? @aturon (rust_highfive has picked a reviewer for you, use r? to override) |
|
@bors r+ p=10 force |
|
📌 Commit eef1be5 has been approved by |
|
@bors force |
|
⌛ Testing commit eef1be5 with merge 7753e0c... |
|
💔 Test failed - auto-win-gnu-64-nopt-t |
Types like `&AssertRecoverSafe<T>` and `Rc<AssertRecoverSafe<T>>` were mistakenly not considered recover safe, but the point of the assertion wrapper is that it indeed is! This was caused by an interaction between the `RecoverSafe` and `NoUnsafeCell` marker traits, and this is updated by adding an impl of the `NoUnsafeCell` marker trait for `AssertRecoverSafe` to ensure that it never interacts with the other negative impls of `RecoverSafe`. cc rust-lang#30510
…chton as the buildbot has timeouted when building snap3 branch, I regenerate one locally. here the diff that registers the OpenBSD snapshot. the archive is available at http://semarie.online.fr/rust/rust-stage0-2015-12-18-3391630-openbsd-x86_64-6c8aab2c8a169274942f9a15e460069a3ff64be9.tar.bz2 sha256 : de3c26a93cf9512922cc012f9b57bd08d7b64f7e0469a9bb032fa9c07260cf0c @alexcrichton does it is the good method for providing a snapshot ?
…hs, r=nikomatsakis Avoid duplicating the last element of the def path which led to paths like "std::slice::into_vec::into_vec". cc @rust-lang/compiler
…bnik book: Some operator fixes for the syntax index - Correct the names of the comparison traits (PartialOrd) - Mention only the traits that overload the operator (PartialOrd, PartialEq), not operator-unrelated traits (Ord, Eq). - Add `!=` operator.
Fixes rust-lang#30514 i also went ahead and removed the redundant `ItemKind`s. r? @nikomatsakis (this is an easy one I guess)
Trivial, but my eye is twitching.
|
@bors r+ |
|
📌 Commit 04fe94a has been approved by |
|
@bors force |
bors
added a commit
that referenced
this pull request
Dec 25, 2015
|
💔 Test failed - auto-linux-64-opt |
|
@bors retry force |
|
@bors retry force |
|
⚡ Previous build results for auto-linux-32-nopt-t, auto-linux-32-opt, auto-linux-64-debug-opt, auto-linux-64-nopt-t, auto-linux-cross-opt, auto-linux-musl-64-opt, auto-mac-32-opt, auto-mac-64-nopt-t, auto-mac-64-opt, auto-win-gnu-64-opt, auto-win-msvc-32-opt are reusable. Rebuilding only auto-linux-64-opt, auto-linux-64-x-android-t, auto-win-gnu-32-nopt-t, auto-win-gnu-32-opt, auto-win-gnu-64-nopt-t, auto-win-msvc-64-opt... |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.