From dfc8f02279ab13c81ab47cb875bc585adc0cdc6f Mon Sep 17 00:00:00 2001
From: Thalia Archibald <thalia@archibald.dev>
Date: Mon, 21 Apr 2025 21:05:04 -0700
Subject: [PATCH] Move zkVM constants into `sys::env_consts`
I missed this in #139868. Its `mod` declaration was removed, but the
contents were not moved.
---
library/std/src/sys/env_consts.rs | 11 +++++++++++
library/std/src/sys/pal/zkvm/env.rs | 9 ---------
2 files changed, 11 insertions(+), 9 deletions(-)
delete mode 100644 library/std/src/sys/pal/zkvm/env.rs
diff --git a/library/std/src/sys/env_consts.rs b/library/std/src/sys/env_consts.rs
index 018d7954db26a..9683fd47cf96b 100644
--- a/library/std/src/sys/env_consts.rs
+++ b/library/std/src/sys/env_consts.rs
@@ -389,6 +389,17 @@ pub mod os {
pub const EXE_EXTENSION: &str = "exe";
}
+#[cfg(target_os = "zkvm")]
+pub mod os {
+ pub const FAMILY: &str = "";
+ pub const OS: &str = "";
+ pub const DLL_PREFIX: &str = "";
+ pub const DLL_SUFFIX: &str = ".elf";
+ pub const DLL_EXTENSION: &str = "elf";
+ pub const EXE_SUFFIX: &str = ".elf";
+ pub const EXE_EXTENSION: &str = "elf";
+}
+
// The fallback when none of the other gates match.
#[else]
pub mod os {
diff --git a/library/std/src/sys/pal/zkvm/env.rs b/library/std/src/sys/pal/zkvm/env.rs
deleted file mode 100644
index b85153642b1c9..0000000000000
--- a/library/std/src/sys/pal/zkvm/env.rs
+++ /dev/null
@@ -1,9 +0,0 @@
-pub mod os {
- pub const FAMILY: &str = "";
- pub const OS: &str = "";
- pub const DLL_PREFIX: &str = "";
- pub const DLL_SUFFIX: &str = ".elf";
- pub const DLL_EXTENSION: &str = "elf";
- pub const EXE_SUFFIX: &str = ".elf";
- pub const EXE_EXTENSION: &str = "elf";
-}