Skip to content

Commit 07b4ae6

Browse files
bilelmoussaouibilelmoussaoui
committed
Sort & de-duplicate deps using workspace features
1 parent 61fe2c5 commit 07b4ae6

10 files changed

Lines changed: 84 additions & 74 deletions

File tree

‎Cargo.lock‎

Lines changed: 12 additions & 12 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Cargo.toml‎

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,22 +27,32 @@ rust-version = "1.88"
2727
exclude = ["org.freedesktop.Secrets.xml"]
2828

2929
[workspace.dependencies]
30-
zvariant = { version = "5.8", default-features = false, features = ["gvariant", "serde_bytes"]}
31-
ashpd = {version = "0.13", default-features = false}
30+
ashpd = { version = "0.13", default-features = false }
3231
base64 = "0.22"
32+
cbc = "0.1"
33+
clap = { version = "4.5", features = ["cargo", "derive"] }
3334
endi = "1.1"
34-
clap = { version = "4.5", features = [ "cargo", "derive" ] }
3535
futures-channel = "0.3"
3636
futures-lite = "2.6"
3737
futures-util = "0.3"
38+
hkdf = "0.12"
39+
libc = "0.2"
40+
md-5 = "0.10"
41+
num = "0.4.0"
3842
num-bigint-dig = { version = "0.9", features = ["zeroize"] }
39-
oo7 = { path = "client", version = "0.6.0-alpha", default-features = false, features = ["unstable", "tracing"]}
43+
oo7 = { path = "client", version = "0.6.0-alpha", default-features = false, features = ["unstable", "tracing"] }
44+
openssl = "0.10"
45+
pbkdf2 = { version = "0.12", default-features = false }
46+
rpassword = "7.4"
4047
serde = { version = "1.0", features = ["derive"] }
4148
serde_json = "1.0"
42-
tokio = { version = "1.50", default-features = false }
49+
serde_repr = "0.1"
50+
sha2 = "0.10"
4351
tempfile = "3.26"
52+
tokio = { version = "1.50", default-features = false }
4453
tracing = "0.1"
4554
tracing-subscriber = "0.3"
4655
zbus = { version = "5.14.0", default-features = false }
47-
zbus_macros = {version = "5.11", features = ["gvariant"]}
56+
zbus_macros = { version = "5.11", features = ["gvariant"] }
4857
zeroize = { version = "1", features = ["zeroize_derive"] }
58+
zvariant = { version = "5.8", default-features = false, features = ["gvariant", "serde_bytes"] }

‎cli/Cargo.toml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,15 @@ rust-version.workspace = true
1313
version.workspace = true
1414

1515
[dependencies]
16-
anstyle = "1.0.13"
17-
time = { version = "0.3", default-features = false, features = ["alloc", "formatting", "local-offset"] }
16+
anstyle = "1.0"
1817
clap.workspace = true
1918
hex = "0.4"
2019
oo7 = { workspace = true, features = ["tokio"] }
21-
rpassword = "7.4.0"
22-
tokio = { workspace = true, features = [ "macros", "rt"] }
23-
serde_json = { workspace = true }
24-
serde = { workspace = true }
20+
rpassword.workspace = true
21+
serde.workspace = true
22+
serde_json.workspace = true
23+
time = { version = "0.3", default-features = false, features = ["alloc", "formatting", "local-offset"] }
24+
tokio = { workspace = true, features = ["macros", "rt"] }
2525

2626
[features]
2727
default = ["native_crypto"]

‎client/Cargo.toml‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -15,25 +15,25 @@ version.workspace = true
1515
[dependencies]
1616
aes = { version = "0.8", features = ["zeroize"], optional = true }
1717
ashpd = { workspace = true, features = ["secret"] }
18-
async-fs = { version = "2.2.0", optional = true }
19-
async-io = { version = "2.6.0", optional = true }
20-
async-lock = { version = "3.4.2", optional = true }
21-
blocking = { version = "1.5.1", optional = true }
22-
cbc = { version = "0.1", features = ["zeroize"], optional = true }
18+
async-fs = { version = "2.2", optional = true }
19+
async-io = { version = "2.6", optional = true }
20+
async-lock = { version = "3.4", optional = true }
21+
blocking = { version = "1.5", optional = true }
22+
cbc = { workspace = true, features = ["zeroize"], optional = true }
2323
endi.workspace = true
2424
futures-lite = { workspace = true, optional = true }
2525
futures-util.workspace = true
2626
getrandom = "0.4"
27-
oo7-macros = { path = "../macros", version = "0.6.0-alpha", optional = true }
28-
hkdf = { version = "0.12", optional = true }
29-
md-5 = { version = "0.10", optional = true }
30-
num = "0.4.0"
27+
hkdf = { workspace = true, optional = true }
28+
md-5 = { workspace = true, optional = true }
29+
num.workspace = true
3130
num-bigint-dig.workspace = true
32-
openssl = { version = "0.10", optional = true }
33-
pbkdf2 = { version = "0.12", optional = true }
31+
oo7-macros = { path = "../macros", version = "0.6.0-alpha", optional = true }
32+
openssl = { workspace = true, optional = true }
33+
pbkdf2 = { workspace = true, optional = true }
3434
serde.workspace = true
3535
serde_bytes = "0.11"
36-
sha2 = { version = "0.10", optional = true }
36+
sha2 = { workspace = true, optional = true }
3737
subtle = { version = "2.5", optional = true }
3838
tokio = { workspace = true, features = [
3939
"sync",
@@ -50,7 +50,7 @@ zeroize.workspace = true
5050
oo7-daemon = { path = "../server", features = ["test-util"], default-features = false, version = "0.6.0-alpha" }
5151
tempfile.workspace = true
5252
tokio = { workspace = true, features = ["macros", "rt-multi-thread", "time"] }
53-
tracing-subscriber = { version = "0.3", features = ["env-filter", "fmt"] }
53+
tracing-subscriber = { workspace = true, features = ["env-filter", "fmt"] }
5454

5555
[features]
5656
default = ["tokio", "native_crypto"]

‎kwallet/cli/Cargo.toml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@ license.workspace = true
1010
rust-version.workspace = true
1111

1212
[dependencies]
13+
clap.workspace = true
1314
kwallet-parser = { version = "0.6.0-alpha", path = "../parser" }
1415
oo7 = { workspace = true, features = ["tokio", "native_crypto"] }
15-
clap = { workspace = true }
16-
serde = { workspace = true }
17-
serde_json = { workspace = true }
18-
rpassword = "7.3"
16+
rpassword.workspace = true
17+
serde.workspace = true
18+
serde_json.workspace = true
1919
tokio = { workspace = true, features = ["rt-multi-thread", "macros"] }

‎kwallet/parser/Cargo.toml‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -13,18 +13,18 @@ rust-version.workspace = true
1313
exclude.workspace = true
1414

1515
[dependencies]
16+
base64.workspace = true
1617
blowfish = "0.9"
17-
cbc = "0.1"
18+
cbc.workspace = true
19+
cipher = { version = "0.4", features = ["block-padding"] }
1820
ecb = "0.1"
19-
md-5 = "0.10"
21+
md-5.workspace = true
22+
pbkdf2 = { workspace = true, default-features = false, features = ["simple"] }
23+
serde.workspace = true
24+
serde_json.workspace = true
2025
sha1 = "0.10"
21-
sha2 = "0.10"
22-
pbkdf2 = { version = "0.12", default-features = false, features = ["simple"] }
23-
cipher = { version = "0.4", features = ["block-padding"] }
24-
zeroize = { workspace = true }
25-
serde = { workspace = true }
26-
serde_json = { workspace = true }
27-
base64 = { workspace = true }
26+
sha2.workspace = true
27+
zeroize.workspace = true
2828

2929
[dev-dependencies]
3030
hex = "0.4"

‎macros/Cargo.toml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,6 @@ version.workspace = true
1515
proc-macro = true
1616

1717
[dependencies]
18-
syn = { version = "2.0", features = ["full"] }
19-
quote = "1.0"
2018
proc-macro2 = "1.0"
19+
quote = "1.0"
20+
syn = { version = "2.0", features = ["full"] }

‎pam/Cargo.toml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,16 +14,16 @@ name = "pam_oo7"
1414
crate-type = ["cdylib"]
1515

1616
[dependencies]
17-
libc = "0.2"
17+
libc.workspace = true
18+
serde.workspace = true
19+
serde_repr.workspace = true
1820
tokio = { workspace = true, features = ["rt", "rt-multi-thread", "net", "io-util", "sync", "time"] }
19-
serde = { workspace = true }
20-
serde_repr = "0.1"
21-
zvariant = { workspace = true }
22-
tracing = { workspace = true }
23-
tracing-subscriber = { workspace = true, features = ["env-filter"] }
21+
tracing.workspace = true
2422
tracing-journald = "0.3"
25-
zeroize = { workspace = true }
23+
tracing-subscriber = { workspace = true, features = ["env-filter"] }
24+
zeroize.workspace = true
25+
zvariant.workspace = true
2626

2727
[dev-dependencies]
28-
tempfile = { workspace = true }
28+
tempfile.workspace = true
2929
tokio = { workspace = true, features = ["rt", "rt-multi-thread", "net", "io-util", "sync", "time", "macros"] }

‎python/Cargo.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,4 @@ crate-type = ["cdylib"]
1919
oo7_rs = { package = "oo7", path = "../client", version = "0.6.0-alpha" }
2020
pyo3 = { version = "0.28", features = ["extension-module", "abi3-py38"] }
2121
pyo3-async-runtimes = { version = "0.28", features = ["tokio-runtime"] }
22-
tokio = { version = "1", features = ["rt-multi-thread"] }
22+
tokio = { workspace = true, features = ["rt-multi-thread"] }

‎server/Cargo.toml‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -20,31 +20,31 @@ path = "src/lib.rs"
2020
test = false
2121

2222
[dependencies]
23-
ashpd = {workspace = true, features = ["backend", "secret", "tracing"]}
24-
base64 = {version = "0.22", optional = true}
23+
ashpd = { workspace = true, features = ["backend", "secret", "tracing"] }
24+
base64 = { version = "0.22", optional = true }
2525
clap.workspace = true
2626
enumflags2 = "0.7"
2727
formatx = "0.2"
28-
gettext-rs = {version = "0.7", features = ["gettext-system"]}
29-
hkdf = { version = "0.12", optional = true }
28+
gettext-rs = { version = "0.7", features = ["gettext-system"] }
29+
hkdf = { workspace = true, optional = true }
3030
kwallet-parser = { version = "0.6.0-alpha", path = "../kwallet/parser", optional = true }
31-
libc = "0.2"
32-
rustix = { version = "1.1", default-features = false, features = ["process", "std", "thread", "mm"] }
33-
num = "0.4.0"
31+
libc.workspace = true
32+
num.workspace = true
3433
num-bigint-dig.workspace = true
35-
openssl = { version = "0.10", optional = true }
3634
oo7 = { workspace = true, features = ["tokio"] }
37-
rpassword = "7.4"
35+
openssl = { workspace = true, optional = true }
36+
rpassword.workspace = true
37+
rustix = { version = "1.1", default-features = false, features = ["process", "std", "thread", "mm"] }
3838
serde.workspace = true
39-
serde_repr = "0.1"
40-
sha2 = { version = "0.10", optional = true }
39+
serde_repr.workspace = true
40+
sha2 = { workspace = true, optional = true }
41+
tempfile = { workspace = true, optional = true }
4142
tokio = { workspace = true, features = ["full"] }
4243
tokio-stream = "0.1"
43-
tracing = "0.1"
44+
tracing.workspace = true
4445
tracing-subscriber.workspace = true
4546
zbus = { workspace = true, features = ["p2p"] }
4647
zeroize.workspace = true
47-
tempfile = { workspace = true, optional = true }
4848

4949
[features]
5050
test-util = ["dep:tempfile"]

0 commit comments

Comments
 (0)