Skip to content

Update to the latest wasi-sysroot.#1342

Merged
bors merged 1 commit into
rust-lang:masterfrom
sunfishcode:master
May 16, 2019
Merged

Update to the latest wasi-sysroot.#1342
bors merged 1 commit into
rust-lang:masterfrom
sunfishcode:master

Conversation

@sunfishcode

@sunfishcode sunfishcode commented May 15, 2019

Copy link
Copy Markdown
Member
  • Rename wasm32-unknown-wasi to wasm32-wasi.
  • __wasilibc_rmfileat was renamed to __wasilibc_unlinkat
  • Add bindings for a few more functions and typedefs.

@rust-highfive

rust-highfive commented May 15, 2019

Copy link
Copy Markdown

r? @gnzlbg

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

@sunfishcode

sunfishcode commented May 15, 2019

Copy link
Copy Markdown
Member Author

r? @alexcrichton

@rust-highfive rust-highfive assigned alexcrichton and unassigned gnzlbg May 15, 2019
@alexcrichton

alexcrichton commented May 15, 2019

Copy link
Copy Markdown
Member

@bors: r+

@bors

bors commented May 15, 2019

Copy link
Copy Markdown
Contributor

📌 Commit acd7ad8 has been approved by alexcrichton

@bors

bors commented May 15, 2019

Copy link
Copy Markdown
Contributor

⌛ Testing commit acd7ad8 with merge bdd47f7...

bors added a commit that referenced this pull request May 15, 2019
@bors
Auto merge of #1342 - sunfishcode:master, r=alexcrichton
bdd47f7 
Update to the latest wasi-sysroot.

 - Rename `wasm32-unknown-wasi` to `wasm32-wasi`.
 - `__wasilibc_rmfileat` was renamed to `__wasilibc_unlinkat`
 - Add bindings for a few more functions and typedefs.
@bors

bors commented May 15, 2019

Copy link
Copy Markdown
Contributor

💔 Test failed - checks-travis

@gnzlbg

gnzlbg commented May 16, 2019

Copy link
Copy Markdown
Contributor

This is blocked by #1337 which is blocked on this error:

error: toolchain 'nightly-x86_64-unknown-linux-gnu' does not contain component 'rust-std' for target 'wasm32-unknown-wasi'
The command "rustup target add wasm32-unknown-wasi" failed. Retrying, 2 of 3.

@gnzlbg

gnzlbg commented May 16, 2019

Copy link
Copy Markdown
Contributor

This PR does not appear to modify the .travis.yml target name, so maybe the wasi target is not being shipped with nightly anymore or will come in the next nightly?

@mati865

mati865 commented May 16, 2019 •
edited
Loading

Copy link
Copy Markdown
Member

@gnzlbg this target is broken since 2019-05-11: https://rust-lang.github.io/rustup-components-history/wasm32-unknown-wasi.html

@gnzlbg

gnzlbg commented May 16, 2019

Copy link
Copy Markdown
Contributor

@mati865 https://rust-lang.github.io/rustup-components-history/wasm32-wasi.html works, so maybe it was renamed?

@mati865

mati865 commented May 16, 2019

Copy link
Copy Markdown
Member

Ah that was rust-lang/rust#60585

So combining Ubuntu update and this PR (with small fix to download new name) should fix the CI.

@gnzlbg gnzlbg mentioned this pull request May 16, 2019
Merged
@gnzlbg

gnzlbg commented May 16, 2019

Copy link
Copy Markdown
Contributor

This needs to be rebased.

@bors

bors commented May 16, 2019

Copy link
Copy Markdown
Contributor

☔ The latest upstream changes (presumably #1337) made this pull request unmergeable. Please resolve the merge conflicts.

@sunfishcode
Update to the latest wasi-sysroot.
215cd15 
 - Rename `wasm32-unknown-wasi` to `wasm32-wasi`.
 - `__wasilibc_rmfileat` was renamed to `__wasilibc_unlinkat`
 - Add bindings for a few more functions and typedefs.
@gnzlbg

gnzlbg commented May 16, 2019

Copy link
Copy Markdown
Contributor

@bors: r+

@bors

bors commented May 16, 2019

Copy link
Copy Markdown
Contributor

📌 Commit 215cd15 has been approved by gnzlbg

@bors

bors commented May 16, 2019

Copy link
Copy Markdown
Contributor

⌛ Testing commit 215cd15 with merge 6bc42d4...

bors added a commit that referenced this pull request May 16, 2019
@bors
Auto merge of #1342 - sunfishcode:master, r=gnzlbg
6bc42d4 
Update to the latest wasi-sysroot.

 - Rename `wasm32-unknown-wasi` to `wasm32-wasi`.
 - `__wasilibc_rmfileat` was renamed to `__wasilibc_unlinkat`
 - Add bindings for a few more functions and typedefs.
@bors

bors commented May 16, 2019

Copy link
Copy Markdown
Contributor

☀️ Test successful - checks-cirrus, checks-travis, status-appveyor
Approved by: gnzlbg
Pushing 6bc42d4 to master...

@bors bors merged commit 215cd15 into rust-lang:master May 16, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

@alexcrichton alexcrichton

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

6 participants

@sunfishcode @rust-highfive @alexcrichton @bors @gnzlbg @mati865