---

yaml
---
r: 193871
b: refs/heads/beta
c: 4b75dc4
h: refs/heads/master
i:
  193869: 684dece
  193867: 2b30eea
  193863: e90e52e
  193855: ba352ca
v: v3

Author: tshepang

[refs]

@@ -31,7 +31,7 @@ refs/heads/automation-fail: 1bf06495443584539b958873e04cc2f864ab10e4
 refs/heads/issue-18208-method-dispatch-3-quick-reject: 2009f85b9f99dedcec4404418eda9ddba90258a2
 refs/heads/batch: b7fd822592a4fb577552d93010c4a4e14f314346
 refs/heads/building: 126db549b038c84269a1e4fe46f051b2c15d6970
-refs/heads/beta: e8889c94046c89e8d80e9218b000ab36b1271f47
+refs/heads/beta: 4b75dc464868e6800ee73911b50e440de45f783d
 refs/heads/windistfix: 7608dbad651f02e837ed05eef3d74a6662a6e928
 refs/tags/1.0.0-alpha: e42bd6d93a1d3433c486200587f8f9e12590a4d7
 refs/heads/tmp: de8a23bbc3a7b9cbd7574b5b91a34af59bf030e6

branches/beta/mk/dist.mk

@@ -53,7 +53,6 @@ PKG_FILES := \
       driver                                   \
       etc                                      \
       $(foreach crate,$(CRATES),lib$(crate))   \
-      libcollectionstest                       \
       libcoretest                              \
       libbacktrace                             \
       rt                                       \

branches/beta/mk/target.mk

@@ -72,7 +72,6 @@ $$(TLIB$(1)_T_$(2)_H_$(3))/stamp.$(4): CFG_COMPILER_HOST_TRIPLE = $(2)
 $$(TLIB$(1)_T_$(2)_H_$(3))/stamp.$(4): \
 		$$(CRATEFILE_$(4)) \
 		$$(CRATE_FULLDEPS_$(1)_T_$(2)_H_$(3)_$(4)) \
-		$$(LLVM_CONFIG_$(2)) \
 		$$(TSREQ$(1)_T_$(2)_H_$(3)) \
 		| $$(TLIB$(1)_T_$(2)_H_$(3))/
 	@$$(call E, rustc: $$(@D)/lib$(4))

branches/beta/mk/tests.mk

@@ -19,10 +19,7 @@
 DEPS_coretest :=
 $(eval $(call RUST_CRATE,coretest))
 
-DEPS_collectionstest :=
-$(eval $(call RUST_CRATE,collectionstest))
-
-TEST_TARGET_CRATES = $(filter-out core unicode,$(TARGET_CRATES)) collectionstest coretest
+TEST_TARGET_CRATES = $(filter-out core unicode,$(TARGET_CRATES)) coretest
 TEST_DOC_CRATES = $(DOC_CRATES)
 TEST_HOST_CRATES = $(filter-out rustc_typeck rustc_borrowck rustc_resolve rustc_trans rustc_lint,\
                      $(HOST_CRATES))

branches/beta/src/compiletest/compiletest.rs

@@ -20,6 +20,7 @@
 #![feature(std_misc)]
 #![feature(test)]
 #![feature(core)]
+#![feature(net)]
 #![feature(path_ext)]
 
 #![deny(warnings)]

branches/beta/src/doc/intro.md

