Skip to content

Commit 8ca6131

Browse files
alexalex
committed
Remove implementation of SimpleAsn1Writable for &T
I don't know if this is a good idea.
1 parent e23fbf1 commit 8ca6131

File tree

3 files changed

+29
-50
lines changed

3 files changed

+29
-50
lines changed

‎asn1_derive/src/lib.rs‎

Lines changed: 19 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ pub fn derive_asn1_read(input: proc_macro::TokenStream) -> proc_macro::TokenStre
1717
all_field_types(&input.data, false, &input.generics),
1818
syn::parse_quote!(asn1::Asn1Readable<#lifetime_name>),
1919
syn::parse_quote!(asn1::Asn1DefinedByReadable<#lifetime_name, asn1::ObjectIdentifier>),
20-
false,
2120
);
2221
let (impl_generics, _, where_clause) = generics.split_for_impl();
2322

@@ -67,7 +66,6 @@ pub fn derive_asn1_write(input: proc_macro::TokenStream) -> proc_macro::TokenStr
6766
fields,
6867
syn::parse_quote!(asn1::Asn1Writable),
6968
syn::parse_quote!(asn1::Asn1DefinedByWritable<asn1::ObjectIdentifier>),
70-
true,
7169
);
7270
let (impl_generics, ty_generics, where_clause) = input.generics.split_for_impl();
7371

@@ -154,7 +152,6 @@ pub fn derive_asn1_defined_by_read(input: proc_macro::TokenStream) -> proc_macro
154152
all_field_types(&input.data, true, &input.generics),
155153
syn::parse_quote!(asn1::Asn1Readable<#lifetime_name>),
156154
syn::parse_quote!(asn1::Asn1DefinedByReadable<#lifetime_name, asn1::ObjectIdentifier>),
157-
false,
158155
);
159156
let (impl_generics, _, where_clause) = generics.split_for_impl();
160157

@@ -220,7 +217,6 @@ pub fn derive_asn1_defined_by_write(input: proc_macro::TokenStream) -> proc_macr
220217
fields,
221218
syn::parse_quote!(asn1::Asn1Writable),
222219
syn::parse_quote!(asn1::Asn1DefinedByWritable<asn1::ObjectIdentifier>),
223-
true,
224220
);
225221
let (impl_generics, ty_generics, where_clause) = input.generics.split_for_impl();
226222

