Merge pull request #22 from rust-osdev/develop

RKennedy9064 · web-flow · commit e110b5d4fc12 · 2021-02-14T21:38:51.000-06:00
Update config/testing
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,4 @@
 /target
 /testing/target
+/testing/binaries
 Cargo.lock
diff --git 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."
diff --git 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.
diff --git 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 = [
