Skip to content

Commit 3ee0028

Browse files
authored
Derive Default for enums (#2057)
* Derive `Default` for enums * cargo fmt --all
1 parent afa62cc commit 3ee0028

File tree

3 files changed

+6
-18
lines changed

3 files changed

+6
-18
lines changed

pkcs1/src/params.rs

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,17 +25,13 @@ const SHA_1_AI: AlgorithmIdentifierRef<'_> = AlgorithmIdentifierRef {
2525
/// [RFC 8017 Appendix 2.3]: https://datatracker.ietf.org/doc/html/rfc8017#appendix-A.2.3
2626
#[derive(Clone, Debug, Copy, PartialEq, Eq)]
2727
#[repr(u8)]
28+
#[derive(Default)]
2829
pub enum TrailerField {
2930
/// the only supported value (0xbc, default)
31+
#[default]
3032
BC = 1,
3133
}
3234

33-
impl Default for TrailerField {
34-
fn default() -> Self {
35-
Self::BC
36-
}
37-
}
38-
3935
impl<'a> DecodeValue<'a> for TrailerField {
4036
type Error = der::Error;
4137

tls_codec/derive/tests/decode.rs

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,9 @@ use tls_codec_derive::{TlsDeserialize, TlsDeserializeBytes, TlsSerialize, TlsSiz
99
TlsDeserialize, TlsDeserializeBytes, Debug, PartialEq, Clone, Copy, TlsSize, TlsSerialize,
1010
)]
1111
#[repr(u16)]
12+
#[derive(Default)]
1213
pub enum ExtensionType {
14+
#[default]
1315
Reserved = 0,
1416
Capabilities = 1,
1517
Lifetime = 2,
@@ -19,12 +21,6 @@ pub enum ExtensionType {
1921
SomethingElse = 500,
2022
}
2123

22-
impl Default for ExtensionType {
23-
fn default() -> Self {
24-
Self::Reserved
25-
}
26-
}
27-
2824
#[derive(
2925
TlsDeserialize, TlsDeserializeBytes, Debug, PartialEq, TlsSerialize, TlsSize, Clone, Default,
3026
)]

x509-cert/src/certificate.rs

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -87,8 +87,10 @@ impl Profile for Raw {
8787
#[derive(Clone, Debug, Copy, PartialEq, Eq, Enumerated)]
8888
#[asn1(type = "INTEGER")]
8989
#[repr(u8)]
90+
#[derive(Default)]
9091
pub enum Version {
9192
/// Version 1 (default)
93+
#[default]
9294
V1 = 0,
9395

9496
/// Version 2
@@ -104,12 +106,6 @@ impl ValueOrd for Version {
104106
}
105107
}
106108

107-
impl Default for Version {
108-
fn default() -> Self {
109-
Self::V1
110-
}
111-
}
112-
113109
/// X.509 `TbsCertificate` as defined in [RFC 5280 Section 4.1]
114110
pub type TbsCertificate = TbsCertificateInner<Rfc5280>;
115111

0 commit comments

Comments
 (0)