diff options
| author | Erik Kaneda <erik@risczero.com> | 2024-04-15 09:26:40 -0700 |
|---|---|---|
| committer | Erik Kaneda <erik@risczero.com> | 2024-04-15 09:32:21 -0700 |
| commit | ee0aea5f658953ca5d788d7526ea08428ea3e7da (patch) | |
| tree | bd1544de0f9f91d63b486b1dbd955f6019ebbbf6 | |
| parent | 84e729a59f216cc64755788a470f165429a731f4 (diff) | |
| download | rust-ee0aea5f658953ca5d788d7526ea08428ea3e7da.tar.gz rust-ee0aea5f658953ca5d788d7526ea08428ea3e7da.zip | |
zkvm: fix references to `os_str` module
The `os_str` module has been moved to `sys`.
| -rw-r--r-- | library/std/src/sys/pal/zkvm/args.rs | 3 | ||||
| -rw-r--r-- | library/std/src/sys/pal/zkvm/os.rs | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/library/std/src/sys/pal/zkvm/args.rs b/library/std/src/sys/pal/zkvm/args.rs index 7753cf63840..583c16e3a47 100644 --- a/library/std/src/sys/pal/zkvm/args.rs +++ b/library/std/src/sys/pal/zkvm/args.rs @@ -1,6 +1,7 @@ use super::{abi, WORD_SIZE}; use crate::ffi::OsString; use crate::fmt; +use crate::sys::os_str; use crate::sys_common::FromInner; pub struct Args { @@ -33,7 +34,7 @@ impl Args { // "os_str". let arg_bytes: &[u8] = unsafe { crate::slice::from_raw_parts(words.cast() as *const u8, arg_len) }; - OsString::from_inner(super::os_str::Buf { inner: arg_bytes.to_vec() }) + OsString::from_inner(os_str::Buf { inner: arg_bytes.to_vec() }) } } diff --git a/library/std/src/sys/pal/zkvm/os.rs b/library/std/src/sys/pal/zkvm/os.rs index d8739ee3824..759beb2d306 100644 --- a/library/std/src/sys/pal/zkvm/os.rs +++ b/library/std/src/sys/pal/zkvm/os.rs @@ -5,6 +5,7 @@ use crate::fmt; use crate::io; use crate::marker::PhantomData; use crate::path::{self, PathBuf}; +use crate::sys::os_str; use crate::sys_common::FromInner; pub fn errno() -> i32 { @@ -111,7 +112,7 @@ pub fn getenv(varname: &OsStr) -> Option<OsString> { // reimplement "os_str" instead of just using the generic unix // "os_str". let u8s: &[u8] = unsafe { crate::slice::from_raw_parts(words.cast() as *const u8, nbytes) }; - Some(OsString::from_inner(super::os_str::Buf { inner: u8s.to_vec() })) + Some(OsString::from_inner(os_str::Buf { inner: u8s.to_vec() })) } pub fn setenv(_: &OsStr, _: &OsStr) -> io::Result<()> { |
