Skip to content

Commit 40f62eb

Browse files
committed
der, spki: rename to_owned method
The naming of the `to_owned` method was a bit unfortunate as it triggered conflicts with the `alloc::borrow::ToOwned` method. When used, this would make for compiler messages asking things like: ``` error[E0034]: multiple applicable items in scope --> certval/src/validator/name_constraints_set.rs:748:34 | 748 | value: a.to_owned(), | ^^^^^^^^ multiple `to_owned` found | = note: candidate RustCrypto#1 is defined in an impl of the trait `RefToOwned` for the type `AnyRef<'a>` = note: candidate RustCrypto#2 is defined in an impl of the trait `ToOwned` for the type `T` help: disambiguate the associated function for candidate RustCrypto#1 | 748 | value: RefToOwned::to_owned(&a), | ~~~~~~~~~~~~~~~~~~~~~~~~ help: disambiguate the associated function for candidate RustCrypto#2 | 748 | value: ToOwned::to_owned(&a), | ~~~~~~~~~~~~~~~~~~~~~ ```
1 parent 1f1dd1a commit 40f62eb

11 files changed

+22
-22
lines changed

der/src/asn1/any.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -277,7 +277,7 @@ mod allocating {
277277

278278
impl<'a> RefToOwned<'a> for AnyRef<'a> {
279279
type Owned = Any;
280-
fn to_owned(&self) -> Self::Owned {
280+
fn ref_to_owned(&self) -> Self::Owned {
281281
Any {
282282
tag: self.tag(),
283283
value: BytesOwned::from(self.value),

der/src/asn1/bit_string.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -379,7 +379,7 @@ mod allocating {
379379

380380
impl<'a> RefToOwned<'a> for BitStringRef<'a> {
381381
type Owned = BitString;
382-
fn to_owned(&self) -> Self::Owned {
382+
fn ref_to_owned(&self) -> Self::Owned {
383383
BitString {
384384
unused_bits: self.unused_bits,
385385
bit_length: self.bit_length,

der/src/asn1/ia5_string.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -150,9 +150,9 @@ mod allocation {
150150

151151
impl<'a> RefToOwned<'a> for Ia5StringRef<'a> {
152152
type Owned = Ia5String;
153-
fn to_owned(&self) -> Self::Owned {
153+
fn ref_to_owned(&self) -> Self::Owned {
154154
Ia5String {
155-
inner: self.inner.to_owned(),
155+
inner: self.inner.ref_to_owned(),
156156
}
157157
}
158158
}

der/src/asn1/integer/bigint.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -277,8 +277,8 @@ mod allocating {
277277

278278
impl<'a> RefToOwned<'a> for IntRef<'a> {
279279
type Owned = Int;
280-
fn to_owned(&self) -> Self::Owned {
281-
let inner = self.inner.to_owned();
280+
fn ref_to_owned(&self) -> Self::Owned {
281+
let inner = self.inner.ref_to_owned();
282282

283283
Int { inner }
284284
}
@@ -384,8 +384,8 @@ mod allocating {
384384

385385
impl<'a> RefToOwned<'a> for UintRef<'a> {
386386
type Owned = Uint;
387-
fn to_owned(&self) -> Self::Owned {
388-
let inner = self.inner.to_owned();
387+
fn ref_to_owned(&self) -> Self::Owned {
388+
let inner = self.inner.ref_to_owned();
389389

390390
Uint { inner }
391391
}

der/src/asn1/printable_string.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -221,9 +221,9 @@ mod allocation {
221221

222222
impl<'a> RefToOwned<'a> for PrintableStringRef<'a> {
223223
type Owned = PrintableString;
224-
fn to_owned(&self) -> Self::Owned {
224+
fn ref_to_owned(&self) -> Self::Owned {
225225
PrintableString {
226-
inner: self.inner.to_owned(),
226+
inner: self.inner.ref_to_owned(),
227227
}
228228
}
229229
}

der/src/asn1/teletex_string.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -179,9 +179,9 @@ mod allocation {
179179

180180
impl<'a> RefToOwned<'a> for TeletexStringRef<'a> {
181181
type Owned = TeletexString;
182-
fn to_owned(&self) -> Self::Owned {
182+
fn ref_to_owned(&self) -> Self::Owned {
183183
TeletexString {
184-
inner: self.inner.to_owned(),
184+
inner: self.inner.ref_to_owned(),
185185
}
186186
}
187187
}

der/src/bytes_ref.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ mod allocating {
145145

146146
impl<'a> RefToOwned<'a> for BytesRef<'a> {
147147
type Owned = BytesOwned;
148-
fn to_owned(&self) -> Self::Owned {
148+
fn ref_to_owned(&self) -> Self::Owned {
149149
BytesOwned::from(*self)
150150
}
151151
}

der/src/referenced.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ pub trait RefToOwned<'a> {
2121
Self: 'a;
2222

2323
/// Creates a new object taking ownership of the data
24-
fn to_owned(&self) -> Self::Owned;
24+
fn ref_to_owned(&self) -> Self::Owned;
2525
}
2626

2727
impl<T> OwnedToRef for Option<T>
@@ -41,7 +41,7 @@ where
4141
T::Owned: OwnedToRef,
4242
{
4343
type Owned = Option<T::Owned>;
44-
fn to_owned(&self) -> Self::Owned {
45-
self.as_ref().map(|o| o.to_owned())
44+
fn ref_to_owned(&self) -> Self::Owned {
45+
self.as_ref().map(|o| o.ref_to_owned())
4646
}
4747
}

der/src/str_ref.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ mod allocating {
8585

8686
impl<'a> RefToOwned<'a> for StrRef<'a> {
8787
type Owned = StrOwned;
88-
fn to_owned(&self) -> Self::Owned {
88+
fn ref_to_owned(&self) -> Self::Owned {
8989
StrOwned::from(*self)
9090
}
9191
}

spki/src/algorithm.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -171,10 +171,10 @@ mod allocating {
171171

172172
impl<'a> RefToOwned<'a> for AlgorithmIdentifierRef<'a> {
173173
type Owned = AlgorithmIdentifierOwned;
174-
fn to_owned(&self) -> Self::Owned {
174+
fn ref_to_owned(&self) -> Self::Owned {
175175
AlgorithmIdentifier {
176176
oid: self.oid,
177-
parameters: self.parameters.to_owned(),
177+
parameters: self.parameters.ref_to_owned(),
178178
}
179179
}
180180
}

spki/src/spki.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -193,10 +193,10 @@ mod allocating {
193193

194194
impl<'a> RefToOwned<'a> for SubjectPublicKeyInfoRef<'a> {
195195
type Owned = SubjectPublicKeyInfoOwned;
196-
fn to_owned(&self) -> Self::Owned {
196+
fn ref_to_owned(&self) -> Self::Owned {
197197
SubjectPublicKeyInfo {
198-
algorithm: self.algorithm.to_owned(),
199-
subject_public_key: self.subject_public_key.to_owned(),
198+
algorithm: self.algorithm.ref_to_owned(),
199+
subject_public_key: self.subject_public_key.ref_to_owned(),
200200
}
201201
}
202202
}

0 commit comments

Comments
 (0)