Skip to content

zkvm: fix references to os_str module #123970

New issue

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

#

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

Already on GitHub? # to your account

Jump to bottom
Merged
merged 1 commit into from
Apr 15, 2024
Merged

zkvm: fix references to os_str module #123970

merged 1 commit into from
Apr 15, 2024

Conversation

SchmErik
Copy link
Contributor

The os_str module has been moved to sys. This change fixes build issues by changing use to point to crate::sys::os_str.

zkvm: fix references to os_str module
ee0aea5 
The `os_str` module has been moved to `sys`.
@rustbot
Copy link
Collaborator

rustbot commented Apr 15, 2024

r? @workingjubilee

rustbot has assigned @workingjubilee.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

@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 15, 2024
@SchmErik
Copy link
Contributor Author

r? joboet

This is a follow-up to #123858

@rustbot rustbot assigned joboet and unassigned workingjubilee Apr 15, 2024
@joboet joboet mentioned this pull request Apr 15, 2024
Closed
@joboet
Copy link
Member

joboet commented Apr 15, 2024

Fair enough!
@bors r+ rollup

@bors
Copy link
Collaborator

bors commented Apr 15, 2024

📌 Commit ee0aea5 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 15, 2024
@compiler-errors compiler-errors mentioned this pull request Apr 15, 2024
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Apr 15, 2024
@bors
Auto merge of rust-lang#123982 - compiler-errors:rollup-m2v4epp, r=co…
3493a56 
…mpiler-errors

Rollup of 4 pull requests

Successful merges:

 - rust-lang#123900 (Stop using `PolyTraitRef` for closure/coroutine predicates already instantiated w placeholders)
 - rust-lang#123924 (Fix various bugs in `ty_kind_suggestion`)
 - rust-lang#123943 (Use the rustc_private libc less in tests)
 - rust-lang#123970 (zkvm: fix references to `os_str` module)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 27cb6bc into rust-lang:master Apr 15, 2024
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Apr 15, 2024
@rust-timer
Unrolled build for rust-lang#123970
5d4ca1b 
Rollup merge of rust-lang#123970 - risc0:erik/zkvm-fix-os-str, r=joboet

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`.
@rustbot rustbot added this to the 1.79.0 milestone Apr 15, 2024
# for free to join this conversation on GitHub. Already have an account? # to comment
Reviewers
No reviews
Assignees

@joboet joboet

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
Milestone
1.79.0
Development

Successfully merging this pull request may close these issues.
5 participants
@SchmErik @rustbot @joboet @bors @workingjubilee