Skip to content

Commit 26717f6

Browse files
committed
error: enable core::error::Error for all error payloads
1 parent cf005f5 commit 26717f6

File tree

2 files changed

+7
-4
lines changed

2 files changed

+7
-4
lines changed

CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,9 @@
2121
`HandleBuffer::handles` and `ProtocolsPerHandle::protocols` methods have been
2222
deprecated.
2323
- Removed `'boot` lifetime from the `Output` protocol.
24+
- The generic type `Data` of `uefi::Error<Data: Debug>` doesn't need to be
25+
`Display` to be compatible with `core::error::Error`. Note that the error
26+
Trait requires the `unstable` feature.
2427

2528
## uefi-macros - [Unreleased]
2629

uefi/src/result/error.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
use super::Status;
22
use core::fmt::{Debug, Display};
33

4-
/// Errors emitted from UEFI entry point must propagate erronerous UEFI statuses,
4+
/// Errors emitted from UEFI entry point must propagate erroneous UEFI statuses,
55
/// and may optionally propagate additional entry point-specific data.
66
#[derive(Debug, PartialEq, Eq)]
77
pub struct Error<Data: Debug = ()> {
@@ -40,11 +40,11 @@ impl From<Status> for Error<()> {
4040
}
4141
}
4242

43-
impl<Data: Debug + Display> Display for Error<Data> {
43+
impl<Data: Debug> Display for Error<Data> {
4444
fn fmt(&self, f: &mut core::fmt::Formatter<'_>) -> core::fmt::Result {
45-
write!(f, "UEFI Error {}: {}", self.status(), self.data())
45+
write!(f, "UEFI Error {}: {:?}", self.status(), self.data())
4646
}
4747
}
4848

4949
#[cfg(feature = "unstable")]
50-
impl<Data: Debug + Display> core::error::Error for Error<Data> {}
50+
impl<Data: Debug> core::error::Error for Error<Data> {}

0 commit comments

Comments
 (0)