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.

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

Update several dependencies. #6171

Merged

Conversation

sunfishcode
Copy link
Member

This updates to rustix 0.37.7, which contains some features we can use to implement more features in wasi-common for the wasi-sockets API. This also pulls in several other updates to avoid having multiple versions of rustix.

This does introduce multiple versions of windows-sys, as the errno and tokio crates are currently using 0.45 while rustix and other dependencies have updated to 0.48; PRs updating these are already in flight so this will hopefully be resolved soon.

@sunfishcode sunfishcode requested review from a team as code owners April 6, 2023 18:07
@sunfishcode sunfishcode requested review from alexcrichton and removed request for a team April 6, 2023 18:07
@github-actions github-actions bot added the wasi Issues pertaining to WASI label Apr 6, 2023
@github-actions
Copy link

github-actions bot commented Apr 6, 2023

Subscribe to Label Action

cc @kubkon

This issue or pull request has been labeled: "wasi"

Thus the following users have been cc'd because of the following labels:

  • kubkon: wasi

To subscribe or unsubscribe from this label, edit the .github/subscribe-to-label.json configuration file.

Learn more.

@alexcrichton alexcrichton added this pull request to the merge queue Apr 7, 2023
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks Apr 7, 2023
@sunfishcode
Copy link
Member Author

This apparenetly failed in the merge queue in the "Record the result of testing and building steps" step, but there's no indication of what the problem is.

@alexcrichton
Copy link
Member

The error isn't always apparent due to various reasons, but if you look through the logs this is the error:

error[E0599]: no method named `is_null` found for type `isize` in the current scope
   --> crates\runtime\src\mmap.rs:143:24
    |
143 |                 if ptr.is_null() {
    |                        ^^^^^^^ method not found in `isize`

error[E0308]: mismatched types
   --> crates\runtime\src\mmap.rs:495:50
    |
495 |                 let r = unsafe { UnmapViewOfFile(self.ptr as *mut c_void) };
    |                                  --------------- ^^^^^^^^^^^^^^^^^^^^^^^ expected `isize`, found `*mut c_void`
    |                                  |
    |                                  arguments to this function are incorrect
    |
    = note:     expected type `isize`
            found raw pointer `*mut c_void`
note: function defined here
   --> C:\Users\runneradmin\.cargo\registry\src\index.crates.io-6f17d22bba15001f\windows-sys-0.48.0\src\Windows\Win32\System\Memory\mod.rs:159:137
    |
159 | ...s: `\"Win32_System_Memory\"`, `\"Win32_Foundation\"`*"] fn UnmapViewOfFile ( lpbaseaddress : MEMORYMAPPEDVIEW_HANDLE ) -> super::super...
    |                                                               ^^^^^^^^^^^^^^^

@sunfishcode
Copy link
Member Author

Thanks. I've now fixed that error.

@alexcrichton alexcrichton added this pull request to the merge queue Apr 11, 2023
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks Apr 11, 2023
@alexcrichton
Copy link
Member

I think that's a minor windows error:

error[E0432]: unresolved import `windows_sys::Win32::Foundation::HINSTANCE`
   --> cranelift\jit\src\backend.rs:934:9
    |
934 |     use windows_sys::Win32::Foundation::HINSTANCE;
    |         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ no `HINSTANCE` in `Windows::Win32::Foundation`

@sunfishcode sunfishcode force-pushed the sunfishcode/update-rustix branch from 7d16d17 to 3302955 Compare April 12, 2023 02:14
@sunfishcode sunfishcode requested a review from a team as a code owner April 12, 2023 02:14
@sunfishcode sunfishcode requested review from fitzgen and removed request for a team April 12, 2023 02:14
@github-actions github-actions bot added the cranelift Issues related to the Cranelift code generator label Apr 12, 2023
@alexcrichton alexcrichton added this pull request to the merge queue Apr 12, 2023
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks Apr 12, 2023
@sunfishcode sunfishcode force-pushed the sunfishcode/update-rustix branch 2 times, most recently from ef62bd6 to 912aba5 Compare April 20, 2023 06:45
This updates to rustix 0.37.13, which contains some features we can use to
implement more features in wasi-common for the wasi-sockets API. This also
pulls in several other updates to avoid having multiple versions of rustix.

This does introduce multiple versions of windows-sys, as the errno and tokio
crates are currently using 0.45 while rustix and other dependencies have
updated to 0.48; PRs updating these are already in flight so this will
hopefully be resolved soon.

It also includes cap-std 1.0.14, which disables the use of `openat2` and
`statx` on Android, fixing a bug where some Android devices crash the
process when those syscalls are executed.
@sunfishcode sunfishcode force-pushed the sunfishcode/update-rustix branch from 912aba5 to 3449b73 Compare April 20, 2023 13:43
@sunfishcode sunfishcode added this pull request to the merge queue Apr 20, 2023
Merged via the queue into bytecodealliance:main with commit c59bb8d Apr 20, 2023
@sunfishcode sunfishcode deleted the sunfishcode/update-rustix branch April 20, 2023 14:45
eduardomourar pushed a commit to eduardomourar/wasmtime that referenced this pull request Apr 28, 2023
This updates to rustix 0.37.13, which contains some features we can use to
implement more features in wasi-common for the wasi-sockets API. This also
pulls in several other updates to avoid having multiple versions of rustix.

This does introduce multiple versions of windows-sys, as the errno and tokio
crates are currently using 0.45 while rustix and other dependencies have
updated to 0.48; PRs updating these are already in flight so this will
hopefully be resolved soon.

It also includes cap-std 1.0.14, which disables the use of `openat2` and
`statx` on Android, fixing a bug where some Android devices crash the
process when those syscalls are executed.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
cranelift Issues related to the Cranelift code generator wasi Issues pertaining to WASI
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants