Alloc + no_std: part 1

src/base/charstr.rs

@@ -1112,8 +1112,7 @@ impl fmt::Display for CharStrError {
     }
 }
 
-#[cfg(feature = "std")]
-impl std::error::Error for CharStrError {}
+impl core::error::Error for CharStrError {}
 
 //------------ FromStrError --------------------------------------------------
 
@@ -1152,8 +1151,7 @@ impl fmt::Display for FromStrError {
     }
 }
 
-#[cfg(feature = "std")]
-impl std::error::Error for FromStrError {}
+impl core::error::Error for FromStrError {}
 
 //------------ PresentationError ---------------------------------------------
 
@@ -1208,8 +1206,7 @@ impl fmt::Display for PresentationError {
     }
 }
 
-#[cfg(feature = "std")]
-impl std::error::Error for PresentationError {}
+impl core::error::Error for PresentationError {}
 
 //============ Testing =======================================================
 

src/base/header.rs

@@ -938,8 +938,7 @@ impl fmt::Display for FlagsFromStrError {
     }
 }
 
-#[cfg(feature = "std")]
-impl std::error::Error for FlagsFromStrError {}
+impl core::error::Error for FlagsFromStrError {}
 
 //------------ CountOverflow -------------------------------------------------
 
@@ -953,8 +952,7 @@ impl fmt::Display for CountOverflow {
     }
 }
 
-#[cfg(feature = "std")]
-impl std::error::Error for CountOverflow {}
+impl core::error::Error for CountOverflow {}
 
 //============ Testing ======================================================
 

src/base/iana/macros.rs

@@ -520,8 +520,7 @@ macro_rules! from_str_error {
         #[derive(Clone, Debug)]
         pub struct FromStrError(());
 
-        #[cfg(feature = "std")]
-        impl std::error::Error for FromStrError {
+        impl core::error::Error for FromStrError {
             fn description(&self) -> &str {
                 $description
             }

src/base/iana/rcode.rs

@@ -911,8 +911,7 @@ impl fmt::Display for InvalidRcode {
     }
 }
 
-#[cfg(feature = "std")]
-impl std::error::Error for InvalidRcode {}
+impl core::error::Error for InvalidRcode {}
 
 //============ Tests =========================================================
 

src/base/message.rs

@@ -1306,8 +1306,7 @@ impl fmt::Display for ShortMessage {
     }
 }
 
-#[cfg(feature = "std")]
-impl std::error::Error for ShortMessage {}
+impl core::error::Error for ShortMessage {}
 
 //------------ CopyRecordsError ----------------------------------------------
 
@@ -1346,8 +1345,7 @@ impl fmt::Display for CopyRecordsError {
     }
 }
 
-#[cfg(feature = "std")]
-impl std::error::Error for CopyRecordsError {}
+impl core::error::Error for CopyRecordsError {}
 
 //============ Testing =======================================================
 

src/base/message_builder.rs

@@ -2693,8 +2693,7 @@ impl fmt::Display for PushError {
     }
 }
 
-#[cfg(feature = "std")]
-impl std::error::Error for PushError {}
+impl core::error::Error for PushError {}
 
 //============ Testing =======================================================
 

src/base/name/absolute.rs

@@ -1217,8 +1217,7 @@ impl fmt::Display for NameError {
     }
 }
 
-#[cfg(feature = "std")]
-impl std::error::Error for NameError {}
+impl core::error::Error for NameError {}
 
 //============ Testing =======================================================
 //

src/base/name/builder.rs

@@ -562,8 +562,7 @@ impl fmt::Display for PushError {
     }
 }
 
-#[cfg(feature = "std")]
-impl std::error::Error for PushError {}
+impl core::error::Error for PushError {}
 
 //------------ PushNameError -------------------------------------------------
 
@@ -596,8 +595,7 @@ impl fmt::Display for PushNameError {
     }
 }
 
-#[cfg(feature = "std")]
-impl std::error::Error for PushNameError {}
+impl core::error::Error for PushNameError {}
 
 //------------ LabelFromStrError ---------------------------------------------
 
@@ -655,8 +653,7 @@ impl fmt::Display for LabelFromStrError {
     }
 }
 
