Skip to content

Commit cadfcc5

Browse files
committed
Rollup merge of rust-lang#24240 - apasel422:patch-1, r=aturon
2 parents 7725c8d + 644a75e commit cadfcc5

File tree

1 file changed

+9
-9
lines changed

1 file changed

+9
-9
lines changed

src/libcollections/borrow.rs

+9-9
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ use self::Cow::*;
3939
/// Borrow<Vec<T>>` and `Vec<T>: Borrow<[T]>`.
4040
#[stable(feature = "rust1", since = "1.0.0")]
4141
pub trait Borrow<Borrowed: ?Sized> {
42-
/// Immutably borrow from an owned value.
42+
/// Immutably borrows from an owned value.
4343
///
4444
/// # Examples
4545
///
@@ -67,7 +67,7 @@ pub trait Borrow<Borrowed: ?Sized> {
6767
/// Similar to `Borrow`, but for mutable borrows.
6868
#[stable(feature = "rust1", since = "1.0.0")]
6969
pub trait BorrowMut<Borrowed: ?Sized> : Borrow<Borrowed> {
70-
/// Mutably borrow from an owned value.
70+
/// Mutably borrows from an owned value.
7171
///
7272
/// # Examples
7373
///
@@ -126,7 +126,7 @@ impl<'a, B: ?Sized> Borrow<B> for Cow<'a, B> where B: ToOwned, <B as ToOwned>::O
126126
}
127127
}
128128

129-
/// A generalization of Clone to borrowed data.
129+
/// A generalization of `Clone` to borrowed data.
130130
///
131131
/// Some types make it possible to go from borrowed to owned, usually by
132132
/// implementing the `Clone` trait. But `Clone` works only for going from `&T`
@@ -137,7 +137,7 @@ pub trait ToOwned {
137137
#[stable(feature = "rust1", since = "1.0.0")]
138138
type Owned: Borrow<Self>;
139139

140-
/// Create owned data from borrowed data, usually by copying.
140+
/// Creates owned data from borrowed data, usually by cloning.
141141
#[stable(feature = "rust1", since = "1.0.0")]
142142
fn to_owned(&self) -> Self::Owned;
143143
}
@@ -155,9 +155,9 @@ impl<T> ToOwned for T where T: Clone {
155155
/// data lazily when mutation or ownership is required. The type is designed to
156156
/// work with general borrowed data via the `Borrow` trait.
157157
///
158-
/// `Cow` implements both `Deref`, which means that you can call
158+
/// `Cow` implements `Deref`, which means that you can call
159159
/// non-mutating methods directly on the data it encloses. If mutation
160-
/// is desired, `to_mut` will obtain a mutable references to an owned
160+
/// is desired, `to_mut` will obtain a mutable reference to an owned
161161
/// value, cloning if necessary.
162162
///
163163
/// # Examples
@@ -200,7 +200,7 @@ impl<'a, B: ?Sized> Clone for Cow<'a, B> where B: ToOwned {
200200
}
201201

202202
impl<'a, B: ?Sized> Cow<'a, B> where B: ToOwned {
203-
/// Acquire a mutable reference to the owned form of the data.
203+
/// Acquires a mutable reference to the owned form of the data.
204204
///
205205
/// Copies the data if it is not already owned.
206206
///
@@ -226,7 +226,7 @@ impl<'a, B: ?Sized> Cow<'a, B> where B: ToOwned {
226226
}
227227
}
228228

229-
/// Extract the owned data.
229+
/// Extracts the owned data.
230230
///
231231
/// Copies the data if it is not already owned.
232232
///
@@ -327,7 +327,7 @@ impl<'a, B: ?Sized> Hash for Cow<'a, B> where B: Hash + ToOwned
327327
}
328328
}
329329

330-
/// Trait for moving into a `Cow`
330+
/// Trait for moving into a `Cow`.
331331
#[unstable(feature = "into_cow", reason = "may be replaced by `convert::Into`")]
332332
pub trait IntoCow<'a, B: ?Sized> where B: ToOwned {
333333
/// Moves `self` into `Cow`

0 commit comments

Comments
 (0)