Skip to content

Commit 7761687

Browse files
committed
---
yaml --- r: 125814 b: refs/heads/try c: 7c61bb7 h: refs/heads/master v: v3
1 parent bb83e75 commit 7761687

File tree

3 files changed

+24
-24
lines changed

3 files changed

+24
-24
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
refs/heads/master: f2fa55903e378368ed9173560f03a0ef16e371c2
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: 9fc8394d3bce22ab483f98842434c84c396212ae
5-
refs/heads/try: 5599b69b6d3cb7ba9eb30b155aa580865b99d90e
5+
refs/heads/try: 7c61bb72130415006b505f12970b72bd96a7bc70
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
88
refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c

branches/try/src/libcollections/lib.rs

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -326,7 +326,30 @@ pub trait MutableSet<T>: Set<T> + Mutable {
326326
}
327327

328328
pub trait MutableSeq<T>: Mutable {
329+
/// Append an element to the back of a collection.
330+
///
331+
/// # Failure
332+
///
333+
/// Fails if the number of elements in the vector overflows a `uint`.
334+
///
335+
/// # Example
336+
///
337+
/// ```rust
338+
/// let mut vec = vec!(1i, 2);
339+
/// vec.push(3);
340+
/// assert_eq!(vec, vec!(1, 2, 3));
341+
/// ```
329342
fn push(&mut self, t: T);
343+
/// Remove the last element from a collection and return it, or `None` if it is
344+
/// empty.
345+
///
346+
/// # Example
347+
///
348+
/// ```rust
349+
/// let mut vec = vec!(1i, 2, 3);
350+
/// assert_eq!(vec.pop(), Some(3));
351+
/// assert_eq!(vec, vec!(1, 2));
352+
/// ```
330353
fn pop(&mut self) -> Option<T>;
331354
}
332355

branches/try/src/libcollections/vec.rs

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1555,19 +1555,6 @@ impl<T:fmt::Show> fmt::Show for Vec<T> {
15551555
}
15561556

15571557
impl<T> MutableSeq<T> for Vec<T> {
1558-
/// Append an element to a vector.
1559-
///
1560-
/// # Failure
1561-
///
1562-
/// Fails if the number of elements in the vector overflows a `uint`.
1563-
///
1564-
/// # Example
1565-
///
1566-
/// ```rust
1567-
/// let mut vec = vec!(1i, 2);
1568-
/// vec.push(3);
1569-
/// assert_eq!(vec, vec!(1, 2, 3));
1570-
/// ```
15711558
#[inline]
15721559
fn push(&mut self, value: T) {
15731560
if mem::size_of::<T>() == 0 {
@@ -1594,16 +1581,6 @@ impl<T> MutableSeq<T> for Vec<T> {
15941581
}
15951582
}
15961583

1597-
/// Remove the last element from a vector and return it, or `None` if it is
1598-
/// empty.
1599-
///
1600-
/// # Example
1601-
///
1602-
/// ```rust
1603-
/// let mut vec = vec!(1i, 2, 3);
1604-
/// assert_eq!(vec.pop(), Some(3));
1605-
/// assert_eq!(vec, vec!(1, 2));
1606-
/// ```
16071584
#[inline]
16081585
fn pop(&mut self) -> Option<T> {
16091586
if self.len == 0 {

0 commit comments

Comments
 (0)