Skip to content

Commit 71a75cc

Browse files
committed
Just land already
1 parent 27e70c5 commit 71a75cc

File tree

5 files changed

+44
-44
lines changed

5 files changed

+44
-44
lines changed

src/libcollections/dlist.rs

+23-23
Original file line numberDiff line numberDiff line change
@@ -279,12 +279,12 @@ impl<T> DList<T> {
279279
/// # Example
280280
///
281281
/// ```rust
282-
/// use std::collections::{DList, Deque};
282+
/// use std::collections::DList;
283283
///
284284
/// let mut dl = DList::new();
285-
/// dl.push_back(1i);
286-
/// dl.push_back(2);
287-
/// dl.push_back(3);
285+
/// dl.push(1i);
286+
/// dl.push(2);
287+
/// dl.push(3);
288288
///
289289
/// dl.rotate_forward();
290290
///
@@ -306,12 +306,12 @@ impl<T> DList<T> {
306306
/// # Example
307307
///
308308
/// ```rust
309-
/// use std::collections::{DList, Deque};
309+
/// use std::collections::DList;
310310
///
311311
/// let mut dl = DList::new();
312-
/// dl.push_back(1i);
313-
/// dl.push_back(2);
314-
/// dl.push_back(3);
312+
/// dl.push(1i);
313+
/// dl.push(2);
314+
/// dl.push(3);
315315
///
316316
/// dl.rotate_backward();
317317
///
@@ -333,14 +333,14 @@ impl<T> DList<T> {
333333
/// # Example
334334
///
335335
/// ```rust
336-
/// use std::collections::{DList, Deque};
336+
/// use std::collections::DList;
337337
///
338338
/// let mut a = DList::new();
339339
/// let mut b = DList::new();
340-
/// a.push_back(1i);
341-
/// a.push_back(2);
342-
/// b.push_back(3i);
343-
/// b.push_back(4);
340+
/// a.push(1i);
341+
/// a.push(2);
342+
/// b.push(3i);
343+
/// b.push(4);
344344
///
345345
/// a.append(b);
346346
///
@@ -374,14 +374,14 @@ impl<T> DList<T> {
374374
/// # Example
375375
///
376376
/// ```rust
377-
/// use std::collections::{DList, Deque};
377+
/// use std::collections::DList;
378378
///
379379
/// let mut a = DList::new();
380380
/// let mut b = DList::new();
381-
/// a.push_back(1i);
382-
/// a.push_back(2);
383-
/// b.push_back(3i);
384-
/// b.push_back(4);
381+
/// a.push(1i);
382+
/// a.push(2);
383+
/// b.push(3i);
384+
/// b.push(4);
385385
///
386386
/// a.prepend(b);
387387
///
@@ -403,13 +403,13 @@ impl<T> DList<T> {
403403
/// # Example
404404
///
405405
/// ```rust
406-
/// use std::collections::{DList, Deque};
406+
/// use std::collections::DList;
407407
///
408408
/// let mut a: DList<int> = DList::new();
409-
/// a.push_back(2i);
410-
/// a.push_back(4);
411-
/// a.push_back(7);
412-
/// a.push_back(8);
409+
/// a.push(2i);
410+
/// a.push(4);
411+
/// a.push(7);
412+
/// a.push(8);
413413
///
414414
/// // insert 11 before the first odd number in the list
415415
/// a.insert_when(11, |&e, _| e % 2 == 1);

src/libcollections/lib.rs

+18-18
Original file line numberDiff line numberDiff line change
@@ -360,9 +360,9 @@ pub trait MutableSeq<T>: Mutable {
360360
/// use std::collections::{RingBuf, Deque};
361361
///
362362
/// let mut queue = RingBuf::new();
363-
/// queue.push_back(1i);
364-
/// queue.push_back(2i);
365-
/// queue.push_back(3i);
363+
/// queue.push(1i);
364+
/// queue.push(2i);
365+
/// queue.push(3i);
366366
///
367367
/// // Will print 1, 2, 3
368368
/// while !queue.is_empty() {
@@ -398,13 +398,13 @@ pub trait MutableSeq<T>: Mutable {
398398
/// // Init deque with 1, 2, 3, 4
399399
/// deque.push_front(2i);
400400
/// deque.push_front(1i);
401-
/// deque.push_back(3i);
402-
/// deque.push_back(4i);
401+
/// deque.push(3i);
402+
/// deque.push(4i);
403403
///
404404
/// // Will print (1, 4) and (2, 3)
405405
/// while !deque.is_empty() {
406406
/// let f = deque.pop_front().unwrap();
407-
/// let b = deque.pop_back().unwrap();
407+
/// let b = deque.pop().unwrap();
408408
/// println!("{}", (f, b));
409409
/// }
410410
/// ```
@@ -420,8 +420,8 @@ pub trait Deque<T> : MutableSeq<T> {
420420
/// let mut d = RingBuf::new();
421421
/// assert_eq!(d.front(), None);
422422
///
423-
/// d.push_back(1i);
424-
/// d.push_back(2i);
423+
/// d.push(1i);
424+
/// d.push(2i);
425425
/// assert_eq!(d.front(), Some(&1i));
426426
/// ```
427427
fn front<'a>(&'a self) -> Option<&'a T>;
@@ -437,8 +437,8 @@ pub trait Deque<T> : MutableSeq<T> {
437437
/// let mut d = RingBuf::new();
438438
/// assert_eq!(d.front_mut(), None);
439439
///
440-
/// d.push_back(1i);
441-
/// d.push_back(2i);
440+
/// d.push(1i);
441+
/// d.push(2i);
442442
/// match d.front_mut() {
443443
/// Some(x) => *x = 9i,
444444
/// None => (),
@@ -458,8 +458,8 @@ pub trait Deque<T> : MutableSeq<T> {
458458
/// let mut d = DList::new();
459459
/// assert_eq!(d.back(), None);
460460
///
461-
/// d.push_back(1i);
462-
/// d.push_back(2i);
461+
/// d.push(1i);
462+
/// d.push(2i);
463463
/// assert_eq!(d.back(), Some(&2i));
464464
/// ```
465465
fn back<'a>(&'a self) -> Option<&'a T>;
@@ -475,8 +475,8 @@ pub trait Deque<T> : MutableSeq<T> {
475475
/// let mut d = DList::new();
476476
/// assert_eq!(d.back(), None);
477477
///
478-
/// d.push_back(1i);
479-
/// d.push_back(2i);
478+
/// d.push(1i);
479+
/// d.push(2i);
480480
/// match d.back_mut() {
481481
/// Some(x) => *x = 9i,
482482
/// None => (),
@@ -503,7 +503,7 @@ pub trait Deque<T> : MutableSeq<T> {
503503
///
504504
/// # Example
505505
///
506-
/// ```
506+
/// ```ignore
507507
/// use std::collections::{DList, Deque};
508508
///
509509
/// let mut d = DList::new();
@@ -518,7 +518,7 @@ pub trait Deque<T> : MutableSeq<T> {
518518
///
519519
/// # Example
520520
///
521-
/// ```
521+
/// ```ignore
522522
/// use std::collections::{RingBuf, Deque};
523523
///
524524
/// let mut d = RingBuf::new();
@@ -540,8 +540,8 @@ pub trait Deque<T> : MutableSeq<T> {
540540
/// use std::collections::{RingBuf, Deque};
541541
///
542542
/// let mut d = RingBuf::new();
543-
/// d.push_back(1i);
544-
/// d.push_back(2i);
543+
/// d.push(1i);
544+
/// d.push(2i);
545545
///
546546
/// assert_eq!(d.pop_front(), Some(1i));
547547
/// assert_eq!(d.pop_front(), Some(2i));

src/libcollections/string.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -575,7 +575,7 @@ mod tests {
575575
use std::prelude::*;
576576
use test::Bencher;
577577

578-
use Mutable;
578+
use {Mutable, MutableSeq};
579579
use str;
580580
use str::{Str, StrSlice, Owned, Slice};
581581
use super::String;

src/libcollections/vec.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -981,7 +981,7 @@ impl<T> Vec<T> {
981981
///
982982
/// # Example
983983
///
984-
/// ```
984+
/// ```ignore
985985
/// let mut vec = vec![1i, 2, 3];
986986
/// vec.unshift(4);
987987
/// assert_eq!(vec, vec![4, 1, 2, 3]);

src/libstd/collections/hashmap.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1291,7 +1291,7 @@ impl<K: Eq + Hash<S>, V, S, H: Hasher<S>> HashMap<K, V, H> {
12911291
/// // new value based on the first letter of the key.
12921292
/// |key, already, new| {
12931293
/// if key.as_slice().starts_with("z") {
1294-
/// already.unshift(new);
1294+
/// already.insert(0, new);
12951295
/// } else {
12961296
/// already.push(new);
12971297
/// }

0 commit comments

Comments
 (0)