Skip to content

Commit 311e56f

Browse files
authored
Resolve conflicts
* Dependencies * `&Option<T>` -> `Option<&T>` conversion
2 parents 7727039 + ed99fe2 commit 311e56f

File tree

14 files changed

+586
-2603
lines changed

14 files changed

+586
-2603
lines changed

.github/wiki/Command-line-options.md

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ INFO:
4242
-e, --exclude <EXCLUDE>...
4343
Ignore all files & directories matching EXCLUDE
4444
45-
--no-bots [<REGEX>]
45+
--no-bots[=<REGEX>]
4646
Exclude [bot] commits. Use <REGEX> to override the default pattern
4747
4848
--no-merges
@@ -51,6 +51,12 @@ INFO:
5151
-E, --email
5252
Show the email address of each author
5353
54+
--http-url
55+
Display repository URL as HTTP
56+
57+
--hide-token
58+
Hide token in repository URL
59+
5460
--include-hidden
5561
Count hidden files and directories
5662

Cargo.lock

Lines changed: 44 additions & 58 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 & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
authors = ["o2sh <ossama-hjaji@live.fr>"]
33
edition = "2021"
44
license = "MIT"
5-
version = "2.20.0"
5+
version = "2.21.0"
66
repository = "https://github.com/o2sh/onefetch"
77

88
[workspace]
@@ -11,7 +11,7 @@ members = ["ascii", "image", "manifest"]
1111
[workspace.dependencies]
1212
owo-colors = "3.5.0"
1313
anyhow = "1.0"
14-
clap = { version = "4.5.3", features = ["derive"] }
14+
clap = { version = "4.5.4", features = ["derive"] }
1515
image = "0.24.9"
1616
strum = { version = "0.25.0", features = ["derive"] }
1717

@@ -32,11 +32,11 @@ rust-version = "1.74.1"
3232
[dependencies]
3333
anyhow.workspace = true
3434
askalono = "0.4.6"
35-
byte-unit = "5.1.2"
36-
bytecount = "0.6.7"
35+
byte-unit = "5.1.4"
36+
bytecount = "0.6.8"
3737
clap.workspace = true
38-
clap_complete = "4.5.1"
39-
crossbeam-channel = "0.5.9"
38+
clap_complete = "4.5.2"
39+
crossbeam-channel = "0.5.12"
4040
# NOTE Ensures that gengo's gix features don't conflict with the ones we're using
4141
gengo = { version = "0.11.2", default-features = false, features = ["max-performance-safe"] }
4242
gix = { version = "0.62.0", default-features = false, features = [
@@ -55,24 +55,24 @@ onefetch-ascii = { path = "ascii", version = "2.19.0" }
5555
onefetch-image = { path = "image", version = "2.19.0" }
5656
onefetch-manifest = { path = "manifest", version = "2.19.0" }
5757
owo-colors.workspace = true
58-
regex = "1.10.2"
58+
regex = "1.10.4"
5959
serde = "1.0"
6060
serde_json = "1.0"
61-
serde_yaml = "0.9.27"
61+
serde_yaml = "0.9.34"
6262
# TODO With the new value parsers, we're really close to being able to eliminate
6363
# the strum dependency
6464
strum.workspace = true
65-
time = { version = "0.3.34", features = ["formatting"] }
65+
time = { version = "0.3.36", features = ["formatting"] }
6666
time-humanize = { version = "0.1.3", features = ["time"] }
6767
typetag = "0.2"
6868
parking_lot = "0.12"
6969

7070
[dev-dependencies]
7171
criterion = "0.5.1"
7272
gix-testtools = "0.13.0"
73-
insta = { version = "1.34.0", features = ["json", "redactions"] }
73+
insta = { version = "1.38.0", features = ["json", "redactions"] }
7474
pretty_assertions = "1.4.0"
75-
rstest = "0.18.2"
75+
rstest = "0.19.0"
7676

7777
[[bench]]
7878
name = "repo"

assets/language-badge.svg

Lines changed: 1 addition & 1 deletion
Loading

0 commit comments

Comments
 (0)