diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0d7d9e14..2fa9fa9c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -71,13 +71,7 @@ jobs: with: lfs: true - name: Install stable Rust toolchain - if: matrix.target != 'x86_64-uefi' uses: dtolnay/rust-toolchain@stable - - name: Use nightly Rust toolchain (UEFI) - if: matrix.target == 'x86_64-uefi' - uses: dtolnay/rust-toolchain@master - with: - toolchain: nightly-2023-02-01 - name: Build run: cargo xtask build --target ${{ matrix.target }} env: diff --git a/Cargo.lock b/Cargo.lock index dfd0e9b0..79bf0846 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -223,9 +223,9 @@ dependencies = [ [[package]] name = "uefi" -version = "0.19.1" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f5607fef843201070ed442fa257c7a944fae963fac7d4620612123192eb4d844" +checksum = "ab39d5e7740f21ed4c46d6659f31038bbe3fe7a8be1f702d8a984348837c43b1" dependencies = [ "bitflags", "log", @@ -236,9 +236,9 @@ dependencies = [ [[package]] name = "uefi-macros" -version = "0.10.0" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8099684193f2d99f7f130951f4054a1591ff7da370e2b33d7a71f0434920499" +checksum = "e0caeb0e7b31b9f1f347e541106be10aa8c66c76fa722a3298a4cd21433fabd4" dependencies = [ "proc-macro2", "quote", @@ -247,9 +247,9 @@ dependencies = [ [[package]] name = "uefi-services" -version = "0.16.0" +version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f75daa44f951cc1d9dc68d98cabc06ddbccc221d7bd21222271be5d7ac526a9d" +checksum = "42d8ffbcc532083312224b4540737c1102ede6a81360fa9320a60deff329a3a1" dependencies = [ "cfg-if", "log", diff --git a/Cargo.toml b/Cargo.toml index a87b8018..e45e1855 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -21,8 +21,8 @@ x86_64 = { version = "0.14", default-features = false } align-data = "0.1" [target.'cfg(target_os = "uefi")'.dependencies] -uefi = { version = "0.19" } -uefi-services = "0.16" +uefi = { version = "0.20" } +uefi-services = "0.17" [build-dependencies] cc = "1.0" diff --git a/src/main.rs b/src/main.rs index 3ac0d87b..b98159ad 100644 --- a/src/main.rs +++ b/src/main.rs @@ -2,7 +2,6 @@ #![no_main] #![warn(rust_2018_idioms)] #![allow(clippy::missing_safety_doc)] -#![cfg_attr(target_os = "uefi", feature(abi_efiapi))] #[macro_use] mod macros;