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

Criterion to divan #622

Merged
merged 11 commits into from
Jun 19, 2024
Merged

Criterion to divan #622

merged 11 commits into from
Jun 19, 2024

Conversation

JackCrumpLeys
Copy link
Contributor

As discussed in #620.

@rj00a
Copy link
Member

rj00a commented Jun 19, 2024

Should be good once conflicts are fixed.

@JackCrumpLeys
Copy link
Contributor Author

Should be good once conflicts are fixed.

I can't fix those (not admin) I suggest you just accept mine for all conflicts as the conflicts are only in the benchmark files which are completely changed anyway.

@rj00a
Copy link
Member

rj00a commented Jun 19, 2024

Your branch is 5 commits behind the main branch. If you rebase or merge you can resolve the conflicts locally.

@JackCrumpLeys
Copy link
Contributor Author

JackCrumpLeys commented Jun 19, 2024 via email

@JackCrumpLeys
Copy link
Contributor Author

Well apparently main branch has failing CI so it is not my fault.

@rj00a
Copy link
Member

rj00a commented Jun 19, 2024

Yeah don't worry about CI for now. Thanks.

@rj00a rj00a merged commit 83e3e29 into valence-rs:main Jun 19, 2024
4 of 11 checks passed
@JackCrumpLeys
Copy link
Contributor Author

Yeah don't worry about CI for now. Thanks.

made clippy happy in #623

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.

2 participants