Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Rollup of 11 pull requests #47339

Closed
wants to merge 26 commits into from
Closed

Rollup of 11 pull requests #47339

wants to merge 26 commits into from

Conversation

kennytm
Copy link
Member

@kennytm kennytm commented Jan 10, 2018

malbarbo and others added 11 commits January 8, 2018 21:26
@malbarbo
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.
@cuviper
Update jobserver to 0.1.9
b1c9b6e 
Fix for `ENOSYS` when calling `pipe2`, rust-lang/jobserver-rs#5.

r? @alexcrichton
@etaoins
Skip linker-output-non-utf8 test on Apple
a713c67 
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.
@cramertj
Treat #[path] files as mod.rs files
7b420cf
@etaoins
Restore the original Window comment
4cc0fe5 
The Windows situation is more complicated than I realised
@etaoins
Fix typo
b69c320
@cramertj
Use copy/clone closures to simplify calendar test
ce4673d
@bmusin
fix typo rwlock.rs
d0d5db6 
Hi. Fixed typo: contained -> content
@nikomatsakis
resolve type and region variables in "NLL dropck"
00ce7ee 
Fixes rust-lang#47022.
@mbrubeck
Pre-allocate in fs::read and fs::read_string
44912bf
@dlrobertson
Fix panic strings.
c78679d 
 - Fix panic string in `check_ast_crate`.
@rust-highfive
Copy link
Collaborator

r? @aturon

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

@kennytm
Copy link
Member Author

kennytm commented Jan 10, 2018

@bors r+ p=11

@bors
Copy link
Contributor

bors commented Jan 10, 2018

📌 Commit 82d6a9d has been approved by kennytm

@kennytm 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 10, 2018
@bors
Copy link
Contributor

bors commented Jan 11, 2018

⌛ Testing commit 82d6a9d40c48ee98e096f148be8232382b8a9c4f with merge 04241998aa0483a8aeaad65e7d3b8c2019f75954...

@bors
Copy link
Contributor

bors commented Jan 11, 2018

💔 Test failed - status-travis

topecongiro and others added 3 commits January 11, 2018 13:03
@topecongiro
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.
@kennytm
Rollup merge of rust-lang#47283 - malbarbo:musl-1.1.18, r=alexcrichton
173ab34 
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.
@kennytm
Rollup merge of rust-lang#47288 - cuviper:jobserver-pipe2, r=alexcric…
213bbde 
…hton

Update jobserver to 0.1.9

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

r? @alexcrichton
@kennytm
Rollup merge of rust-lang#47289 - etaoins:skip-linker-output-non-utf8…
55d27c8 
…-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.
@kennytm
Rollup merge of rust-lang#47298 - cramertj:path-as-modrs, r=nikomatsakis
0323654 
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
@kennytm
Rollup merge of rust-lang#47305 - cramertj:better-calendar-alone, r=e…
c0dc4c5 
…ddyb

Use copy/clone closures to simplify calendar test

Split out from rust-lang#47304

r? @eddyb
@kennytm
Rollup merge of rust-lang#47307 - dlrobertson:fix_panic_strings, r=ke…
b95f18f 
…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
@kennytm
Rollup merge of rust-lang#47310 - bmusin:patch-1, r=sfackler
2f43a2b 
fix typo rwlock.rs

Hi. Fixed typo: contained -> content
@kennytm
Rollup merge of rust-lang#47322 - nikomatsakis:nll-ice, r=pnkfelix
56e8f5d 
resolve type and region variables in "NLL dropck"

Fixes rust-lang#47022.

r? @pnkfelix
@kennytm
Rollup merge of rust-lang#47324 - mbrubeck:len, r=sfackler
da0e548 
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.
@kennytm
Rollup merge of rust-lang#47328 - mbrubeck:fs_read, r=sfackler
ab73129 
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.
@kennytm
Rollup merge of rust-lang#47340 - alercah:typo-fix, r=GuillaumeGomez
b256b83 
Fix typo.
@kennytm
Rollup merge of rust-lang#47344 - topecongiro:fixed-ices, r=alexcrichton
4551f3a 
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.
@kennytm kennytm closed this Jan 11, 2018
@Centril Centril added the rollup A PR which is a rollup label Oct 24, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
rollup A PR which is a rollup S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.