der: add DerCow, change OwnedToRef trait

Author: dishmaker

der/src/asn1/bit_string.rs

@@ -445,8 +445,7 @@ mod allocating {
         type Borrowed = BitStringRef<'a>;
         fn owned_to_ref(&'a self) -> Self::Borrowed {
             // Ensured to parse successfully in constructor
-            BitStringRef::new(self.unused_bits, &self.inner)
-                .expect("invalid BIT STRING")
+            BitStringRef::new(self.unused_bits, &self.inner).expect("invalid BIT STRING")
         }
     }
 }

der/src/asn1/ia5_string.rs

@@ -166,7 +166,7 @@ mod allocation {
 
     impl<'a> OwnedToRef<'a> for Ia5String {
         type Borrowed = Ia5StringRef<'a>;
-        fn owned_to_ref(&self) -> Self::Borrowed {
+        fn owned_to_ref(&'a self) -> Self::Borrowed {
             Ia5StringRef {
                 inner: self.inner.owned_to_ref(),
             }

der/src/asn1/integer/int.rs

@@ -296,7 +296,7 @@ mod allocating {
 
     impl<'a> OwnedToRef<'a> for Int {
         type Borrowed = IntRef<'a>;
-        fn owned_to_ref(&self) -> Self::Borrowed {
+        fn owned_to_ref(&'a self) -> Self::Borrowed {
             let inner = self.inner.owned_to_ref();
 
             IntRef { inner }

der/src/asn1/integer/uint.rs

@@ -267,7 +267,7 @@ mod allocating {
 
     impl<'a> OwnedToRef<'a> for Uint {
         type Borrowed = UintRef<'a>;
-        fn owned_to_ref(&self) -> Self::Borrowed {
+        fn owned_to_ref(&'a self) -> Self::Borrowed {
             let inner = self.inner.owned_to_ref();
 
             UintRef { inner }

der/src/asn1/octet_string.rs

@@ -1,10 +1,10 @@
 //! ASN.1 `OCTET STRING` support.
 
 use crate::{
-    asn1::AnyRef, ord::OrdIsValueOrd, referenced::RefToOwned, BytesRef, Decode, DecodeValue, EncodeValue, Error, ErrorKind, FixedTag, Header, Length, Reader, Tag, Writer
+    BytesRef, Decode, DecodeValue, EncodeValue, Error, ErrorKind, FixedTag, Header, Length, Reader,
+    Tag, Writer, asn1::AnyRef, ord::OrdIsValueOrd, referenced::RefToOwned,
 };
 
-
 /// ASN.1 `OCTET STRING` type: borrowed form.
 ///
 /// Octet strings represent contiguous sequences of octets, a.k.a. bytes.

der/src/asn1/printable_string.rs

@@ -221,7 +221,7 @@ mod allocation {
 
     impl<'a> OwnedToRef<'a> for PrintableString {
         type Borrowed = PrintableStringRef<'a>;
-        fn owned_to_ref(&self) -> Self::Borrowed {
+        fn owned_to_ref(&'a self) -> Self::Borrowed {
             PrintableStringRef {
                 inner: self.inner.owned_to_ref(),
             }

der/src/referenced.rs

@@ -1,6 +1,5 @@
 //! A module for working with referenced data.
 
-
 use crate::FixedTag;
 
 /// A trait for borrowing data from an owned struct
@@ -27,7 +26,7 @@ pub trait OwnedToRef<'a> {
 /// own the content.
 pub trait RefToOwned<'a> {
     /// The resulting type after obtaining ownership.
-    type Owned: OwnedToRef<'a ,Borrowed = Self>
+    type Owned: OwnedToRef<'a, Borrowed = Self>
     where
         Self: 'a;
 
@@ -39,8 +38,7 @@ impl<'a, T> OwnedToRef<'a> for Option<T>
 where
     T: OwnedToRef<'a>,
 {
-    type Borrowed
-        = Option<T::Borrowed>;
+    type Borrowed = Option<T::Borrowed>;
 
     fn owned_to_ref(&'a self) -> Self::Borrowed {
         self.as_ref().map(|o| o.owned_to_ref())
@@ -102,25 +100,23 @@ where
     const TAG: crate::Tag = B::TAG;
 }
 
-impl<'a, B> PartialEq for DerCow<'a, B>
-where
-    B: RefToOwned<'a> + Sized + PartialEq,
-    <B as RefToOwned<'a>>::Owned: PartialEq + OwnedToRef<'a>,
-{
-    fn eq(&self, other: &Self) -> bool {
-        match (self, other) {
-            (Self::Borrowed(l0), Self::Borrowed(r0)) => l0 == r0,
-            (Self::Owned(l0), Self::Owned(r0)) => l0 == r0,
-            (Self::Owned(l0), Self::Borrowed(r0)) => {
-                let l1 = l0.owned_to_ref();
-                &l1 == *r0
-            },
-            _ => false,
-        }
-    }
-}
-
-
+// impl<'a, B> PartialEq for DerCow<'a, B>
+// where
+//     B: RefToOwned<'a> + Sized + PartialEq,
+//     <B as RefToOwned<'a>>::Owned: PartialEq + OwnedToRef<'a>,
+// {
+//     fn eq(&self, other: &Self) -> bool {
+//         match (self, other) {
+//             (Self::Borrowed(l0), Self::Borrowed(r0)) => l0 == r0,
+//             (Self::Owned(l0), Self::Owned(r0)) => l0 == r0,
+//             (Self::Owned(l0), Self::Borrowed(r0)) => {
+//                 let l1 = l0.owned_to_ref();
+//                 *r0 == &l1
+//             }
+//             _ => false,
+//         }
+//     }
+// }
 
 // impl<'a, B> Deref for DerCow<'a, B>
 // where

x509-cert/src/certificate.rs

@@ -4,9 +4,9 @@ use crate::{AlgorithmIdentifier, SubjectPublicKeyInfo};
 use crate::{ext, name::Name, serial_number::SerialNumber, time::Validity};
 use alloc::vec::Vec;
 use const_oid::AssociatedOid;
+use core::{cmp::Ordering, fmt::Debug};
 use der::asn1::BitStringRef;
 use der::referenced::DerCow;
-use core::{cmp::Ordering, fmt::Debug};
 use der::{Decode, Enumerated, ErrorKind, Sequence, Tag, ValueOrd, asn1::BitString};
 
 #[cfg(feature = "pem")]
@@ -170,8 +170,6 @@ pub struct TbsCertificateInner<P: Profile = Rfc5280> {
     pub(crate) extensions: Option<ext::Extensions>,
 }
 
-
-
 #[derive(Clone, Debug, Eq, PartialEq, Sequence, ValueOrd)]
 #[allow(missing_docs)]
 pub struct TbsCertificateInnerCow<'a, P: Profile = Rfc5280> {