@@ -454,7 +450,6 @@ fn add_bounds(
454450
field_types: Vec<(syn::Type, OpType, bool)>,
455451
bound: syn::TypeParamBound,
456452
defined_by_bound: syn::TypeParamBound,
457-
add_ref: bool,
458453
) {
459454
let where_clause = if field_types.is_empty() {
460455
return;
@@ -468,11 +463,11 @@ fn add_bounds(
468463
};
469464

470465
for (f, op_type, has_default) in field_types {
471-
let (bounded_ty, required_bound) = match (op_type, add_ref) {
472-
(OpType::Regular, _) => (f, bound.clone()),
473-
(OpType::DefinedBy(_), _) => (f, defined_by_bound.clone()),
466+
let (bounded_ty, required_bound) = match op_type {
467+
OpType::Regular => (f, bound.clone()),
468+
OpType::DefinedBy(_) => (f, defined_by_bound.clone()),
474469

475-
(OpType::Implicit(OpTypeArgs { value, required }), false) => {
470+
OpType::Implicit(OpTypeArgs { value, required }) => {
476471
let ty = if required || has_default {
477472
syn::parse_quote!(asn1::Implicit::<#f, #value>)
478473
} else {
@@ -481,32 +476,14 @@ fn add_bounds(
481476

482477
(ty, bound.clone())
483478
}
484-
(OpType::Implicit(OpTypeArgs { value, required }), true) => {
485-
let ty = if required || has_default {
486-
syn::parse_quote!(for<'asn1_internal> asn1::Implicit::<&'asn1_internal #f, #value>)
487-
} else {
488-
syn::parse_quote!(for<'asn1_internal> asn1::Implicit::<&'asn1_internal <#f as asn1::OptionExt>::T, #value>)
489-
};
490-
491-
(ty, bound.clone())
492-
}
493479

494-
(OpType::Explicit(OpTypeArgs { value, required }), false) => {
480+
OpType::Explicit(OpTypeArgs { value, required }) => {
495481
let ty = if required || has_default {
496482
syn::parse_quote!(asn1::Explicit::<#f, #value>)
497483
} else {
498484
syn::parse_quote!(asn1::Explicit::<<#f as asn1::OptionExt>::T, #value>)
499485
};
500486

501-
(ty, bound.clone())
502-
}
503-
(OpType::Explicit(OpTypeArgs { value, required }), true) => {
504-
let ty = if required || has_default {
505-
syn::parse_quote!(for<'asn1_internal> asn1::Explicit::<&'asn1_internal #f, #value>)
506-
} else {
507-
syn::parse_quote!(for<'asn1_internal> asn1::Explicit::<&'asn1_internal <#f as asn1::OptionExt>::T, #value>)
508-
};
509-
510487
(ty, bound.clone())
511488
}
512489
};
@@ -814,8 +791,9 @@ fn generate_write_element(
814791
) -> proc_macro2::TokenStream {
815792
let (write_type, default) = extract_field_properties(&f.attrs);
816793

794+
let has_default = default.is_some();
817795
if let Some(default) = default {
818-
field_read = quote::quote! {&{
796+
field_read = quote::quote! {{
819797
asn1::to_optional_default(#field_read, &(#default).into())
820798
}}
821799
}
@@ -825,12 +803,12 @@ fn generate_write_element(
825803
let value = arg.value;
826804
if arg.required {
827805
quote::quote_spanned! {f.span() =>
828-
w.write_element(&asn1::Explicit::<_, #value>::new(#field_read))?;
806+
w.write_element(asn1::Explicit::<_, #value>::from_ref(#field_read))?;
829807
}
830808
} else {
831809
quote::quote_spanned! {f.span() =>
832810
if let Some(v) = #field_read {
833-
w.write_element(&asn1::Explicit::<_, #value>::new(v))?;
811+
w.write_element(asn1::Explicit::<_, #value>::from_ref(v))?;
834812
}
835813
}
836814
}
@@ -839,12 +817,12 @@ fn generate_write_element(
839817
let value = arg.value;
840818
if arg.required {
841819
quote::quote_spanned! {f.span() =>
842-
w.write_element(&asn1::Implicit::<_, #value>::new(#field_read))?;
820+
w.write_element(asn1::Implicit::<_, #value>::from_ref(#field_read))?;
843821
}
844822
} else {
845823
quote::quote_spanned! {f.span() =>
846824
if let Some(v) = #field_read {
847-
w.write_element(&asn1::Implicit::<_, #value>::new(v))?;
825+
w.write_element(asn1::Implicit::<_, #value>::from_ref(v))?;
848826
}
849827
}
850828
}
@@ -854,6 +832,12 @@ fn generate_write_element(
854832
quote::quote! {
855833
w.write_element(asn1::writable_defined_by_item(#defined_by_marker_read))?;
856834
}
835+
} else if has_default {
836+
quote::quote! {
837+
if let Some(v) = #field_read {
838+
w.write_element(v)?;
839+
}
840+
}
857841
} else {
858842
quote::quote! {
859843
w.write_element(#field_read)?;
@@ -934,13 +918,13 @@ fn generate_enum_write_block(name: &syn::Ident, data: &syn::DataEnum) -> proc_ma
934918
OpType::Explicit(arg) => {
935919
let tag = arg.value;
936920
quote::quote! {
937-
#name::#ident(value) => w.write_element(&asn1::Explicit::<_, #tag>::new(value)),
921+
#name::#ident(value) => w.write_element(asn1::Explicit::<_, #tag>::from_ref(value)),
938922
}
939923
}
940924
OpType::Implicit(arg) => {
941925
let tag = arg.value;
942926
quote::quote! {
943-
#name::#ident(value) => w.write_element(&asn1::Implicit::<_, #tag>::new(value)),
927+
#name::#ident(value) => w.write_element(asn1::Implicit::<_, #tag>::from_ref(value)),
944928
}
945929
}
946930
OpType::DefinedBy(_) => panic!("Can't use #[defined_by] in an Asn1Write on an enum"),

‎src/lib.rs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
#![cfg_attr(not(feature = "std"), no_std)]
2-
#![forbid(unsafe_code)]
32
#![deny(rust_2018_idioms)]
43

54
//! This crate provides you with the ability to generate and parse ASN.1

‎src/types.rs‎

Lines changed: 10 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -82,13 +82,6 @@ impl<T: SimpleAsn1Writable> Asn1Writable for T {
8282
}
8383
}
8484

85-
impl<T: SimpleAsn1Writable> SimpleAsn1Writable for &T {
86-
const TAG: Tag = T::TAG;
87-
fn write_data(&self, dest: &mut WriteBuf) -> WriteResult {
88-
T::write_data(self, dest)
89-
}
90-
}
91-
9285
impl<T: SimpleAsn1Writable> SimpleAsn1Writable for Box<T> {
9386
const TAG: Tag = T::TAG;
9487
fn write_data(&self, dest: &mut WriteBuf) -> WriteResult {
@@ -145,13 +138,6 @@ impl Asn1Writable for Tlv<'_> {
145138
}
146139
}
147140

148-
impl Asn1Writable for &Tlv<'_> {
149-
#[inline]
150-
fn write(&self, w: &mut Writer<'_>) -> WriteResult {
151-
Tlv::write(self, w)
152-
}
153-
}
154-
155141
/// The ASN.1 NULL type, for use with `Parser.read_element` and
156142
/// `Writer.write_element`.
157143
pub type Null = ();
@@ -1734,6 +1720,7 @@ impl<T: Asn1Writable, V: Borrow<[T]>> SimpleAsn1Writable for SetOfWriter<'_, T,
17341720
/// `Implicit` is a type which wraps another ASN.1 type, indicating that the tag is an ASN.1
17351721
/// `IMPLICIT`. This will generally be used with `Option` or `Choice`.
17361722
#[derive(PartialEq, Eq, Debug)]
1723+
#[repr(transparent)]
17371724
pub struct Implicit<T, const TAG: u32> {
17381725
inner: T,
17391726
}
@@ -1743,6 +1730,10 @@ impl<T, const TAG: u32> Implicit<T, { TAG }> {
17431730
Implicit { inner: v }
17441731
}
17451732

1733+
pub fn from_ref(v: &T) -> &Self {
1734+
unsafe { &*(v as *const T as *const Self) }
1735+
}
1736+
17461737
pub fn as_inner(&self) -> &T {
17471738
&self.inner
17481739
}
@@ -1778,6 +1769,7 @@ impl<T: SimpleAsn1Writable, const TAG: u32> SimpleAsn1Writable for Implicit<T, {
17781769
/// `Explicit` is a type which wraps another ASN.1 type, indicating that the tag is an ASN.1
17791770
/// `EXPLICIT`. This will generally be used with `Option` or `Choice`.
17801771
#[derive(PartialEq, Eq, Debug)]
1772+
#[repr(transparent)]
17811773
pub struct Explicit<T, const TAG: u32> {
17821774
inner: T,
17831775
}
@@ -1787,6 +1779,10 @@ impl<T, const TAG: u32> Explicit<T, { TAG }> {
17871779
Explicit { inner: v }
17881780
}
17891781

1782+
pub fn from_ref(v: &T) -> &Self {
1783+
unsafe { &*(v as *const T as *const Self) }
1784+
}
1785+
17901786
pub fn as_inner(&self) -> &T {
17911787
&self.inner
17921788
}

0 commit comments

Comments
 (0)