From 78facd46ddf4e79545be1d10ed715dbc977088f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Kr=C3=B6ning?= Date: Mon, 23 Jun 2025 18:01:24 +0200 Subject: [PATCH 1/3] build(deps): upgrade bitfield-struct to 0.11 --- Cargo.lock | 6 +++--- Cargo.toml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 05bac19..eb5c1a1 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1,6 +1,6 @@ # This file is automatically @generated by Cargo. # It is not intended for manual editing. -version = 3 +version = 4 [[package]] name = "allocator-api2" @@ -16,9 +16,9 @@ checksum = "dc827186963e592360843fb5ba4b973e145841266c1357f7180c43526f2e5b61" [[package]] name = "bitfield-struct" -version = "0.9.0" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45ced5210f4878484de1a151cbef1cbff7afe0c1a005e4448e8a4ec76275c7a0" +checksum = "d3ca019570363e800b05ad4fd890734f28ac7b72f563ad8a35079efb793616f8" dependencies = [ "proc-macro2", "quote", diff --git a/Cargo.toml b/Cargo.toml index e13ea44..c165779 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -15,7 +15,7 @@ rustdoc-args = ["--cfg", "docsrs"] [dependencies] allocator-api2 = { version = "0.2", default-features = false, features = ["alloc"], optional = true } -bitfield-struct = "0.9" +bitfield-struct = "0.11" bitflags = "2" endian-num = { version = "0.2", features = ["bitflags", "linux-types"] } num_enum = { version = "0.7", default-features = false } From a29322f30ede142f65db5d119c1fc16183f9010d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Kr=C3=B6ning?= Date: Mon, 23 Jun 2025 18:13:52 +0200 Subject: [PATCH 2/3] build(deps): upgrade allocator-api2 to 0.3 See the projects README for the reasons for removing the nightly feature: https://github.com/zakarumych/allocator-api2/tree/2873b737304003b1cf0c999f4148497293cc9e0f#usage --- Cargo.lock | 4 ++-- Cargo.toml | 4 ++-- src/virtq/alloc.rs | 12 ++++++++++-- 3 files changed, 14 insertions(+), 6 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index eb5c1a1..8e1ea2b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4,9 +4,9 @@ version = 4 [[package]] name = "allocator-api2" -version = "0.2.18" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c6cb57a04249c6480766f7f7cef5467412af1490f8d1e243141daddada3264f" +checksum = "78200ac3468a57d333cd0ea5dd398e25111194dcacd49208afca95c629a6311d" [[package]] name = "bit_field" diff --git a/Cargo.toml b/Cargo.toml index c165779..c111faa 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -14,7 +14,7 @@ all-features = true rustdoc-args = ["--cfg", "docsrs"] [dependencies] -allocator-api2 = { version = "0.2", default-features = false, features = ["alloc"], optional = true } +allocator-api2 = { version = "0.3", default-features = false, features = ["alloc"], optional = true } bitfield-struct = "0.11" bitflags = "2" endian-num = { version = "0.2", features = ["bitflags", "linux-types"] } @@ -28,6 +28,6 @@ zerocopy-derive = { version = "0.8", optional = true } [features] alloc = ["dep:allocator-api2"] mmio = [] -nightly = ["allocator-api2/nightly"] +nightly = [] pci = ["dep:pci_types"] zerocopy = ["dep:zerocopy", "dep:zerocopy-derive", "endian-num/zerocopy"] diff --git a/src/virtq/alloc.rs b/src/virtq/alloc.rs index 69441d6..0a60065 100644 --- a/src/virtq/alloc.rs +++ b/src/virtq/alloc.rs @@ -1,6 +1,14 @@ use ::alloc::alloc::handle_alloc_error; -use allocator_api2::alloc::{AllocError, Allocator, Global}; -use allocator_api2::boxed::Box; +#[cfg(feature = "nightly")] +use ::alloc::{ + alloc::{AllocError, Allocator, Global}, + boxed::Box, +}; +#[cfg(not(feature = "nightly"))] +use allocator_api2::{ + alloc::{AllocError, Allocator, Global}, + boxed::Box, +}; use super::*; From db19647ed811ee8ceb30eb01d6c2c9b3548739f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Kr=C3=B6ning?= Date: Mon, 23 Jun 2025 18:14:28 +0200 Subject: [PATCH 3/3] build(deps): update `Cargo.lock` ``` Locking 10 packages to latest compatible versions Updating bitflags v2.6.0 -> v2.9.1 Updating num_enum v0.7.3 -> v0.7.4 Updating num_enum_derive v0.7.3 -> v0.7.4 Updating proc-macro2 v1.0.87 -> v1.0.95 Updating quote v1.0.37 -> v1.0.40 Adding rustversion v1.0.21 Updating syn v2.0.79 -> v2.0.104 Updating unicode-ident v1.0.13 -> v1.0.18 Updating zerocopy v0.8.5 -> v0.8.26 Updating zerocopy-derive v0.8.5 -> v0.8.26 ``` --- Cargo.lock | 43 +++++++++++++++++++++++++------------------ 1 file changed, 25 insertions(+), 18 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 8e1ea2b..6749e85 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -27,9 +27,9 @@ dependencies = [ [[package]] name = "bitflags" -version = "2.6.0" +version = "2.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" +checksum = "1b8e56985ec62d17e9c1001dc89c88ecd7dc08e47eba5ec7c29c7b5eeecde967" [[package]] name = "endian-num" @@ -44,18 +44,19 @@ dependencies = [ [[package]] name = "num_enum" -version = "0.7.3" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e613fc340b2220f734a8595782c551f1250e969d87d3be1ae0579e8d4065179" +checksum = "a973b4e44ce6cad84ce69d797acf9a044532e4184c4f267913d1b546a0727b7a" dependencies = [ "num_enum_derive", + "rustversion", ] [[package]] name = "num_enum_derive" -version = "0.7.3" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af1844ef2428cc3e1cb900be36181049ef3d3193c63e43026cfe202983b27a56" +checksum = "77e878c846a8abae00dd069496dbe8751b16ac1c3d6bd2a7283a938e8228f90d" dependencies = [ "proc-macro2", "quote", @@ -74,27 +75,33 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.87" +version = "1.0.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3e4daa0dcf6feba26f985457cdf104d4b4256fc5a09547140f3631bb076b19a" +checksum = "02b3e5e68a3a1a02aad3ec490a98007cbc13c37cbe84a3cd7b8e406d76e7f778" dependencies = [ "unicode-ident", ] [[package]] name = "quote" -version = "1.0.37" +version = "1.0.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af" +checksum = "1885c039570dc00dcb4ff087a89e185fd56bae234ddc7f056a945bf36467248d" dependencies = [ "proc-macro2", ] +[[package]] +name = "rustversion" +version = "1.0.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a0d197bd2c9dc6e53b84da9556a69ba4cdfab8619eb41a8bd1cc2027a0f6b1d" + [[package]] name = "syn" -version = "2.0.79" +version = "2.0.104" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89132cd0bf050864e1d38dc3bbc07a0eb8e7530af26344d3d2bbbef83499f590" +checksum = "17b6f705963418cdb9927482fa304bc562ece2fdd4f616084c50b7023b435a40" dependencies = [ "proc-macro2", "quote", @@ -103,9 +110,9 @@ dependencies = [ [[package]] name = "unicode-ident" -version = "1.0.13" +version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe" +checksum = "5a5f39404a5da50712a4c1eecf25e90dd62b613502b7e925fd4e4d19b5c96512" [[package]] name = "virtio-spec" @@ -142,18 +149,18 @@ dependencies = [ [[package]] name = "zerocopy" -version = "0.8.5" +version = "0.8.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6129d25825e874589a0e529175dd060c13dab4f3d960c6a0b711e5535b598bb2" +checksum = "1039dd0d3c310cf05de012d8a39ff557cb0d23087fd44cad61df08fc31907a2f" dependencies = [ "zerocopy-derive", ] [[package]] name = "zerocopy-derive" -version = "0.8.5" +version = "0.8.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d917df3784b4e2f5deb708d14623b2c02833890e1aa7a5dd1088998e8e9402b1" +checksum = "9ecf5b4cc5364572d7f4c329661bcc82724222973f2cab6f050a4e5c22f75181" dependencies = [ "proc-macro2", "quote",