Skip to content

Commit a380b65

Browse files
authored
Merge pull request #6023 from epage/template
chore: Update from _rust/main template
2 parents 25eb6fb + 4d7ab14 commit a380b65

File tree

13 files changed

+64
-32
lines changed

13 files changed

+64
-32
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: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,15 @@
99
customManagers: [
1010
{
1111
customType: 'regex',
12-
fileMatch: [
13-
'^rust-toolchain\\.toml$',
14-
'Cargo.toml$',
15-
'clippy.toml$',
16-
'^Makefile$',
17-
'^tests/derive_ui.rs$',
18-
'\\.clippy.toml$',
19-
'^\\.github/workflows/ci.yml$',
20-
'^\\.github/workflows/rust-next.yml$',
12+
managerFilePatterns: [
13+
'/^rust-toolchain\\.toml$/',
14+
'/Cargo.toml$/',
15+
'/clippy.toml$/',
16+
'/^Makefile$/',
17+
'/^tests/derive_ui.rs$/',
18+
'/\\.clippy.toml$/',
19+
'/^\\.github/workflows/ci.yml$/',
20+
'/^\\.github/workflows/rust-next.yml$/',
2121
],
2222
matchStrings: [
2323
'STABLE.*?(?<currentValue>\\d+\\.\\d+(\\.\\d+)?)',

.pre-commit-config.yaml

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,29 +3,22 @@ exclude: |
33
tests/.*|
44
CHANGELOG.md
55
)$
6+
default_install_hook_types: ["pre-commit", "commit-msg"]
67
repos:
78
- repo: https://github.com/pre-commit/pre-commit-hooks
8-
rev: v4.5.0
9+
rev: v5.0.0
910
hooks:
1011
- id: check-yaml
11-
stages: [commit]
1212
- id: check-json
13-
stages: [commit]
1413
- id: check-toml
15-
stages: [commit]
1614
- id: check-merge-conflict
17-
stages: [commit]
1815
- id: check-case-conflict
19-
stages: [commit]
2016
- id: detect-private-key
21-
stages: [commit]
2217
- repo: https://github.com/crate-ci/typos
23-
rev: v1.16.20
18+
rev: v1.32.0
2419
hooks:
2520
- id: typos
26-
stages: [commit]
2721
- repo: https://github.com/crate-ci/committed
28-
rev: v1.0.20
22+
rev: v1.1.7
2923
hooks:
3024
- id: committed
31-
stages: [commit-msg]

Cargo.toml

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,12 @@ include = [
2121
"Cargo.toml",
2222
"LICENSE*",
2323
"README.md",
24-
"benches/**/*",
2524
"examples/**/*"
2625
]
2726

2827
[workspace.lints.rust]
2928
rust_2018_idioms = { level = "warn", priority = -1 }
29+
unnameable_types = "allow"
3030
unreachable_pub = "warn"
3131
unsafe_op_in_unsafe_fn = "warn"
3232
unused_lifetimes = "warn"
@@ -69,7 +69,7 @@ lossy_float_literal = "warn"
6969
macro_use_imports = "warn"
7070
mem_forget = "warn"
7171
mutex_integer = "warn"
72-
needless_continue = "warn"
72+
needless_continue = "allow"
7373
needless_for_each = "warn"
7474
negative_feature_names = "warn"
7575
path_buf_push_overwrite = "warn"
@@ -78,6 +78,7 @@ rc_mutex = "warn"
7878
redundant_feature_names = "warn"
7979
ref_option_ref = "warn"
8080
rest_pat_in_fully_bound_structs = "warn"
81+
result_large_err = "allow"
8182
same_functions_in_if_condition = "warn"
8283
self_named_module_files = "warn"
8384
semicolon_if_nothing_returned = "warn"
@@ -97,6 +98,15 @@ multiple_bound_locations = "allow"
9798
assigning_clones = "allow"
9899
blocks_in_conditions = "allow"
99100

101+
[profile.dev]
102+
panic = "abort"
103+
104+
[profile.release]
105+
panic = "abort"
106+
codegen-units = 1
107+
lto = true
108+
# debug = "line-tables-only" # requires Cargo 1.71
109+
100110
[package]
101111
name = "clap"
102112
version = "4.5.39"

clap_builder/README.md

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,16 @@ Builder implementation for clap.
1010

1111
Licensed under either of
1212

13-
- Apache License, Version 2.0 ([LICENSE-APACHE](LICENSE-APACHE) or <https://www.apache.org/licenses/LICENSE-2.0>)
14-
- MIT license ([LICENSE-MIT](LICENSE-MIT) or <https://opensource.org/licenses/MIT>)
13+
* Apache License, Version 2.0, ([LICENSE-APACHE](LICENSE-APACHE) or <http://www.apache.org/licenses/LICENSE-2.0>)
14+
* MIT license ([LICENSE-MIT](LICENSE-MIT) or <http://opensource.org/licenses/MIT>)
1515

1616
at your option.
1717

1818
### Contribution
1919

20-
Unless you explicitly state otherwise, any contribution intentionally submitted
21-
for inclusion in the work by you, as defined in the Apache-2.0 license, shall be
22-
dual licensed as above, without any additional terms or conditions.
20+
Unless you explicitly state otherwise, any contribution intentionally
21+
submitted for inclusion in the work by you, as defined in the Apache-2.0
22+
license, shall be dual-licensed as above, without any additional terms or
23+
conditions.
2324

2425
See [CONTRIBUTING](CONTRIBUTING.md) for more details.

clap_builder/src/lib.rs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,3 +47,7 @@ mod util;
4747

4848
const INTERNAL_ERROR_MSG: &str = "Fatal internal error. Please consider filing a bug \
4949
report at https://github.com/clap-rs/clap/issues";
50+
51+
#[doc = include_str!("../README.md")]
52+
#[cfg(doctest)]
53+
pub struct ReadmeDoctests;

clap_complete/src/lib.rs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,3 +106,7 @@ pub use aot::generate_to;
106106
pub use aot::Generator;
107107
/// Deprecated, see [`aot::Shell`]
108108
pub use aot::Shell;
109+
110+
#[doc = include_str!("../README.md")]
111+
#[cfg(doctest)]
112+
pub struct ReadmeDoctests;

clap_complete_nushell/src/lib.rs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -235,3 +235,7 @@ fn generate_completion(completions: &mut String, cmd: &Command, is_subcommand: b
235235
fn single_line_styled_str(text: &StyledStr) -> String {
236236
text.to_string().replace('\n', " ")
237237
}
238+
239+
#[doc = include_str!("../README.md")]
240+
#[cfg(doctest)]
241+
pub struct ReadmeDoctests;

clap_derive/README.md

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,16 @@ Macro implementation for clap's derives.
1010

1111
Licensed under either of
1212

13-
- Apache License, Version 2.0 ([LICENSE-APACHE](LICENSE-APACHE) or <https://www.apache.org/licenses/LICENSE-2.0>)
14-
- MIT license ([LICENSE-MIT](LICENSE-MIT) or <https://opensource.org/licenses/MIT>)
13+
* Apache License, Version 2.0, ([LICENSE-APACHE](LICENSE-APACHE) or <http://www.apache.org/licenses/LICENSE-2.0>)
14+
* MIT license ([LICENSE-MIT](LICENSE-MIT) or <http://opensource.org/licenses/MIT>)
1515

1616
at your option.
1717

1818
### Contribution
1919

20-
Unless you explicitly state otherwise, any contribution intentionally submitted
21-
for inclusion in the work by you, as defined in the Apache-2.0 license, shall be
22-
dual licensed as above, without any additional terms or conditions.
20+
Unless you explicitly state otherwise, any contribution intentionally
21+
submitted for inclusion in the work by you, as defined in the Apache-2.0
22+
license, shall be dual-licensed as above, without any additional terms or
23+
conditions.
2324

2425
See [CONTRIBUTING](CONTRIBUTING.md) for more details.

clap_lex/src/lib.rs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -520,3 +520,7 @@ fn is_number(arg: &str) -> bool {
520520
None => true,
521521
}
522522
}
523+
524+
#[doc = include_str!("../README.md")]
525+
#[cfg(doctest)]
526+
pub struct ReadmeDoctests;

0 commit comments

Comments
 (0)