Skip to content

Commit 4b631f0

Browse files
authored
Merge pull request #118 from epage/template
chore: Update from _rust/main template
2 parents 9c86651 + 4cadda6 commit 4b631f0

File tree

8 files changed

+35
-36
lines changed

8 files changed

+35
-36
lines changed

.cargo/config.toml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
[resolver]
2+
incompatible-rust-versions = "fallback"
3+
14
[target.x86_64-pc-windows-msvc]
25
rustflags = ["-Ctarget-feature=+crt-static"]
36

.github/renovate.json5

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,13 @@
99
customManagers: [
1010
{
1111
customType: 'regex',
12-
fileMatch: [
13-
'^rust-toolchain\\.toml$',
14-
'Cargo.toml$',
15-
'clippy.toml$',
16-
'\\.clippy.toml$',
17-
'^\\.github/workflows/ci.yml$',
18-
'^\\.github/workflows/rust-next.yml$',
12+
managerFilePatterns: [
13+
'/^rust-toolchain\\.toml$/',
14+
'/Cargo.toml$/',
15+
'/clippy.toml$/',
16+
'/\\.clippy.toml$/',
17+
'/^\\.github/workflows/ci.yml$/',
18+
'/^\\.github/workflows/rust-next.yml$/',
1919
],
2020
matchStrings: [
2121
'STABLE.*?(?<currentValue>\\d+\\.\\d+(\\.\\d+)?)',

.github/workflows/ci.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ jobs:
5454
- name: Build
5555
run: cargo test --workspace --no-run
5656
- name: Test
57-
run: cargo hack test --feature-powerset --workspace
57+
run: cargo hack test --each-feature --workspace
5858
msrv:
5959
name: "Check MSRV"
6060
runs-on: ubuntu-latest
@@ -68,7 +68,7 @@ jobs:
6868
- uses: Swatinem/rust-cache@v2
6969
- uses: taiki-e/install-action@cargo-hack
7070
- name: Default features
71-
run: cargo hack check --feature-powerset --locked --rust-version --ignore-private --workspace --all-targets
71+
run: cargo hack check --each-feature --locked --rust-version --ignore-private --workspace --all-targets --keep-going
7272
minimal-versions:
7373
name: Minimal versions
7474
runs-on: ubuntu-latest
@@ -86,7 +86,7 @@ jobs:
8686
- name: Downgrade dependencies to minimal versions
8787
run: cargo +nightly generate-lockfile -Z minimal-versions
8888
- name: Compile with minimal versions
89-
run: cargo +stable check --workspace --all-features --locked
89+
run: cargo +stable check --workspace --all-features --locked --keep-going
9090
lockfile:
9191
runs-on: ubuntu-latest
9292
steps:
@@ -113,7 +113,7 @@ jobs:
113113
- name: Check documentation
114114
env:
115115
RUSTDOCFLAGS: -D warnings
116-
run: cargo doc --workspace --all-features --no-deps --document-private-items
116+
run: cargo doc --workspace --all-features --no-deps --document-private-items --keep-going
117117
rustfmt:
118118
name: rustfmt
119119
runs-on: ubuntu-latest
@@ -159,7 +159,7 @@ jobs:
159159
sarif_file: clippy-results.sarif
160160
wait-for-processing: true
161161
- name: Report status
162-
run: cargo clippy --workspace --all-features --all-targets -- -D warnings --allow deprecated
162+
run: cargo clippy --workspace --all-features --all-targets --keep-going -- -D warnings --allow deprecated
163163
coverage:
164164
name: Coverage
165165
runs-on: ubuntu-latest

.github/workflows/rust-next.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ jobs:
4444
- name: Build
4545
run: cargo test --workspace --no-run
4646
- name: Test
47-
run: cargo hack test --feature-powerset --workspace
47+
run: cargo hack test --each-feature --workspace
4848
latest:
4949
name: "Check latest dependencies"
5050
runs-on: ubuntu-latest
@@ -66,4 +66,4 @@ jobs:
6666
- name: Build
6767
run: cargo test --workspace --no-run
6868
- name: Test
69-
run: cargo hack test --feature-powerset --workspace
69+
run: cargo hack test --each-feature --workspace

.pre-commit-config.yaml

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,19 @@
1+
default_install_hook_types: ["pre-commit", "commit-msg"]
12
repos:
23
- repo: https://github.com/pre-commit/pre-commit-hooks
3-
rev: v4.5.0
4+
rev: v5.0.0
45
hooks:
56
- id: check-yaml
6-
stages: [commit]
77
- id: check-json
8-
stages: [commit]
98
- id: check-toml
10-
stages: [commit]
119
- id: check-merge-conflict
12-
stages: [commit]
1310
- id: check-case-conflict
14-
stages: [commit]
1511
- id: detect-private-key
16-
stages: [commit]
1712
- repo: https://github.com/crate-ci/typos
18-
rev: v1.16.20
13+
rev: v1.32.0
1914
hooks:
2015
- id: typos
21-
stages: [commit]
2216
- repo: https://github.com/crate-ci/committed
23-
rev: v1.0.20
17+
rev: v1.1.7
2418
hooks:
2519
- id: committed
26-
stages: [commit-msg]

Cargo.lock

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

Cargo.toml

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,12 @@ include = [
1313
"Cargo.lock",
1414
"LICENSE*",
1515
"README.md",
16-
"benches/**/*",
1716
"examples/**/*"
1817
]
1918

2019
[workspace.lints.rust]
2120
rust_2018_idioms = { level = "warn", priority = -1 }
21+
unnameable_types = "warn"
2222
unreachable_pub = "warn"
2323
unsafe_op_in_unsafe_fn = "warn"
2424
unused_lifetimes = "warn"
@@ -61,7 +61,7 @@ lossy_float_literal = "warn"
6161
macro_use_imports = "warn"
6262
mem_forget = "warn"
6363
mutex_integer = "warn"
64-
needless_continue = "warn"
64+
needless_continue = "allow"
6565
needless_for_each = "warn"
6666
negative_feature_names = "warn"
6767
path_buf_push_overwrite = "warn"
@@ -86,6 +86,15 @@ verbose_file_reads = "warn"
8686
wildcard_imports = "warn"
8787
zero_sized_map_values = "warn"
8888

89+
[profile.dev]
90+
panic = "abort"
91+
92+
[profile.release]
93+
panic = "abort"
94+
codegen-units = 1
95+
lto = true
96+
# debug = "line-tables-only" # requires Cargo 1.71
97+
8998
[package]
9099
name = "git-fixture"
91100
description = "Reproducible git trees for bug reporting and testing"
@@ -149,12 +158,5 @@ automod = "1.0.14"
149158
[target.'cfg(any())'.dependencies]
150159
pkg-config = "0.3.26" # HACK: bad minimal dep in libgit2-sys
151160

152-
[profile.dev]
153-
panic = "abort"
154-
155-
[profile.release]
156-
panic = "abort"
157-
codegen-units = 1
158-
159161
[lints]
160162
workspace = true

deny.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,7 @@ allow = [
9494
"CC0-1.0",
9595
"ISC",
9696
"OpenSSL",
97+
"Zlib",
9798
]
9899
# The confidence threshold for detecting a license from license text.
99100
# The higher the value, the more closely the license text must be to the

0 commit comments

Comments
 (0)