Unrolled build for rust-lang#121765

rust-timer · web-flow · commit 051f24632cd9 · 2024-02-29T11:05:57.000-05:00
Rollup merge of rust-lang#121765 - hermit-os:errno, r=ChrisDenton add platform-specific function to get the error number for HermitOS Extending `std` to get the last error number for HermitOS. HermitOS is a tier 3 platform and this PR changes only files, wich are related to the tier 3 platform.
diff --git a/Cargo.lock b/Cargo.lock
@@ -1640,9 +1640,9 @@ checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8"
 
 [[package]]
 name = "hermit-abi"
-version = "0.3.6"
+version = "0.3.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bd5256b483761cd23699d0da46cc6fd2ee3be420bbe6d020ae4a091e70b7e9fd"
+checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024"
 dependencies = [
  "compiler_builtins",
  "rustc-std-workspace-alloc",
diff --git a/library/std/Cargo.toml b/library/std/Cargo.toml
@@ -48,7 +48,7 @@ dlmalloc = { version = "0.2.4", features = ['rustc-dep-of-std'] }
 fortanix-sgx-abi = { version = "0.5.0", features = ['rustc-dep-of-std'], public = true }
 
 [target.'cfg(target_os = "hermit")'.dependencies]
-hermit-abi = { version = "0.3.2", features = ['rustc-dep-of-std'], public = true }
+hermit-abi = { version = "0.3.9", features = ['rustc-dep-of-std'], public = true }
 
 [target.'cfg(target_os = "wasi")'.dependencies]
 wasi = { version = "0.11.0", features = ['rustc-dep-of-std'], default-features = false }
diff --git a/library/std/src/sys/pal/hermit/os.rs b/library/std/src/sys/pal/hermit/os.rs
@@ -14,15 +14,15 @@ use crate::sys::unsupported;
 use crate::vec;
 
 pub fn errno() -> i32 {
-    0
+    unsafe { abi::get_errno() }
 }
 
-pub fn error_string(_errno: i32) -> String {
-    "operation successful".to_string()
+pub fn error_string(errno: i32) -> String {
+    abi::error_string(errno).to_string()
 }
 
 pub fn getcwd() -> io::Result<PathBuf> {
-    unsupported()
+    Ok(PathBuf::from("/"))
 }
 
 pub fn chdir(_: &path::Path) -> io::Result<()> {
@@ -188,7 +188,7 @@ pub fn unsetenv(k: &OsStr) -> io::Result<()> {
 }
 
 pub fn temp_dir() -> PathBuf {
-    panic!("no filesystem on hermit")
+    PathBuf::from("/tmp")
 }
 
 pub fn home_dir() -> Option<PathBuf> {

Original file line number	Diff line number	Diff line change
`@@ -14,15 +14,15 @@ use crate::sys::unsupported;`
`14`	`14`	`use crate::vec;`
`15`	`15`
`16`	`16`	`pub fn errno() -> i32 {`
`17`		`- 0`
	`17`	`+ unsafe { abi::get_errno() }`
`18`	`18`	`}`
`19`	`19`
`20`		`-pub fn error_string(_errno: i32) -> String {`
`21`		`- "operation successful".to_string()`
	`20`	`+pub fn error_string(errno: i32) -> String {`
	`21`	`+ abi::error_string(errno).to_string()`
`22`	`22`	`}`
`23`	`23`
`24`	`24`	`pub fn getcwd() -> io::Result<PathBuf> {`
`25`		`- unsupported()`
	`25`	`+ Ok(PathBuf::from("/"))`
`26`	`26`	`}`
`27`	`27`
`28`	`28`	`pub fn chdir(_: &path::Path) -> io::Result<()> {`
`@@ -188,7 +188,7 @@ pub fn unsetenv(k: &OsStr) -> io::Result<()> {`
`188`	`188`	`}`
`189`	`189`
`190`	`190`	`pub fn temp_dir() -> PathBuf {`
`191`		`- panic!("no filesystem on hermit")`
	`191`	`+ PathBuf::from("/tmp")`
`192`	`192`	`}`
`193`	`193`
`194`	`194`	`pub fn home_dir() -> Option<PathBuf> {`