Skip to content

Commit 26d284a

Browse files
authored
Merge pull request #98 from epage/template
chore: Update from _rust/main template
2 parents 52056fe + e6ee452 commit 26d284a

File tree

10 files changed

+47
-34
lines changed

10 files changed

+47
-34
lines changed

.cargo/config.toml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
[resolver]
2+
incompatible-rust-versions = "fallback"

.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]

CONTRIBUTING.md

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,18 +7,18 @@ appreciate any level you're willing to do.
77

88
Need some new functionality to help? You can let us know by opening an
99
[issue][new issue]. It's helpful to look through [all issues][all issues] in
10-
case its already being talked about.
10+
case it's already being talked about.
1111

1212
## Bug Reports
1313

1414
Please let us know about what problems you run into, whether in behavior or
1515
ergonomics of API. You can do this by opening an [issue][new issue]. It's
16-
helpful to look through [all issues][all issues] in case its already being
16+
helpful to look through [all issues][all issues] in case it's already being
1717
talked about.
1818

1919
## Pull Requests
2020

21-
Looking for an idea? Check our [issues][issues]. If it's look more open ended,
21+
Looking for an idea? Check our [issues][issues]. If the issue looks open ended,
2222
it is probably best to post on the issue how you are thinking of resolving the
2323
issue so you can get feedback early in the process. We want you to be
2424
successful and it can be discouraging to find out a lot of re-work is needed.
@@ -41,15 +41,18 @@ As a heads up, we'll be running your PR through the following gauntlet:
4141
Not everything can be checked automatically though.
4242

4343
We request that the commit history gets cleaned up.
44+
4445
We ask that commits are atomic, meaning they are complete and have a single responsibility.
45-
PRs should tell a cohesive story, with test and refactor commits that keep the
46+
A complete commit should build, pass tests, update documentation and tests, and not have dead code.
47+
48+
PRs should tell a cohesive story, with refactor and test commits that keep the
4649
fix or feature commits simple and clear.
4750

4851
Specifically, we would encourage
4952
- File renames be isolated into their own commit
50-
- Add tests in a commit before their feature or fix, showing the current behavior.
53+
- Add tests in a commit before their feature or fix, showing the current behavior (i.e. they should pass).
5154
The diff for the feature/fix commit will then show how the behavior changed,
52-
making it clearer to reviewers and the community and showing people that the
55+
making the commit's intent clearer to reviewers and the community, and showing people that the
5356
test is verifying the expected state.
5457
- e.g. [clap#5520](https://github.com/clap-rs/clap/pull/5520)
5558

Cargo.toml

Lines changed: 11 additions & 2 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 = "git2-ext"
91100
version = "0.6.3"

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ at your option.
2525

2626
Unless you explicitly state otherwise, any contribution intentionally
2727
submitted for inclusion in the work by you, as defined in the Apache-2.0
28-
license, shall be dual licensed as above, without any additional terms or
28+
license, shall be dual-licensed as above, without any additional terms or
2929
conditions.
3030

3131
[Crates.io]: https://crates.io/crates/git2-ext

deny.toml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,12 +87,14 @@ allow = [
8787
"MIT",
8888
"MIT-0",
8989
"Apache-2.0",
90+
"BSD-2-Clause",
9091
"BSD-3-Clause",
9192
"MPL-2.0",
9293
"Unicode-DFS-2016",
9394
"CC0-1.0",
9495
"ISC",
9596
"OpenSSL",
97+
"Zlib",
9698
]
9799
# The confidence threshold for detecting a license from license text.
98100
# The higher the value, the more closely the license text must be to the

src/lib.rs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,3 +17,7 @@ pub(crate) mod bytes;
1717

1818
#[cfg(test)]
1919
mod testing;
20+
21+
#[doc = include_str!("../README.md")]
22+
#[cfg(doctest)]
23+
pub struct ReadmeDoctests;

0 commit comments

Comments
 (0)