Merge pull request #208 from rust-osdev/v0.9-hotfix

[v0.9] Update x86_64 dependency to v0.14.7 to fix nightly breakage
rust-osdev · Dec 20, 2021 · 4adee42 · 4adee42
2 parents 794c5b8 + 857e48e
commit 4adee42
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 15 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -14,7 +14,7 @@ required-features = ["binary"]
 
 [dependencies]
 xmas-elf = { version = "0.6.2", optional = true }
-x86_64 = { version = "0.13.2", optional = true, default-features = false, features = ["instructions", "inline_asm"] }
+x86_64 = { version = "0.14.7", optional = true, default-features = false, features = ["instructions", "inline_asm"] }
 usize_conversions = { version = "0.2.0", optional = true }
 fixedvec = { version = "0.2.4", optional = true }
 bit_field = { version = "0.10.0", optional = true }

diff --git a/example-kernel/Cargo.toml b/example-kernel/Cargo.toml
@@ -5,4 +5,4 @@ authors = ["Philipp Oppermann <[email protected]>"]
 edition = "2018"
 
 [dependencies]
-x86_64 = { version = "0.13.2", default-features = false, features = ["instructions", "inline_asm"] }
+x86_64 = { version = "0.14.7", default-features = false, features = ["instructions", "inline_asm"] }
diff --git a/src/main.rs b/src/main.rs
@@ -10,8 +10,7 @@ compile_error!("The bootloader crate must be compiled for the `x86_64-bootloader
 extern crate rlibc;
 
 use bootloader::bootinfo::{BootInfo, FrameRange};
-use core::convert::TryInto;
-use core::panic::PanicInfo;
+use core::{arch::global_asm, convert::TryInto, panic::PanicInfo};
 use core::{mem, slice};
 use fixedvec::alloc_stack;
 use usize_conversions::usize_from;

diff --git a/test-kernel/Cargo.toml b/test-kernel/Cargo.toml
@@ -5,4 +5,4 @@ authors = ["Philipp Oppermann <[email protected]>"]
 edition = "2018"
 
 [dependencies]
-x86_64 = { version = "0.13.2", default-features = false, features = ["instructions", "inline_asm"] }
+x86_64 = { version = "0.14.7", default-features = false, features = ["instructions", "inline_asm"] }