---

yaml
---
r: 171679
b: refs/heads/batch
c: 20bce44
h: refs/heads/master
i:
  171677: 31d02e8
  171675: 6b0b80f
  171671: 44d5cd6
  171663: 16ffd3d
  171647: fa1dcfb
v: v3

Author: bors

[refs]

@@ -29,7 +29,7 @@ refs/tags/0.12.0: f0c419429ef30723ceaf6b42f9b5a2aeb5d2e2d1
 refs/heads/issue-18208-method-dispatch-2: 9e1eae4fb9b6527315b4441cf8a0f5ca911d1671
 refs/heads/automation-fail: 1bf06495443584539b958873e04cc2f864ab10e4
 refs/heads/issue-18208-method-dispatch-3-quick-reject: 2009f85b9f99dedcec4404418eda9ddba90258a2
-refs/heads/batch: a728b4c9b8936ec63f88a3d8a6e5622e43ee4fc5
+refs/heads/batch: 20bce44810eb5146f609b4362990ef8835e55bb5
 refs/heads/building: 126db549b038c84269a1e4fe46f051b2c15d6970
 refs/heads/beta: 496dc4eae7de9d14cd49511a9acfbf5f11ae6c3f
 refs/heads/windistfix: 7608dbad651f02e837ed05eef3d74a6662a6e928

branches/batch/mk/main.mk

@@ -15,8 +15,10 @@
 # The version number
 CFG_RELEASE_NUM=1.0.0
 
-# An optional number to put after the label, e.g. '2' -> '-beta2'
-CFG_BETA_CYCLE=
+# An optional number to put after the label, e.g. '.2' -> '-beta.2'
+# NB Make sure it starts with a dot to conform to semver pre-release
+# versions (section 9)
+CFG_PRERELEASE_VERSION=
 
 CFG_FILENAME_EXTRA=4e7c5e5c
 
@@ -29,8 +31,8 @@ CFG_DISABLE_UNSTABLE_FEATURES=1
 endif
 ifeq ($(CFG_RELEASE_CHANNEL),beta)
 # The beta channel is temporarily called 'alpha'
-CFG_RELEASE=$(CFG_RELEASE_NUM)-alpha$(CFG_BETA_CYCLE)
-CFG_PACKAGE_VERS=$(CFG_RELEASE_NUM)-alpha$(CFG_BETA_CYCLE)
+CFG_RELEASE=$(CFG_RELEASE_NUM)-alpha$(CFG_PRERELEASE_VERSION)
+CFG_PACKAGE_VERS=$(CFG_RELEASE_NUM)-alpha$(CFG_PRERELEASE_VERSION)
 CFG_DISABLE_UNSTABLE_FEATURES=1
 endif
 ifeq ($(CFG_RELEASE_CHANNEL),nightly)

branches/batch/src/libstd/sys/unix/condvar.rs

@@ -76,8 +76,20 @@ impl Condvar {
     }
 
     #[inline]
+    #[cfg(not(target_os = "dragonfly"))]
     pub unsafe fn destroy(&self) {
         let r = ffi::pthread_cond_destroy(self.inner.get());
         debug_assert_eq!(r, 0);
     }
+
+    #[inline]
+    #[cfg(target_os = "dragonfly")]
+    pub unsafe fn destroy(&self) {
+        let r = ffi::pthread_cond_destroy(self.inner.get());
+        // On DragonFly pthread_cond_destroy() returns EINVAL if called on
+        // a condvar that was just initialized with
+        // ffi::PTHREAD_COND_INITIALIZER. Once it is used or
+        // pthread_cond_init() is called, this behaviour no longer occurs.
+        debug_assert!(r == 0 || r == libc::EINVAL);
+    }
 }

branches/batch/src/libstd/sys/unix/mutex.rs

@@ -48,8 +48,20 @@ impl Mutex {
         ffi::pthread_mutex_trylock(self.inner.get()) == 0
     }
     #[inline]
