Rollup of 13 pull requests #56422
Closed
Rollup of 13 pull requests #56422
Conversation
This file contains 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
This way all files needed by packagers now reside in toplevel Signed-off-by: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>
…especting inhabitedness checks
We've seen sporadic QE failures in the timeout tests on this assertion:
assert!(kind == ErrorKind::WouldBlock || kind == ErrorKind::TimedOut);
So there's an error, but not either of the expected kinds. Adding a
format to show the kind revealed `ErrorKind::Interrupted` (`EINTR`).
For the cases that were using `read`, we can just use `read_exact` to
keep trying after interruption. For those using `recv_from`, we have to
manually loop until we get a non-interrupted result.
The previous one didn't actually use the Display&Debug bounds in any way, so I think this one is a bit more meaningful.
Signed-off-by: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>
…cramertj Consider references and unions potentially inhabited during privacy-respecting inhabitedness checks It isn't settled exactly how references to uninhabited types and unions of uninhabited types should act, but we should be more conservative here, as it's likely it will be permitted to soundly have values of such types. This will also be more important in light of the changes at rust-lang#54125. cc @RalfJung
Update cargo 14 commits in b3d0b2e545b61d4cd08096911724b7d49d213f73..1ff5975b96b3d395bb962394596998dfb485f793 2018-11-15 19:13:04 +0000 to 2018-11-25 14:59:12 +0000 - Intern SourceId (rust-lang/cargo#6342) - Tweak Layout to allow for non json file targets with internal "." (rust-lang/cargo#6255) - Correct Target Directory command-line option (rust-lang/cargo#6343) - Persistent data structures by im-rs (rust-lang/cargo#6336) - Move command prelude into main library (rust-lang/cargo#6335) - Distinguish custom build invocations (rust-lang/cargo#6331) - Allow crate_type=bin examples to run (rust-lang/cargo#6330) - Make verify-project honour unstable features (rust-lang/cargo#6326) - Make autodiscovery disable inferred targets (rust-lang/cargo#6329) - Add `c` alias for `check` (rust-lang/cargo#6218) - Allow user aliases to override built-in aliases (rust-lang/cargo#6259) - Fix renaming directory project using build scripts with cross-compiling. (rust-lang/cargo#6328) - Fix add_plugin_deps-related tests. (rust-lang/cargo#6327) - Add a glossary. (rust-lang/cargo#6321)
move stage0.txt to toplevel directory This way all files needed by packagers now reside in toplevel
update miri This should make miri green again :) (Includes rust-lang/miri#553) r? @oli-obk
… r=Centril Stabilize self_in_typedefs feature [**Tracking Issue**](rust-lang#49303) r? @Centril
…ref, r=davidtwco Refer to the second borrow as the "second borrow" in E0501.rs Fixes rust-lang#55314. r? @davidtwco
…kler
Deal with EINTR in net timeout tests
We've seen sporadic QE failures in the timeout tests on this assertion:
assert!(kind == ErrorKind::WouldBlock || kind == ErrorKind::TimedOut);
So there's an error, but not either of the expected kinds. Adding a
format to show the kind revealed `ErrorKind::Interrupted` (`EINTR`).
For the cases that were using `read`, we can just use `read_exact` to
keep trying after interruption. For those using `recv_from`, we have to
manually loop until we get a non-interrupted result.
…nSapin Stabilize dbg!(...) Per FCP in rust-lang#54306 (which is ~1 day from completion). r? @SimonSapin The PR is fairly isolated so a rollup should probably work.
…olnay Move VecDeque::resize_with out of the impl<T:Clone> block I put this in the wrong `impl` block in rust-lang#56016, so fixing. Tracking issue for the unstable method: rust-lang#41758 (comment)
…e, r=Centril Improve the unstable book example for #[marker] trait The previous one didn't actually use the Display&Debug bounds in any way, so I think this one is a bit more meaningful.
…dreavus Remove unneeded body class selector r? @QuietMisdreavus
Fix failing tidy (line endings on Windows) Updates to `rustc-guide` and `edition-guide` including rust-lang/rustc-dev-guide#246 and rust-lang/edition-guide#122.
Remove some uses of try!
|
📌 Commit 874af23 has been approved by |
bors
added
the
S-waiting-on-bors
|
⌛ Testing commit 874af23 with merge 475c7f4904dbbaa35a3a0d73910165b061e90b15... |
|
💔 Test failed - status-travis |
bors
added
S-waiting-on-review
|
The job Click to expand the log.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 |
|
Failure is probably due to #56285; will retry without it. |
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.
Successful merges:
Failed merges:
r? @ghost