Skip to content

Commit b04bc1b

Browse files
Sk7Str1p3Sk7Str1p3
committed
taplo: disable CRLF
1 parent 8241a02 commit b04bc1b

File tree

9 files changed

+199
-178
lines changed

9 files changed

+199
-178
lines changed

‎.rustfmt.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
# See also https://rust-lang.github.io/rustfmt for more settings.
2-
edition = "2021"
3-
newline_style = "Unix"
1+
# See also https://rust-lang.github.io/rustfmt for more settings.
2+
edition = "2021"
3+
newline_style = "Unix"

‎Cargo.toml

Lines changed: 75 additions & 74 deletions
Original file line numberDiff line numberDiff line change
@@ -1,96 +1,97 @@
11
[workspace.package]
2-
authors = ["o2sh <[email protected]>"]
3-
edition = "2021"
4-
license = "MIT"
5-
version = "2.23.1"
6-
repository = "https://github.com/o2sh/onefetch"
2+
authors = [ "o2sh <[email protected]>" ]
3+
edition = "2021"
4+
license = "MIT"
5+
repository = "https://github.com/o2sh/onefetch"
6+
version = "2.23.1"
77

88
[workspace]
9-
members = ["ascii", "image", "manifest"]
10-
11-
[workspace.dependencies]
12-
owo-colors = "4.1.0"
13-
anyhow = "1.0"
14-
clap = { version = "4.5.26", features = ["derive"] }
15-
image = { version = "0.25.5", default-features = false, features = [
16-
"color_quant",
17-
"jpeg",
18-
"png",
19-
"webp",
20-
] }
21-
strum = { version = "0.26.3", features = ["derive"] }
9+
members = [ "ascii", "image", "manifest" ]
10+
[workspace.dependencies]
11+
anyhow = "1.0"
12+
clap = { version = "4.5.26", features = [ "derive" ] }
13+
image = { version = "0.25.5", default-features = false, features = [
14+
"color_quant",
15+
"jpeg",
16+
"png",
17+
"webp",
18+
] }
19+
owo-colors = "4.1.0"
20+
strum = { version = "0.26.3", features = [ "derive" ] }
2221

2322
[package]
24-
authors.workspace = true
25-
edition.workspace = true
26-
version.workspace = true
27-
license.workspace = true
28-
repository.workspace = true
29-
categories = ["command-line-utilities"]
30-
description = "Command-line Git information tool"
31-
exclude = ["docs/vercel/*"]
32-
keywords = ["git", "cli", "terminal"]
33-
name = "onefetch"
34-
homepage = "https://onefetch.dev"
35-
rust-version = "1.81.0"
23+
authors.workspace = true
24+
categories = [ "command-line-utilities" ]
25+
description = "Command-line Git information tool"
26+
edition.workspace = true
27+
exclude = [ "docs/vercel/*" ]
28+
homepage = "https://onefetch.dev"
29+
keywords = [ "cli", "git", "terminal" ]
30+
license.workspace = true
31+
name = "onefetch"
32+
repository.workspace = true
33+
rust-version = "1.81.0"
34+
version.workspace = true
3635

3736
[dependencies]
38-
anyhow.workspace = true
39-
askalono = "0.5.0"
40-
byte-unit = "5.1.6"
41-
clap.workspace = true
42-
clap_complete = "4.5.42"
43-
crossbeam-channel = "0.5.14"
44-
gix = { version = "0.70.0", default-features = false, features = [
45-
"max-performance-safe",
37+
anyhow.workspace = true
38+
askalono = "0.5.0"
39+
byte-unit = "5.1.6"
40+
clap.workspace = true
41+
clap_complete = "4.5.42"
42+
crossbeam-channel = "0.5.14"
43+
#
44+
gix = { version = "0.70.0", default-features = false, features = [
4645
"blob-diff",
47-
"mailmap",
4846
"index",
47+
"mailmap",
48+
"max-performance-safe",
4949
"status",
50-
] }
51-
gix-features = { version = "0.40.0", features = ["zlib-ng"] }
52-
globset = "0.4.15"
53-
human-panic = "2.0.2"
54-
image.workspace = true
55-
num-format = "0.4.4"
56-
onefetch-ascii = { path = "ascii", version = "2.19.0" }
57-
onefetch-image = { path = "image", version = "2.19.0" }
58-
onefetch-manifest = { path = "manifest", version = "2.19.0" }
59-
owo-colors.workspace = true
60-
regex = "1.11.1"
61-
serde = "1.0"
62-
serde_json = "1.0"
63-
serde_yaml = "0.9.34"
64-
# TODO With the new value parsers, we're really close to being able to eliminate
65-
# the strum dependency
66-
strum.workspace = true
67-
time = { version = "0.3.37", features = ["formatting"] }
68-
time-humanize = { version = "0.1.3", features = ["time"] }
69-
tokei = "13.0.0-alpha.8"
70-
typetag = "0.2"
50+
] }
51+
#
52+
gix-features = { version = "0.40.0", features = [ "zlib-ng" ] }
53+
globset = "0.4.15"
54+
human-panic = "2.0.2"
55+
image.workspace = true
56+
num-format = "0.4.4"
57+
onefetch-ascii = { path = "ascii", version = "2.19.0" }
58+
onefetch-image = { path = "image", version = "2.19.0" }
59+
onefetch-manifest = { path = "manifest", version = "2.19.0" }
60+
owo-colors.workspace = true
61+
regex = "1.11.1"
62+
serde = "1.0"
63+
serde_json = "1.0"
64+
serde_yaml = "0.9.34"
65+
# TODO With the new value parsers, we're really close to being able to eliminate
66+
# the strum dependency
67+
strum.workspace = true
68+
time = { version = "0.3.37", features = [ "formatting" ] }
69+
time-humanize = { version = "0.1.3", features = [ "time" ] }
70+
tokei = "13.0.0-alpha.8"
71+
typetag = "0.2"
7172

