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

Fix benchmarks build #995

Merged
merged 4 commits into from
Mar 14, 2023
Merged

Fix benchmarks build #995

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
69add57
Increase required Rust version for benchmarks
iamnotacake Mar 6, 2023
3c21c6c
Freeze rayon=1.6.1 for benchmarks
iamnotacake Mar 10, 2023
193407a
Fix build
iamnotacake Mar 13, 2023
da86aba
Slightly better way to freeze dependencies
iamnotacake Mar 14, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,9 @@ members = [
default-members = [
"src/wrappers/themis/rust",
]

# Freeze `rayon` version (used by `criterion` used by benchmarks)
# so that benchmarks still build/run with Rust 1.58.
# FIXME: remove this after we bump minimum required Rust version
[patch.crates-io]
rayon = { git = "https://github.com/rayon-rs/rayon.git", tag = "v1.6.1" }
ilammy marked this conversation as resolved.
Show resolved Hide resolved
1 change: 0 additions & 1 deletion benches/rust/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
name = "rust-themis-bench"
version = "0.0.0"
edition = "2018"
rust-version = "1.59.0"
publish = false

[dependencies]
Expand Down
1 change: 0 additions & 1 deletion benches/themis/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ themis = { version = "0.14", path = "../../src/wrappers/themis/rust" }
libthemis-sys = { version = "0.14", path = "../../src/wrappers/themis/rust/libthemis-sys" }

[dev-dependencies]
criterion = { version = "0.3.4", features = ["cargo_bench_support", "html_reports"] }
ilammy marked this conversation as resolved.
Show resolved Hide resolved
# Unpin when MSRV > 1.60
csv = "~1.1"

Expand Down