Skip to content

Commit 20dda06

Browse files
committed
chore(divan_fork): integrate the fork within the workspace
1 parent e59cb0d commit 20dda06

File tree

4 files changed

+46
-54
lines changed

4 files changed

+46
-54
lines changed

Cargo.lock

Lines changed: 39 additions & 42 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ members = [
66
"crates/cargo-codspeed",
77
"crates/divan_compat",
88
"crates/divan_compat/macros",
9+
"crates/divan_compat/divan_fork",
910
]
1011
resolver = "2"
1112

crates/divan_compat/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ keywords = ["codspeed", "benchmark", "divan"]
1919

2020
[dependencies]
2121
codspeed = { path = "../codspeed", version = "=2.8.0-alpha.0" }
22-
divan = { git = "https://github.com/CodSpeedHQ/divan" }
22+
divan = { package = "codspeed-divan-compat-walltime", path = "./divan_fork", version = "=0.1.17" }
2323
codspeed-divan-compat-macros = { version = "=2.8.0-alpha.0", path = './macros' }
2424

2525
[[bench]]

crates/divan_compat/divan_fork/Cargo.toml

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
[package]
2-
name = "divan"
2+
name = "codspeed-divan-compat-walltime"
33
version = "0.1.17"
44
rust-version = "1.80.0"
55
edition = "2021"
66
authors = ["Nikolai Vazquez"]
77
license = "MIT OR Apache-2.0"
8-
description = "Statistically-comfy benchmarking library."
8+
description = "A temporary compatibility layer for CodSpeed to use Divan's walltime entrypoint."
99
repository = "https://github.com/nvzqz/divan"
1010
homepage = "https://github.com/nvzqz/divan"
1111
documentation = "https://docs.rs/divan"
@@ -14,15 +14,16 @@ keywords = ["benchmark", "criterion", "instrument", "measure", "performance"]
1414
readme = "README.md"
1515

1616
[dependencies]
17-
divan-macros = { version = "=0.1.17", path = "macros" }
17+
divan-macros = { version = "=0.1.17" }
1818

1919
cfg-if = "1"
2020
clap = { version = "4", default-features = false, features = ["std", "env"] }
2121
condtype = "1.3"
2222
regex = { package = "regex-lite", version = "0.1", default-features = false, features = ["std", "string"] }
2323

2424
[target.'cfg(unix)'.dependencies]
25-
libc = { workspace = true }
25+
libc = "0.2.148"
26+
2627

2728
[dev-dependencies]
2829
mimalloc = "0.1"
@@ -41,10 +42,3 @@ dyn_thread_local = []
4142

4243
# Benchmark internals. Not meant for public use.
4344
internal_benches = []
44-
45-
[workspace]
46-
members = ["macros", "examples", "internal_benches"]
47-
48-
[workspace.dependencies]
49-
divan = { path = "." }
50-
libc = "0.2.148"

0 commit comments

Comments
 (0)