+    #[cfg(not(target_os = "dragonfly"))]
     pub unsafe fn destroy(&self) {
         let r = ffi::pthread_mutex_destroy(self.inner.get());
         debug_assert_eq!(r, 0);
     }
+    #[inline]
+    #[cfg(target_os = "dragonfly")]
+    pub unsafe fn destroy(&self) {
+        use libc;
+        let r = ffi::pthread_mutex_destroy(self.inner.get());
+        // On DragonFly pthread_mutex_destroy() returns EINVAL if called on a
+        // mutex that was just initialized with ffi::PTHREAD_MUTEX_INITIALIZER.
+        // Once it is used (locked/unlocked) or pthread_mutex_init() is called,
+        // this behaviour no longer occurs.
+        debug_assert!(r == 0 || r == libc::EINVAL);
+    }
 }

branches/batch/src/libstd/sys/unix/rwlock.rs

@@ -50,8 +50,21 @@ impl RWLock {
     #[inline]
     pub unsafe fn write_unlock(&self) { self.read_unlock() }
     #[inline]
+    #[cfg(not(target_os = "dragonfly"))]
     pub unsafe fn destroy(&self) {
         let r = ffi::pthread_rwlock_destroy(self.inner.get());
         debug_assert_eq!(r, 0);
     }
+
+    #[inline]
+    #[cfg(target_os = "dragonfly")]
+    pub unsafe fn destroy(&self) {
+        use libc;
+        let r = ffi::pthread_rwlock_destroy(self.inner.get());
+        // On DragonFly pthread_rwlock_destroy() returns EINVAL if called on a
+        // rwlock that was just initialized with
+        // ffi::PTHREAD_RWLOCK_INITIALIZER. Once it is used (locked/unlocked)
+        // or pthread_rwlock_init() is called, this behaviour no longer occurs.
+        debug_assert!(r == 0 || r == libc::EINVAL);
+    }
 }

branches/batch/src/test/bench/core-map.rs

@@ -14,7 +14,6 @@ use std::collections::{BTreeMap, HashMap, HashSet};
 use std::os;
 use std::rand::{Rng, IsaacRng, SeedableRng};
 use std::time::Duration;