7273
[dev-dependencies]
73-
criterion = "0.5.1"
74-
gix-testtools = "0.15.0"
75-
insta = { version = "1.42.1", features = ["json", "redactions"] }
76-
rstest = "0.24.0"
74+
criterion = "0.5.1"
75+
gix-testtools = "0.15.0"
76+
insta = { version = "1.42.1", features = [ "json", "redactions" ] }
77+
rstest = "0.24.0"
7778

7879
[[bench]]
79-
name = "repo"
80-
harness = false
80+
harness = false
81+
name = "repo"
8182

8283
[build-dependencies]
83-
lazy_static = "1"
84-
regex = "1"
85-
serde_json = "1"
86-
serde_yaml = "0.9"
87-
tera = { version = "1", default-features = false }
84+
lazy_static = "1"
85+
regex = "1"
86+
serde_json = "1"
87+
serde_yaml = "0.9"
88+
tera = { version = "1", default-features = false }
8889

8990
[target.'cfg(windows)'.build-dependencies]
90-
winres = "0.1"
91+
winres = "0.1"
9192

9293
[target.'cfg(windows)'.dependencies]
93-
enable-ansi-support = "0.2.1"
94+
enable-ansi-support = "0.2.1"
9495

9596
[features]
96-
fail-on-deprecated = []
97+
fail-on-deprecated = [ ]

‎ascii/Cargo.toml

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
[package]
2-
authors.workspace = true
3-
edition.workspace = true
4-
version.workspace = true
5-
license.workspace = true
6-
repository.workspace = true
7-
name = "onefetch-ascii"
8-
description = "Display colorized ascii art to the terminal"
9-
10-
[dependencies]
11-
owo-colors.workspace = true
1+
[package]
2+
authors.workspace = true
3+
description = "Display colorized ascii art to the terminal"
4+
edition.workspace = true
5+
license.workspace = true
6+
name = "onefetch-ascii"
7+
repository.workspace = true
8+
version.workspace = true
9+
10+
[dependencies]
11+
owo-colors.workspace = true

‎deny.toml

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,10 @@
1-
[licenses]
2-
allow = ["MIT"]
1+
[licenses]
2+
allow = [
3+
"Apache-2.0",
4+
"BSD-3-Clause",
5+
"ISC",
6+
"MIT",
7+
"MPL-2.0",
8+
"Unicode-3.0",
9+
]
10+
unused-allowed-license = "deny"

‎flake.nix

Lines changed: 26 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,23 @@
2929
pkgs = nixpkgs.legacyPackages.${system};
3030

