Skip to content
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

zkvm: fix path to cmath in zkvm module #123858

Merged
merged 1 commit into from
Apr 12, 2024

Conversation

marijanp
Copy link
Contributor

@marijanp marijanp commented Apr 12, 2024

I don't know why the original author decided to use relative paths.

I think it would be better to use use crate::sys::cmath;

The according issue can be found here risc0/risc0#1647

@rustbot
Copy link
Collaborator

rustbot commented Apr 12, 2024

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @m-ou-se (or someone else) some time within the next two weeks.

Please see the contribution instructions for more information. Namely, in order to ensure the minimum review times lag, PR authors and assigned reviewers should ensure that the review label (S-waiting-on-review and S-waiting-on-author) stays updated, invoking these commands when appropriate:

  • @rustbot author: the review is finished, PR author should check the comments and take action accordingly
  • @rustbot review: the author is ready for a review, this PR will be queued again in the reviewer's queue

@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 12, 2024
@joboet
Copy link
Member

joboet commented Apr 12, 2024

pal::*::cmath isn't used any more. You can just remove the mod, cmath has been moved to sys and is shared by all platforms (see #120109).

@joboet joboet assigned joboet and unassigned m-ou-se Apr 12, 2024
- Remove cmath from zkvm module since cmath was moved to sys and is
shared by all platforms (see rust-lang#120109)
@joboet
Copy link
Member

joboet commented Apr 12, 2024

Cool!

@bors r+ rollup

@bors
Copy link
Contributor

bors commented Apr 12, 2024

📌 Commit 861e213 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 12, 2024
bors added a commit to rust-lang-ci/rust that referenced this pull request Apr 12, 2024
…iaskrgr

Rollup of 7 pull requests

Successful merges:

 - rust-lang#123654 (typeck: fix `?` suggestion span)
 - rust-lang#123807 (Remove `sys_common::thread`)
 - rust-lang#123834 (Don't do coroutine-closure-specific upvar analysis if tainted by errors)
 - rust-lang#123847 (Suppress `let else` suggestion for uninitialized refutable `let`s)
 - rust-lang#123857 (std::net: TcpListener shrinks the backlog argument to 32 for Haiku.)
 - rust-lang#123858 (zkvm: fix path to cmath in zkvm module)
 - rust-lang#123867 (Add `unsafe` to two functions with safety invariants)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit b5c3db1 into rust-lang:master Apr 12, 2024
11 checks passed
@rustbot rustbot added this to the 1.79.0 milestone Apr 12, 2024
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Apr 12, 2024
Rollup merge of rust-lang#123858 - marijanp:fix-zkvm-cmath-path, r=joboet

zkvm: fix path to cmath in zkvm module

I don't know why the original author decided to use relative paths.

I think it would be better to use `use crate::sys::cmath;`

The according issue can be found here risc0/risc0#1647
@marijanp marijanp deleted the fix-zkvm-cmath-path branch April 12, 2024 22:58
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