Skip to content

Commit 38b7b42

Browse files
committed
Try devan
1 parent dac6ba0 commit 38b7b42

File tree

5 files changed

+202
-146
lines changed

5 files changed

+202
-146
lines changed

.github/workflows/ci.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -947,7 +947,7 @@ jobs:
947947
tool: cargo-codspeed
948948

949949
- name: "Build benchmarks"
950-
run: cargo codspeed build --features "codspeed,walltime" --no-default-features -p ruff_benchmark -- --quick
950+
run: cargo codspeed build --features "codspeed,walltime" --no-default-features -p ruff_benchmark
951951

952952
- name: "Run benchmarks"
953953
uses: CodSpeedHQ/action@0010eb0ca6e89b80c88e8edaaa07cfe5f3e6664d # v3.5.0

Cargo.lock

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

Cargo.toml

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@ camino = { version = "1.1.7" }
6262
clap = { version = "4.5.3", features = ["derive"] }
6363
clap_complete_command = { version = "0.6.0" }
6464
clearscreen = { version = "4.0.0" }
65+
divan = { package = "codspeed-divan-compat", version = "2.10.1" }
6566
codspeed-criterion-compat = { version = "2.6.0", default-features = false }
6667
colored = { version = "3.0.0" }
6768
console_error_panic_hook = { version = "0.1.7" }
@@ -167,7 +168,7 @@ tracing-subscriber = { version = "0.3.18", default-features = false, features =
167168
"env-filter",
168169
"fmt",
169170
"ansi",
170-
"smallvec"
171+
"smallvec",
171172
] }
172173
tryfn = { version = "0.2.1" }
173174
typed-arena = { version = "2.0.2" }
@@ -177,11 +178,7 @@ unicode-width = { version = "0.2.0" }
177178
unicode_names2 = { version = "1.2.2" }
178179
unicode-normalization = { version = "0.1.23" }
179180
url = { version = "2.5.0" }
180-
uuid = { version = "1.6.1", features = [
181-
"v4",
182-
"fast-rng",
183-
"macro-diagnostics",
184-
] }
181+
uuid = { version = "1.6.1", features = ["v4", "fast-rng", "macro-diagnostics"] }
185182
walkdir = { version = "2.3.2" }
186183
wasm-bindgen = { version = "0.2.92" }
187184
wasm-bindgen-test = { version = "0.3.42" }
@@ -216,8 +213,8 @@ must_use_candidate = "allow"
216213
similar_names = "allow"
217214
single_match_else = "allow"
218215
too_many_lines = "allow"
219-
needless_continue = "allow" # An explicit continue can be more readable, especially if the alternative is an empty block.
220-
unnecessary_debug_formatting = "allow" # too many instances, the display also doesn't quote the path which is often desired in logs where we use them the most often.
216+
needless_continue = "allow" # An explicit continue can be more readable, especially if the alternative is an empty block.
217+
unnecessary_debug_formatting = "allow" # too many instances, the display also doesn't quote the path which is often desired in logs where we use them the most often.
221218
# Without the hashes we run into a `rustfmt` bug in some snapshot tests, see #13250
222219
needless_raw_string_hashes = "allow"
223220
# Disallowed restriction lints

crates/ruff_benchmark/Cargo.toml

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -55,9 +55,10 @@ ruff_python_parser = { workspace = true, optional = true }
5555
ruff_python_trivia = { workspace = true, optional = true }
5656
ty_project = { workspace = true, optional = true }
5757

58+
divan = { workspace = true, optional = true }
5859
anyhow = { workspace = true }
5960
codspeed-criterion-compat = { workspace = true, default-features = false, optional = true }
60-
criterion = { workspace = true, default-features = false }
61+
criterion = { workspace = true, default-features = false, optional = true }
6162
rayon = { workspace = true }
6263
rustc-hash = { workspace = true }
6364
serde = { workspace = true }
@@ -68,17 +69,17 @@ workspace = true
6869

6970
[features]
7071
default = ["instrumented", "walltime"]
71-
codspeed = ["codspeed-criterion-compat"]
72-
# Enables the benchmark that should only run with codspeed's instrumented runner.
7372
instrumented = [
73+
"criterion",
7474
"ruff_linter",
7575
"ruff_python_formatter",
7676
"ruff_python_parser",
7777
"ruff_python_trivia",
7878
"ty_project",
79-
]
79+
] # Enables the benchmark that should only run with codspeed's instrumented runner.default = ["instrumented", "walltime"]
80+
codspeed = ["codspeed-criterion-compat"]
8081
# Enables benchmark that should only run with codspeed's walltime runner.
81-
walltime = ["ruff_db/os", "ty_project"]
82+
walltime = ["ruff_db/os", "ty_project", "divan"]
8283

8384
[target.'cfg(target_os = "windows")'.dev-dependencies]
8485
mimalloc = { workspace = true }

0 commit comments

Comments
 (0)