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.

Sign up for GitHub

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

Jump to bottom

Merge main branch into next #1351

Merged
merged 23 commits into from
Jun 7, 2024
Merged

Merge main branch into next #1351

merged 23 commits into from
Jun 7, 2024

Conversation

Fumuran
Copy link
Contributor

@Fumuran Fumuran commented Jun 7, 2024

This PR resolves the conflicts between main and next branches, creating a merge commit.

Fumuran and others added 23 commits April 3, 2024 13:02
@Fumuran @bobbinth
refactor: remove message about error returning (#1260)
66e9249
@omahs @bobbinth
docs: fix broken links (#1263)
226a835
@Fumuran @bobbinth
refactor: remove unused find_lone_leaf function (#1262)
206bfd6
@Fumuran @bobbinth
refactor: integrate new ilog2 and cto instructions into MMR (#1269)
853c166
@hackaugusto @bobbinth
miden-vm: match the crate with the package name. Fix #1270 (#1271)
5013b94
@Fumuran @bobbinth
refactor: change StackOutputs fields from u64 to Felt (#1268)
83dd537
@hackaugusto @bobbinth
changelog: miden-vm crate renaming changelog (#1272)
8c294d7
@eltociear @bobbinth
docs: fix typo in constants.rs (#1275)
3c3dd40
@Fumuran @bobbinth
refactor: serialize usize with write_usize (#1266)
4b26304
@mFragaBA @bobbinth
docs: fix multiset link in design section (#1286)
22a9bd2
@hackaugusto @bobbinth
docs: update execution context docs to mention dyncall (#1285)
5b717f1
@Al-Kindi-0 @bobbinth
chore: migrate to miden-crypto v0.9.0 (#1287)
8ffa643 
* chore: fix no-std errors
* fix: Falcon DSA decorators and tests
@bobbinth
chore: increment crate versions to v0.9.0 and update changelog
17555ad
@polydez @bobbinth
feat: ensure all errors implement at least Debug, Clone, `Partial…
23bc2d9 
…Eq` and `Eq` traits
@bobbinth
chore: increment crate versions to v0.9.1 and update changelog
3e74f9c
@partylikeits1983
fix typo: filed to field (#1309)
a20cb5f
@bobbinth
feat: allow enabling debug mode via ExecutionOptions (#1316)
a0da333
@bobbinth
chore: increment air and processor crate versions to v0.9.2 and updat…
9abd8d1 
…e changelog
@bobbinth
fix: Remove usage of group_vector_elements() from combine_blocks() (#…
00a460f 
…1331)
@bobbinth
chore: increment assembly crate version to v0.9.2
2a25e0b
@mFragaBA
fix: only write masm documentation when it's not docs.rs building the…
65f6ead 
… documentation (#1341)
@bobbinth
chore: update stdlib crate version to v0.9.2
1698d13
@Fumuran
Merge branch 'main' into next
ab2e603
@Fumuran Fumuran requested a review from bobbinth June 7, 2024 18:51
bobbinth
bobbinth approved these changes Jun 7, 2024
View reviewed changes
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 good! Thank you!

@bobbinth bobbinth merged commit a63109d into next Jun 7, 2024
15 checks passed
@bobbinth bobbinth deleted the andrew-merge-main-into-next branch June 7, 2024 19:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@bobbinth bobbinth bobbinth approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
9 participants
@Fumuran @bobbinth @omahs @hackaugusto @eltociear @mFragaBA @Al-Kindi-0 @polydez @partylikeits1983