Fix new warnings in clippy unstable (redundant imports)

rusticata · Apr 9, 2024 · 9690362 · 9690362
1 parent 867ffb6
commit 9690362
Show file tree

Hide file tree

Showing 32 changed files with 63 additions and 45 deletions.
diff --git a/src/asn1_types/any.rs b/src/asn1_types/any.rs
@@ -1,6 +1,7 @@
 use crate::ber::*;
 use crate::*;
 use alloc::borrow::Cow;
+#[cfg(not(feature = "std"))]
 use alloc::string::String;
 use core::convert::{TryFrom, TryInto};
 
@@ -103,10 +104,10 @@ impl<'a> Any<'a> {
         let (rem, any) = Any::from_ber(bytes).map_err(Err::convert)?;
         any.tag()
             .assert_eq(Tag(tag))
-            .map_err(|e| nom::Err::Error(e.into()))?;
+            .map_err(|e| Err::Error(e.into()))?;
         any.class()
             .assert_eq(class)
-            .map_err(|e| nom::Err::Error(e.into()))?;
+            .map_err(|e| Err::Error(e.into()))?;
         let (_, res) = op(any.data)?;
         Ok((rem, res))
     }
@@ -127,10 +128,10 @@ impl<'a> Any<'a> {
         let (rem, any) = Any::from_der(bytes).map_err(Err::convert)?;
         any.tag()
             .assert_eq(Tag(tag))
-            .map_err(|e| nom::Err::Error(e.into()))?;
+            .map_err(|e| Err::Error(e.into()))?;
         any.class()
             .assert_eq(class)
-            .map_err(|e| nom::Err::Error(e.into()))?;
+            .map_err(|e| Err::Error(e.into()))?;
         let (_, res) = op(any.data)?;
         Ok((rem, res))
     }

diff --git a/src/asn1_types/generalizedtime.rs b/src/asn1_types/generalizedtime.rs
@@ -1,6 +1,6 @@
-use crate::datetime::decode_decimal;
 use crate::*;
 use alloc::format;
+#[cfg(not(feature = "std"))]
 use alloc::string::String;
 use core::convert::TryFrom;
 use core::fmt;

diff --git a/src/asn1_types/object_descriptor.rs b/src/asn1_types/object_descriptor.rs
@@ -1,5 +1,6 @@
 use crate::{asn1_string, TestValidCharset};
 use crate::{Error, Result};
+#[cfg(not(feature = "std"))]
 use alloc::string::String;
 
 // X.680 section 44.3

diff --git a/src/asn1_types/oid.rs b/src/asn1_types/oid.rs
@@ -2,14 +2,13 @@ use crate::*;
 use alloc::borrow::Cow;
 #[cfg(not(feature = "std"))]
 use alloc::format;
+#[cfg(not(feature = "std"))]
 use alloc::string::{String, ToString};
+#[cfg(not(feature = "std"))]
 use alloc::vec::Vec;
 use core::{
     convert::TryFrom, fmt, iter::FusedIterator, marker::PhantomData, ops::Shl, str::FromStr,
 };
-
-#[cfg(feature = "bigint")]
-use num_bigint::BigUint;
 use num_traits::Num;
 
 /// An error for OID parsing functions.

diff --git a/src/asn1_types/real.rs b/src/asn1_types/real.rs
@@ -1,7 +1,6 @@
 use crate::*;
 use alloc::format;
 use core::convert::TryFrom;
-use nom::Needed;
 
 mod f32;
 mod f64;

diff --git a/src/asn1_types/sequence.rs b/src/asn1_types/sequence.rs
@@ -1,5 +1,6 @@
 use crate::*;
 use alloc::borrow::Cow;
+#[cfg(not(feature = "std"))]
 use alloc::vec::Vec;
 use core::convert::TryFrom;
 
@@ -179,7 +180,7 @@ impl<'a> Sequence<'a> {
     {
         match self.content {
             Cow::Borrowed(b) => f(b),
-            _ => Err(nom::Err::Error(Error::LifetimeError.into())),
+            _ => Err(Err::Error(Error::LifetimeError.into())),
         }
     }
 

diff --git a/src/asn1_types/sequence/sequence_of.rs b/src/asn1_types/sequence/sequence_of.rs
@@ -1,4 +1,5 @@
 use crate::*;
+#[cfg(not(feature = "std"))]
 use alloc::vec::Vec;
 use core::convert::TryFrom;
 use core::fmt::{Debug, Display};
@@ -142,10 +143,10 @@ where
                     .map_err(Err::convert)?;
                 any.header
                     .assert_tag(Self::TAG)
-                    .map_err(|e| nom::Err::Error(e.into()))?;
+                    .map_err(|e| Err::Error(e.into()))?;
                 let items = SequenceIterator::<T, DerParser, E>::new(any.data)
                     .collect::<Result<Vec<T>, E>>()
-                    .map_err(nom::Err::Error)?;
+                    .map_err(Err::Error)?;
                 Ok((rem, SequenceOf::new(items)))
             },
             bytes,

