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

Fix CI #2610

Merged
merged 7 commits into from
Nov 20, 2023
Merged

Fix CI #2610

merged 7 commits into from
Nov 20, 2023

Conversation

mkrasnitski
Copy link
Collaborator

@mkrasnitski mkrasnitski commented Nov 20, 2023

This revives #2536 in order to fix the simd-json feature on the v0.11 series and get CI to actually work again.

Initially I attempted to keep the old simd-json version exported while using a newer version internally, but unfortunately this doesn't work as types from the internal version would leak into the public API (specifically in methods on Http which expect a Value or JsonMap). Therefore, because the old version of simd-json has a soundness bug in from_str, and because not that many people actually use this feature, I propose we just bite the bullet and upgrade to simd-json v0.10 on this branch. This way, we can provide a safe wrapper around simd_json::from_str, and while from_str is still exported in the prelude, it is marked unsafe.

@github-actions github-actions bot added builder Related to the `builder` module. cache Related to the `cache`-feature. client Related to the `client` module. gateway Related to the `gateway` module. http Related to the `http` module. model Related to the `model` module. utils Related to the `utils` module. labels Nov 20, 2023
@github-actions github-actions bot removed model Related to the `model` module. client Related to the `client` module. builder Related to the `builder` module. gateway Related to the `gateway` module. http Related to the `http` module. cache Related to the `cache`-feature. labels Nov 20, 2023
@mkrasnitski
Copy link
Collaborator Author

I'm just gonna make this PR for passing all of CI, not just simd-json.

@github-actions github-actions bot added the ci Related to the continuous integration. label Nov 20, 2023
@mkrasnitski mkrasnitski changed the title Fix compilation with simd-json Fix CI Nov 20, 2023
@github-actions github-actions bot added cache Related to the `cache`-feature. client Related to the `client` module. framework Related to the `framework` and `framework::standard` modules and/or the `command_attr` crate http Related to the `http` module. model Related to the `model` module. labels Nov 20, 2023
@github-actions github-actions bot added collector Related to the `collector` module. examples Related to Serenity's examples. labels Nov 20, 2023
@mkrasnitski
Copy link
Collaborator Author

I don't feel like fixing MSRV at the moment, it's too much work. However, I tested it and without pinning, the MSRV is 1.67.

@arqunis arqunis added the fix A solution to an existing bug. label Nov 20, 2023
@arqunis arqunis merged commit 45655cd into serenity-rs:v0.11.x Nov 20, 2023
21 of 22 checks passed
@mkrasnitski mkrasnitski deleted the fix-simd-json branch November 21, 2023 01:04
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
cache Related to the `cache`-feature. ci Related to the continuous integration. client Related to the `client` module. collector Related to the `collector` module. examples Related to Serenity's examples. fix A solution to an existing bug. framework Related to the `framework` and `framework::standard` modules and/or the `command_attr` crate http Related to the `http` module. model Related to the `model` module. utils Related to the `utils` module.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants