Skip to content

Commit a64ba5a

Browse files
committed
chore(deps): upgrade incompatible versions, resolve breaking changes
Signed-off-by: Robert Sturla <[email protected]>
1 parent fd0f639 commit a64ba5a

File tree

8 files changed

+132
-65
lines changed

8 files changed

+132
-65
lines changed

Cargo.lock

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

Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ debug = true
1414

1515
[profile.thin]
1616
# drop bootc size when split debuginfo is not available and go a step
17-
# further in size optimization (when tested from 140mb, to 12mb without
17+
# further in size optimization (when tested from 140mb, to 12mb without
1818
# symbols/debuginfo, to 5.8mb with extra optimizations)
1919
# https://github.com/johnthagen/min-sized-rust
2020
# cargo build --profile=thin
@@ -44,7 +44,7 @@ clap = "4.5.4"
4444
clap_mangen = { version = "0.2.20" }
4545
hex = "0.4.3"
4646
indoc = "2.0.5"
47-
indicatif = "0.17.0"
47+
indicatif = "0.18.0"
4848
fn-error-context = "0.2.1"
4949
libc = "0.2.154"
5050
openssl = "0.10.72"

crates/lib/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ linkme = "0.3"
4343
openssl = { workspace = true }
4444
regex = "1.10.4"
4545
rustix = { workspace = true }
46-
schemars = { version = "0.8.17", features = ["chrono"] }
46+
schemars = { version = "1.0.4", features = ["chrono04"] }
4747
serde = { workspace = true, features = ["derive"] }
4848
serde_ignored = "0.1.10"
4949
serde_json = { workspace = true }
@@ -52,7 +52,7 @@ tokio = { workspace = true, features = ["io-std", "time", "process", "rt", "net"
5252
tokio-util = { workspace = true }
5353
tracing = { workspace = true }
5454
tempfile = { workspace = true }
55-
toml = "0.8.12"
55+
toml = "0.9.5"
5656
xshell = { version = "0.2.6", optional = true }
5757
uuid = { version = "1.8.0", features = ["v4"] }
5858
tini = "1.3.0"

crates/lib/src/install/config.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,7 @@ pub(crate) fn load_config() -> Result<Option<InstallConfiguration>> {
200200
for (_name, path) in fragments {
201201
let buf = std::fs::read_to_string(&path)?;
202202
let mut unused = std::collections::HashSet::new();
203-
let de = toml::Deserializer::new(&buf);
203+
let de = toml::Deserializer::parse(&buf).with_context(|| format!("Parsing {path:?}"))?;
204204
let mut c: InstallConfigurationToplevel = serde_ignored::deserialize(de, |path| {
205205
unused.insert(path.to_string());
206206
})

crates/ostree-ext/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ fn-error-context = { workspace = true }
2929
futures-util = "0.3.13"
3030
gvariant = "0.5.0"
3131
hex = { workspace = true }
32-
io-lifetimes = "2"
32+
io-lifetimes = "3"
3333
indicatif = { workspace = true }
3434
libc = { workspace = true }
3535
libsystemd = "0.7.0"

crates/system-reinstall-bootc/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ serde_yaml = "0.9.22"
3030
tempfile = { workspace = true }
3131
tracing = { workspace = true }
3232
uzers = "0.12.1"
33-
which = "7.0.2"
33+
which = "8.0.0"
3434

3535
[lints]
3636
workspace = true

crates/tests-integration/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ fn-error-context = { workspace = true }
1919
indoc = { workspace = true }
2020
libtest-mimic = "0.8.0"
2121
oci-spec = "0.8.0"
22-
rexpect = "0.5"
22+
rexpect = "0.6"
2323
rustix = { workspace = true }
2424
serde = { workspace = true, features = ["derive"] }
2525
serde_json = { workspace = true }

crates/xtask/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@ camino = { workspace = true }
1717
chrono = { workspace = true, features = ["std"] }
1818
fn-error-context = { workspace = true }
1919
tar = "0.4"
20-
toml = "0.8"
20+
toml = "0.9"
2121
tempfile = { workspace = true }
22-
mandown = "0.1.3"
22+
mandown = "1.1.0"
2323
xshell = { version = "0.2.6" }
2424

2525
[lints]

0 commit comments

Comments
 (0)