remove unstable feature

phip1611 · phip1611 · commit 30cb26754b86 · 2025-06-01T09:43:31.000+02:00
diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
@@ -42,7 +42,7 @@ jobs:
     with:
       rust-version: nightly
       do-style-check: false
-      features: builder,unstable
+      features: builder
 
   ### no-std Build   #########################
   build_nostd_msrv:
@@ -99,7 +99,7 @@ jobs:
       rust-version: nightly
       do-style-check: false
       rust-target: thumbv7em-none-eabihf
-      features: builder,unstable
+      features: builder
 
   ### Style Checks + Doc #####################
   style_msrv:
@@ -130,7 +130,7 @@ jobs:
       rust-version: nightly
       do-style-check: true
       do-test: false
-      features: builder,unstable
+      features: builder
 
   miri:
     name: tests with miri (nightly)
@@ -141,4 +141,4 @@ jobs:
       do-style-check: false
       do-test: false
       do-miri: true
-      features: builder,unstable
+      features: builder
diff --git a/integration-test/bins/Cargo.toml b/integration-test/bins/Cargo.toml
@@ -14,8 +14,8 @@ lto = true
 [workspace.dependencies]
 anyhow = { version = "1.0", default-features = false }
 log = { version = "0.4", default-features = false }
-multiboot2 = { path = "../../multiboot2", features = ["builder", "unstable"] }
-multiboot2-header = { path = "../../multiboot2-header", features = ["builder", "unstable"] }
+multiboot2 = { path = "../../multiboot2", features = ["builder"] }
+multiboot2-header = { path = "../../multiboot2-header", features = ["builder"] }
 good_memory_allocator = "0.1"
 util = { path = "./util" }
 
diff --git a/multiboot2-common/CHANGELOG.md b/multiboot2-common/CHANGELOG.md
@@ -2,6 +2,9 @@
 
 ## Unreleased
 
+- **Breaking:** Removed the optional `unstable` feature (required nightly)
+    - `core::error::Error` is now implemented unconditionally
+
 ## v0.2.1 (2024-09-19)
 
 - Documentation improvements
diff --git a/multiboot2-common/Cargo.toml b/multiboot2-common/Cargo.toml
@@ -26,7 +26,6 @@ rust-version = "1.75"
 default = ["builder"]
 alloc = []
 builder = ["alloc"]
-unstable = []
 
 
 [dependencies]
diff --git a/multiboot2-common/src/lib.rs b/multiboot2-common/src/lib.rs
@@ -220,7 +220,6 @@
 //! [`Layout`]: core::alloc::Layout
 
 #![no_std]
-#![cfg_attr(feature = "unstable", feature(error_in_core))]
 // --- BEGIN STYLE CHECKS ---
 #![deny(
     clippy::all,
@@ -442,7 +441,6 @@ pub enum MemoryError {
     InvalidReportedTotalSize,
 }
 
-#[cfg(feature = "unstable")]
 impl core::error::Error for MemoryError {}
 
 /// Increases the given size to the next alignment boundary, if it is not a
diff --git a/multiboot2-header/CHANGELOG.md b/multiboot2-header/CHANGELOG.md
@@ -2,6 +2,9 @@
 
 ## Unreleased
 
+- **Breaking:** Removed the optional `unstable` feature (required nightly)
+    - `core::error::Error` is now implemented unconditionally
+
 ## v0.6.0 (2024-09-17)
 
 - dependency updates
diff --git a/multiboot2-header/Cargo.toml b/multiboot2-header/Cargo.toml
@@ -39,8 +39,6 @@ required-features = ["builder"]
 default = ["builder"]
 alloc = ["multiboot2-common/alloc"]
 builder = ["alloc", "multiboot2-common/builder"]
-# Nightly-only features, which will eventually be stabilized.
-unstable = ["multiboot2-common/unstable"]
 
 [dependencies]
 derive_more.workspace = true
