Skip to content

Commit 24a76f9

Browse files
committed
Upgrading dependencies and move MSRV to 1.77
1 parent db185de commit 24a76f9

File tree

7 files changed

+50
-86
lines changed

7 files changed

+50
-86
lines changed

.github/workflows/check.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ jobs:
8080
# https://docs.github.com/en/actions/learn-github-actions/contexts#context-availability
8181
strategy:
8282
matrix:
83-
msrv: [1.75.0]
83+
msrv: [1.77.0]
8484
name: ubuntu / ${{ matrix.msrv }}
8585
steps:
8686
- uses: actions/checkout@v4

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ version = "0.1.3"
77
edition = "2021"
88
authors = ["Ahmed Farghal <me@asoli.dev>"]
99
license = "Apache-2.0 OR MIT"
10-
rust-version = "1.75.0" # MSRV
10+
rust-version = "1.77.0" # MSRV
1111
keywords = ["click", "cli", "framework"]
1212
repository = "https://github.com/AhmedSoliman/cling"
1313

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ For more details, see:
4040
- [docs.rs](https://docs.rs/cling/latest/cling/)
4141
- [examples](examples/)
4242

43-
*Compiler support: [requires `rustc` 1.75+][msrv]*
43+
*Compiler support: [requires `rustc` 1.77+][msrv]*
4444

4545
[msrv]: #supported-rust-versions
4646

@@ -342,7 +342,7 @@ Beep beep!
342342

343343
# Supported Rust Versions
344344

345-
Cling's minimum supported rust version is `1.75.0`.
345+
Cling's minimum supported rust version is `1.77.0`.
346346

347347
# License
348348

cling-derive/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ bench = false
1919

2020
[dependencies]
2121
proc-macro2 = "1.0"
22-
syn = { version = "2.0", features = ["extra-traits", "printing"] }
22+
syn = { version = "2.0", default-features = false, features = ["extra-traits", "printing"] }
2323
quote = "1.0"
2424
darling = "0.20"
2525
indoc = "2.0.3"

cling/Cargo.toml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ clap = { version = "4", default-features = false, features = [
1919
] }
2020
anyhow = { version = "1.0" }
2121
indoc = { version = "2.0" }
22-
itertools = { version = "0.13.0" }
22+
itertools = { version = "0.14.0", default-features = false }
2323
rustversion = "1.0.14"
2424
shlex = { version = "1.3.0", optional = true }
2525
static_assertions = { workspace = true }
@@ -28,19 +28,19 @@ tracing = { version = "0.1.37", features = ["log"] }
2828

2929

3030
[dev-dependencies]
31-
tokio = { version = "1", features = ["full"] }
31+
tokio = { version = "1", default-features = false, features = ["macros", "rt", "rt-multi-thread"] }
3232
trybuild = { version = "1.0.82" }
3333
trycmd = { version = "0.15.0", features = ["examples"] }
3434
# Only needed to fix an incorrect min version set in trycmd
3535
filetime = { version = "0.2.22" }
3636
# For examples
37-
rand = { version = "0.8.5" }
38-
rustyline = { version = "14.0.0" }
39-
colored = { version = "2.0" }
37+
rand = { version = "0.9" }
38+
rustyline = { version = "15.0.0" }
39+
colored = { version = "3.0" }
4040
# Use clap with default features in tests
4141
clap = { version = "4.3.21", default-features = true, features = ["derive"] }
4242
# For testing collecting external types
43-
clap-verbosity-flag = { version = "2.2.0" }
43+
clap-verbosity-flag = { version = "3.0" }
4444
env_logger = { version = "0.11.3" }
4545
log = { version = "0.4.20" }
4646

cling/build.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
use rustc_version::{version_meta, Channel};
22

33
fn main() {
4+
println!("cargo::rustc-check-cfg=cfg(unstable)");
45
// Set cfg flags depending on release channel. We use "unstable" cfg to gate
56
// some of the unstable features in the compiler.
67
if version_meta().unwrap().channel == Channel::Nightly {
7-
println!("cargo:rustc-cfg=unstable");
8+
println!("cargo::rustc-cfg=unstable");
89
}
910
}

deny.toml

Lines changed: 37 additions & 74 deletions
Original file line numberDiff line numberDiff line change
@@ -11,23 +11,6 @@
1111

1212
# Root options
1313

14-
# If 1 or more target triples (and optionally, target_features) are specified,
15-
# only the specified targets will be checked when running `cargo deny check`.
16-
# This means, if a particular package is only ever used as a target specific
17-
# dependency, such as, for example, the `nix` crate only being used via the
18-
# `target_family = "unix"` configuration, that only having windows targets in
19-
# this list would mean the nix crate, as well as any of its exclusive
20-
# dependencies not shared by any other crates, would be ignored, as the target
21-
# list here is effectively saying which targets you are building for.
22-
targets = [
23-
# The triple can be any string, but only the target triples built in to
24-
# rustc (as of 1.40) can be checked against actual config expressions
25-
#{ triple = "x86_64-unknown-linux-musl" },
26-
# You can also specify which target_features you promise are enabled for a
27-
# particular target. target_features are currently not validated against
28-
# the actual valid features supported by the target architecture.
29-
#{ triple = "wasm32-unknown-unknown", features = ["atomics"] },
30-
]
3114
# When creating the dependency graph used as the source of truth when checks are
3215
# executed, this field can be used to prune crates from the graph, removing them
3316
# from the view of cargo-deny. This is an extremely heavy hammer, as if a crate
@@ -36,55 +19,24 @@ targets = [
3619
# so it should be used with care. The identifiers are [Package ID Specifications]
3720
# (https://doc.rust-lang.org/cargo/reference/pkgid-spec.html)
3821
#exclude = []
39-
# If true, metadata will be collected with `--all-features`. Note that this can't
40-
# be toggled off if true, if you want to conditionally enable `--all-features` it
41-
# is recommended to pass `--all-features` on the cmd line instead
42-
all-features = false
43-
# If true, metadata will be collected with `--no-default-features`. The same
44-
# caveat with `all-features` applies
45-
no-default-features = false
4622
# If set, these feature will be enabled when collecting metadata. If `--features`
4723
# is specified on the cmd line they will take precedence over this option.
4824
#features = []
49-
# When outputting inclusion graphs in diagnostics that include features, this
50-
# option can be used to specify the depth at which feature edges will be added.
51-
# This option is included since the graphs can be quite large and the addition
52-
# of features from the crate(s) to all of the graph roots can be far too verbose.
53-
# This option can be overridden via `--feature-depth` on the cmd line
54-
feature-depth = 1
5525

5626
# This section is considered when running `cargo deny check advisories`
5727
# More documentation for the advisories section can be found here:
5828
# https://embarkstudios.github.io/cargo-deny/checks/advisories/cfg.html
5929
[advisories]
30+
version = 2
6031
# The path where the advisory database is cloned/fetched into
6132
db-path = "~/.cargo/advisory-db"
6233
# The url(s) of the advisory databases to use
6334
db-urls = ["https://github.com/rustsec/advisory-db"]
64-
# The lint level for security vulnerabilities
65-
vulnerability = "deny"
66-
# The lint level for unmaintained crates
67-
unmaintained = "warn"
68-
# The lint level for crates that have been yanked from their source registry
69-
yanked = "warn"
70-
# The lint level for crates with security notices. Note that as of
71-
# 2019-12-17 there are no security notice advisories in
72-
# https://github.com/rustsec/advisory-db
73-
notice = "warn"
7435
# A list of advisory IDs to ignore. Note that ignored advisories will still
7536
# output a note when they are encountered.
7637
ignore = [
7738
#"RUSTSEC-0000-0000",
7839
]
79-
# Threshold for security vulnerabilities, any vulnerability with a CVSS score
80-
# lower than the range specified will be ignored. Note that ignored advisories
81-
# will still output a note when they are encountered.
82-
# * None - CVSS Score 0.0
83-
# * Low - CVSS Score 0.1 - 3.9
84-
# * Medium - CVSS Score 4.0 - 6.9
85-
# * High - CVSS Score 7.0 - 8.9
86-
# * Critical - CVSS Score 9.0 - 10.0
87-
#severity-threshold =
8840

8941
# If this is true, then cargo deny will use the git executable to fetch advisory database.
9042
# If this is false, then it uses a built-in git library.
@@ -96,39 +48,16 @@ ignore = [
9648
# More documentation for the licenses section can be found here:
9749
# https://embarkstudios.github.io/cargo-deny/checks/licenses/cfg.html
9850
[licenses]
99-
# The lint level for crates which do not have a detectable license
100-
unlicensed = "deny"
51+
version = 2
10152
# List of explicitly allowed licenses
10253
# See https://spdx.org/licenses/ for list of possible licenses
10354
# [possible values: any SPDX 3.11 short identifier (+ optional exception)].
10455
allow = [
105-
"Apache-2.0 WITH LLVM-exception",
10656
"Apache-2.0",
107-
"BSL-1.0",
10857
"MIT",
109-
"MPL-2.0",
110-
"Unicode-DFS-2016",
58+
"Unicode-3.0",
11159
"Unlicense",
11260
]
113-
# List of explicitly disallowed licenses
114-
# See https://spdx.org/licenses/ for list of possible licenses
115-
# [possible values: any SPDX 3.11 short identifier (+ optional exception)].
116-
deny = [
117-
]
118-
# Lint level for licenses considered copyleft
119-
copyleft = "deny"
120-
# Blanket approval or denial for OSI-approved or FSF Free/Libre licenses
121-
# * both - The license will be approved if it is both OSI-approved *AND* FSF
122-
# * either - The license will be approved if it is either OSI-approved *OR* FSF
123-
# * osi-only - The license will be approved if is OSI-approved *AND NOT* FSF
124-
# * fsf-only - The license will be approved if is FSF *AND NOT* OSI-approved
125-
# * neither - This predicate is ignored and the default lint level is used
126-
allow-osi-fsf-free = "neither"
127-
# Lint level used when no other predicates are matched
128-
# 1. License isn't in the allow or deny lists
129-
# 2. License isn't copyleft
130-
# 3. License isn't OSI/FSF, or allow-osi-fsf-free = "neither"
131-
default = "deny"
13261
# The confidence threshold for detecting a license from license text.
13362
# The higher the value, the more closely the license text must be to the
13463
# canonical license text of a valid SPDX license file.
@@ -266,3 +195,37 @@ allow-git = []
266195
[sources.allow-org]
267196
# 1 or more github.com organizations to allow git sources for
268197
github = []
198+
199+
[output]
200+
# When outputting inclusion graphs in diagnostics that include features, this
201+
# option can be used to specify the depth at which feature edges will be added.
202+
# This option is included since the graphs can be quite large and the addition
203+
# of features from the crate(s) to all of the graph roots can be far too verbose.
204+
# This option can be overridden via `--feature-depth` on the cmd line
205+
feature-depth = 1
206+
207+
[graph]
208+
# If 1 or more target triples (and optionally, target_features) are specified,
209+
# only the specified targets will be checked when running `cargo deny check`.
210+
# This means, if a particular package is only ever used as a target specific
211+
# dependency, such as, for example, the `nix` crate only being used via the
212+
# `target_family = "unix"` configuration, that only having windows targets in
213+
# this list would mean the nix crate, as well as any of its exclusive
214+
# dependencies not shared by any other crates, would be ignored, as the target
215+
# list here is effectively saying which targets you are building for.
216+
targets = [
217+
# The triple can be any string, but only the target triples built in to
218+
# rustc (as of 1.40) can be checked against actual config expressions
219+
#{ triple = "x86_64-unknown-linux-musl" },
220+
# You can also specify which target_features you promise are enabled for a
221+
# particular target. target_features are currently not validated against
222+
# the actual valid features supported by the target architecture.
223+
#{ triple = "wasm32-unknown-unknown", features = ["atomics"] },
224+
]
225+
# If true, metadata will be collected with `--no-default-features`. The same
226+
# caveat with `all-features` applies
227+
no-default-features = false
228+
# If true, metadata will be collected with `--all-features`. Note that this can't
229+
# be toggled off if true, if you want to conditionally enable `--all-features` it
230+
# is recommended to pass `--all-features` on the cmd line instead
231+
all-features = false

0 commit comments

Comments
 (0)