diff --git a/der/src/asn1/any.rs b/der/src/asn1/any.rs index 72004b7ce..25dd957a5 100644 --- a/der/src/asn1/any.rs +++ b/der/src/asn1/any.rs @@ -277,7 +277,7 @@ mod allocating { impl<'a> RefToOwned<'a> for AnyRef<'a> { type Owned = Any; - fn to_owned(&self) -> Self::Owned { + fn ref_to_owned(&self) -> Self::Owned { Any { tag: self.tag(), value: BytesOwned::from(self.value), @@ -287,7 +287,7 @@ mod allocating { impl OwnedToRef for Any { type Borrowed<'a> = AnyRef<'a>; - fn to_ref(&self) -> Self::Borrowed<'_> { + fn owned_to_ref(&self) -> Self::Borrowed<'_> { self.into() } } @@ -295,7 +295,7 @@ mod allocating { impl Any { /// Is this value an ASN.1 `NULL` value? pub fn is_null(&self) -> bool { - self.to_ref() == AnyRef::NULL + self.owned_to_ref() == AnyRef::NULL } } } diff --git a/der/src/asn1/bit_string.rs b/der/src/asn1/bit_string.rs index b049d4d6f..99f28d7d1 100644 --- a/der/src/asn1/bit_string.rs +++ b/der/src/asn1/bit_string.rs @@ -379,7 +379,7 @@ mod allocating { impl<'a> RefToOwned<'a> for BitStringRef<'a> { type Owned = BitString; - fn to_owned(&self) -> Self::Owned { + fn ref_to_owned(&self) -> Self::Owned { BitString { unused_bits: self.unused_bits, bit_length: self.bit_length, @@ -390,7 +390,7 @@ mod allocating { impl OwnedToRef for BitString { type Borrowed<'a> = BitStringRef<'a>; - fn to_ref(&self) -> Self::Borrowed<'_> { + fn owned_to_ref(&self) -> Self::Borrowed<'_> { self.into() } } diff --git a/der/src/asn1/ia5_string.rs b/der/src/asn1/ia5_string.rs index 39e1b733d..c3f24f01c 100644 --- a/der/src/asn1/ia5_string.rs +++ b/der/src/asn1/ia5_string.rs @@ -150,18 +150,18 @@ mod allocation { impl<'a> RefToOwned<'a> for Ia5StringRef<'a> { type Owned = Ia5String; - fn to_owned(&self) -> Self::Owned { + fn ref_to_owned(&self) -> Self::Owned { Ia5String { - inner: self.inner.to_owned(), + inner: self.inner.ref_to_owned(), } } } impl OwnedToRef for Ia5String { type Borrowed<'a> = Ia5StringRef<'a>; - fn to_ref(&self) -> Self::Borrowed<'_> { + fn owned_to_ref(&self) -> Self::Borrowed<'_> { Ia5StringRef { - inner: self.inner.to_ref(), + inner: self.inner.owned_to_ref(), } } } diff --git a/der/src/asn1/integer/bigint.rs b/der/src/asn1/integer/bigint.rs index 3178c4ed4..cfde2966e 100644 --- a/der/src/asn1/integer/bigint.rs +++ b/der/src/asn1/integer/bigint.rs @@ -277,8 +277,8 @@ mod allocating { impl<'a> RefToOwned<'a> for IntRef<'a> { type Owned = Int; - fn to_owned(&self) -> Self::Owned { - let inner = self.inner.to_owned(); + fn ref_to_owned(&self) -> Self::Owned { + let inner = self.inner.ref_to_owned(); Int { inner } } @@ -286,8 +286,8 @@ mod allocating { impl OwnedToRef for Int { type Borrowed<'a> = IntRef<'a>; - fn to_ref(&self) -> Self::Borrowed<'_> { - let inner = self.inner.to_ref(); + fn owned_to_ref(&self) -> Self::Borrowed<'_> { + let inner = self.inner.owned_to_ref(); IntRef { inner } } @@ -384,8 +384,8 @@ mod allocating { impl<'a> RefToOwned<'a> for UintRef<'a> { type Owned = Uint; - fn to_owned(&self) -> Self::Owned { - let inner = self.inner.to_owned(); + fn ref_to_owned(&self) -> Self::Owned { + let inner = self.inner.ref_to_owned(); Uint { inner } } @@ -393,8 +393,8 @@ mod allocating { impl OwnedToRef for Uint { type Borrowed<'a> = UintRef<'a>; - fn to_ref(&self) -> Self::Borrowed<'_> { - let inner = self.inner.to_ref(); + fn owned_to_ref(&self) -> Self::Borrowed<'_> { + let inner = self.inner.owned_to_ref(); UintRef { inner } } diff --git a/der/src/asn1/printable_string.rs b/der/src/asn1/printable_string.rs index f1929307f..7a5bb8b6e 100644 --- a/der/src/asn1/printable_string.rs +++ b/der/src/asn1/printable_string.rs @@ -221,18 +221,18 @@ mod allocation { impl<'a> RefToOwned<'a> for PrintableStringRef<'a> { type Owned = PrintableString; - fn to_owned(&self) -> Self::Owned { + fn ref_to_owned(&self) -> Self::Owned { PrintableString { - inner: self.inner.to_owned(), + inner: self.inner.ref_to_owned(), } } } impl OwnedToRef for PrintableString { type Borrowed<'a> = PrintableStringRef<'a>; - fn to_ref(&self) -> Self::Borrowed<'_> { + fn owned_to_ref(&self) -> Self::Borrowed<'_> { PrintableStringRef { - inner: self.inner.to_ref(), + inner: self.inner.owned_to_ref(), } } } diff --git a/der/src/asn1/teletex_string.rs b/der/src/asn1/teletex_string.rs index fdaac856a..b8e24f454 100644 --- a/der/src/asn1/teletex_string.rs +++ b/der/src/asn1/teletex_string.rs @@ -179,18 +179,18 @@ mod allocation { impl<'a> RefToOwned<'a> for TeletexStringRef<'a> { type Owned = TeletexString; - fn to_owned(&self) -> Self::Owned { + fn ref_to_owned(&self) -> Self::Owned { TeletexString { - inner: self.inner.to_owned(), + inner: self.inner.ref_to_owned(), } } } impl OwnedToRef for TeletexString { type Borrowed<'a> = TeletexStringRef<'a>; - fn to_ref(&self) -> Self::Borrowed<'_> { + fn owned_to_ref(&self) -> Self::Borrowed<'_> { TeletexStringRef { - inner: self.inner.to_ref(), + inner: self.inner.owned_to_ref(), } } } diff --git a/der/src/bytes_owned.rs b/der/src/bytes_owned.rs index d47b73f84..a9f67b21a 100644 --- a/der/src/bytes_owned.rs +++ b/der/src/bytes_owned.rs @@ -97,7 +97,7 @@ impl From> for BytesOwned { impl OwnedToRef for BytesOwned { type Borrowed<'a> = BytesRef<'a>; - fn to_ref(&self) -> Self::Borrowed<'_> { + fn owned_to_ref(&self) -> Self::Borrowed<'_> { BytesRef { length: self.length, inner: self.inner.as_ref(), diff --git a/der/src/bytes_ref.rs b/der/src/bytes_ref.rs index 82fdf9a12..2cee4076e 100644 --- a/der/src/bytes_ref.rs +++ b/der/src/bytes_ref.rs @@ -145,7 +145,7 @@ mod allocating { impl<'a> RefToOwned<'a> for BytesRef<'a> { type Owned = BytesOwned; - fn to_owned(&self) -> Self::Owned { + fn ref_to_owned(&self) -> Self::Owned { BytesOwned::from(*self) } } diff --git a/der/src/referenced.rs b/der/src/referenced.rs index dc9a5f3af..bb920db3a 100644 --- a/der/src/referenced.rs +++ b/der/src/referenced.rs @@ -8,7 +8,7 @@ pub trait OwnedToRef { Self: 'a; /// Creates a new object referencing back to the self for storage - fn to_ref(&self) -> Self::Borrowed<'_>; + fn owned_to_ref(&self) -> Self::Borrowed<'_>; } /// A trait for cloning a referenced structure and getting owned objects @@ -21,7 +21,7 @@ pub trait RefToOwned<'a> { Self: 'a; /// Creates a new object taking ownership of the data - fn to_owned(&self) -> Self::Owned; + fn ref_to_owned(&self) -> Self::Owned; } impl OwnedToRef for Option @@ -30,8 +30,8 @@ where { type Borrowed<'a> = Option> where T: 'a; - fn to_ref(&self) -> Self::Borrowed<'_> { - self.as_ref().map(|o| o.to_ref()) + fn owned_to_ref(&self) -> Self::Borrowed<'_> { + self.as_ref().map(|o| o.owned_to_ref()) } } @@ -41,7 +41,7 @@ where T::Owned: OwnedToRef, { type Owned = Option; - fn to_owned(&self) -> Self::Owned { - self.as_ref().map(|o| o.to_owned()) + fn ref_to_owned(&self) -> Self::Owned { + self.as_ref().map(|o| o.ref_to_owned()) } } diff --git a/der/src/str_owned.rs b/der/src/str_owned.rs index 01f7f78de..25c258e4f 100644 --- a/der/src/str_owned.rs +++ b/der/src/str_owned.rs @@ -96,7 +96,7 @@ impl From> for StrOwned { impl OwnedToRef for StrOwned { type Borrowed<'a> = StrRef<'a>; - fn to_ref(&self) -> Self::Borrowed<'_> { + fn owned_to_ref(&self) -> Self::Borrowed<'_> { StrRef { length: self.length, inner: self.inner.as_ref(), diff --git a/der/src/str_ref.rs b/der/src/str_ref.rs index e17198994..899c7506b 100644 --- a/der/src/str_ref.rs +++ b/der/src/str_ref.rs @@ -85,7 +85,7 @@ mod allocating { impl<'a> RefToOwned<'a> for StrRef<'a> { type Owned = StrOwned; - fn to_owned(&self) -> Self::Owned { + fn ref_to_owned(&self) -> Self::Owned { StrOwned::from(*self) } } diff --git a/spki/src/algorithm.rs b/spki/src/algorithm.rs index 739815f4f..b0e08b5b3 100644 --- a/spki/src/algorithm.rs +++ b/spki/src/algorithm.rs @@ -171,20 +171,20 @@ mod allocating { impl<'a> RefToOwned<'a> for AlgorithmIdentifierRef<'a> { type Owned = AlgorithmIdentifierOwned; - fn to_owned(&self) -> Self::Owned { + fn ref_to_owned(&self) -> Self::Owned { AlgorithmIdentifier { oid: self.oid, - parameters: self.parameters.to_owned(), + parameters: self.parameters.ref_to_owned(), } } } impl OwnedToRef for AlgorithmIdentifierOwned { type Borrowed<'a> = AlgorithmIdentifierRef<'a>; - fn to_ref(&self) -> Self::Borrowed<'_> { + fn owned_to_ref(&self) -> Self::Borrowed<'_> { AlgorithmIdentifier { oid: self.oid, - parameters: self.parameters.to_ref(), + parameters: self.parameters.owned_to_ref(), } } } diff --git a/spki/src/spki.rs b/spki/src/spki.rs index daa6c61e7..ffe9e2b7a 100644 --- a/spki/src/spki.rs +++ b/spki/src/spki.rs @@ -193,20 +193,20 @@ mod allocating { impl<'a> RefToOwned<'a> for SubjectPublicKeyInfoRef<'a> { type Owned = SubjectPublicKeyInfoOwned; - fn to_owned(&self) -> Self::Owned { + fn ref_to_owned(&self) -> Self::Owned { SubjectPublicKeyInfo { - algorithm: self.algorithm.to_owned(), - subject_public_key: self.subject_public_key.to_owned(), + algorithm: self.algorithm.ref_to_owned(), + subject_public_key: self.subject_public_key.ref_to_owned(), } } } impl OwnedToRef for SubjectPublicKeyInfoOwned { type Borrowed<'a> = SubjectPublicKeyInfoRef<'a>; - fn to_ref(&self) -> Self::Borrowed<'_> { + fn owned_to_ref(&self) -> Self::Borrowed<'_> { SubjectPublicKeyInfo { - algorithm: self.algorithm.to_ref(), - subject_public_key: self.subject_public_key.to_ref(), + algorithm: self.algorithm.owned_to_ref(), + subject_public_key: self.subject_public_key.owned_to_ref(), } } }