Skip to content

Move zkVM constants into sys::env_consts #140141

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 24, 2025

Conversation

thaliaarchi
Copy link
Contributor

I missed this in #139868. Its mod declaration was removed, but the contents were not moved.

r? joboet

I missed this in rust-lang#139868. Its `mod` declaration was removed, but the
contents were not moved.
@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-libs Relevant to the library team, which will review and decide on the PR/issue. labels Apr 22, 2025
@joboet
Copy link
Member

joboet commented Apr 23, 2025

@flaub @jbruestle @SchmErik I think the OS constant's value should be zkvm, is that correct.

@flaub
Copy link
Contributor

flaub commented Apr 23, 2025

We don't directly rely on any of these values, so I think it being empty as before is probably fine.

@thaliaarchi
Copy link
Contributor Author

WASM and SGX both also don't have a value for OS, as they're independent of the OS, and I think the zkVM is the same way.

@joboet
Copy link
Member

joboet commented Apr 24, 2025

Fair enough.
@bors r+ rollup

@bors
Copy link
Collaborator

bors commented Apr 24, 2025

📌 Commit dfc8f02 has been approved by joboet

It is now in the queue for this repository.

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Apr 24, 2025
bors added a commit to rust-lang-ci/rust that referenced this pull request Apr 24, 2025
…iaskrgr

Rollup of 8 pull requests

Successful merges:

 - rust-lang#136083 (Suggest {to,from}_ne_bytes for transmutations between arrays and integers, etc)
 - rust-lang#138282 (Add `#[repr(u128)]`/`#[repr(i128)]` enums to `improper_ctypes_definitions`)
 - rust-lang#139700 (Autodiff flags)
 - rust-lang#140139 (rustc_target: Adjust RISC-V feature implication)
 - rust-lang#140141 (Move zkVM constants into `sys::env_consts`)
 - rust-lang#140150 (fix MAX_EXP and MIN_EXP docs)
 - rust-lang#140172 (Make algebraic functions into `const fn` items.)
 - rust-lang#140191 (Remove git repository from git config)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 9dcb367 into rust-lang:master Apr 24, 2025
6 checks passed
@rustbot rustbot added this to the 1.88.0 milestone Apr 24, 2025
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Apr 24, 2025
Rollup merge of rust-lang#140141 - thaliaarchi:env-consts/zkvm, r=joboet

Move zkVM constants into `sys::env_consts`

I missed this in rust-lang#139868. Its `mod` declaration was removed, but the contents were not moved.

r? joboet
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-libs Relevant to the library team, which will review and decide on the PR/issue.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants