der_derive: remove OctetStringRefDeriveHack (#2043)

Fixes #2039

Author: baloo

der/src/asn1.rs

@@ -44,7 +44,7 @@ pub use self::{
     ia5_string::Ia5StringRef,
     integer::{int::IntRef, uint::UintRef},
     null::Null,
-    octet_string::{OctetStringRef, OctetStringRefDeriveHack},
+    octet_string::OctetStringRef,
     printable_string::PrintableStringRef,
     private::{Private, PrivateRef},
     sequence::{Sequence, SequenceRef},

der/src/asn1/octet_string.rs

@@ -5,13 +5,6 @@ use crate::{
     Tag, Writer, asn1::AnyRef, ord::OrdIsValueOrd,
 };
 
-/// Custom derive hack until `der_derive` is updated to support `&'a MyRef` reference types.
-///
-/// This is not considered a stable part of the public API and may be removed without warning.
-// TODO(tarcieri): update `der_derive` to support `OctetStringRef` properly. See #2039
-#[doc(hidden)]
-pub type OctetStringRefDeriveHack<'a> = &'a OctetStringRef;
-
 /// ASN.1 `OCTET STRING` type: borrowed form.
 ///
 /// Octet strings represent contiguous sequences of octets, a.k.a. bytes.

der_derive/src/asn1_type.rs

@@ -59,7 +59,7 @@ impl Asn1Type {
     /// Get a `der::Decoder` object for a particular ASN.1 type
     pub fn decoder(self) -> TokenStream {
         let type_path = self.type_path();
-        quote!(#type_path::decode(reader)?)
+        quote!(<#type_path>::decode(reader)?)
     }
 
     /// Get a `der::Decoder` optional object for a particular ASN.1 type
@@ -71,7 +71,7 @@ impl Asn1Type {
     /// Get a `der::DecodeValue` member object for a particular ASN.1 type
     pub fn value_decoder(self) -> TokenStream {
         let type_path = self.type_path();
-        quote!(#type_path::decode_value(reader, header)?)
+        quote!(<#type_path>::decode_value(reader, header)?)
     }
 
     /// Get a `der::DecodeValue` member object for a particular ASN.1 type
@@ -83,7 +83,7 @@ impl Asn1Type {
     /// Get a `der::Encoder` object for a particular ASN.1 type
     pub fn encoder(self, binding: &TokenStream) -> TokenStream {
         let type_path = self.type_path();
-        quote!(#type_path::try_from(#binding)?)
+        quote!(<#type_path>::try_from(#binding)?)
     }
 
     /// Get the Rust type path for a particular ASN.1 type.
@@ -93,8 +93,7 @@ impl Asn1Type {
             Asn1Type::BitString => quote!(::der::asn1::BitStringRef),
             Asn1Type::Ia5String => quote!(::der::asn1::Ia5StringRef),
             Asn1Type::GeneralizedTime => quote!(::der::asn1::GeneralizedTime),
-            // TODO(tarcieri): natively support `OctetStringRef`, remove `OctetStringRefDeriveHack`
-            Asn1Type::OctetString => quote!(::der::asn1::OctetStringRefDeriveHack),
+            Asn1Type::OctetString => quote!(&::der::asn1::OctetStringRef),
             Asn1Type::PrintableString => quote!(::der::asn1::PrintableStringRef),
             Asn1Type::TeletexString => quote!(::der::asn1::TeletexStringRef),
             Asn1Type::VideotexString => quote!(::der::asn1::VideotexStringRef),

der_derive/src/choice/variant.rs

@@ -250,7 +250,7 @@ mod tests {
             variant.to_decode_tokens().to_string(),
             quote! {
                 ::der::Tag::Utf8String => Ok(Self::ExampleVariant(
-                    ::der::asn1::Utf8StringRef::decode(reader)?
+                    <::der::asn1::Utf8StringRef>::decode(reader)?
                     .try_into()?
                 )),
             }
@@ -260,7 +260,7 @@ mod tests {
         assert_eq!(
             variant.to_encode_value_tokens().to_string(),
             quote! {
-                Self::ExampleVariant(variant) => ::der::asn1::Utf8StringRef::try_from(variant)?.encode_value(encoder),
+                Self::ExampleVariant(variant) => <::der::asn1::Utf8StringRef>::try_from(variant)?.encode_value(encoder),
             }
             .to_string()
         );