Merge pull request #22 from rust-osdev/develop

Update config/testing
2021-02-14 21:38:51 -06:00 · 2021-02-14 21:38:51 -06:00 · d80449dc8e
parent 38cc3a9868 8b805d7c3b
commit d80449dc8e
4 changed files with 7 additions and 2 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1,3 +1,4 @@
 /target
 /testing/target
+/testing/binaries
 Cargo.lock
--- a/Cargo.toml
+++ b/Cargo.toml
@ -1,6 +1,6 @@
 [package]
 name = "vga"
-version = "0.2.5"
+version = "0.2.6"
 authors = ["Ryan Kennedy <rkennedy9064@gmail.com>"]
 edition = "2018"
 description = "Support for vga specific functions, data structures, and registers."
--- a/Changelog.md
+++ b/Changelog.md
@ -1,3 +1,7 @@
+# 0.2.6
+
+- Updatex `x86_64` to build with lastest rust nightly.
+
 # 0.2.5

 - Updated various out of date crates.
--- a/testing/Cargo.toml
+++ b/testing/Cargo.toml
@ -11,7 +11,7 @@ spinning_top = { version = "0.2.2", features = ["nightly"] }
 pic8259_simple = "0.2.0"
 vga = { path = "../" }
 uart_16550 = "0.2.10"
-x86_64 = "0.12.2"
+x86_64 = "0.13.2"

 [package.metadata.bootimage]
 test-args = [