Skip to content

Commit dd71a26

Browse files
committed
Update
1 parent 2241482 commit dd71a26

File tree

18 files changed

+45
-27
lines changed

18 files changed

+45
-27
lines changed

.github/workflows/rust.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ jobs:
125125
- name: Install dependencies
126126
run: |
127127
sudo apt-get update
128-
sudo apt-get install -y gnuplot inkscape scour wkhtmltopdf xvfb
128+
sudo apt-get install -y coreutils gnuplot inkscape retry scour wkhtmltopdf xvfb
129129
130130
- name: Install rust
131131
uses: dtolnay/rust-toolchain@master
@@ -142,13 +142,13 @@ jobs:
142142

143143
- name: Run benchmarks
144144
# Pin to one CPU, skipping the first core, to hopefully get fewer outliers.
145-
run: taskset --cpu-list "$(( $RANDOM % ($(nproc) - 2) + 2 ))" cargo bench --bench template-benchmark
145+
run: taskset --cpu-list "$(( $RANDOM % ($(nproc) - 2) + 2 ))" cargo bench --bench template-benchmark -- --nocapture
146146

147147
- name: Fixup paths
148148
run: sed -e 's,href="../,href=",' < target/criterion/report/index.html > target/criterion/index.html
149149

150150
- name: Generate table
151-
run: ./generate-table.py
151+
run: timeout 300 retry timeout 30 ./generate-table.py
152152

153153
- name: Upload artifact
154154
uses: actions/upload-pages-artifact@v3

Cargo.toml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -60,15 +60,15 @@ sailfish = { version = "*", optional = true, path = "tmpls/sailfish", package =
6060
tera = { version = "*", optional = true, path = "tmpls/tera", package = "tmpl-tera" }
6161
tinytemplate = { version = "*", optional = true, path = "tmpls/tinytemplate", package = "tmpl-tinytemplate" }
6262

63-
ahash = { version = "0.8.11", features = ["no-rng"] }
64-
criterion = { version = "0.5.1", features = ["html_reports"] }
65-
pretty-error-debug = "0.3.0"
66-
thiserror = "2.0.3"
63+
ahash = { version = "0.8", features = ["no-rng"] }
64+
criterion = { version = "0.5", features = ["html_reports"] }
65+
pretty-error-debug = "0.3"
66+
thiserror = "2"
6767

6868
[build-dependencies]
69-
pretty-error-debug = "0.3.0"
70-
self_cell = "1.0.4"
71-
thiserror = "2.0.3"
69+
pretty-error-debug = "0.3"
70+
self_cell = "1"
71+
thiserror = "2"
7272

7373
[[bench]]
7474
name = "template-benchmark"

benches/template-benchmark.rs

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,21 @@
1-
use criterion::{criterion_group, criterion_main};
1+
use std::time::Duration;
2+
3+
use criterion::{Criterion, PlottingBackend, criterion_group, criterion_main};
24
use template_benchmark::{big_table, teams};
35

46
criterion_main!(benches);
5-
criterion_group!(benches, big_table, teams);
7+
criterion_group! {
8+
name = benches;
9+
config = new_criterion();
10+
targets = big_table, teams
11+
}
12+
13+
fn new_criterion() -> Criterion {
14+
Criterion::default()
15+
.sample_size(1000)
16+
.confidence_level(0.98)
17+
.significance_level(0.02)
18+
.warm_up_time(Duration::from_secs(5))
19+
.plotting_backend(PlottingBackend::Gnuplot)
20+
.measurement_time(Duration::from_secs(30))
21+
}

deny.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[licenses]
22
version = 2
3-
allow = ["Apache-2.0", "MIT", "Unicode-DFS-2016"]
3+
allow = ["Apache-2.0", "MIT", "Unicode-3.0"]
44
private = { ignore = true }
55

66
[advisories]

tmpls/askama/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@ license = "Apache-2.0"
88
[dependencies]
99
tmpls = { version = "*", path = ".." }
1010

11-
askama = "0.12.1"
11+
askama = "0.12"

tmpls/handlebars/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@ license = "Apache-2.0"
88
[dependencies]
99
tmpls = { version = "*", path = ".." }
1010

11-
handlebars = "6.0.0"
11+
handlebars = "6"

tmpls/horrorshow/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@ license = "Apache-2.0"
88
[dependencies]
99
tmpls = { version = "*", path = ".." }
1010

11-
horrorshow = "0.8.4"
11+
horrorshow = "0.8"

tmpls/markup/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@ license = "Apache-2.0"
88
[dependencies]
99
tmpls = { version = "*", path = ".." }
1010

11-
markup = { version = "0.15.0", features = ["itoa"] }
11+
markup = { version = "0.15", features = ["itoa"] }

tmpls/markup/src/lib.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ use tmpls::{BigTable, Teams};
44
#[derive(Debug, Default)]
55
pub struct Benchmark;
66

7+
#[allow(clippy::needless_lifetimes)] // false-positive
78
impl tmpls::Benchmark for Benchmark {
89
type Output = String;
910
type Error = std::fmt::Error;

tmpls/maud/Cargo.toml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,4 @@ license = "Apache-2.0"
88
[dependencies]
99
tmpls = { version = "*", path = ".." }
1010

11-
maud = "0.26.0"
12-
11+
maud = "0.26"

0 commit comments

Comments
 (0)