-#[cfg(feature = "std")]
-impl std::error::Error for LabelFromStrError {}
+impl core::error::Error for LabelFromStrError {}
 
 //------------ FromStrError --------------------------------------------------
 
@@ -713,8 +710,7 @@ impl fmt::Display for FromStrError {
     }
 }
 
-#[cfg(feature = "std")]
-impl std::error::Error for FromStrError {}
+impl core::error::Error for FromStrError {}
 
 //------------ PresentationError ---------------------------------------------
 
@@ -761,8 +757,7 @@ impl fmt::Display for PresentationError {
     }
 }
 
-#[cfg(feature = "std")]
-impl std::error::Error for PresentationError {}
+impl core::error::Error for PresentationError {}
 
 //============ Testing =======================================================
 

src/base/name/chain.rs

@@ -373,8 +373,7 @@ impl fmt::Display for LongChainError {
     }
 }
 
-#[cfg(feature = "std")]
-impl std::error::Error for LongChainError {}
+impl core::error::Error for LongChainError {}
 
 //============ Testing =======================================================
 

src/base/name/label.rs

@@ -808,8 +808,7 @@ impl fmt::Display for LabelTypeError {
     }
 }
 
-#[cfg(feature = "std")]
-impl std::error::Error for LabelTypeError {}
+impl core::error::Error for LabelTypeError {}
 
 //------------ LongLabelError ------------------------------------------------
 
@@ -825,8 +824,7 @@ impl fmt::Display for LongLabelError {
     }
 }
 
-#[cfg(feature = "std")]
-impl std::error::Error for LongLabelError {}
+impl core::error::Error for LongLabelError {}
 
 //------------ SplitLabelError -----------------------------------------------
 
@@ -879,8 +877,7 @@ impl fmt::Display for SplitLabelError {
     }
 }
 
-#[cfg(feature = "std")]
-impl std::error::Error for SplitLabelError {}
+impl core::error::Error for SplitLabelError {}
 
 //============ Testing =======================================================
 

src/base/name/parsed.rs

@@ -707,8 +707,7 @@ impl fmt::Display for ParsedDnameError {
     }
 }
 
-#[cfg(feature = "std")]
-impl std::error::Error for ParsedDnameError {}
+impl core::error::Error for ParsedDnameError {}
 
 impl From<LabelTypeError> for ParsedDnameError {
     fn from(err: LabelTypeError) -> Self {

src/base/name/relative.rs

@@ -1043,8 +1043,7 @@ impl fmt::Display for RelativeNameError {
     }
 }
 
-#[cfg(feature = "std")]
-impl std::error::Error for RelativeNameError {}
+impl core::error::Error for RelativeNameError {}
 
 //------------ RelativeFromStrError ------------------------------------------
 
@@ -1079,8 +1078,7 @@ impl fmt::Display for RelativeFromStrError {
     }
 }
 
-#[cfg(feature = "std")]
-impl std::error::Error for RelativeFromStrError {}
+impl core::error::Error for RelativeFromStrError {}
 
 //------------ StripSuffixError ----------------------------------------------
 
@@ -1096,8 +1094,7 @@ impl fmt::Display for StripSuffixError {
     }
 }
 
-#[cfg(feature = "std")]
-impl std::error::Error for StripSuffixError {}
+impl core::error::Error for StripSuffixError {}
 
 //============ Testing =======================================================
 

src/base/name/uncertain.rs

@@ -637,8 +637,7 @@ impl fmt::Display for UncertainDnameError {
     }
 }
 
-#[cfg(feature = "std")]
-impl std::error::Error for UncertainDnameError {}
+impl core::error::Error for UncertainDnameError {}
 
 //============ Testing =======================================================
 

src/base/opt/keepalive.rs

@@ -227,8 +227,7 @@ impl fmt::Display for FromDurationError {
     }
 }
 
-#[cfg(feature = "std")]
-impl std::error::Error for FromDurationError {}
+impl core::error::Error for FromDurationError {}
 
 //============ Testing =======================================================
 

src/base/opt/mod.rs

@@ -1103,8 +1103,7 @@ impl fmt::Display for LongOptData {
     }
 }
 
