Rollup of 24 pull requests #47392
Merged
Rollup of 24 pull requests #47392
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
Member
kennytm
commented
Jan 12, 2018
•
kennytm
commented
- Successful merges: Implement AsRef<Path> for Component #46985, rustfmt libarena/lib.rs #47069, Fix nested imports not included in the save_analysis output #47081, Show only stderr diff when a ui test fails #47185, 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, Don't track local_needs_drop separately in qualify_consts. #47306, Fix panic strings. #47307, fix typo rwlock.rs #47310, Pre-allocate in fs::read and fs::read_string #47324, Use the new fs_read_write functions in rustc internals #47328, Add -Ztime-passes line for dep-graph loading. #47331, Fix typo. #47340, Glued tokens can themselves be joint. #47343, Add tests to fixed issues. #47344, Make libtest build on CloudABI. #47352, Fix docs for OsStr #47357, Re-enable num tests on wasm #47365, Fix examples of Duration::subsec_millis and Duration::subsec_micros #47375, Ignore CTFE errors while lowering patterns #47382
- Failed merges: Only link res_init() on GNU/*nix #47334
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`.
When gluing two tokens, the second of which is joint, the result should also be joint. This fixes an issue with joining three `Dot` tokens to make a `DotDotDot` - the intermediate `DotDot` would not be joint and therefore we would not attempt to glue the last `Dot` token, yielding `.. .` instead of `...`.
Closes rust-lang#36792. Closes rust-lang#38091. Closes rust-lang#39687. Closes rust-lang#42148. Closes rust-lang#42956.
Just like on UNIX systems, we need to use sysconf() to obtain the number of CPUs. Extend the existing cfg()'s to match CloudABI as well.
|
@bors r+ p=25 Let's see how many retries are needed this time 😓 |
|
📌 Commit e024f40 has been approved by |
|
⌛ Testing commit e024f40d8ba2f4e5663e1dc820aff1e459b77207 with merge 600b33cce4b7408d818c8dc0885300502e7154be... |
|
💔 Test failed - status-appveyor |
Glued tokens can themselves be joint. When gluing two tokens, the second of which is joint, the result should also be joint. This fixes an issue with joining three `Dot` tokens to make a `DotDotDot` - the intermediate `DotDot` would not be joint and therefore we would not attempt to glue the last `Dot` token, yielding `.. .` instead of `...`. r? @jseyfried
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.
Make libtest build on CloudABI. Just like on UNIX systems, we need to use sysconf() to obtain the number of CPUs. Extend the existing cfg()'s to match CloudABI as well.
…omez Fix docs for OsStr At present, there are two small issues with the [docs](https://doc.rust-lang.org/std/ffi/struct.OsStr.html) for std::ffi::OsStr: - The docs say "OsStr is to OsString as String is to &str: the former in each pair are borrowed references; the latter are owned strings.". The latter pair is mixed up: String is the owned variant whereas &str is the borrowed reference. - The doc links to String and &str are broken and render as [String] and [&str]. This PR fixes these issues.
Re-enable num tests on wasm Issue rust-lang#42630 was closed but the tests are still ignored, supposedly they should pass now.
Fix examples of Duration::subsec_millis and Duration::subsec_micros Update examples of `Duration::subsec_millis` and `Duration::subsec_micros`, because they are not for these two methods actually.
Ignore CTFE errors while lowering patterns Closes rust-lang#43105. r? @eddyb
|
📌 Commit c12eabf has been approved by |
|
☀️ Test successful - status-appveyor, status-travis |
This was referenced Jan 12, 2018
Merged
Merged
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.