Rollup of 11 pull requests #47339
Closed
Rollup of 11 pull requests #47339
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
kennytm
commented
Jan 10, 2018
kennytm
commented
- Successful merges: Add i586-unknown-linux-musl target #47282, Update musl to 1.1.18 #47283, Update jobserver to 0.1.9 #47288, Skip linker-output-non-utf8 test on Apple #47289, Treat #[path] files as mod.rs files #47298, Use copy/clone closures to simplify calendar test #47305, Fix panic strings. #47307, fix typo rwlock.rs #47310, resolve type and region variables in "NLL dropck" #47322, Pre-allocate in fs::read and fs::read_string #47324, fix off-by-one error #47330
- Failed merges:
According to http://www.musl-libc.org/download.html: This release corrects regressions in glob() and armv4t build failure introduced in the previous release, and includes an important bug fix for posix_spawnp in the presence of a large PATH environment variable.
Fix for `ENOSYS` when calling `pipe2`, rust-lang/jobserver-rs#5. r? @alexcrichton
This test fails on APFS filesystems with the following error: mkdir: /Users/ryan/Code/rust/build/x86_64-apple-darwin/test/run-make/linker-output-non-utf8.stage2-x86_64-apple-darwin/zzz�: Illegal byte sequence This is due to APFS now requiring that all paths are valid UTF-8. As APFS will be the default filesystem for all new Darwin-based systems the most straightforward fix is to skip this test on Darwin as well as Windows.
The Windows situation is more complicated than I realised
Hi. Fixed typo: contained -> content
- Fix panic string in `check_ast_crate`.
|
r? @aturon (rust_highfive has picked a reviewer for you, use r? to override) |
|
@bors r+ p=11 |
|
📌 Commit 82d6a9d has been approved by |
kennytm
added
the
S-waiting-on-bors
|
⌛ Testing commit 82d6a9d40c48ee98e096f148be8232382b8a9c4f with merge 04241998aa0483a8aeaad65e7d3b8c2019f75954... |
|
💔 Test failed - status-travis |
Closes rust-lang#36792. Closes rust-lang#38091. Closes rust-lang#39687. Closes rust-lang#42148. Closes rust-lang#42956.
Update musl to 1.1.18 According to http://www.musl-libc.org/download.html: This release corrects regressions in glob() and armv4t build failure introduced in the previous release, and includes an important bug fix for posix_spawnp in the presence of a large PATH environment variable.
…hton Update jobserver to 0.1.9 Fix for `ENOSYS` when calling `pipe2`, rust-lang/jobserver-rs#5. r? @alexcrichton
…-test-on-apple, r=kennytm Skip linker-output-non-utf8 test on Apple This test fails on APFS filesystems with the following error: ```shell mkdir: /Users/ryan/Code/rust/build/x86_64-apple-darwin/test/run-make/linker-output-non-utf8.stage2-x86_64-apple-darwin/zzz�: Illegal byte sequence ``` The mkdir does succeed on an HFS+ volume mounted on the same system: ```shell $ mkdir zzz$$'\xff' $ ls zzz47432\xff ``` This is due to APFS now requiring that all paths are valid UTF-8. As APFS will be the default filesystem for all new Darwin-based systems the most straightforward fix is to skip this test on Darwin as well as Windows.
Treat #[path] files as mod.rs files Fixes rust-lang#46936, cc @briansmith, @SergioBenitez, @nikomatsakis. This (insta-stable) change treats files included via `#[path = "bla.rs"] mod foo;` as though they were `mod.rs` files. Namely, it allows them to include `mod` statements and looks for the child modules in sibling directories, rather than in relative `modname/childmodule.rs` files as happens for non-`mod.rs` files. This change makes the `non_modrs_mods` feature backwards compatible with the existing usage in https://github.com/briansmith/ring, several versions of which are currently broken in beta. If we decide to merge, this change should be backported to beta. cc rust-lang#37872 r? @jseyfried
…ddyb Use copy/clone closures to simplify calendar test Split out from rust-lang#47304 r? @eddyb
…nnytm Fix panic strings. - Fix panic string in `check_ast_crate`. - Update panic string for Duration subtraction on overflow/underflow. Not sure if the changes to `Duration` are helpful/needed. Mostly just a nit. Otherwise this is just a one character change :) On another note: I hit the panic in `check_ast_crate` when compiling [m-labs/smoltcp] with the following: ``` cargo test --doc --no-default-features --features "std socket-raw"` ``` [m-labs/smoltcp]: https://github.com/m-labs/smoltcp
fix typo rwlock.rs Hi. Fixed typo: contained -> content
resolve type and region variables in "NLL dropck" Fixes rust-lang#47022. r? @pnkfelix
Pre-allocate in fs::read and fs::read_string This is a simpler alternative to rust-lang#46340 and rust-lang#45928, as requested by the libs team.
Use the new fs_read_write functions in rustc internals Uses `fs::read` and `fs::write` (added by rust-lang#45837) where appropriate, to simplify code and dog-food these new APIs. This also improves performance, when combined with rust-lang#47324.
Add tests to fixed issues. Closes rust-lang#36792. Closes rust-lang#38091. Closes rust-lang#39687. Closes rust-lang#42148. Closes rust-lang#42956.
# for free
to join this conversation on GitHub.
Already have an account?
# 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.