Skip to content

Rollup of 10 pull requests #67080

New issue

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

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

Already on GitHub? # to your account

Merged
merged 28 commits into from
Dec 6, 2019
Merged

Rollup of 10 pull requests #67080

merged 28 commits into from
Dec 6, 2019

Conversation

JohnTitor
Copy link
Member

Successful merges:

Failed merges:

r? @ghost

BaoshanPang and others added 28 commits November 22, 2019 14:36
Using `if [ ! isCI ] || ...` doesn't run any command, just tests `isCI`
as a string, whereas `if ! isCI || ...` will actually run the `isCI`
command and negate its exit status.
Fixes an error introduced in rust-lang#66750 where wasi executables always think
they have zero arguments because one of the vectors returned here
accidentally thought it was length 0.
This commit updates the `wasi-libc` repository used to build the
wasm32-wasi target's libstd to ensure that both libstd and libc are
using the same wasi snapshot version.
VxWorks: fix issues in accessing environment variables
…crichton

Tweak wording of `collect()` on bad target type

Fix rust-lang#60440.
[CI] fix the `! isCI` check in src/ci/run.sh

Using `if [ ! isCI ] || ...` doesn't run any command, just tests `isCI`
as a string, whereas `if ! isCI || ...` will actually run the `isCI`
command and negate its exit status.
…Gomez

Add long error for E0631 and update ui tests.

This PR adds a long error for `E0631`, which covers errors where closure argument types are mismatched. It also updates UI tests where this error is applicable.

Part of rust-lang#61137
…s-2, r=Dylan-DPC

cleanup long error explanations

r? @Dylan-DPC
Fix docs for formatting delegations

If you use the example in the docs right now it breaks all the options Formatters have to offer.
i.e. https://play.rust-lang.org/?version=stable&mode=debug&edition=2018&gist=214392ecc6eff73b4789c32568395f72 this should've padded the output with 4 zeros but didn't.

with the new example it does work: https://play.rust-lang.org/?version=stable&mode=debug&edition=2018&gist=3bdfb29f395230c5129c5f56dcfcb2a9

The only thing i'm not quite sure about is what's the right way to do it in a loop (altough non of the docs talk about it people are doing it in the wild and there were a couple of attempts to include in libcore)
i.e. https://play.rust-lang.org/?version=stable&mode=debug&edition=2018&gist=4c4dca3c90ba36779ecd014f3899ab9c
Fix fetching arguments on the wasm32-wasi target

Fixes an error introduced in rust-lang#66750 where wasi executables always think
they have zero arguments because one of the vectors returned here
accidentally thought it was length 0.
…rk-Simulacrum

Update the revision of wasi-libc used in wasm32-wasi

This commit updates the `wasi-libc` repository used to build the
wasm32-wasi target's libstd to ensure that both libstd and libc are
using the same wasi snapshot version.
@JohnTitor
Copy link
Member Author

@bors r+ p=10 rollup=never

@bors
Copy link
Collaborator

bors commented Dec 6, 2019

📌 Commit acd2b08 has been approved by JohnTitor

@bors bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Dec 6, 2019
@JohnTitor JohnTitor added the rollup A PR which is a rollup label Dec 6, 2019
@bors
Copy link
Collaborator

bors commented Dec 6, 2019

⌛ Testing commit acd2b08 with merge d0126e8...

bors added a commit that referenced this pull request Dec 6, 2019
Rollup of 10 pull requests

Successful merges:

 - #66649 (VxWorks: fix issues in accessing environment variables)
 - #66764 (Tweak wording of `collect()` on bad target type)
 - #66900 (Clean up error codes)
 - #66974 ([CI] fix the `! isCI` check in src/ci/run.sh)
 - #66979 (Add long error for E0631 and update ui tests.)
 - #67017 (cleanup long error explanations)
 - #67021 (Fix docs for formatting delegations)
 - #67041 (add ExitStatusExt into prelude)
 - #67065 (Fix fetching arguments on the wasm32-wasi target)
 - #67066 (Update the revision of wasi-libc used in wasm32-wasi)

Failed merges:

r? @ghost
@bors
Copy link
Collaborator

bors commented Dec 6, 2019

☀️ Test successful - checks-azure
Approved by: JohnTitor
Pushing d0126e8 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Dec 6, 2019
@bors bors merged commit acd2b08 into rust-lang:master Dec 6, 2019
@JohnTitor JohnTitor deleted the rollup-2t6fm3u branch December 6, 2019 11:45
# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
merged-by-bors This PR was explicitly merged by bors. 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
Development

Successfully merging this pull request may close these issues.

10 participants