@@ -140,7 +140,7 @@ right at home if you've used tools like [Bundler](http://bundler.io/),
 [npm](https://www.npmjs.org/), or [pip](https://pip.pypa.io/en/latest/).
 There's no `Makefile`s or endless `autotools` output here. (Rust's tooling does
 [play nice with external libraries written in those
-tools](http://doc.crates.io/build-script.html), if you need to.)
+tools](http://crates.io/native-build.html), if you need to.)
 
 Enough about tools, let's talk code!
 

branches/beta/src/doc/reference.md

@@ -1961,18 +1961,16 @@ module through the rules above. It essentially allows public access into the
 re-exported item. For example, this program is valid:
 
 ```
-pub use self::implementation::api;
+pub use self::implementation as api;
 
 mod implementation {
-    pub mod api {
-        pub fn f() {}
-    }
+    pub fn f() {}
 }
 
 # fn main() {}
 ```
 
-This means that any external crate referencing `implementation::api::f` would
+This means that any external crate referencing `implementation::f` would
 receive a privacy violation, while the path `api::f` would be allowed.
 
 When re-exporting a private item, it can be thought of as allowing the "privacy

branches/beta/src/liballoc/heap.rs

@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-#[cfg(stage0)]
 #[cfg(not(test))]
 use core::ptr::PtrExt;
 
@@ -388,6 +387,7 @@ mod imp {
 mod test {
     extern crate test;
     use self::test::Bencher;
+    use core::ptr::PtrExt;
     use boxed::Box;
     use heap;
 

branches/beta/src/liballoc/rc.rs

@@ -159,10 +159,7 @@ use core::nonzero::NonZero;
 use core::ops::{Deref, Drop};
 use core::option::Option;
 use core::option::Option::{Some, None};
-#[cfg(stage0)]
 use core::ptr::{self, PtrExt};
-#[cfg(not(stage0))]
-use core::ptr;
 use core::result::Result;
 use core::result::Result::{Ok, Err};
 use core::intrinsics::assume;

branches/beta/src/libarena/lib.rs

@@ -46,7 +46,6 @@ use std::intrinsics::{TyDesc, get_tydesc};
 use std::intrinsics;
 use std::marker;
 use std::mem;
-#[cfg(stage0)]
 use std::num::{Int, UnsignedInt};
 use std::ptr;
 use std::rc::Rc;

branches/beta/src/libcollectionstest/bench.rs renamed to branches/beta/src/libcollections/bench.rs

@@ -66,11 +66,11 @@ macro_rules! map_find_rand_bench {
     ($name: ident, $n: expr, $map: ident) => (
         #[bench]
         pub fn $name(b: &mut ::test::Bencher) {
+            use std::rand;
             use std::iter::IteratorExt;
             use std::rand::Rng;
-            use std::rand;
-            use std::vec::Vec;
             use test::black_box;
+            use vec::Vec;
 
             let mut map = $map::new();
             let n: usize = $n;

branches/beta/src/libcollections/binary_heap.rs

@@ -163,11 +163,6 @@ use vec::{self, Vec};
 /// A priority queue implemented with a binary heap.
 ///
 /// This will be a max-heap.
-///
-/// It is a logic error for an item to be modified in such a way that the
-/// item's ordering relative to any other item, as determined by the `Ord`
-/// trait, changes while it is in the heap. This is normally only possible
-/// through `Cell`, `RefCell`, global state, I/O, or unsafe code.
 #[derive(Clone)]
 #[stable(feature = "rust1", since = "1.0.0")]
 pub struct BinaryHeap<T> {
@@ -693,3 +688,218 @@ impl<T: Ord> Extend<T> for BinaryHeap<T> {
         }
     }
 }
+
+#[cfg(test)]
+mod tests {
+    use prelude::*;
+
+    use super::BinaryHeap;
+
+    #[test]
+    fn test_iterator() {
+        let data = vec![5, 9, 3];
+        let iterout = [9, 5, 3];
+        let heap = BinaryHeap::from_vec(data);
+        let mut i = 0;
+        for el in &heap {
+            assert_eq!(*el, iterout[i]);
+            i += 1;
+        }
+    }
+
+    #[test]
+    fn test_iterator_reverse() {
+        let data = vec![5, 9, 3];
+        let iterout = vec![3, 5, 9];
+        let pq = BinaryHeap::from_vec(data);
+
+        let v: Vec<_> = pq.iter().rev().cloned().collect();
+        assert_eq!(v, iterout);
+    }
+
+    #[test]
+    fn test_move_iter() {
+        let data = vec![5, 9, 3];
+        let iterout = vec![9, 5, 3];
+        let pq = BinaryHeap::from_vec(data);
+
+        let v: Vec<_> = pq.into_iter().collect();
+        assert_eq!(v, iterout);
+    }
+
+    #[test]
+    fn test_move_iter_size_hint() {
+        let data = vec![5, 9];
+        let pq = BinaryHeap::from_vec(data);
+
+        let mut it = pq.into_iter();
+
+        assert_eq!(it.size_hint(), (2, Some(2)));
+        assert_eq!(it.next(), Some(9));
+
+        assert_eq!(it.size_hint(), (1, Some(1)));
+        assert_eq!(it.next(), Some(5));
+
+        assert_eq!(it.size_hint(), (0, Some(0)));
+        assert_eq!(it.next(), None);
+    }
+
+    #[test]
+    fn test_move_iter_reverse() {
+        let data = vec![5, 9, 3];
+        let iterout = vec![3, 5, 9];
+        let pq = BinaryHeap::from_vec(data);
+
+        let v: Vec<_> = pq.into_iter().rev().collect();
+        assert_eq!(v, iterout);
+    }
+
+    #[test]
+    fn test_peek_and_pop() {
+        let data = vec![2, 4, 6, 2, 1, 8, 10, 3, 5, 7, 0, 9, 1];
+        let mut sorted = data.clone();
+        sorted.sort();
+        let mut heap = BinaryHeap::from_vec(data);
+        while !heap.is_empty() {
+            assert_eq!(heap.peek().unwrap(), sorted.last().unwrap());
+            assert_eq!(heap.pop().unwrap(), sorted.pop().unwrap());
+        }
+    }
+
+    #[test]
+    fn test_push() {
+        let mut heap = BinaryHeap::from_vec(vec![2, 4, 9]);
+        assert_eq!(heap.len(), 3);
+        assert!(*heap.peek().unwrap() == 9);
+        heap.push(11);
+        assert_eq!(heap.len(), 4);
+        assert!(*heap.peek().unwrap() == 11);
+        heap.push(5);
+        assert_eq!(heap.len(), 5);
+        assert!(*heap.peek().unwrap() == 11);
+        heap.push(27);
+        assert_eq!(heap.len(), 6);
+        assert!(*heap.peek().unwrap() == 27);
+        heap.push(3);
+        assert_eq!(heap.len(), 7);
+        assert!(*heap.peek().unwrap() == 27);
+        heap.push(103);
+        assert_eq!(heap.len(), 8);
+        assert!(*heap.peek().unwrap() == 103);
+    }
+
+    #[test]
+    fn test_push_unique() {
+        let mut heap = BinaryHeap::<Box<_>>::from_vec(vec![box 2, box 4, box 9]);
+        assert_eq!(heap.len(), 3);
+        assert!(*heap.peek().unwrap() == box 9);
+        heap.push(box 11);
+        assert_eq!(heap.len(), 4);
+        assert!(*heap.peek().unwrap() == box 11);
+        heap.push(box 5);
+        assert_eq!(heap.len(), 5);
+        assert!(*heap.peek().unwrap() == box 11);
+        heap.push(box 27);
+        assert_eq!(heap.len(), 6);
+        assert!(*heap.peek().unwrap() == box 27);
+        heap.push(box 3);
+        assert_eq!(heap.len(), 7);
+        assert!(*heap.peek().unwrap() == box 27);
+        heap.push(box 103);
+        assert_eq!(heap.len(), 8);
+        assert!(*heap.peek().unwrap() == box 103);
+    }
+
+    #[test]
+    fn test_push_pop() {
+        let mut heap = BinaryHeap::from_vec(vec![5, 5, 2, 1, 3]);
+        assert_eq!(heap.len(), 5);
+        assert_eq!(heap.push_pop(6), 6);
+        assert_eq!(heap.len(), 5);
+        assert_eq!(heap.push_pop(0), 5);
+        assert_eq!(heap.len(), 5);
+        assert_eq!(heap.push_pop(4), 5);
+        assert_eq!(heap.len(), 5);
+        assert_eq!(heap.push_pop(1), 4);
+        assert_eq!(heap.len(), 5);
+    }
+
+    #[test]
+    fn test_replace() {
+        let mut heap = BinaryHeap::from_vec(vec![5, 5, 2, 1, 3]);
+        assert_eq!(heap.len(), 5);
+        assert_eq!(heap.replace(6).unwrap(), 5);
+        assert_eq!(heap.len(), 5);
+        assert_eq!(heap.replace(0).unwrap(), 6);
+        assert_eq!(heap.len(), 5);
+        assert_eq!(heap.replace(4).unwrap(), 5);
+        assert_eq!(heap.len(), 5);
+        assert_eq!(heap.replace(1).unwrap(), 4);
+        assert_eq!(heap.len(), 5);
+    }
+
+    fn check_to_vec(mut data: Vec<i32>) {
+        let heap = BinaryHeap::from_vec(data.clone());
+        let mut v = heap.clone().into_vec();
+        v.sort();
+        data.sort();
+
+        assert_eq!(v, data);
+        assert_eq!(heap.into_sorted_vec(), data);
+    }
+
+    #[test]
+    fn test_to_vec() {
+        check_to_vec(vec![]);
+        check_to_vec(vec![5]);
+        check_to_vec(vec![3, 2]);
+        check_to_vec(vec![2, 3]);
+        check_to_vec(vec![5, 1, 2]);
+        check_to_vec(vec![1, 100, 2, 3]);
+        check_to_vec(vec![1, 3, 5, 7, 9, 2, 4, 6, 8, 0]);
+        check_to_vec(vec![2, 4, 6, 2, 1, 8, 10, 3, 5, 7, 0, 9, 1]);
+        check_to_vec(vec![9, 11, 9, 9, 9, 9, 11, 2, 3, 4, 11, 9, 0, 0, 0, 0]);
+        check_to_vec(vec![0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10]);
+        check_to_vec(vec![10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0]);
+        check_to_vec(vec![0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 0, 0, 1, 2]);
+        check_to_vec(vec![5, 4, 3, 2, 1, 5, 4, 3, 2, 1, 5, 4, 3, 2, 1]);
+    }
+
+    #[test]
+    fn test_empty_pop() {
+        let mut heap = BinaryHeap::<i32>::new();
+        assert!(heap.pop().is_none());
+    }
+
+    #[test]
+    fn test_empty_peek() {
+        let empty = BinaryHeap::<i32>::new();
+        assert!(empty.peek().is_none());
+    }
+
+    #[test]
+    fn test_empty_replace() {
+        let mut heap = BinaryHeap::new();
+        assert!(heap.replace(5).is_none());
+    }
+
+    #[test]
+    fn test_from_iter() {
+        let xs = vec![9, 8, 7, 6, 5, 4, 3, 2, 1];
+
+        let mut q: BinaryHeap<_> = xs.iter().rev().cloned().collect();
+
+        for &x in &xs {
+            assert_eq!(q.pop().unwrap(), x);
+        }
+    }
+
+    #[test]
+    fn test_drain() {
+        let mut q: BinaryHeap<_> = [9, 8, 7, 6, 5, 4, 3, 2, 1].iter().cloned().collect();
+
+        assert_eq!(q.drain().take(5).count(), 5);
+
+        assert!(q.is_empty());
+    }
+}