diff --git a/multiboot2-header/src/header.rs b/multiboot2-header/src/header.rs
@@ -4,7 +4,6 @@ use crate::{
     HeaderTagType, InformationRequestHeaderTag, ModuleAlignHeaderTag, RelocatableHeaderTag,
     TagIter,
 };
-#[cfg(feature = "unstable")]
 use core::error::Error;
 use core::fmt::{Debug, Formatter};
 use core::mem::size_of;
@@ -237,7 +236,6 @@ pub enum LoadError {
     Memory(MemoryError),
 }
 
-#[cfg(feature = "unstable")]
 impl Error for LoadError {
     fn source(&self) -> Option<&(dyn Error + 'static)> {
         match self {
diff --git a/multiboot2-header/src/lib.rs b/multiboot2-header/src/lib.rs
@@ -26,7 +26,6 @@
 //! The MSRV is 1.75.0 stable.
 
 #![no_std]
-#![cfg_attr(feature = "unstable", feature(error_in_core))]
 // --- BEGIN STYLE CHECKS ---
 #![deny(
     clippy::all,
diff --git a/multiboot2/CHANGELOG.md b/multiboot2/CHANGELOG.md
@@ -2,6 +2,9 @@
 
 ## Unreleased
 
+- **Breaking:** Removed the optional `unstable` feature (required nightly)
+    - `core::error::Error` is now implemented unconditionally
+
 ## v0.23.1 (2024-10-21)
 
 - Fix wrong tag ID when using `BootdevTag::new`
diff --git a/multiboot2/Cargo.toml b/multiboot2/Cargo.toml
@@ -38,8 +38,6 @@ rust-version = "1.75"
 default = ["builder"]
 alloc = ["multiboot2-common/alloc"]
 builder = ["alloc", "multiboot2-common/builder"]
-# Nightly-only features, which will eventually be stabilized.
-unstable = ["multiboot2-common/unstable"]
 
 [dependencies]
 bitflags.workspace = true
diff --git a/multiboot2/src/boot_information.rs b/multiboot2/src/boot_information.rs
@@ -9,7 +9,6 @@ use crate::{
     ImageLoadPhysAddrTag, MemoryMapTag, ModuleIter, NetworkTag, RsdpV1Tag, RsdpV2Tag, SmbiosTag,
     TagIter, TagType, VBEInfoTag,
 };
-#[cfg(feature = "unstable")]
 use core::error::Error;
 use core::fmt;
 use core::mem;
@@ -28,7 +27,6 @@ pub enum LoadError {
     NoEndTag,
 }
 
-#[cfg(feature = "unstable")]
 impl Error for LoadError {
     fn source(&self) -> Option<&(dyn Error + 'static)> {
         match self {
diff --git a/multiboot2/src/framebuffer.rs b/multiboot2/src/framebuffer.rs
@@ -406,7 +406,6 @@ pub struct FramebufferColor {
 #[display("Unknown framebuffer type {}", _0)]
 pub struct UnknownFramebufferType(u8);
 
-#[cfg(feature = "unstable")]
 impl core::error::Error for UnknownFramebufferType {}
 
 #[cfg(test)]
diff --git a/multiboot2/src/lib.rs b/multiboot2/src/lib.rs
@@ -1,5 +1,4 @@
 #![no_std]
-#![cfg_attr(feature = "unstable", feature(error_in_core))]
 // --- BEGIN STYLE CHECKS ---
 #![deny(
     clippy::all,
@@ -1102,7 +1101,6 @@ mod tests {
     }
 
     #[test]
-    #[cfg(feature = "unstable")]
     /// This test succeeds if it compiles.
     fn mbi_load_error_implements_error() {
         fn consumer<E: core::error::Error>(_e: E) {}
diff --git a/multiboot2/src/util.rs b/multiboot2/src/util.rs
@@ -20,7 +20,6 @@ impl Display for StringError {
     }
 }
 
-#[cfg(feature = "unstable")]
 impl core::error::Error for StringError {
     fn source(&self) -> Option<&(dyn core::error::Error + 'static)> {
         match self {
