Skip to content

Commit

Permalink
Rollup merge of #123970 - risc0:erik/zkvm-fix-os-str, r=joboet
Browse files Browse the repository at this point in the history
zkvm: fix references to `os_str` module

The `os_str` module has been moved to `sys`. This change fixes build issues by changing `use` to point to `crate::sys::os_str`.
  • Loading branch information
compiler-errors authored Apr 15, 2024
2 parents 89e55f7 + ee0aea5 commit 27cb6bc
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 2 deletions.
3 changes: 2 additions & 1 deletion library/std/src/sys/pal/zkvm/args.rs
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down Expand Up @@ -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() })
}
}

Expand Down
3 changes: 2 additions & 1 deletion library/std/src/sys/pal/zkvm/os.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -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<()> {
Expand Down

0 comments on commit 27cb6bc

Please sign in to comment.