From e8fca7b8dd2e54de51cd08cc70ffe8cfb0e6216d Mon Sep 17 00:00:00 2001 From: Kenny Strawn Date: Thu, 27 Jan 2022 15:11:33 -0800 Subject: [PATCH 1/4] `maybe_uninit_extra` is no longer feature-gated in Rust 1.60 --- src/lib.rs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/lib.rs b/src/lib.rs index d30fb4cc..33274167 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -66,7 +66,9 @@ for all possible configuration options. */ #![cfg_attr(not(feature = "builder"), no_std)] -#![feature(maybe_uninit_extra)] +#![feature(cfg_version)] + +#![cfg_attr(not(version("1.60"), feature(maybe_uninit_extra))] #![feature(maybe_uninit_slice)] #![deny(unsafe_op_in_unsafe_fn)] #![warn(missing_docs)] From 5ce2f5c3c404bd91d05725fc27194b20407f0e60 Mon Sep 17 00:00:00 2001 From: Kenny Strawn Date: Thu, 27 Jan 2022 15:16:22 -0800 Subject: [PATCH 2/4] Fix delimiter errors --- src/lib.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib.rs b/src/lib.rs index 33274167..c4c383ba 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -68,7 +68,7 @@ for all possible configuration options. #![cfg_attr(not(feature = "builder"), no_std)] #![feature(cfg_version)] -#![cfg_attr(not(version("1.60"), feature(maybe_uninit_extra))] +#![cfg_attr(not(version("1.60")), feature(maybe_uninit_extra))] #![feature(maybe_uninit_slice)] #![deny(unsafe_op_in_unsafe_fn)] #![warn(missing_docs)] From 494dff9150bd2a7620c1ff8b523446e2a98da1d8 Mon Sep 17 00:00:00 2001 From: GitExample Date: Thu, 27 Jan 2022 15:18:54 -0800 Subject: [PATCH 3/4] Fix formatting --- src/lib.rs | 1 - 1 file changed, 1 deletion(-) diff --git a/src/lib.rs b/src/lib.rs index c4c383ba..84186777 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -67,7 +67,6 @@ for all possible configuration options. #![cfg_attr(not(feature = "builder"), no_std)] #![feature(cfg_version)] - #![cfg_attr(not(version("1.60")), feature(maybe_uninit_extra))] #![feature(maybe_uninit_slice)] #![deny(unsafe_op_in_unsafe_fn)] From c3e6cdf8fe3d77b686015aa44c6c1fdf23e75f12 Mon Sep 17 00:00:00 2001 From: Kenny Strawn Date: Thu, 27 Jan 2022 15:27:27 -0800 Subject: [PATCH 4/4] Found another place in the code where this warning is generated --- src/bin/uefi.rs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/bin/uefi.rs b/src/bin/uefi.rs index d81ebfd2..0dd50446 100644 --- a/src/bin/uefi.rs +++ b/src/bin/uefi.rs @@ -1,7 +1,8 @@ #![no_std] #![no_main] #![feature(abi_efiapi)] -#![feature(maybe_uninit_extra)] +#![feature(cfg_version)] +#![cfg_attr(not(version("1.60")), feature(maybe_uninit_extra))] #![deny(unsafe_op_in_unsafe_fn)] // Defines the constants `KERNEL_BYTES` (array of `u8`) and `KERNEL_SIZE` (`usize`).