no extra changes

succinctlabs · Jul 31, 2024 · 7ed4149 · 7ed4149
1 parent 2f73bba
commit 7ed4149
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 12 deletions.
diff --git a/library/std/src/lib.rs b/library/std/src/lib.rs
@@ -252,7 +252,6 @@
 #![allow(internal_features)]
 #![deny(rustc::existing_doc_keyword)]
 #![deny(fuzzy_provenance_casts)]
-#![allow(rustdoc::broken_intra_doc_links)]
 #![allow(rustdoc::redundant_explicit_links)]
 // Ensure that std can be linked against panic_abort despite compiled with `-C panic=unwind`
 #![deny(ffi_unwind_calls)]

diff --git a/library/std/src/os/fd/owned.rs b/library/std/src/os/fd/owned.rs
@@ -9,7 +9,7 @@ use crate::fs;
 use crate::io;
 use crate::marker::PhantomData;
 use crate::mem::forget;
-#[cfg(not(any(target_arch = "wasm32", target_env = "sgx", target_os = "hermit", target_os = "zkvm")))]
+#[cfg(not(any(target_arch = "wasm32", target_env = "sgx", target_os = "hermit")))]
 use crate::sys::cvt;
 use crate::sys_common::{AsInner, FromInner, IntoInner};
 

diff --git a/library/std/src/os/fd/raw.rs b/library/std/src/os/fd/raw.rs
@@ -8,7 +8,7 @@ use crate::io;
 use crate::os::hermit::io::OwnedFd;
 #[cfg(not(target_os = "hermit"))]
 use crate::os::raw;
-#[cfg(all(doc, not(target_arch = "wasm32"), not(target_os = "zkvm")))]
+#[cfg(all(doc, not(target_arch = "wasm32")))]
 use crate::os::unix::io::AsFd;
 #[cfg(unix)]
 use crate::os::unix::io::OwnedFd;

diff --git a/library/std/src/os/mod.rs b/library/std/src/os/mod.rs
@@ -14,11 +14,10 @@ pub mod raw;
 // documented don't compile (missing things in `libc` which is empty),
 // so just omit them with an empty module and add the "unstable" attribute.
 
-// Unix, linux, wasi, windows, and zkvm are handled a bit differently.
+// Unix, linux, wasi and windows are handled a bit differently.
 #[cfg(all(
     doc,
     any(
-        target_os = "zkvm",
         all(target_arch = "wasm32", not(target_os = "wasi")),
         all(target_vendor = "fortanix", target_env = "sgx")
     )
@@ -28,7 +27,6 @@ pub mod unix {}
 #[cfg(all(
     doc,
     any(
-        target_os = "zkvm",
         all(target_arch = "wasm32", not(target_os = "wasi")),
         all(target_vendor = "fortanix", target_env = "sgx")
     )
@@ -38,7 +36,6 @@ pub mod linux {}
 #[cfg(all(
     doc,
     any(
-        target_os = "zkvm",
         all(target_arch = "wasm32", not(target_os = "wasi")),
         all(target_vendor = "fortanix", target_env = "sgx")
     )
@@ -48,7 +45,6 @@ pub mod wasi {}
 #[cfg(all(
     doc,
     any(
-        target_os = "zkvm",
         all(target_arch = "wasm32", not(target_os = "wasi")),
         all(target_vendor = "fortanix", target_env = "sgx")
     )
@@ -60,7 +56,6 @@ pub mod windows {}
 #[cfg(not(all(
     doc,
     any(
-        target_os = "zkvm",
         all(target_arch = "wasm32", not(target_os = "wasi")),
         all(target_vendor = "fortanix", target_env = "sgx")
     )
@@ -72,7 +67,6 @@ pub mod unix;
 #[cfg(not(all(
     doc,
     any(
-        target_os = "zkvm",
         all(target_arch = "wasm32", not(target_os = "wasi")),
         all(target_vendor = "fortanix", target_env = "sgx")
     )
@@ -84,7 +78,6 @@ pub mod linux;
 #[cfg(not(all(
     doc,
     any(
-        target_os = "zkvm",
         all(target_arch = "wasm32", not(target_os = "wasi")),
         all(target_vendor = "fortanix", target_env = "sgx")
     )
@@ -99,7 +92,6 @@ pub mod wasip2;
 #[cfg(not(all(
     doc,
     any(
-        target_os = "zkvm",
         all(target_arch = "wasm32", not(target_os = "wasi")),
         all(target_vendor = "fortanix", target_env = "sgx")
     )