diff --git a/der/src/asn1/any.rs b/der/src/asn1/any.rs index 72004b7ce..0ba26c553 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), diff --git a/der/src/asn1/bit_string.rs b/der/src/asn1/bit_string.rs index b049d4d6f..933df2f5b 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, diff --git a/der/src/asn1/ia5_string.rs b/der/src/asn1/ia5_string.rs index 39e1b733d..dab7c2acc 100644 --- a/der/src/asn1/ia5_string.rs +++ b/der/src/asn1/ia5_string.rs @@ -150,9 +150,9 @@ 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(), } } } diff --git a/der/src/asn1/integer/bigint.rs b/der/src/asn1/integer/bigint.rs index 3178c4ed4..76719e5d6 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 } } @@ -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 } } diff --git a/der/src/asn1/printable_string.rs b/der/src/asn1/printable_string.rs index f1929307f..46c78cbeb 100644 --- a/der/src/asn1/printable_string.rs +++ b/der/src/asn1/printable_string.rs @@ -221,9 +221,9 @@ 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(), } } } diff --git a/der/src/asn1/teletex_string.rs b/der/src/asn1/teletex_string.rs index fdaac856a..93975fe13 100644 --- a/der/src/asn1/teletex_string.rs +++ b/der/src/asn1/teletex_string.rs @@ -179,9 +179,9 @@ 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(), } } } 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..c61e656f4 100644 --- a/der/src/referenced.rs +++ b/der/src/referenced.rs @@ -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 @@ -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_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..725acfe04 100644 --- a/spki/src/algorithm.rs +++ b/spki/src/algorithm.rs @@ -171,10 +171,10 @@ 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(), } } } diff --git a/spki/src/spki.rs b/spki/src/spki.rs index daa6c61e7..c7c7834c1 100644 --- a/spki/src/spki.rs +++ b/spki/src/spki.rs @@ -193,10 +193,10 @@ 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(), } } }