3131
inherit (pkgs) lib;
32-
3332
craneLib = crane.mkLib pkgs;
34-
src = ./.;
33+
34+
# This filter prevent project from being rebuilded then changing
35+
# unrelated files ,e.g. MDs
36+
filter' =
37+
path: _type:
38+
builtins.match (lib.concatStringsSep "|" [
39+
".*tera"
40+
".*yaml"
41+
".*zstd"
42+
]) path != null;
43+
filter = path: type: (filter' path type) || (craneLib.filterCargoSources path type);
44+
src = lib.cleanSourceWith {
45+
src = ./.;
46+
inherit filter;
47+
name = "source";
48+
};
3549

3650
# Common arguments can be set here to avoid repeating them later
3751
common = {
@@ -48,10 +62,10 @@
4862
++ lib.optionals pkgs.stdenv.isDarwin (
4963
with pkgs;
5064
[
51-
# additional dependencies on Darwin systems
52-
CoreFoundation
53-
libresolv
54-
Security
65+
# additional dependencies on Darwin systems
66+
CoreFoundation
67+
libresolv
68+
Security
5569
]
5670
);
5771
# Software required for project build
@@ -83,8 +97,8 @@
8397
clippy = craneLib.cargoClippy (
8498
common
8599
// {
86-
inherit cargoArtifacts;
87-
cargoClippyExtraArgs = "--all-targets -- --deny warnings";
100+
inherit cargoArtifacts;
101+
cargoClippyExtraArgs = "--all-targets -- --deny warnings";
88102
}
89103
);
90104

@@ -111,10 +125,10 @@
111125
nextest = craneLib.cargoNextest (
112126
common
113127
// {
114-
inherit cargoArtifacts;
115-
partitions = 1;
116-
partitionType = "count";
117-
cargoNextestPartitionsExtraArgs = "--no-tests=pass";
128+
inherit cargoArtifacts;
129+
partitions = 1;
130+
partitionType = "count";
131+
cargoNextestPartitionsExtraArgs = "--no-tests=pass";
118132
}
119133
);
120134
};

‎image/Cargo.toml

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
1-
[package]
2-
authors.workspace = true
3-
edition.workspace = true
4-
version.workspace = true
5-
license.workspace = true
6-
repository.workspace = true
7-
name = "onefetch-image"
8-
description = "Display images in the terminal"
9-
10-
[dependencies]
11-
anyhow.workspace = true
12-
clap.workspace = true
13-
image.workspace = true
14-
15-
[target.'cfg(not(windows))'.dependencies]
16-
color_quant = "1.1.0"
17-
base64 = "0.22.1"
18-
libc = "0.2.169"
1+
[package]
2+
authors.workspace = true
3+
description = "Display images in the terminal"
4+
edition.workspace = true
5+
license.workspace = true
6+
name = "onefetch-image"
7+
repository.workspace = true
8+
version.workspace = true
9+
10+
[dependencies]
11+
anyhow.workspace = true
12+
clap.workspace = true
13+
image.workspace = true
14+
15+
[target.'cfg(not(windows))'.dependencies]
16+
base64 = "0.22.1"
17+
color_quant = "1.1.0"
18+
libc = "0.2.169"

‎manifest/Cargo.toml

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
[package]
2-
authors.workspace = true
3-
edition.workspace = true
4-
version.workspace = true
5-
license.workspace = true
6-
repository.workspace = true
7-
name = "onefetch-manifest"
8-
description = "Detect and parse manifest files"
9-
10-
[dependencies]
11-
anyhow.workspace = true
12-
cargo_toml = "0.21.0"
13-
npm-package-json = "0.1.3"
14-
strum.workspace = true
1+
[package]
2+
authors.workspace = true
3+
description = "Detect and parse manifest files"
4+
edition.workspace = true
5+
license.workspace = true
6+
name = "onefetch-manifest"
7+
repository.workspace = true
8+
version.workspace = true
9+
10+
[dependencies]
11+
anyhow.workspace = true
12+
cargo_toml = "0.21.0"
13+
npm-package-json = "0.1.3"
14+
strum.workspace = true

‎manifest/tests/fixtures/cargo/Cargo.toml

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
1-
[package]
2-
name = "project"
3-
version = "0.1.0"
4-
edition = "2018"
5-
description = "this is a description"
6-
license = "MIT"
7-
8-
[dependencies]
9-
cortex-m-rtic = "0.6.0-alpha.1"
10-
anyhow = "1.0"
11-
12-
[dependencies.cortex-m]
13-
version = "0.7.1"
14-
15-
[dependencies.cortex-m-rt]
16-
version = "0.6.11"
17-
18-
[dependencies.stm32f4xx-hal]
19-
version = "0.8.3"
20-
features = ["rt", "stm32f401"]
1+
[package]
2+
description = "this is a description"
3+
edition = "2018"
4+
license = "MIT"
5+
name = "project"
6+
version = "0.1.0"
7+
8+
[dependencies]
9+
anyhow = "1.0"
10+
cortex-m-rtic = "0.6.0-alpha.1"
11+
12+
[dependencies.cortex-m]
13+
version = "0.7.1"
14+
15+
[dependencies.cortex-m-rt]
16+
version = "0.6.11"
17+
18+
[dependencies.stm32f4xx-hal]
19+
features = [ "rt", "stm32f401" ]
20+
version = "0.8.3"

0 commit comments

Comments
 (0)