From 1f1bfa77f01c30c951fb78f7fcb5200c78c53b10 Mon Sep 17 00:00:00 2001 From: Philipp Oppermann Date: Fri, 30 Apr 2021 10:40:05 +0200 Subject: [PATCH 1/3] Update `x86_64` to v0.14.0 --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index 1ec0484..974dc91 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -9,7 +9,7 @@ edition = "2018" [dependencies] bitflags = "1.1.0" -x86_64 = { version = "0.13.2", default-features = false, features = ["instructions"] } +x86_64 = { version = "0.14.0", default-features = false, features = ["instructions"] } [features] default = [ "nightly" ] From 3f229491fa14f3c1df1fcf7165bc6f85b4a3925b Mon Sep 17 00:00:00 2001 From: Philipp Oppermann Date: Fri, 30 Apr 2021 10:41:03 +0200 Subject: [PATCH 2/3] Only enable the `x86_64/inline_asm` feature instead of the full `x86_64/nightly` feature To prevent breakage because of breakage in other features. --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index 974dc91..9c9f891 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -14,7 +14,7 @@ x86_64 = { version = "0.14.0", default-features = false, features = ["instructio [features] default = [ "nightly" ] stable = [ "x86_64/external_asm" ] -nightly = [ "x86_64/nightly" ] +nightly = [ "x86_64/inline_asm" ] [package.metadata.release] no-dev-version = true From 9ad466319d4bb5218dd3c2d5a0e949a93788bce7 Mon Sep 17 00:00:00 2001 From: Philipp Oppermann Date: Fri, 30 Apr 2021 10:44:55 +0200 Subject: [PATCH 3/3] Update changelog --- Changelog.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Changelog.md b/Changelog.md index 823175b..290c370 100644 --- a/Changelog.md +++ b/Changelog.md @@ -1,5 +1,7 @@ # Unreleased +- Update x86_64 dependency and make it more robust ([#14](https://github.com/rust-osdev/uart_16550/pull/14)) + # 0.2.12 – 2021-02-02 - Fix build on nightly by updating to x86_64 v0.13.2 ([#12](https://github.com/rust-osdev/uart_16550/pull/12))