diff --git a/src/asn1_types/sequence/vec.rs b/src/asn1_types/sequence/vec.rs
@@ -1,4 +1,5 @@
 use crate::*;
+#[cfg(not(feature = "std"))]
 use alloc::vec::Vec;
 use core::convert::TryFrom;
 use core::fmt::Debug;
@@ -121,10 +122,10 @@ where
                     .map_err(Err::convert)?;
                 any.header
                     .assert_tag(Self::TAG)
-                    .map_err(|e| nom::Err::Error(e.into()))?;
+                    .map_err(|e| Err::Error(e.into()))?;
                 let v = SequenceIterator::<T, DerParser, E>::new(any.data)
                     .collect::<Result<Vec<T>, E>>()
-                    .map_err(nom::Err::Error)?;
+                    .map_err(Err::Error)?;
                 Ok((rem, v))
             },
             bytes,

diff --git a/src/asn1_types/set.rs b/src/asn1_types/set.rs
@@ -1,5 +1,6 @@
 use crate::*;
 use alloc::borrow::Cow;
+#[cfg(not(feature = "std"))]
 use alloc::vec::Vec;
 use core::convert::TryFrom;
 
@@ -180,7 +181,7 @@ impl<'a> Set<'a> {
     {
         match self.content {
             Cow::Borrowed(b) => f(b),
-            _ => Err(nom::Err::Error(Error::LifetimeError.into())),
+            _ => Err(Err::Error(Error::LifetimeError.into())),
         }
     }
 

diff --git a/src/asn1_types/set/btreeset.rs b/src/asn1_types/set/btreeset.rs
@@ -62,13 +62,13 @@ where
                     .map_err(Err::convert)?;
                 any.tag()
                     .assert_eq(Self::TAG)
-                    .map_err(|e| nom::Err::Error(e.into()))?;
+                    .map_err(|e| Err::Error(e.into()))?;
                 any.header
                     .assert_constructed()
-                    .map_err(|e| nom::Err::Error(e.into()))?;
+                    .map_err(|e| Err::Error(e.into()))?;
                 let items = SetIterator::<T, DerParser, E>::new(any.data)
                     .collect::<Result<BTreeSet<T>, E>>()
-                    .map_err(nom::Err::Error)?;
+                    .map_err(Err::Error)?;
                 Ok((rem, items))
             },
             bytes,

diff --git a/src/asn1_types/set/hashset.rs b/src/asn1_types/set/hashset.rs
@@ -57,13 +57,13 @@ where
                     .map_err(Err::convert)?;
                 any.tag()
                     .assert_eq(Self::TAG)
-                    .map_err(|e| nom::Err::Error(e.into()))?;
+                    .map_err(|e| Err::Error(e.into()))?;
                 any.header
                     .assert_constructed()
-                    .map_err(|e| nom::Err::Error(e.into()))?;
+                    .map_err(|e| Err::Error(e.into()))?;
                 let items = SetIterator::<T, DerParser, E>::new(any.data)
                     .collect::<Result<HashSet<T>, E>>()
-                    .map_err(nom::Err::Error)?;
+                    .map_err(Err::Error)?;
                 Ok((rem, items))
             },
             bytes,

diff --git a/src/asn1_types/set/set_of.rs b/src/asn1_types/set/set_of.rs
@@ -1,4 +1,5 @@
 use crate::*;
+#[cfg(not(feature = "std"))]
 use alloc::vec::Vec;
 use core::convert::TryFrom;
 use core::fmt::{Debug, Display};
@@ -142,10 +143,10 @@ where
                     .map_err(Err::convert)?;
                 any.header
                     .assert_tag(Self::TAG)
-                    .map_err(|e| nom::Err::Error(e.into()))?;
+                    .map_err(|e| Err::Error(e.into()))?;
                 let items = SetIterator::<T, DerParser, E>::new(any.data)
                     .collect::<Result<Vec<T>, E>>()
-                    .map_err(nom::Err::Error)?;
+                    .map_err(Err::Error)?;
                 Ok((rem, SetOf::new(items)))
             },
             bytes,

diff --git a/src/asn1_types/strings/bmpstring.rs b/src/asn1_types/strings/bmpstring.rs
@@ -3,7 +3,9 @@
 
 use crate::*;
 use alloc::borrow::Cow;
+#[cfg(not(feature = "std"))]
 use alloc::string::{String, ToString};
+#[cfg(not(feature = "std"))]
 use alloc::vec::Vec;
 
 /// ASN.1 `BMPSTRING` type
@@ -42,7 +44,7 @@ impl<'a> From<&'a str> for BmpString<'a> {
 impl From<String> for BmpString<'_> {
     fn from(s: String) -> Self {
         Self {
-            data: alloc::borrow::Cow::Owned(s),
+            data: Cow::Owned(s),
         }
     }
 }

diff --git a/src/asn1_types/strings/generalstring.rs b/src/asn1_types/strings/generalstring.rs
@@ -1,5 +1,6 @@
 use crate::{asn1_string, TestValidCharset};
 use crate::{Error, Result};
+#[cfg(not(feature = "std"))]
 use alloc::string::String;
 
 asn1_string!(GeneralString);

diff --git a/src/asn1_types/strings/graphicstring.rs b/src/asn1_types/strings/graphicstring.rs
@@ -1,5 +1,6 @@
 use crate::{asn1_string, TestValidCharset};
 use crate::{Error, Result};
+#[cfg(not(feature = "std"))]
 use alloc::string::String;
 
 asn1_string!(GraphicString);

diff --git a/src/asn1_types/strings/ia5string.rs b/src/asn1_types/strings/ia5string.rs
@@ -1,5 +1,6 @@
 use crate::{asn1_string, TestValidCharset};
 use crate::{Error, Result};
+#[cfg(not(feature = "std"))]
 use alloc::string::String;
 
 asn1_string!(Ia5String);

diff --git a/src/asn1_types/strings/numericstring.rs b/src/asn1_types/strings/numericstring.rs
@@ -1,5 +1,6 @@
 use crate::{asn1_string, TestValidCharset};
 use crate::{Error, Result};
+#[cfg(not(feature = "std"))]
 use alloc::string::String;
 
 asn1_string!(NumericString);

diff --git a/src/asn1_types/strings/printablestring.rs b/src/asn1_types/strings/printablestring.rs
@@ -1,5 +1,6 @@
 use crate::{asn1_string, TestValidCharset};
 use crate::{Error, Result};
+#[cfg(not(feature = "std"))]
 use alloc::string::String;
 
 asn1_string!(PrintableString);

diff --git a/src/asn1_types/strings/string.rs b/src/asn1_types/strings/string.rs
@@ -1,4 +1,5 @@
 use crate::*;
+#[cfg(not(feature = "std"))]
 use alloc::string::String;
 use core::convert::TryFrom;
 

diff --git a/src/asn1_types/strings/teletexstring.rs b/src/asn1_types/strings/teletexstring.rs
@@ -1,5 +1,6 @@
 use crate::{asn1_string, TestValidCharset};
 use crate::{Error, Result};
+#[cfg(not(feature = "std"))]
 use alloc::string::String;
 
 asn1_string!(TeletexString);

diff --git a/src/asn1_types/strings/universalstring.rs b/src/asn1_types/strings/universalstring.rs
@@ -3,7 +3,9 @@
 
 use crate::*;
 use alloc::borrow::Cow;
+#[cfg(not(feature = "std"))]
 use alloc::string::{String, ToString};
+#[cfg(not(feature = "std"))]
 use alloc::vec::Vec;
 use core::convert::TryFrom;
 use core::iter::FromIterator;
@@ -43,7 +45,7 @@ impl<'a> From<&'a str> for UniversalString<'a> {
 impl From<String> for UniversalString<'_> {
     fn from(s: String) -> Self {
         Self {
-            data: alloc::borrow::Cow::Owned(s),
+            data: Cow::Owned(s),
         }
     }
 }

diff --git a/src/asn1_types/strings/utf8string.rs b/src/asn1_types/strings/utf8string.rs
@@ -1,6 +1,7 @@
 use crate::asn1_string;
 use crate::Result;
 use crate::TestValidCharset;
+#[cfg(not(feature = "std"))]
 use alloc::string::String;
 
 asn1_string!(Utf8String);

diff --git a/src/asn1_types/strings/videotexstring.rs b/src/asn1_types/strings/videotexstring.rs
@@ -1,5 +1,6 @@
 use crate::{asn1_string, TestValidCharset};
 use crate::{Error, Result};
+#[cfg(not(feature = "std"))]
 use alloc::string::String;
 
 asn1_string!(VideotexString);

diff --git a/src/asn1_types/strings/visiblestring.rs b/src/asn1_types/strings/visiblestring.rs
@@ -1,5 +1,6 @@
 use crate::{asn1_string, TestValidCharset};
 use crate::{Error, Result};
+#[cfg(not(feature = "std"))]
 use alloc::string::String;
 
 asn1_string!(VisibleString);

diff --git a/src/asn1_types/tagged/helpers.rs b/src/asn1_types/tagged/helpers.rs
@@ -34,7 +34,7 @@ where
     parse_der_container(tag, move |any: Any<'a>| {
         any.header
             .assert_tag(tag)
-            .map_err(|e| nom::Err::convert(e.into()))?;
+            .map_err(|e| Err::convert(e.into()))?;
         f(any.data, any.header)
     })
 }
@@ -51,9 +51,7 @@ where
     let tag = tag.into();
     move |i| {
         let (rem, tagged) = TaggedParser::from_der(i)?;
-        tagged
-            .assert_tag(tag)
-            .map_err(|e| nom::Err::convert(e.into()))?;
+        tagged.assert_tag(tag).map_err(|e| Err::convert(e.into()))?;
         Ok((rem, tagged))
     }
 }
@@ -73,7 +71,7 @@ where
         // verify tag of external header
         any.header
             .assert_tag(tag)
-            .map_err(|e| nom::Err::convert(e.into()))?;
+            .map_err(|e| Err::convert(e.into()))?;
         // build a fake header with the expected tag
         let Any { header, data } = any;
         let header = Header {
@@ -93,10 +91,10 @@ where
     E: ParseError<&'a [u8]> + From<Error>,
 {
     move |i: &[u8]| {
-        let (rem, any) = Any::from_der(i).map_err(nom::Err::convert)?;
+        let (rem, any) = Any::from_der(i).map_err(Err::convert)?;
         any.header
             .assert_tag(tag)
-            .map_err(|e| nom::Err::convert(e.into()))?;
+            .map_err(|e| Err::convert(e.into()))?;
         let (_, output) = f(any)?;
         Ok((rem, output))
     }

diff --git a/src/asn1_types/tagged/implicit.rs b/src/asn1_types/tagged/implicit.rs
@@ -74,7 +74,7 @@ where
         };
         match T::try_from(any) {
             Ok(inner) => Ok((rem, TaggedValue::implicit(inner))),
-            Err(e) => Err(nom::Err::Error(e)),
+            Err(e) => Err(Err::Error(e)),
         }
     }
 }
@@ -182,7 +182,7 @@ where
                 };
                 Ok((rem, tagged_value))
             }
-            Err(e) => Err(nom::Err::Error(e)),
+            Err(e) => Err(Err::Error(e)),
         }
     }
 }
@@ -217,7 +217,7 @@ where
             },
             data,
         };
-        T::check_constraints(&any).map_err(|e| nom::Err::Error(e.into()))?;
+        T::check_constraints(&any).map_err(|e| Err::Error(e.into()))?;
         match T::try_from(any) {
             Ok(t) => {
                 let tagged_value = TaggedParser {
@@ -228,7 +228,7 @@ where
                 };
                 Ok((rem, tagged_value))
             }
-            Err(e) => Err(nom::Err::Error(e)),
+            Err(e) => Err(Err::Error(e)),
         }
     }
 }

diff --git a/src/asn1_types/tagged/optional.rs b/src/asn1_types/tagged/optional.rs
@@ -1,4 +1,3 @@
-use super::{explicit::TaggedExplicit, implicit::TaggedImplicit};
 use crate::*;
 
 /// Helper object to parse TAGGED OPTIONAL types (explicit or implicit)

diff --git a/src/asn1_types/utctime.rs b/src/asn1_types/utctime.rs
@@ -1,4 +1,3 @@
-use crate::datetime::decode_decimal;
 use crate::*;
 use core::convert::TryFrom;
 use core::fmt;

diff --git a/src/datetime.rs b/src/datetime.rs
@@ -1,5 +1,6 @@
 use crate::{Result, Tag};
 use alloc::format;
+#[cfg(not(feature = "std"))]
 use alloc::string::ToString;
 use core::fmt;
 #[cfg(feature = "datetime")]