Merge pull request #1258 from hermit-os/volatile-release

build(deps): update volatile to version 0.6
hermit-os · Jun 6, 2024 · a723af0 · a723af0
2 parents 0844437 + 6c5c9c7
commit a723af0
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 16 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -104,7 +104,7 @@ smallvec = { version = "1", features = ["const_new"] }
 take-static = "0.1"
 talc = { version = "4" }
 time = { version = "0.3", default-features = false }
-volatile = { version = "0.5.4", features = ["unstable"] }
+volatile = { version = "0.6", features = ["unstable"] }
 zerocopy = { version = "0.7", features = ["derive"] }
 
 [dependencies.smoltcp]
@@ -167,7 +167,3 @@ members = [
 exclude = [
 	"hermit-builtins",
 ]
-
-[patch.crates-io]
-# We need https://github.com/rust-osdev/volatile/pull/61
-volatile = { git = "https://github.com/rust-osdev/volatile.git" }
diff --git a/virtio-spec/Cargo.toml b/virtio-spec/Cargo.toml
@@ -12,7 +12,8 @@ categories = ["no-std", "no-std::no-alloc"]
 bitflags = "2"
 endian-num = { version = "0.1", features = ["bitflags", "linux-types"] }
 num_enum = { version = "0.7", default-features = false }
-volatile = { version = "0.5.3", features = ["derive"] }
+volatile = "0.6"
+volatile-macro = "0.6"
 zerocopy = { version = "0.7", optional = true, default-features = false }
 zerocopy-derive = { version = "0.7", optional = true }
 

diff --git a/virtio-spec/src/pci.rs b/virtio-spec/src/pci.rs
@@ -2,7 +2,8 @@
 
 use num_enum::{FromPrimitive, IntoPrimitive};
 use volatile::access::{ReadOnly, ReadWrite, RestrictAccess};
-use volatile::{VolatileFieldAccess, VolatilePtr};
+use volatile::VolatilePtr;
+use volatile_macro::VolatileFieldAccess;
 
 use crate::volatile::WideVolatilePtr;
 use crate::{le16, le32, DeviceStatus};