diff --git a/Cargo.lock b/Cargo.lock index 0ec45c1..ff08d8a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4,9 +4,9 @@ version = 4 [[package]] name = "anyhow" -version = "1.0.101" +version = "1.0.102" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f0e0fee31ef5ed1ba1316088939cea399010ed7731dba877ed44aeb407a75ea" +checksum = "7f202df86484c868dbad7eaa557ef785d5c66295e41b460ef922eca0723b842c" [[package]] name = "bit_field" @@ -16,17 +16,17 @@ checksum = "1e4b40c7323adcfc0a41c4b88143ed58346ff65a288fc144329c5c45e05d70c6" [[package]] name = "bitflags" -version = "2.10.0" +version = "2.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "812e12b5285cc515a9c72a5c1d3b6d46a19dac5acfef5265968c166106e31dd3" +checksum = "c4512299f36f043ab09a583e57bceb5a5aab7a73db1805848e8fef3c9e8c78b3" [[package]] name = "block-buffer" -version = "0.10.4" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71" +checksum = "cdd35008169921d80bc60d3d0ab416eecb028c4cd653352907921d95084790be" dependencies = [ - "generic-array", + "hybrid-array", ] [[package]] @@ -37,28 +37,27 @@ checksum = "9330f8b2ff13f34540b44e946ef35111825727b38d33286ef986142615121801" [[package]] name = "cpufeatures" -version = "0.2.17" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59ed5838eebb26a2bb2e58f6d5b5316989ae9d08bab10e0e6d103e656d1b0280" +checksum = "8b2a41393f66f16b0823bb79094d54ac5fbd34ab292ddafb9a0456ac9f87d201" dependencies = [ "libc", ] [[package]] name = "crypto-common" -version = "0.1.7" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78c8292055d1c1df0cce5d180393dc8cce0abec0a7102adb6c7b1eef6016d60a" +checksum = "77727bb15fa921304124b128af125e7e3b968275d1b108b379190264f4423710" dependencies = [ - "generic-array", - "typenum", + "hybrid-array", ] [[package]] name = "digest" -version = "0.10.7" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" +checksum = "4850db49bf08e663084f7fb5c87d202ef91a3907271aff24a94eb97ff039153c" dependencies = [ "block-buffer", "crypto-common", @@ -122,22 +121,21 @@ dependencies = [ "sha2", ] -[[package]] -name = "generic-array" -version = "0.14.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" -dependencies = [ - "typenum", - "version_check", -] - [[package]] name = "hex" version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" +[[package]] +name = "hybrid-array" +version = "0.4.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3944cf8cf766b40e2a1a333ee5e9b563f854d5fa49d6a8ca2764e97c6eddb214" +dependencies = [ + "typenum", +] + [[package]] name = "jaarg" version = "0.2.2" @@ -146,9 +144,9 @@ checksum = "534d589df1ef528a238f4bc4b1db081a1280f3aedf2695fd8971e9853a7fa4f6" [[package]] name = "libc" -version = "0.2.180" +version = "0.2.185" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bcc35a38544a891a5f7c865aca548a982ccb3b8650a5b06d0fd33a10283c56fc" +checksum = "52ff2c0fe9bc6cb6b14a0592c2ff4fa9ceb83eea9db979b0487cd054946a2b8f" [[package]] name = "lock_api" @@ -196,9 +194,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.44" +version = "1.0.45" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21b2ebcf727b7760c461f091f9f0f539b77b8e87f2fd88131e7f1b433b3cece4" +checksum = "41f2619966050689382d2b44f664f4bc593e129785a36d6ee376ddf37259b924" dependencies = [ "proc-macro2", ] @@ -241,18 +239,18 @@ dependencies = [ [[package]] name = "serde_spanned" -version = "1.0.4" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8bbf91e5a4d6315eee45e704372590b30e260ee83af6639d64557f51b067776" +checksum = "6662b5879511e06e8999a8a235d848113e942c9124f211511b16466ee2995f26" dependencies = [ "serde_core", ] [[package]] name = "sha2" -version = "0.10.9" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7507d819769d01a365ab707794a4084392c824f54a7a6a7862f8c3d0892b283" +checksum = "446ba717509524cb3f22f17ecc096f10f4822d76ab5c0b9822c5f9c284e825f4" dependencies = [ "cfg-if", "cpufeatures", @@ -276,9 +274,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.114" +version = "2.0.117" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4d107df263a3013ef9b1879b0df87d706ff80f65a86ea879bd9c31f9b307c2a" +checksum = "e665b8803e7b1d2a727f4023456bbbbe74da67099c585258af0ad9c5013b9b99" dependencies = [ "proc-macro2", "quote", @@ -287,9 +285,9 @@ dependencies = [ [[package]] name = "toml" -version = "0.9.11+spec-1.1.0" +version = "1.1.2+spec-1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3afc9a848309fe1aaffaed6e1546a7a14de1f935dc9d89d32afd9a44bab7c46" +checksum = "81f3d15e84cbcd896376e6730314d59fb5a87f31e4b038454184435cd57defee" dependencies = [ "serde_core", "serde_spanned", @@ -300,18 +298,18 @@ dependencies = [ [[package]] name = "toml_datetime" -version = "0.7.5+spec-1.1.0" +version = "1.1.1+spec-1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92e1cfed4a3038bc5a127e35a2d360f145e1f4b971b551a2ba5fd7aedf7e1347" +checksum = "3165f65f62e28e0115a00b2ebdd37eb6f3b641855f9d636d3cd4103767159ad7" dependencies = [ "serde_core", ] [[package]] name = "toml_parser" -version = "1.0.6+spec-1.1.0" +version = "1.1.2+spec-1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3198b4b0a8e11f09dd03e133c0280504d0801269e9afa46362ffde1cbeebf44" +checksum = "a2abe9b86193656635d2411dc43050282ca48aa31c2451210f4202550afb7526" dependencies = [ "winnow", ] @@ -333,9 +331,9 @@ dependencies = [ [[package]] name = "uefi" -version = "0.36.1" +version = "0.37.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71fe9058b73ee2b6559524af9e33199c13b2485ddbf3ad1181b68051cdc50c17" +checksum = "66ab9569afdd1e33a31d8002343aa1df594f055347b1a66136bf9dd6cbc3ec37" dependencies = [ "bitflags", "cfg-if", @@ -360,9 +358,9 @@ dependencies = [ [[package]] name = "uefi-raw" -version = "0.13.0" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f64fe59e11af447d12fd60a403c74106eb104309f34b4c6dbce6e927d97da9d" +checksum = "f3775e5934877acaef4b00f254f252df1e2266903c31e51455c117f4f2824eda" dependencies = [ "bitflags", "uguid", @@ -376,18 +374,12 @@ checksum = "0c8352f8c05e47892e7eaf13b34abd76a7f4aeaf817b716e88789381927f199c" [[package]] name = "unicode-ident" -version = "1.0.23" +version = "1.0.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "537dd038a89878be9b64dd4bd1b260315c1bb94f4d784956b81e27a088d9a09e" - -[[package]] -name = "version_check" -version = "0.9.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a" +checksum = "e6e4313cd5fcd3dad5cafa179702e2b244f760991f45397d14d4ebf38247da75" [[package]] name = "winnow" -version = "0.7.14" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a5364e9d77fcdeeaa6062ced926ee3381faa2ee02d3eb83a5c27a8825540829" +checksum = "09dac053f1cd375980747450bfc7250c264eaae0583872e845c0c7cd578872b5" diff --git a/Cargo.toml b/Cargo.toml index dc864e4..9d5f816 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -17,13 +17,13 @@ repository = "https://github.com/edera-dev/sprout" edition = "2024" [workspace.dependencies] -bitflags = "2.10.0" +bitflags = "2.11.1" log = "0.4.29" spin = "0.10.0" -uefi-raw = "0.13.0" +uefi-raw = "0.14.0" [workspace.dependencies.anyhow] -version = "1.0.100" +version = "1.0.102" default-features = false [workspace.dependencies.hex] @@ -42,7 +42,7 @@ default-features = false features = ["alloc", "derive"] [workspace.dependencies.sha2] -version = "0.10.9" +version = "0.11.0" default-features = false [workspace.dependencies.shlex] @@ -50,12 +50,12 @@ version = "1.3.0" default-features = false [workspace.dependencies.toml] -version = "0.9.11" +version = "1.1.2" default-features = false features = ["serde", "parse"] [workspace.dependencies.uefi] -version = "0.36.1" +version = "0.37.0" default-features = false features = ["alloc", "global_allocator", "panic_handler"] diff --git a/crates/boot/src/autoconfigure/bls.rs b/crates/boot/src/autoconfigure/bls.rs index d4ab931..87b1095 100644 --- a/crates/boot/src/autoconfigure/bls.rs +++ b/crates/boot/src/autoconfigure/bls.rs @@ -30,7 +30,7 @@ pub fn scan( // Convert the device path root to a string we can use in the configuration. let mut root = root - .to_string(DisplayOnly(false), AllowShortcuts(false)) + .to_string16(DisplayOnly(false), AllowShortcuts(false)) .context("unable to convert device root to string")? .to_string(); // Add a trailing forward-slash to the root to ensure the device root is completed. diff --git a/crates/boot/src/autoconfigure/linux.rs b/crates/boot/src/autoconfigure/linux.rs index d7ec70c..b9f336c 100644 --- a/crates/boot/src/autoconfigure/linux.rs +++ b/crates/boot/src/autoconfigure/linux.rs @@ -158,7 +158,7 @@ pub fn scan( // Convert the device path root to a string we can use in the configuration. let mut root = root - .to_string(DisplayOnly(false), AllowShortcuts(false)) + .to_string16(DisplayOnly(false), AllowShortcuts(false)) .context("unable to convert device root to string")? .to_string(); // Add a trailing forward-slash to the root to ensure the device root is completed. diff --git a/crates/boot/src/autoconfigure/windows.rs b/crates/boot/src/autoconfigure/windows.rs index 0c49b2d..5279000 100644 --- a/crates/boot/src/autoconfigure/windows.rs +++ b/crates/boot/src/autoconfigure/windows.rs @@ -38,7 +38,7 @@ pub fn scan( // Convert the device path root to a string we can use in the configuration. let mut root = root - .to_string(DisplayOnly(false), AllowShortcuts(false)) + .to_string16(DisplayOnly(false), AllowShortcuts(false)) .context("unable to convert device root to string")? .to_string(); // Add a trailing forward-slash to the root to ensure the device root is completed. diff --git a/crates/boot/src/generators/bls.rs b/crates/boot/src/generators/bls.rs index 60919c9..ad47771 100644 --- a/crates/boot/src/generators/bls.rs +++ b/crates/boot/src/generators/bls.rs @@ -49,7 +49,7 @@ pub fn generate(context: Rc, bls: &BlsConfiguration) -> Result Result { let mut path = path .node_iter() .filter_map(|item| { - let item = item.to_string(DisplayOnly(false), AllowShortcuts(false)); + let item = item.to_string16(DisplayOnly(false), AllowShortcuts(false)); if item .as_ref() .map(|item| cstring16_contains_char(item, '(')) @@ -93,7 +93,7 @@ pub fn device_path_subpath(path: &DevicePath) -> Result { let path = path .node_iter() .filter_map(|item| { - let item = item.to_string(DisplayOnly(false), AllowShortcuts(false)); + let item = item.to_string16(DisplayOnly(false), AllowShortcuts(false)); if item .as_ref() .map(|item| cstring16_contains_char(item, '(')) @@ -124,7 +124,7 @@ pub fn resolve_path( .node_iter() .next() .map(|it| { - it.to_string(DisplayOnly(false), AllowShortcuts(false)) + it.to_string16(DisplayOnly(false), AllowShortcuts(false)) .unwrap_or_default() }) .map(|it| it.to_string().contains('(')) diff --git a/crates/eficore/src/shim.rs b/crates/eficore/src/shim.rs index 49affa2..28a7a04 100644 --- a/crates/eficore/src/shim.rs +++ b/crates/eficore/src/shim.rs @@ -82,7 +82,7 @@ impl<'a> ShimInput<'a> { }; // Convert the underlying path to a string. let path = path - .to_string(DisplayOnly(false), AllowShortcuts(false)) + .to_string16(DisplayOnly(false), AllowShortcuts(false)) .context("unable to convert device path to string")?; let path = crate::path::resolve_path(None, path.to_string()) .context("unable to resolve path")?; diff --git a/rust-toolchain.toml b/rust-toolchain.toml index 22d8cad..7ad2976 100644 --- a/rust-toolchain.toml +++ b/rust-toolchain.toml @@ -1,4 +1,4 @@ [toolchain] -channel = "1.93.0" +channel = "1.95.0" components = ["rustfmt", "clippy"] targets = ["x86_64-unknown-uefi", "aarch64-unknown-uefi"]