Offline, privacy-first grammar checker. Fast, open-source, Rust-powered
feat: swapped back to `criterion`
Elijah Potter3046aa731f8a
diff --git a/Cargo.lock b/Cargo.lockindex 056ec50be..34fcbf58d 100644--- a/Cargo.lock+++ b/Cargo.lock@@ -126,6 +126,17 @@ dependencies = ["syn",]+[[package]]+name = "atty"+version = "0.2.14"+source = "registry+https://github.com/rust-lang/crates.io-index"+checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8"+dependencies = [+ "hermit-abi 0.1.19",+ "libc",+ "winapi",+]+[[package]]name = "auto_impl"version = "1.2.0"@@ -193,6 +204,12 @@ version = "1.6.0"source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9"+[[package]]+name = "cast"+version = "0.3.0"+source = "registry+https://github.com/rust-lang/crates.io-index"+checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5"+[[package]]name = "cc"version = "1.0.97"@@ -205,6 +222,17 @@ version = "1.0.0"source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"+[[package]]+name = "clap"+version = "2.34.0"+source = "registry+https://github.com/rust-lang/crates.io-index"+checksum = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c"+dependencies = [+ "bitflags 1.3.2",+ "textwrap",+ "unicode-width",+]+[[package]]name = "clap"version = "4.5.4"@@ -225,7 +253,6 @@ dependencies = ["anstyle","clap_lex","strsim",- "terminal_size",][[package]]@@ -252,12 +279,6 @@ version = "1.0.1"source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "0b6a852b24ab71dffc585bcb46eaf7959d175cb865a7152e35b348d1b2960422"-[[package]]-name = "condtype"-version = "1.3.0"-source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "baf0a07a401f374238ab8e2f11a104d2851bf9ce711ec69804834de8af45c7af"-[[package]]name = "console_error_panic_hook"version = "0.1.7"@@ -268,6 +289,88 @@ dependencies = ["wasm-bindgen",]+[[package]]+name = "criterion"+version = "0.3.6"+source = "registry+https://github.com/rust-lang/crates.io-index"+checksum = "b01d6de93b2b6c65e17c634a26653a29d107b3c98c607c765bf38d041531cd8f"+dependencies = [+ "atty",+ "cast",+ "clap 2.34.0",+ "criterion-plot",+ "csv",+ "itertools 0.10.5",+ "lazy_static",+ "num-traits",+ "oorandom",+ "plotters",+ "rayon",+ "regex",+ "serde",+ "serde_cbor",+ "serde_derive",+ "serde_json",+ "tinytemplate",+ "walkdir",+]++[[package]]+name = "criterion-plot"+version = "0.4.5"+source = "registry+https://github.com/rust-lang/crates.io-index"+checksum = "2673cc8207403546f45f5fd319a974b1e6983ad1a3ee7e6041650013be041876"+dependencies = [+ "cast",+ "itertools 0.10.5",+]++[[package]]+name = "crossbeam-deque"+version = "0.8.5"+source = "registry+https://github.com/rust-lang/crates.io-index"+checksum = "613f8cc01fe9cf1a3eb3d7f488fd2fa8388403e97039e2f73692932e291a770d"+dependencies = [+ "crossbeam-epoch",+ "crossbeam-utils",+]++[[package]]+name = "crossbeam-epoch"+version = "0.9.18"+source = "registry+https://github.com/rust-lang/crates.io-index"+checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e"+dependencies = [+ "crossbeam-utils",+]++[[package]]+name = "crossbeam-utils"+version = "0.8.20"+source = "registry+https://github.com/rust-lang/crates.io-index"+checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80"++[[package]]+name = "csv"+version = "1.3.0"+source = "registry+https://github.com/rust-lang/crates.io-index"+checksum = "ac574ff4d437a7b5ad237ef331c17ccca63c46479e5b5453eb8e10bb99a759fe"+dependencies = [+ "csv-core",+ "itoa",+ "ryu",+ "serde",+]++[[package]]+name = "csv-core"+version = "0.1.11"+source = "registry+https://github.com/rust-lang/crates.io-index"+checksum = "5efa2b3d7902f4b634a20cae3c9c4e6209dc4779feb6863329607560143efa70"+dependencies = [+ "memchr",+]+[[package]]name = "dashmap"version = "5.5.3"@@ -322,47 +425,12 @@ dependencies = ["windows-sys 0.48.0",]-[[package]]-name = "divan"-version = "0.1.14"-source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "a0d567df2c9c2870a43f3f2bd65aaeb18dbce1c18f217c3e564b4fbaeb3ee56c"-dependencies = [- "cfg-if",- "clap",- "condtype",- "divan-macros",- "libc",- "regex-lite",-]--[[package]]-name = "divan-macros"-version = "0.1.14"-source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "27540baf49be0d484d8f0130d7d8da3011c32a44d4fc873368154f1510e574a2"-dependencies = [- "proc-macro2",- "quote",- "syn",-]-[[package]]name = "either"version = "1.11.0"source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "a47c1c47d2f5964e29c61246e81db715514cd532db6b5116a25ea3c03d6780a2"-[[package]]-name = "errno"-version = "0.3.9"-source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba"-dependencies = [- "libc",- "windows-sys 0.52.0",-]-[[package]]name = "form_urlencoded"version = "1.2.1"@@ -487,13 +555,19 @@ version = "0.28.1"source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253"+[[package]]+name = "half"+version = "1.8.3"+source = "registry+https://github.com/rust-lang/crates.io-index"+checksum = "1b43ede17f21864e81be2fa654110bf1e793774238d86ef8555c37e6519c0403"+[[package]]name = "harper-cli"version = "0.1.0"dependencies = ["anyhow","ariadne",- "clap",+ "clap 4.5.4","harper-comments","harper-core",]@@ -529,7 +603,7 @@ name = "harper-core"version = "0.9.5"dependencies = ["blanket",- "divan",+ "criterion","hashbrown","is-macro","itertools 0.13.0",@@ -560,7 +634,7 @@ name = "harper-ls"version = "0.9.5"dependencies = ["anyhow",- "clap",+ "clap 4.5.4","dirs 5.0.1","futures","harper-comments",@@ -615,6 +689,15 @@ version = "0.5.0"source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"+[[package]]+name = "hermit-abi"+version = "0.1.19"+source = "registry+https://github.com/rust-lang/crates.io-index"+checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33"+dependencies = [+ "libc",+]+[[package]]name = "hermit-abi"version = "0.3.9"@@ -674,6 +757,15 @@ version = "1.70.0"source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "f8478577c03552c21db0e2724ffb8986a5ce7af88107e6be5d2ee6e158c12800"+[[package]]+name = "itertools"+version = "0.10.5"+source = "registry+https://github.com/rust-lang/crates.io-index"+checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473"+dependencies = [+ "either",+]+[[package]]name = "itertools"version = "0.12.1"@@ -698,6 +790,15 @@ version = "1.0.11"source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b"+[[package]]+name = "js-sys"+version = "0.3.69"+source = "registry+https://github.com/rust-lang/crates.io-index"+checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d"+dependencies = [+ "wasm-bindgen",+]+[[package]]name = "lazy_static"version = "1.4.0"@@ -720,12 +821,6 @@ dependencies = ["libc",]-[[package]]-name = "linux-raw-sys"-version = "0.4.13"-source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c"-[[package]]name = "lock_api"version = "0.4.12"@@ -791,13 +886,22 @@ dependencies = ["winapi",]+[[package]]+name = "num-traits"+version = "0.2.19"+source = "registry+https://github.com/rust-lang/crates.io-index"+checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"+dependencies = [+ "autocfg",+]+[[package]]name = "num_cpus"version = "1.16.0"source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43"dependencies = [- "hermit-abi",+ "hermit-abi 0.3.9","libc",]@@ -816,6 +920,12 @@ version = "1.19.0"source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"+[[package]]+name = "oorandom"+version = "11.1.4"+source = "registry+https://github.com/rust-lang/crates.io-index"+checksum = "b410bbe7e14ab526a0e86877eb47c6996a2bd7746f027ba551028c925390e4e9"+[[package]]name = "open"version = "5.1.2"@@ -902,6 +1012,34 @@ version = "0.1.0"source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"+[[package]]+name = "plotters"+version = "0.3.6"+source = "registry+https://github.com/rust-lang/crates.io-index"+checksum = "a15b6eccb8484002195a3e44fe65a4ce8e93a625797a063735536fd59cb01cf3"+dependencies = [+ "num-traits",+ "plotters-backend",+ "plotters-svg",+ "wasm-bindgen",+ "web-sys",+]++[[package]]+name = "plotters-backend"+version = "0.3.6"+source = "registry+https://github.com/rust-lang/crates.io-index"+checksum = "414cec62c6634ae900ea1c56128dfe87cf63e7caece0852ec76aba307cebadb7"++[[package]]+name = "plotters-svg"+version = "0.3.6"+source = "registry+https://github.com/rust-lang/crates.io-index"+checksum = "81b30686a7d9c3e010b84284bdd26a29f2138574f52f5eb6f794fc0ad924e705"+dependencies = [+ "plotters-backend",+]+[[package]]name = "ppv-lite86"version = "0.2.17"@@ -975,6 +1113,26 @@ dependencies = ["getrandom",]+[[package]]+name = "rayon"+version = "1.10.0"+source = "registry+https://github.com/rust-lang/crates.io-index"+checksum = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa"+dependencies = [+ "either",+ "rayon-core",+]++[[package]]+name = "rayon-core"+version = "1.12.1"+source = "registry+https://github.com/rust-lang/crates.io-index"+checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2"+dependencies = [+ "crossbeam-deque",+ "crossbeam-utils",+]+[[package]]name = "redox_syscall"version = "0.5.1"@@ -1018,12 +1176,6 @@ dependencies = ["regex-syntax",]-[[package]]-name = "regex-lite"-version = "0.1.5"-source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "30b661b2f27137bdbc16f00eda72866a92bb28af1753ffbd56744fb6e2e9cd8e"-[[package]]name = "regex-syntax"version = "0.8.3"@@ -1045,25 +1197,21 @@ version = "0.1.24"source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f"-[[package]]-name = "rustix"-version = "0.38.34"-source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f"-dependencies = [- "bitflags 2.5.0",- "errno",- "libc",- "linux-raw-sys",- "windows-sys 0.52.0",-]-[[package]]name = "ryu"version = "1.0.18"source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f"+[[package]]+name = "same-file"+version = "1.0.6"+source = "registry+https://github.com/rust-lang/crates.io-index"+checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502"+dependencies = [+ "winapi-util",+]+[[package]]name = "scopeguard"version = "1.2.0"@@ -1079,6 +1227,16 @@ dependencies = ["serde_derive",]+[[package]]+name = "serde_cbor"+version = "0.11.2"+source = "registry+https://github.com/rust-lang/crates.io-index"+checksum = "2bef2ebfde456fb76bbcf9f59315333decc4fda0b2b44b420243c11e0f5ec1f5"+dependencies = [+ "half",+ "serde",+]+[[package]]name = "serde_derive"version = "1.0.203"@@ -1168,13 +1326,12 @@ dependencies = [][[package]]-name = "terminal_size"-version = "0.3.0"+name = "textwrap"+version = "0.11.0"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "21bebf2b7c9e0a515f6e0f8c51dc0f8e4696391e6f1ff30379559f8365fb0df7"+checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060"dependencies = [- "rustix",- "windows-sys 0.48.0",+ "unicode-width",][[package]]@@ -1207,6 +1364,16 @@ dependencies = ["once_cell",]+[[package]]+name = "tinytemplate"+version = "1.2.1"+source = "registry+https://github.com/rust-lang/crates.io-index"+checksum = "be4d6b5f19ff7664e8c98d03e2139cb510db9b0a60b55f8e8709b689d939b6bc"+dependencies = [+ "serde",+ "serde_json",+]+[[package]]name = "tinyvec"version = "1.6.0"@@ -1623,6 +1790,16 @@ version = "0.9.4"source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"+[[package]]+name = "walkdir"+version = "2.5.0"+source = "registry+https://github.com/rust-lang/crates.io-index"+checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b"+dependencies = [+ "same-file",+ "winapi-util",+]+[[package]]name = "wasi"version = "0.11.0+wasi-snapshot-preview1"@@ -1683,6 +1860,16 @@ version = "0.2.92"source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96"+[[package]]+name = "web-sys"+version = "0.3.69"+source = "registry+https://github.com/rust-lang/crates.io-index"+checksum = "77afa9a11836342370f4817622a2f0f418b134426d91a82dfb48f532d2ec13ef"+dependencies = [+ "js-sys",+ "wasm-bindgen",+]+[[package]]name = "winapi"version = "0.3.9"@@ -1699,6 +1886,15 @@ version = "0.4.0"source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"+[[package]]+name = "winapi-util"+version = "0.1.9"+source = "registry+https://github.com/rust-lang/crates.io-index"+checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb"+dependencies = [+ "windows-sys 0.52.0",+]+[[package]]name = "winapi-x86_64-pc-windows-gnu"version = "0.4.0"diff --git a/harper-core/Cargo.toml b/harper-core/Cargo.tomlindex 3bca4519f..0801d259b 100644--- a/harper-core/Cargo.toml+++ b/harper-core/Cargo.toml@@ -22,7 +22,7 @@ unicode-blocks = "0.1.9"unicode-width = "0.1.11"[dev-dependencies]-divan = "0.1.14"+criterion = "0.3"rand = "0.8.5"[[bench]]diff --git a/harper-core/benches/parse_demo.rs b/harper-core/benches/parse_demo.rsindex 8118d44ec..1250048cd 100644--- a/harper-core/benches/parse_demo.rs+++ b/harper-core/benches/parse_demo.rs@@ -1,41 +1,41 @@-use divan::{black_box, AllocProfiler, Bencher};+use criterion::{black_box, criterion_group, criterion_main, Criterion};use harper_core::linting::{LintGroup, LintGroupConfig, Linter};use harper_core::{Document, FullDictionary};-#[global_allocator]-static ALLOC: AllocProfiler = AllocProfiler::system();-static DEMO: &str = include_str!("../../demo.md");-#[divan::bench]-fn parse_demo(bencher: Bencher) {- bencher.bench_local(|| {- let _document = Document::new_markdown_curated(black_box(DEMO));+fn parse_demo(c: &mut Criterion) {+ c.bench_function("parse_demo", |b| {+ b.iter(|| Document::new_markdown_curated(black_box(DEMO)))});}-#[divan::bench]-fn lint_demo(bencher: Bencher) {+fn lint_demo(c: &mut Criterion) {let dictionary = FullDictionary::curated();let mut lint_set = LintGroup::new(Default::default(), dictionary);let document = Document::new_markdown_curated(black_box(DEMO));- bencher.bench_local(|| {- lint_set.lint(&document);+ c.bench_function("lint_demo", |b| {+ b.iter(|| lint_set.lint(&document));});}-#[divan::bench]-fn lint_demo_uncached(bencher: Bencher) {- let dictionary = FullDictionary::curated();- bencher.bench_local(|| {- let mut lint_set = LintGroup::new(LintGroupConfig::default(), dictionary.clone());- let document = Document::new_markdown_curated(black_box(DEMO));-- lint_set.lint(&document);+fn lint_demo_uncached(c: &mut Criterion) {+ c.bench_function("lint_demo_uncached", |b| {+ b.iter(|| {+ let dictionary = FullDictionary::curated();+ let mut lint_set = LintGroup::new(LintGroupConfig::default(), dictionary.clone());+ let document = Document::new_markdown_curated(black_box(DEMO));+ lint_set.lint(&document)+ })});}-fn main() {- divan::main();+pub fn criterion_benchmark(c: &mut Criterion) {+ parse_demo(c);+ lint_demo(c);+ lint_demo_uncached(c);}++criterion_group!(benches, criterion_benchmark);+criterion_main!(benches);