Rollup of 12 pull requests #47350

kennytm · 2018-01-11T09:13:02Z

Successful merges: 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, Use the new fs_read_write functions in rustc internals #47328, Fix typo. #47340, Add tests to fixed issues. #47344
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.

@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

Fixes rust-lang#47022.

- Fix panic string in `check_ast_crate`.

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.

@alexcrichton

…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.

@briansmith

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

@eddyb

…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

@pnkfelix

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.

Fix typo.

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.

rust-highfive · 2018-01-11T09:13:06Z

r? @estebank

(rust_highfive has picked a reviewer for you, use r? to override)

kennytm · 2018-01-11T09:13:25Z

@bors r+ p=12

bors · 2018-01-11T09:13:26Z

📌 Commit 5bd7d69 has been approved by kennytm

bors · 2018-01-11T09:22:00Z

⌛ Testing commit 5bd7d69 with merge 12b5c2dbb77cd6bb2e2b1ec6dff5a59d3832b7e3...

bors · 2018-01-11T12:22:51Z

💔 Test failed - status-appveyor

kennytm · 2018-01-11T12:53:28Z

@bors retry #46903

bors · 2018-01-11T15:19:47Z

⌛ Testing commit 5bd7d69 with merge 9bceb61b76096fe47725eff18168234980709c12...

bors · 2018-01-11T15:20:31Z

💔 Test failed - status-travis

kennytm · 2018-01-11T15:46:20Z

@bors retry

GitHub was down.

bors · 2018-01-11T15:46:29Z

⌛ Testing commit 5bd7d69 with merge 27270e6...

Rollup of 12 pull requests - Successful merges: #47283, #47288, #47289, #47298, #47305, #47307, #47310, #47322, #47324, #47328, #47340, #47344 - Failed merges:

bors · 2018-01-11T18:47:33Z

💔 Test failed - status-appveyor

kennytm · 2018-01-11T18:48:36Z

3 hour timeout but on check-aux 🤔

The stage1-rustc compilation time is 15 minutes longer than the previous retry with no reason.

@bors retry

bors · 2018-01-11T19:14:25Z

⌛ Testing commit 5bd7d69 with merge dc9a79af33018ad9a135e8032e4ee37fa9e26e54...

bors · 2018-01-11T20:44:12Z

💔 Test failed - status-travis

kennytm · 2018-01-11T20:47:09Z

@bors retry

30-minutes no output from dist x86_64-apple-darwin.

[00:51:20]    Compiling syntax_ext v0.0.0 (file:///Users/travis/build/rust-lang/rust/src/libsyntax_ext)
No output has been received in the last 30m0s, this potentially indicates a stalled build or something wrong with the build itself.
Check the details on how to adjust your build configuration on: https://docs.travis-ci.com/user/common-build-problems/#Build-times-out-because-no-output-was-received
The build has been terminated

bors · 2018-01-12T06:59:20Z

⌛ Testing commit 5bd7d69 with merge 712e755...

Rollup of 12 pull requests - Successful merges: #47283, #47288, #47289, #47298, #47305, #47307, #47310, #47322, #47324, #47328, #47340, #47344 - Failed merges:

bors · 2018-01-12T10:00:03Z

💔 Test failed - status-appveyor

kennytm · 2018-01-12T11:15:18Z

@bors retry

3 hour timeout on i686-pc-windows-gnu

bors · 2018-01-12T12:51:36Z

⌛ Testing commit 5bd7d69 with merge 620db9f4cd39921164a4d1005fd23ae08a12deda...

bors · 2018-01-12T15:52:20Z

💔 Test failed - status-appveyor

malbarbo and others added 26 commits January 8, 2018 21:26

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

resolve type and region variables in "NLL dropck"

00ce7ee

Fixes rust-lang#47022.

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.

Rollup merge of rust-lang#47288 - cuviper:jobserver-pipe2, r=alexcric…

904ee5e

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

Rollup merge of rust-lang#47305 - cramertj:better-calendar-alone, r=e…

e31a02a

…ddyb Use copy/clone closures to simplify calendar test Split out from rust-lang#47304 r? @eddyb

Rollup merge of rust-lang#47310 - bmusin:patch-1, r=sfackler

e8bb17b

fix typo rwlock.rs Hi. Fixed typo: contained -> content

Rollup merge of rust-lang#47322 - nikomatsakis:nll-ice, r=pnkfelix

e933088

resolve type and region variables in "NLL dropck" Fixes rust-lang#47022. r? @pnkfelix

Rollup merge of rust-lang#47324 - mbrubeck:len, r=sfackler

4e019fd

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.

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

3a87b5a

Fix typo.

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

5bd7d69

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.

rust-highfive assigned estebank Jan 11, 2018

kennytm unassigned estebank Jan 11, 2018

kennytm added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Jan 11, 2018

bors added a commit that referenced this pull request Jan 11, 2018

Auto merge of #47350 - kennytm:rollup, r=kennytm

27270e6

Rollup of 12 pull requests - Successful merges: #47283, #47288, #47289, #47298, #47305, #47307, #47310, #47322, #47324, #47328, #47340, #47344 - Failed merges:

bors added a commit that referenced this pull request Jan 12, 2018

Auto merge of #47350 - kennytm:rollup, r=kennytm

712e755

Rollup of 12 pull requests - Successful merges: #47283, #47288, #47289, #47298, #47305, #47307, #47310, #47322, #47324, #47328, #47340, #47344 - Failed merges:

kennytm closed this Jan 12, 2018

kennytm mentioned this pull request Jan 18, 2018

Spurious macOS 30-minute timeout when compiling stage0-rustc #47539

Closed

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

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Rollup of 12 pull requests #47350

Rollup of 12 pull requests #47350

kennytm commented Jan 11, 2018

rust-highfive commented Jan 11, 2018

kennytm commented Jan 11, 2018

bors commented Jan 11, 2018

bors commented Jan 11, 2018

bors commented Jan 11, 2018

kennytm commented Jan 11, 2018

bors commented Jan 11, 2018

bors commented Jan 11, 2018

kennytm commented Jan 11, 2018

bors commented Jan 11, 2018

bors commented Jan 11, 2018

kennytm commented Jan 11, 2018 •

edited

Loading

bors commented Jan 11, 2018

bors commented Jan 11, 2018

kennytm commented Jan 11, 2018

bors commented Jan 12, 2018

bors commented Jan 12, 2018

kennytm commented Jan 12, 2018

bors commented Jan 12, 2018

bors commented Jan 12, 2018

Rollup of 12 pull requests #47350

Rollup of 12 pull requests #47350

Conversation

kennytm commented Jan 11, 2018

rust-highfive commented Jan 11, 2018

kennytm commented Jan 11, 2018

bors commented Jan 11, 2018

bors commented Jan 11, 2018

bors commented Jan 11, 2018

kennytm commented Jan 11, 2018

bors commented Jan 11, 2018

bors commented Jan 11, 2018

kennytm commented Jan 11, 2018

bors commented Jan 11, 2018

bors commented Jan 11, 2018

kennytm commented Jan 11, 2018 • edited Loading

bors commented Jan 11, 2018

bors commented Jan 11, 2018

kennytm commented Jan 11, 2018

bors commented Jan 12, 2018

bors commented Jan 12, 2018

kennytm commented Jan 12, 2018

bors commented Jan 12, 2018

bors commented Jan 12, 2018

kennytm commented Jan 11, 2018 •

edited

Loading