-use std::uint;
 
 fn timed<F>(label: &str, f: F) where F: FnMut() {
     println!("  {}: {}", label, Duration::span(f));

branches/batch/src/test/bench/core-set.rs

@@ -22,7 +22,6 @@ use std::collections::hash_map::Hasher;
 use std::hash::Hash;
 use std::os;
 use std::time::Duration;
-use std::uint;
 
 struct Results {
     sequential_ints: Duration,

branches/batch/src/test/bench/core-uint-to-str.rs

@@ -9,7 +9,6 @@
 // except according to those terms.
 
 use std::os;
-use std::uint;
 
 fn main() {
     let args = os::args();

branches/batch/src/test/bench/msgsend-pipes-shared.rs

@@ -22,7 +22,6 @@ use std::sync::mpsc::{channel, Sender, Receiver};
 use std::os;
 use std::thread::Thread;
 use std::time::Duration;
-use std::uint;
 
 fn move_out<T>(_x: T) {}
 

branches/batch/src/test/bench/msgsend-pipes.rs

@@ -18,9 +18,6 @@ use std::sync::mpsc::{channel, Sender, Receiver};
 use std::os;
 use std::thread::Thread;
 use std::time::Duration;
-use std::uint;
-
-fn move_out<T>(_x: T) {}
 
 enum request {
     get_count,
@@ -42,7 +39,7 @@ fn server(requests: &Receiver<request>, responses: &Sender<uint>) {
           _ => { }
         }
     }
-    responses.send(count);
+    responses.send(count).unwrap();
     //println!("server exiting");
 }
 

branches/batch/src/test/bench/msgsend-ring-mutex-arcs.rs

@@ -21,7 +21,6 @@
 use std::os;
 use std::sync::{Arc, Future, Mutex, Condvar};
 use std::time::Duration;
-use std::uint;
 
 // A poor man's pipe.
 type pipe = Arc<(Mutex<Vec<uint>>, Condvar)>;
@@ -76,7 +75,7 @@ fn main() {
     let num_tasks = args[1].parse::<uint>().unwrap();
     let msg_per_task = args[2].parse::<uint>().unwrap();
 
-    let (mut num_chan, num_port) = init();
+    let (num_chan, num_port) = init();
 
     let mut p = Some((num_chan, num_port));
     let dur = Duration::span(|| {

branches/batch/src/test/bench/rt-parfib.rs

@@ -11,23 +11,22 @@
 use std::sync::mpsc::channel;
 use std::os;
 use std::thread::Thread;
-use std::uint;
 
 // A simple implementation of parfib. One subtree is found in a new
 // task and communicated over a oneshot pipe, the other is found
 // locally. There is no sequential-mode threshold.
 
 fn parfib(n: uint) -> uint {
-    if(n == 0 || n == 1) {
+    if n == 0 || n == 1 {
         return 1;
     }
 
     let (tx, rx) = channel();
     Thread::spawn(move|| {
-        tx.send(parfib(n-1));
+        tx.send(parfib(n-1)).unwrap();
     });
     let m2 = parfib(n-2);
-    return (rx.recv().unwrap() + m2);
+    return rx.recv().unwrap() + m2;
 }
 
 fn main() {

branches/batch/src/test/bench/shootout-binarytrees.rs

@@ -92,7 +92,7 @@ fn main() {
     let long_lived_arena = TypedArena::new();
     let long_lived_tree = bottom_up_tree(&long_lived_arena, 0, max_depth);
 
-    let mut messages = range_step(min_depth, max_depth + 1, 2).map(|depth| {
+    let messages = range_step(min_depth, max_depth + 1, 2).map(|depth| {
             use std::num::Int;
             let iterations = 2i.pow((max_depth - depth + min_depth) as uint);
             Thread::scoped(move|| {

branches/batch/src/test/bench/shootout-chameneos-redux.rs

@@ -182,7 +182,7 @@ fn rendezvous(nn: uint, set: Vec<Color>) {
     let (to_rendezvous_log, from_creatures_log) = channel::<String>();
 
     // these channels will allow us to talk to each creature by 'name'/index
-    let mut to_creature: Vec<Sender<CreatureInfo>> =
+    let to_creature: Vec<Sender<CreatureInfo>> =
         set.iter().enumerate().map(|(ii, &col)| {
             // create each creature as a listener with a port, and
             // give us a channel to talk to each

branches/batch/src/test/bench/shootout-fannkuch-redux.rs

@@ -128,7 +128,7 @@ impl Perm {
 }
 
 
-fn reverse(tperm: &mut [i32], mut k: uint) {
+fn reverse(tperm: &mut [i32], k: uint) {
     tperm.slice_to_mut(k).reverse()
 }
 
@@ -163,7 +163,7 @@ fn fannkuch(n: i32) -> (i32, i32) {
     let mut futures = vec![];
     let k = perm.max() / N;
 
-    for (i, j) in range(0, N).zip(iter::count(0, k)) {
+    for (_, j) in range(0, N).zip(iter::count(0, k)) {
         let max = cmp::min(j+k, perm.max());
 
         futures.push(Thread::scoped(move|| {

branches/batch/src/test/bench/shootout-k-nucleotide.rs

@@ -43,7 +43,6 @@
 #![feature(box_syntax)]
 
 use std::ascii::OwnedAsciiExt;
-use std::iter::repeat;
 use std::slice;
 use std::sync::Arc;
 use std::thread::Thread;

branches/batch/src/test/bench/shootout-nbody.rs

@@ -202,6 +202,6 @@ fn shift_mut_ref<'a, T>(r: &mut &'a mut [T]) -> Option<&'a mut T> {
         raw.data = raw.data.offset(1);
         raw.len -= 1;
         *r = mem::transmute(raw);
-        Some(unsafe { &mut *ret })
+        Some({ &mut *ret })
     }
 }

branches/batch/src/test/bench/shootout-reverse-complement.rs

@@ -229,7 +229,7 @@ unsafe impl<T: 'static> Send for Racy<T> {}
 
 /// Executes a closure in parallel over the given iterator over mutable slice.
 /// The closure `f` is run in parallel with an element of `iter`.
-fn parallel<'a, I, T, F>(mut iter: I, f: F)
+fn parallel<'a, I, T, F>(iter: I, f: F)
         where T: 'a+Send + Sync,
               I: Iterator<Item=&'a mut [T]>,
               F: Fn(&mut [T]) + Sync {

branches/batch/src/test/bench/shootout-threadring.rs

@@ -43,7 +43,7 @@ use std::thread::Thread;
 
 fn start(n_tasks: int, token: int) {
     let (tx, mut rx) = channel();
-    tx.send(token);
+    tx.send(token).unwrap();
     for i in range(2, n_tasks + 1) {
         let (tx, next_rx) = channel();
         Thread::spawn(move|| roundtrip(i, tx, rx));
@@ -58,7 +58,7 @@ fn roundtrip(id: int, tx: Sender<int>, rx: Receiver<int>) {
             println!("{}", id);
             break;
         }
-        tx.send(token - 1);
+        tx.send(token - 1).unwrap();
     }
 }
 

branches/batch/src/test/bench/std-smallintmap.rs

@@ -13,7 +13,6 @@
 use std::collections::VecMap;
 use std::os;
 use std::time::Duration;
-use std::uint;
 
 fn append_sequential(min: uint, max: uint, map: &mut VecMap<uint>) {
     for i in range(min, max) {

branches/batch/src/test/bench/sudoku.rs

@@ -55,18 +55,6 @@ impl Sudoku {
         return Sudoku::new(g)
     }
 
-    pub fn equal(&self, other: &Sudoku) -> bool {
-        for row in range(0u8, 9u8) {
-            for col in range(0u8, 9u8) {
-                if self.grid[row as uint][col as uint] !=
-                        other.grid[row as uint][col as uint] {
-                    return false;
-                }
-            }
-        }
-        return true;
-    }
-
     pub fn read(mut reader: &mut BufferedReader<StdReader>) -> Sudoku {
         /* assert first line is exactly "9,9" */
         assert!(reader.read_line().unwrap() == "9,9".to_string());
@@ -184,7 +172,7 @@ impl Colors {
     fn next(&self) -> u8 {
         let Colors(c) = *self;
         let val = c & HEADS;
-        if (0u16 == val) {
+        if 0u16 == val {
             return 0u8;
         } else {
             return val.trailing_zeros() as u8

branches/batch/src/test/bench/task-perf-alloc-unwind.rs

@@ -19,10 +19,6 @@ enum List<T> {
     Nil, Cons(T, Box<List<T>>)
 }
 
-enum UniqueList {
-    ULNil, ULCons(Box<UniqueList>)
-}
-
 fn main() {
     let (repeat, depth) = if os::getenv("RUST_BENCH").is_some() {
         (50, 1000)

branches/batch/src/test/bench/task-perf-jargon-metal-smoke.rs

@@ -20,7 +20,6 @@
 use std::sync::mpsc::{channel, Sender};
 use std::os;
 use std::thread::Thread;
-use std::uint;
 
 fn child_generation(gens_left: uint, tx: Sender<()>) {
     // This used to be O(n^2) in the number of generations that ever existed.

branches/batch/src/test/bench/task-perf-spawnalot.rs

@@ -9,7 +9,6 @@
 // except according to those terms.
 
 use std::os;
-use std::uint;
 use std::thread::Thread;
 
 fn f(n: uint) {