Rollup of 24 pull requests #47392

kennytm · 2018-01-12T18:26:47Z

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.

@alexcrichton

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.

…-lang#47351).

Closes rust-lang#43105.

kennytm · 2018-01-12T18:27:37Z

@bors r+ p=25

Let's see how many retries are needed this time 😓

bors · 2018-01-12T18:27:37Z

📌 Commit e024f40 has been approved by kennytm

bors · 2018-01-12T18:53:28Z

⌛ Testing commit e024f40d8ba2f4e5663e1dc820aff1e459b77207 with merge 600b33cce4b7408d818c8dc0885300502e7154be...

bors · 2018-01-12T19:00:50Z

💔 Test failed - status-appveyor

Fix typo.

@jseyfried

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.

@eddyb

Ignore CTFE errors while lowering patterns Closes rust-lang#43105. r? @eddyb

kennytm · 2018-01-12T19:18:09Z

@bors r +

Removed #47334.

bors · 2018-01-12T19:18:11Z

📌 Commit c12eabf has been approved by kennytm

bors · 2018-01-12T20:28:26Z

⌛ Testing commit c12eabf with merge 51b0b37...

Rollup of 24 pull requests - Successful merges: #46985, #47069, #47081, #47185, #47282, #47283, #47288, #47289, #47298, #47305, #47306, #47307, #47310, #47324, #47328, #47331, #47340, #47343, #47344, #47352, #47357, #47365, #47375, #47382 - Failed merges: #47334

bors · 2018-01-12T23:27:52Z

☀️ Test successful - status-appveyor, status-travis
Approved by: kennytm
Pushing 51b0b37 to master...

Diggsey and others added 30 commits December 28, 2017 13:27

Implement AsRef<Path> for Component

e0855ff

rustfmt libarena/lib.rs

bafbac4

fixup

b2d0d18

Fix nested imports not included in the save_analysis output

9991fdf

Clean output

45c2c9a

Show line numbers

4054030

Update musl to 1.1.18

b5a3f56

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.

Update jobserver to 0.1.9

b1c9b6e

Fix for `ENOSYS` when calling `pipe2`, rust-lang/jobserver-rs#5. r? @alexcrichton

Treat #[path] files as mod.rs files

7b420cf

Restore the original Window comment

4cc0fe5

The Windows situation is more complicated than I realised

Fix typo

b69c320

Use copy/clone closures to simplify calendar test

ce4673d

fix typo rwlock.rs

d0d5db6

Hi. Fixed typo: contained -> content

Add -Ztime-passes line for dep-graph loading.

fe21c4c

Pre-allocate in fs::read and fs::read_string

44912bf

Fix panic strings.

c78679d

- Fix panic string in `check_ast_crate`.

Use the new fs_read_write functions in rustc internals

3f9c057

Fix typo.

9d9504a

Add tests to fixed issues.

9649c4a

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.

9babb8a

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.

Fix confusing documentation for OsStr

fc825f0

Fix dead links in docs for OsStr

bac725e

Add i586-unknown-linux-musl target

882cd3c

Don't track local_needs_drop separately in qualify_consts (fixes rust…

e2c1a93

…-lang#47351).

s/OsStr/&OsStr in docs to align with &str/String comparison

8002876

Enable num tests on wasm

53c05ff

Fix Duration::subsec_millis and Duration::subsec_micros examples

7cad7f6

Ignore CTFE errors while lowering patterns

142134d

Closes rust-lang#43105.

kennytm unassigned alexcrichton Jan 12, 2018

kennytm changed the title ~~Rollup of 25 pull requests~~ Rollup of 24 pull requests Jan 12, 2018

kennytm added 8 commits January 13, 2018 03:16

Rollup merge of rust-lang#47340 - alercah:typo-fix, r=GuillaumeGomez

cf70a48

Fix typo.

Rollup merge of rust-lang#47344 - topecongiro:fixed-ices, r=alexcrichton

f589482

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.

Rollup merge of rust-lang#47352 - EdSchouten:cloudabi-libtest, r=kennytm

a63121c

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.

Rollup merge of rust-lang#47365 - Diggsey:issue-42630, r=alexcrichton

722838f

Re-enable num tests on wasm Issue rust-lang#42630 was closed but the tests are still ignored, supposedly they should pass now.

Rollup merge of rust-lang#47375 - overvenus:duration-examples, r=dtolnay

21ac84e

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.

Rollup merge of rust-lang#47382 - topecongiro:issue-43105, r=eddyb

c12eabf

Ignore CTFE errors while lowering patterns Closes rust-lang#43105. r? @eddyb

kennytm force-pushed the rollup branch from e024f40 to c12eabf Compare January 12, 2018 19:17

bors merged commit c12eabf into rust-lang:master Jan 12, 2018

This was referenced Jan 12, 2018

Move Duration to libcore #46666

Merged

Show only stderr diff when a ui test fails #47185

Merged

Libtest json output #46450

Merged

Update Cargo and its dependencies #47280

Merged

Fix typo. #47340

Merged

Glued tokens can themselves be joint. #47343

Merged

mati865 mentioned this pull request Jan 12, 2018

Update to rustls 0.12 rustls/hyper-rustls#38

Merged

Centril added the rollup A PR which is a rollup label Oct 2, 2019

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Uh oh!

Rollup of 24 pull requests #47392

Rollup of 24 pull requests #47392

Uh oh!

kennytm commented Jan 12, 2018 •

edited

Loading

Uh oh!

kennytm commented Jan 12, 2018

Uh oh!

bors commented Jan 12, 2018

Uh oh!

bors commented Jan 12, 2018

Uh oh!

bors commented Jan 12, 2018

Uh oh!

kennytm commented Jan 12, 2018 •

edited

Loading

Uh oh!

bors commented Jan 12, 2018

Uh oh!

bors commented Jan 12, 2018

Uh oh!

bors commented Jan 12, 2018

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

22 participants

Uh oh!

Rollup of 24 pull requests #47392

Rollup of 24 pull requests #47392

Uh oh!

Conversation

kennytm commented Jan 12, 2018 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

kennytm commented Jan 12, 2018

Uh oh!

bors commented Jan 12, 2018

Uh oh!

bors commented Jan 12, 2018

Uh oh!

bors commented Jan 12, 2018

Uh oh!

kennytm commented Jan 12, 2018 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

bors commented Jan 12, 2018

Uh oh!

bors commented Jan 12, 2018

Uh oh!

bors commented Jan 12, 2018

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

22 participants

kennytm commented Jan 12, 2018 •

edited

Loading

kennytm commented Jan 12, 2018 •

edited

Loading