From e7af47d7eb4180b0723da488731e36e041f4fac5 Mon Sep 17 00:00:00 2001 From: "bootc-bot[bot]" <225049296+bootc-bot[bot]@users.noreply.github.com> Date: Sat, 15 Aug 2026 00:25:55 +0000 Subject: [PATCH 1/2] Update Rust Signed-off-by: bootc-bot[bot] <225049296+bootc-bot[bot]@users.noreply.github.com> --- Cargo.lock | 114 +++++++++++++++++++---------------- crates/lib/Cargo.toml | 2 +- crates/ostree-ext/Cargo.toml | 2 +- 3 files changed, 64 insertions(+), 54 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index b99032d57..9e1481531 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -353,7 +353,7 @@ dependencies = [ "clap", "clap_complete", "clap_mangen", - "comfy-table", + "comfy-table 8.0.0", "composefs-ctl", "etc-merge", "fn-error-context", @@ -385,7 +385,7 @@ dependencies = [ "static_assertions", "tar", "tempfile", - "thiserror 2.0.19", + "thiserror 2.0.20", "tini", "tokio", "tokio-util", @@ -411,7 +411,7 @@ dependencies = [ "rustix", "similar-asserts", "tempfile", - "thiserror 2.0.19", + "thiserror 2.0.20", "uzers", ] @@ -428,7 +428,7 @@ dependencies = [ "rustix", "similar-asserts", "tempfile", - "thiserror 2.0.19", + "thiserror 2.0.20", "uzers", ] @@ -479,7 +479,7 @@ dependencies = [ "serde", "serde_derive", "serde_json", - "thiserror 2.0.19", + "thiserror 2.0.20", ] [[package]] @@ -561,7 +561,7 @@ dependencies = [ "semver", "serde", "serde_json", - "thiserror 2.0.19", + "thiserror 2.0.20", ] [[package]] @@ -625,9 +625,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.6.5" +version = "4.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "301b56658598e48f3648647ac6fc887be7e7108eddfa4e9b63fcf3ec58c0cadf" +checksum = "473c7e07f409a8d772161724aa8db6a765a2532a70f9667eeb7b49d3d02fbdca" dependencies = [ "clap_builder", "clap_derive", @@ -635,9 +635,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.6.5" +version = "4.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94a65403d1a1bd28f7dc68eb8506e8874808ee5eecb59298de588e2e1407a078" +checksum = "7b48fea5a88e9ae728a2dcbedbfc0e730f7d60da42e1cb049a83c9fb8b789889" dependencies = [ "anstream", "anstyle", @@ -648,9 +648,9 @@ dependencies = [ [[package]] name = "clap_complete" -version = "4.6.8" +version = "4.6.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1f84a88507dbd05c695f2cb5e8558e747179134005e9893882dec964190ed89" +checksum = "3be2ad0423bdbbb0e25bc89add796f3559706d4a95e1bc98e4d9662a957b6a19" dependencies = [ "clap", "clap_lex", @@ -678,9 +678,9 @@ checksum = "c8d4a3bb8b1e0c1050499d1815f5ab16d04f0959b233085fb31653fbfc9d98f9" [[package]] name = "clap_mangen" -version = "0.3.0" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d82842b45bf9f6a3be090dd860095ac30728042c08e0d6261ca7259b5d850f07" +checksum = "211d617eaa4b735c96c9e0228fcbdb5120ef623f2b8cb67ffb84c3e02dbc28a4" dependencies = [ "clap", "roff", @@ -724,6 +724,16 @@ name = "comfy-table" version = "7.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "958c5d6ecf1f214b4c2bbbbf6ab9523a864bd136dcf71a7e8904799acfe1ad47" +dependencies = [ + "unicode-segmentation", + "unicode-width", +] + +[[package]] +name = "comfy-table" +version = "8.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "136c8c4c3823846e8ba6d4bda011b4e5d5827b8bb0ac26c31f9ab31abe9f54f2" dependencies = [ "crossterm", "unicode-segmentation", @@ -754,7 +764,7 @@ dependencies = [ "serde_repr", "sha2 0.11.0", "tempfile", - "thiserror 2.0.19", + "thiserror 2.0.20", "tokio", "tokio-stream", "xxhash-rust", @@ -775,7 +785,7 @@ dependencies = [ "pcre2", "regex-automata", "rustix", - "thiserror 2.0.19", + "thiserror 2.0.20", "zerocopy", ] @@ -788,7 +798,7 @@ dependencies = [ "cap-std-ext", "clap", "clap_complete", - "comfy-table", + "comfy-table 7.2.2", "composefs", "composefs-boot", "composefs-fuse", @@ -829,7 +839,7 @@ version = "0.7.0" source = "git+https://github.com/composefs/composefs-rs?rev=0fbc853325ff92dbb842e715611bed7ddf9fe169#0fbc853325ff92dbb842e715611bed7ddf9fe169" dependencies = [ "rustix", - "thiserror 2.0.19", + "thiserror 2.0.20", ] [[package]] @@ -857,7 +867,7 @@ dependencies = [ "serde_json", "sha2 0.11.0", "tar-core", - "thiserror 2.0.19", + "thiserror 2.0.20", "tokio", "tokio-util", "tracing", @@ -875,7 +885,7 @@ dependencies = [ "rand_pcg", "rustix", "sha2 0.11.0", - "thiserror 2.0.19", + "thiserror 2.0.20", "tokio", ] @@ -896,7 +906,7 @@ dependencies = [ "serde", "serde_json", "tar-core", - "thiserror 2.0.19", + "thiserror 2.0.20", "tokio", "toml", "tracing", @@ -987,7 +997,7 @@ dependencies = [ "serde", "serde_json", "sha2 0.11.0", - "thiserror 2.0.19", + "thiserror 2.0.20", "tokio", "tracing", ] @@ -1295,7 +1305,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb" dependencies = [ "libc", - "windows-sys 0.59.0", + "windows-sys 0.61.2", ] [[package]] @@ -1465,9 +1475,9 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.33" +version = "0.3.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2cd50c473c80f6d7c3670a752354b8e569b1a7cbfdc0419ec88e5edad85e0dc7" +checksum = "92d699e522242e69e3003b94ecc1f960f3a5e015aa7c5d7486e65ad01dd94f5e" [[package]] name = "futures-executor" @@ -1501,13 +1511,13 @@ dependencies = [ [[package]] name = "futures-macro" -version = "0.3.33" +version = "0.3.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d6d3cde68c518367be28956066ddfef33813991b77a55005a69dae04bf3b10b" +checksum = "9fb9654ba8355388abeb8dcb4fc62f511300867002afc858860463bdd9fe0c44" dependencies = [ "proc-macro2", "quote", - "syn 2.0.117", + "syn 3.0.2", ] [[package]] @@ -1518,15 +1528,15 @@ checksum = "c39754e157331b013978ec91992bde1ac089843443c49cbc7f46150b0fad0893" [[package]] name = "futures-task" -version = "0.3.33" +version = "0.3.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b231ed28831efb4a61a08580c4bc233ec56bc009f4cd8f52da2c3cb97df0c109" +checksum = "cd417de3d1d015fc3bfd2b1ea46dfc7bab72ef86f1cc7cc9c78e728b34a6d1fd" [[package]] name = "futures-util" -version = "0.3.33" +version = "0.3.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a77a90a256fce34da66415271e30f94ee91c57b04b8a2c042d9cf3220179deaa" +checksum = "0d50a92467f8ba5dd6e3ee5d4bd04d73ab2e4e1c44474a0674821dfce14b79bc" dependencies = [ "futures-core", "futures-macro", @@ -1767,9 +1777,9 @@ dependencies = [ [[package]] name = "http-body-util" -version = "0.1.4" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9f41fd6a08e4d4ec69df65976da761afd5ad5e58a9d4acb46bd1c953a9e3ff2" +checksum = "23169fe34a5fbcdd3f3862e78fb9b6fccd5f02a6dc6f732547005d45631ce71c" dependencies = [ "bytes", "futures-core", @@ -1937,7 +1947,7 @@ version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "82cb6a9f675da968c63b6208c641b9dca58fc0133ae53375736b1767b0cab8bd" dependencies = [ - "windows-sys 0.59.0", + "windows-sys 0.61.2", ] [[package]] @@ -2049,7 +2059,7 @@ dependencies = [ "once_cell", "serde", "sha2 0.10.9", - "thiserror 2.0.19", + "thiserror 2.0.20", "uuid", ] @@ -2255,7 +2265,7 @@ version = "0.50.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7957b9740744892f114936ab4a57b3f487491bbeafaf8083688b16841a4240e5" dependencies = [ - "windows-sys 0.59.0", + "windows-sys 0.61.2", ] [[package]] @@ -2312,7 +2322,7 @@ dependencies = [ "serde_json", "strum", "strum_macros", - "thiserror 2.0.19", + "thiserror 2.0.20", ] [[package]] @@ -2332,7 +2342,7 @@ dependencies = [ "serde", "serde_json", "tar", - "thiserror 2.0.19", + "thiserror 2.0.20", ] [[package]] @@ -2426,7 +2436,7 @@ dependencies = [ "chrono", "clap", "clap_mangen", - "comfy-table", + "comfy-table 8.0.0", "composefs-ctl", "containers-image-proxy", "flate2", @@ -2847,7 +2857,7 @@ dependencies = [ "nix 0.31.2", "regex", "tempfile", - "thiserror 2.0.19", + "thiserror 2.0.20", ] [[package]] @@ -2881,7 +2891,7 @@ dependencies = [ "errno", "libc", "linux-raw-sys", - "windows-sys 0.59.0", + "windows-sys 0.61.2", ] [[package]] @@ -3298,7 +3308,7 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a870b96d9b5bd13e81517d63a18da0f0c33de072eeb5a293a2e40f3830befa0e" dependencies = [ - "thiserror 2.0.19", + "thiserror 2.0.20", "zerocopy", ] @@ -3318,7 +3328,7 @@ dependencies = [ "getrandom 0.3.4", "once_cell", "rustix", - "windows-sys 0.59.0", + "windows-sys 0.61.2", ] [[package]] @@ -3328,7 +3338,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "230a1b821ccbd75b185820a1f1ff7b14d21da1e442e22c0863ea5f08771a8874" dependencies = [ "rustix", - "windows-sys 0.59.0", + "windows-sys 0.61.2", ] [[package]] @@ -3370,11 +3380,11 @@ dependencies = [ [[package]] name = "thiserror" -version = "2.0.19" +version = "2.0.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09a43598840e33d5b0331f38c5e30d13bb11c11210a4b58f0d9b18a5a5eefcd9" +checksum = "ec86235f5fcc2a73650310756d2ac5b138a5780bbbdfae3eeccec992c435ba4f" dependencies = [ - "thiserror-impl 2.0.19", + "thiserror-impl 2.0.20", ] [[package]] @@ -3390,9 +3400,9 @@ dependencies = [ [[package]] name = "thiserror-impl" -version = "2.0.19" +version = "2.0.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43cbfe0cf76104d42a574802844187e84a305e531ed54455f11fbde0f10541cd" +checksum = "bc04cd3e1236dd4a98afca4569f2deb3f120e5422a4023be2cb683f8486292af" dependencies = [ "proc-macro2", "quote", @@ -3668,9 +3678,9 @@ checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" [[package]] name = "uuid" -version = "1.24.0" +version = "1.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf3923a6f5c4c6382e0b653c4117f48d631ea17f38ed86e2a828e6f7412f5239" +checksum = "2cefc03fd367c0c6d4305de1b312cf00248c4114f4a0418ce6a6af769e3b0bd9" dependencies = [ "getrandom 0.4.2", "js-sys", diff --git a/crates/lib/Cargo.toml b/crates/lib/Cargo.toml index c53a1c245..d2b5df72b 100644 --- a/crates/lib/Cargo.toml +++ b/crates/lib/Cargo.toml @@ -61,7 +61,7 @@ xshell = { workspace = true, optional = true } # Crate-specific dependencies anstyle = "1.0.6" -comfy-table = "7.1.1" +comfy-table = "8.0.0" liboverdrop = "0.1.0" unicode-width = "0.2" libsystemd = "0.7" diff --git a/crates/ostree-ext/Cargo.toml b/crates/ostree-ext/Cargo.toml index fbe0985e0..f9b610c35 100644 --- a/crates/ostree-ext/Cargo.toml +++ b/crates/ostree-ext/Cargo.toml @@ -38,7 +38,7 @@ tracing = { workspace = true } xshell = { workspace = true, optional = true } # Crate-specific dependencies -comfy-table = "7.1.1" +comfy-table = "8.0.0" containers-image-proxy = "0.11.0" flate2 = { features = ["zlib"], default-features = false, version = "1.0.20" } futures-util = "0.3.13" From 27af911bf935e13cebeed571885a6ef235971781 Mon Sep 17 00:00:00 2001 From: John Eckersberg Date: Tue, 18 Aug 2026 16:56:59 -0400 Subject: [PATCH 2/2] Adapt to comfy-table 8.0 API changes The comfy-table 8.0 release replaced the old string-based preset system with a new TableStyle type. The load_preset() method has been removed in favor of load_style(). Update both call sites accordingly. Generated-by: AI Signed-off-by: John Eckersberg --- crates/lib/src/image.rs | 2 +- crates/ostree-ext/src/cli.rs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/crates/lib/src/image.rs b/crates/lib/src/image.rs index adbaace0a..2221db430 100644 --- a/crates/lib/src/image.rs +++ b/crates/lib/src/image.rs @@ -167,7 +167,7 @@ pub(crate) async fn list_entrypoint( let mut table = Table::new(); table - .load_preset(NOTHING) + .load_style(NOTHING) .set_content_arrangement(comfy_table::ContentArrangement::Dynamic) .set_header(["REPOSITORY", "TYPE"]); diff --git a/crates/ostree-ext/src/cli.rs b/crates/ostree-ext/src/cli.rs index 7c3f9995f..38a1c7982 100644 --- a/crates/ostree-ext/src/cli.rs +++ b/crates/ostree-ext/src/cli.rs @@ -937,7 +937,7 @@ async fn container_history(repo: &ostree::Repo, imgref: &ImageReference) -> Resu .ok_or_else(|| anyhow::anyhow!("No such image: {}", imgref))?; let mut table = comfy_table::Table::new(); table - .load_preset(comfy_table::presets::NOTHING) + .load_style(comfy_table::presets::NOTHING) .set_content_arrangement(comfy_table::ContentArrangement::Dynamic) .set_header(["ID", "SIZE", "CRCEATED BY"]);