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

refactor: Deref MainTrace type to ColMatrix #1214

Merged
merged 8 commits into from
Jan 29, 2024
Merged

refactor: Deref MainTrace type to ColMatrix #1214

merged 8 commits into from
Jan 29, 2024

Conversation

iammadab
Copy link
Contributor

@iammadab iammadab commented Jan 24, 2024

Describe your changes

  • Implement Deref for MainTrace to &ColMatrix
  • Remove lifetime annotation from Maintrace
    • new method now takes in ColMatrix as opposed to &ColMatrix
  • Replace &ColMatrix with &MainTrace

relevant issue: #1201

@iammadab iammadab marked this pull request as ready for review January 24, 2024 11:36
Copy link
Contributor

@plafer plafer left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks great, thank you! Let a few minor nits.

Let's fix the CI too. You can fix by running locally:

// fix any clippy errors
$ cargo +nightly clippy --all -- -D clippy::all -D warning
// format once all fixes are done
$ cargo fmt

air/src/trace/main_trace.rs Outdated Show resolved Hide resolved
processor/src/trace/mod.rs Outdated Show resolved Hide resolved
@iammadab iammadab requested a review from plafer January 24, 2024 15:20
Copy link
Contributor

@plafer plafer left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM!

@bobbinth want to take a look before we merge?

processor/src/chiplets/tests.rs Show resolved Hide resolved
@plafer
Copy link
Contributor

plafer commented Jan 26, 2024

@iammadab oops can you fix the CI? Basically an explicit import of Vec is needed for no_std (look at how other files do it)

@iammadab
Copy link
Contributor Author

@plafer pushed no-std fix, we can run CI again.

Copy link
Contributor

@bobbinth bobbinth left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks great! Thank you for working on this! I left one comment inline - but it could be as simple as adding a comment to the relevant method.

air/src/trace/main_trace.rs Show resolved Hide resolved
@plafer
Copy link
Contributor

plafer commented Jan 29, 2024

The clippy error is due to the latest nightly clippy (all branches have that error). I think we're good to merge this with the error, and fix it elsewhere (and only once).

Copy link
Contributor

@bobbinth bobbinth left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

All looks good! Thank you again!

@bobbinth bobbinth merged commit 5f36479 into 0xPolygonMiden:al-simplify-aux Jan 29, 2024
14 of 15 checks passed
bobbinth pushed a commit that referenced this pull request Feb 6, 2024
bobbinth pushed a commit that referenced this pull request Feb 8, 2024
bobbinth pushed a commit that referenced this pull request Feb 8, 2024
Fumuran pushed a commit that referenced this pull request Feb 9, 2024
bobbinth pushed a commit that referenced this pull request Feb 13, 2024
bobbinth pushed a commit that referenced this pull request Feb 26, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants