Merge pull request #3 from rust-osdev/dependencies

build(deps): upgrade dependencies

Author: mkroening

Cargo.lock

@@ -14,8 +14,8 @@ all-features = true
 rustdoc-args = ["--cfg", "docsrs"]
 
 [dependencies]
-allocator-api2 = { version = "0.2", default-features = false, features = ["alloc"], optional = true }
-bitfield-struct = "0.9"
+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"] }
 num_enum = { version = "0.7", default-features = false }
@@ -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"]

Cargo.toml

@@ -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::*;