-#[cfg(feature = "std")]
-impl std::error::Error for LongOptData {}
+impl core::error::Error for LongOptData {}
 
 //------------ BuildDataError ------------------------------------------------
 
@@ -1155,8 +1154,7 @@ impl fmt::Display for BuildDataError {
     }
 }
 
-#[cfg(feature = "std")]
-impl std::error::Error for BuildDataError {}
+impl core::error::Error for BuildDataError {}
 
 //============ Tests =========================================================
 

src/base/question.rs

@@ -408,8 +408,7 @@ impl fmt::Display for FromStrError {
     }
 }
 
-#[cfg(feature = "std")]
-impl std::error::Error for FromStrError {}
+impl core::error::Error for FromStrError {}
 
 //------------ PresentationError ---------------------------------------------
 
@@ -466,5 +465,4 @@ impl fmt::Display for PresentationError {
     }
 }
 
-#[cfg(feature = "std")]
-impl std::error::Error for PresentationError {}
+impl core::error::Error for PresentationError {}

src/base/rdata.rs

@@ -535,8 +535,7 @@ impl fmt::Display for LongRecordData {
     }
 }
 
-#[cfg(feature = "std")]
-impl std::error::Error for LongRecordData {}
+impl core::error::Error for LongRecordData {}
 
 //============ Testing ======================================================
 

src/base/record.rs

@@ -1068,11 +1068,10 @@ where
     }
 }
 
-#[cfg(feature = "std")]
-impl<N, D> std::error::Error for RecordParseError<N, D>
+impl<N, D> core::error::Error for RecordParseError<N, D>
 where
-    N: std::error::Error,
-    D: std::error::Error,
+    N: core::error::Error,
+    D: core::error::Error,
 {
 }
 

src/base/scan.rs

@@ -25,6 +25,7 @@ use crate::base::charstr::{CharStr, CharStrBuilder};
 use crate::base::name::{Name, ToName};
 use crate::base::wire::{Compose, Composer};
 use core::convert::{TryFrom, TryInto};
+use core::error;
 use core::iter::Peekable;
 use core::marker::PhantomData;
 use core::{fmt, str};
@@ -33,8 +34,6 @@ use octseq::{
     EmptyBuilder, FreezeBuilder, FromBuilder, OctetsBuilder, ShortBuf,
     Truncate,
 };
-#[cfg(feature = "std")]
-use std::error;
 
 use super::Ttl;
 
@@ -286,12 +285,8 @@ macro_rules! declare_error_trait {
     }
 }
 
-#[cfg(feature = "std")]
 declare_error_trait!(ScannerError: Sized + error::Error);
 
-#[cfg(not(feature = "std"))]
-declare_error_trait!(ScannerError: Sized + fmt::Debug + fmt::Display);
-
 #[cfg(feature = "std")]
 impl ScannerError for std::io::Error {
     fn custom(msg: &'static str) -> Self {
@@ -1083,8 +1078,7 @@ impl fmt::Display for SymbolCharsError {
     }
 }
 
-#[cfg(feature = "std")]
-impl std::error::Error for SymbolCharsError {}
+impl core::error::Error for SymbolCharsError {}
 
 //------------ SymbolOctetsError ---------------------------------------------
 
@@ -1125,8 +1119,7 @@ impl fmt::Display for SymbolOctetsError {
     }
 }
 
-#[cfg(feature = "std")]
-impl std::error::Error for SymbolOctetsError {}
+impl core::error::Error for SymbolOctetsError {}
 
 //------------ BadSymbol -----------------------------------------------------
 
@@ -1174,8 +1167,7 @@ impl fmt::Display for BadSymbol {
     }
 }
 
-#[cfg(feature = "std")]
-impl std::error::Error for BadSymbol {}
+impl core::error::Error for BadSymbol {}
 
 #[cfg(feature = "std")]
 impl From<BadSymbol> for std::io::Error {
@@ -1220,8 +1212,7 @@ impl fmt::Display for StrError {
     }
 }
 
-#[cfg(feature = "std")]
-impl std::error::Error for StrError {}
+impl core::error::Error for StrError {}
 
 //============ Testing =======================================================