diff --git a/Cargo.lock b/Cargo.lock index 5f392334..907e6757 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -294,9 +294,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.4.1" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" +checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" [[package]] name = "bitvec" @@ -511,13 +511,23 @@ checksum = "7684a49fb1af197853ef7b2ee694bc1f5b4179556f1e5710e1760c5db6f5e929" [[package]] name = "derive_more" -version = "0.99.17" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fb810d30a7c1953f91334de7244731fc3f3c10d7fe163338a35b9f640960321" +checksum = "4a9b99b9cbbe49445b21764dc0625032a89b145a2642e67603e1c936f5458d05" +dependencies = [ + "derive_more-impl", +] + +[[package]] +name = "derive_more-impl" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb7330aeadfbe296029522e6c40f315320aba36fc43a5b3632f3795348f3bd22" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.49", + "unicode-xid", ] [[package]] @@ -833,7 +843,7 @@ dependencies = [ name = "linux-bzimage-setup" version = "0.1.0" dependencies = [ - "bitflags 2.4.1", + "bitflags 2.6.0", "cfg-if", "core2", "libflate", @@ -910,15 +920,26 @@ dependencies = [ [[package]] name = "multiboot2" -version = "0.20.2" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad7ef048d4783355163fd0c874aac3db54b919dc6a86dc29bb13f67308b114b0" +checksum = "f8bcd36c1256cbfbabbd8da34d487a64b45bea009a869185708735951792f0f3" dependencies = [ - "bitflags 2.4.1", + "bitflags 2.6.0", "derive_more", "log", + "multiboot2-common", + "ptr_meta", + "uefi-raw 0.8.0", +] + +[[package]] +name = "multiboot2-common" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f9f510cab65715c2b358a50d7d03c022e7c1499084ae6d420b0e594a9ca30853" +dependencies = [ + "derive_more", "ptr_meta", - "uefi-raw", ] [[package]] @@ -1252,7 +1273,7 @@ version = "11.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e29830cbb1290e404f24c73af91c5d8d631ce7e128691e9477556b540cd01ecd" dependencies = [ - "bitflags 2.4.1", + "bitflags 2.6.0", ] [[package]] @@ -1542,12 +1563,12 @@ version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "07ead9f748a4646479b850add36b527113a80e80a7e0f44d7b0334291850dcc5" dependencies = [ - "bitflags 2.4.1", + "bitflags 2.6.0", "log", "ptr_meta", "ucs2", "uefi-macros", - "uefi-raw", + "uefi-raw 0.5.0", "uguid", ] @@ -1568,7 +1589,18 @@ version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "864ac69eadd877bfb34e7814be1928122ed0057d9f975169a56ee496aa7bdfd7" dependencies = [ - "bitflags 2.4.1", + "bitflags 2.6.0", + "ptr_meta", + "uguid", +] + +[[package]] +name = "uefi-raw" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b463030b802e1265a3800fab24df95d3229c202c2e408832a206f05b4d1496ca" +dependencies = [ + "bitflags 2.6.0", "ptr_meta", "uguid", ] @@ -1596,6 +1628,12 @@ version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "301abaae475aa91687eb82514b328ab47a211a533026cb25fc3e519b86adfc3c" +[[package]] +name = "unicode-xid" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "229730647fbc343e3a80e463c1db7f78f3855d3f3739bee0dda773c9a037c90a" + [[package]] name = "unwinding" version = "0.2.2" @@ -1686,7 +1724,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3b835097a84e4457323331ec5d6eb23d096066cbfb215d54096dcb4b2e85f500" dependencies = [ "bit_field", - "bitflags 2.4.1", + "bitflags 2.6.0", "rustversion", "volatile", ] @@ -1698,7 +1736,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4bc79523af8abf92fb1a970c3e086c5a343f6bcc1a0eb890f575cbb3b45743df" dependencies = [ "bit_field", - "bitflags 2.4.1", + "bitflags 2.6.0", "rustversion", "volatile", ] diff --git a/ostd/Cargo.toml b/ostd/Cargo.toml index eb6519bc..7314377e 100644 --- a/ostd/Cargo.toml +++ b/ostd/Cargo.toml @@ -49,7 +49,7 @@ x86_64 = "0.14.2" x86 = "0.52.0" acpi = "4.1.1" aml = "0.16.3" -multiboot2 = "0.20.2" +multiboot2 = "0.23.0" rsdp = "2.0.0" iced-x86 = { version = "1.21.0", default-features = false, features = [ "no_std",