Skip to content

Commit e3a2290

Browse files
committed
Update wasix crate to latest version, update code accordingly
1 parent bdcb723 commit e3a2290

File tree

3 files changed

+16
-14
lines changed

3 files changed

+16
-14
lines changed

library/Cargo.lock

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -436,9 +436,9 @@ dependencies = [
436436

437437
[[package]]
438438
name = "wasix"
439-
version = "0.12.21"
439+
version = "0.13.0"
440440
source = "registry+https://github.com/rust-lang/crates.io-index"
441-
checksum = "c1fbb4ef9bbca0c1170e0b00dd28abc9e3b68669821600cad1caaed606583c6d"
441+
checksum = "30d3a78f6dfda080ea3bcb6230bb4d1cf36ed04cf8a6ca9b91d1a97c3f4efa40"
442442
dependencies = [
443443
"compiler_builtins",
444444
"rustc-std-workspace-alloc",

library/std/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,10 +80,10 @@ wasi = { version = "0.11.0", features = [
8080
], default-features = false }
8181

8282
[target.wasm32-wasmer-wasi.dependencies]
83-
wasi = { package = "wasix", version = "0.12.9", features = ['rustc-dep-of-std'], default-features = false, public = true }
83+
wasi = { package = "wasix", version = "0.13.0", features = ['rustc-dep-of-std'], default-features = false, public = true }
8484

8585
[target.wasm64-wasmer-wasi.dependencies]
86-
wasi = { package = "wasix", version = "0.12.9", features = ['rustc-dep-of-std'], default-features = false, public = true }
86+
wasi = { package = "wasix", version = "0.13.0", features = ['rustc-dep-of-std'], default-features = false, public = true }
8787

8888
[target.'cfg(target_os = "uefi")'.dependencies]
8989
r-efi = { version = "4.5.0", features = ['rustc-dep-of-std'] }

library/std/src/sys/pal/wasix/net.rs

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,19 @@
11
#![deny(unsafe_op_in_unsafe_fn)]
22
#![allow(dead_code)]
33

4+
use libc::c_int;
5+
46
use super::err2io;
57
use super::fd::WasiFd;
68
use crate::collections::VecDeque;
79
use crate::fmt;
810
use crate::io::{self, BorrowedCursor, IoSlice, IoSliceMut};
911
use crate::net::{IpAddr, Ipv4Addr, Ipv6Addr, Shutdown, SocketAddr};
1012
use crate::os::wasi::io::{AsFd, AsRawFd, BorrowedFd, FromRawFd, IntoRawFd, RawFd};
11-
1213
use crate::sync::{Arc, Mutex};
13-
use crate::sys_common::{AsInner, FromInner, IntoInner};
14-
use crate::time::Duration;
15-
use crate::time::Instant;
16-
use libc::c_int;
17-
1814
pub use crate::sys::cvt;
15+
use crate::sys_common::{AsInner, FromInner, IntoInner};
16+
use crate::time::{Duration, Instant};
1917

2018
pub struct Socket {
2119
fd: Option<WasiFd>,
@@ -741,11 +739,11 @@ fn conv_addr_v4(u: wasi::AddrIp4) -> Ipv4Addr {
741739
Ipv4Addr::new(u.n0, u.n1, u.h0, u.h1)
742740
}
743741

744-
fn conv_addr_v6(u: wasi::AddrIp6) -> Ipv6Addr {
742+
fn conv_addr_v6(u: wasi::AddrIp6Bare) -> Ipv6Addr {
745743
Ipv6Addr::new(u.n0, u.n1, u.n2, u.n3, u.h0, u.h1, u.h2, u.h3)
746744
}
747745

748-
fn conv_addr(addr: wasi::Addr) -> IpAddr {
746+
fn conv_addr(addr: wasi::AddrIp) -> IpAddr {
749747
unsafe {
750748
match addr.tag {
751749
a if a == wasi::ADDRESS_FAMILY_INET6.raw() => IpAddr::V6(conv_addr_v6(addr.u.inet6)),
@@ -787,6 +785,10 @@ fn to_wasi_addr_v6(ip: Ipv6Addr) -> wasi::AddrIp6 {
787785
h1: segs[5],
788786
h2: segs[6],
789787
h3: segs[7],
788+
flow_info0: 0,
789+
flow_info1: 0,
790+
scope_id0: 0,
791+
scope_id1: 0,
790792
}
791793
}
792794

@@ -1304,8 +1306,8 @@ impl<'a> TryFrom<(&'a str, u16)> for LookupHost {
13041306
let port = v.1;
13051307
let mut ret = VecDeque::new();
13061308
unsafe {
1307-
let mut ips = [crate::mem::MaybeUninit::<wasi::Addr>::zeroed(); 50];
1308-
let cnt = wasi::resolve(host, port, ips.as_mut_ptr() as *mut wasi::Addr, ips.len())
1309+
let mut ips = [crate::mem::MaybeUninit::<wasi::AddrIp>::zeroed(); 50];
1310+
let cnt = wasi::resolve(host, port, ips.as_mut_ptr() as *mut wasi::AddrIp, ips.len())
13091311
.map_err(err2io)?;
13101312
for n in 0..cnt {
13111313
let ip = ips[n].assume_init();

0 commit comments

Comments
 (0)