fix std::error::Error impl

meithecatte · Aug 29, 2019 · 8499f0c · 8499f0c
1 parent 8861464
commit 8499f0c
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 4 deletions.
diff --git a/enumflags/src/fallible.rs b/enumflags/src/fallible.rs
@@ -1,4 +1,5 @@
 use core::convert::TryFrom;
+use core::fmt;
 use super::BitFlags;
 use super::_internal::RawBitFlags;
 
@@ -47,9 +48,15 @@ impl<T: RawBitFlags> FromBitsError<T> {
     }
 }
 
+impl<T: RawBitFlags + fmt::Debug> fmt::Display for FromBitsError<T> {
+    fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result {
+        write!(fmt, "Invalid bits for {:?}: {:#b}", self.flags, self.invalid)
+    }
+}
+
 #[cfg(feature = "std")]
-impl<T: RawBitFlags> std::error::Error for FromBitsError<T> {
+impl<T: RawBitFlags + fmt::Debug> std::error::Error for FromBitsError<T> {
     fn description(&self) -> &str {
-        "invalid bit representation"
+        "invalid bitflags representation"
     }
 }
diff --git a/enumflags/src/formatting.rs b/enumflags/src/formatting.rs
@@ -1,5 +1,5 @@
 use core::fmt::{self, Debug, Binary};
-use crate::{BitFlags, FromBitsError, _internal::RawBitFlags};
+use crate::{BitFlags, _internal::RawBitFlags};
 
 impl<T> fmt::Debug for BitFlags<T>
 where

diff --git a/enumflags/src/lib.rs b/enumflags/src/lib.rs
@@ -48,7 +48,7 @@
 #![warn(missing_docs)]
 #![cfg_attr(all(not(test), not(feature = "std")), no_std)]
 
-#[cfg(all(test, not(feature = "std")))]
+#[cfg(any(test, feature = "std"))]
 extern crate core;
 use core::{cmp, ops};
 use core::iter::FromIterator;