---

yaml
---
r: 152385
b: refs/heads/try2
c: b13e275
h: refs/heads/master
i:
  152383: 19e9b64
v: v3

Author: TeXitoi

[refs]

@@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
 refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
-refs/heads/try2: e688d0e846e4fc24ab032b2c301fa355235c108a
+refs/heads/try2: b13e275852099c82b63d8d98f192f99112d49474
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/src/etc/licenseck.py

@@ -42,6 +42,7 @@
     "libstd/sync/spsc_queue.rs", # BSD
     "libstd/sync/mpmc_bounded_queue.rs", # BSD
     "libsync/mpsc_intrusive.rs", # BSD
+    "test/bench/shootout-fannkuch-redux.rs", # BSD
     "test/bench/shootout-meteor.rs", # BSD
     "test/bench/shootout-regex-dna.rs", # BSD
 ]

branches/try2/src/libcollections/vec.rs

@@ -1532,7 +1532,7 @@ impl<T> FromVec<T> for ~[T] {
 
         // In a post-DST world, we can attempt to reuse the Vec allocation by calling
         // shrink_to_fit() on it. That may involve a reallocation+memcpy, but that's no
-        // different than what we're doing manually here.
+        // diffrent than what we're doing manually here.
 
         let vp = v.as_mut_ptr();
 

branches/try2/src/libcore/simd.rs

@@ -31,7 +31,7 @@
 //!
 //! ## Stability Note
 //!
-//! These are all experimental. The interface may change entirely, without
+//! These are all experimental. The inferface may change entirely, without
 //! warning.
 
 #![allow(non_camel_case_types)]

branches/try2/src/libcore/str.rs

@@ -478,7 +478,7 @@ impl TwoWaySearcher {
 }
 
 /// The internal state of an iterator that searches for matches of a substring
-/// within a larger string using a dynamically chosen search algorithm
+/// within a larger string using a dynamically chosed search algorithm
 #[deriving(Clone)]
 enum Searcher {
     Naive(NaiveSearcher),
@@ -1120,7 +1120,7 @@ pub trait StrSlice<'a> {
     ///
     /// That is, each returned value `(start, end)` satisfies
     /// `self.slice(start, end) == sep`. For matches of `sep` within
-    /// `self` that overlap, only the indices corresponding to the
+    /// `self` that overlap, only the indicies corresponding to the
     /// first match are returned.
     ///
     /// # Example

branches/try2/src/libserialize/json.rs

@@ -992,7 +992,7 @@ enum ParserState {
     ParseObject(bool),
     // Parse ',' or ']' after an element in an object.
     ParseObjectComma,
-    // Initial state.
+    // Initialial state.
     ParseStart,
     // Expecting the stream to end.
     ParseBeforeFinish,
@@ -1152,7 +1152,7 @@ pub struct Parser<T> {
     // We maintain a stack representing where we are in the logical structure
     // of the JSON stream.
     stack: Stack,
-    // A state machine is kept to make it possible to interrupt and resume parsing.
+    // A state machine is kept to make it possible to interupt and resume parsing.
     state: ParserState,
 }
 
@@ -1449,7 +1449,7 @@ impl<T: Iterator<char>> Parser<T> {
     // information to return a JsonEvent.
     // Manages an internal state so that parsing can be interrupted and resumed.
     // Also keeps track of the position in the logical structure of the json
-    // stream int the form of a stack that can be queried by the user using the
+    // stream int the form of a stack that can be queried by the user usng the
     // stack() method.
     fn parse(&mut self) -> JsonEvent {
         loop {

branches/try2/src/libstd/io/mod.rs

@@ -910,7 +910,7 @@ impl<'a> Reader for &'a mut Reader {
 
 /// Returns a slice of `v` between `start` and `end`.
 ///
-/// Similar to `slice()` except this function only bounds the slice on the
+/// Similar to `slice()` except this function only bounds the sclie on the
 /// capacity of `v`, not the length.
 ///
 /// # Failure

branches/try2/src/libstd/io/process.rs

@@ -873,7 +873,7 @@ mod tests {
     pub fn sleeper() -> Process {
         // There's a `timeout` command on windows, but it doesn't like having
         // its output piped, so instead just ping ourselves a few times with
-        // gaps in between so we're sure this process is alive for awhile
+        // gaps inbetweeen so we're sure this process is alive for awhile
         Command::new("ping").arg("127.0.0.1").arg("-n").arg("1000").spawn().unwrap()
     }
 

branches/try2/src/libstd/io/stdio.rs

@@ -102,7 +102,7 @@ local_data_key!(local_stdout: Box<Writer:Send>)
 pub fn stdin() -> BufferedReader<StdReader> {
     // The default buffer capacity is 64k, but apparently windows doesn't like
     // 64k reads on stdin. See #13304 for details, but the idea is that on
-    // windows we use a slightly smaller buffer that's been seen to be
+    // windows we use a slighly smaller buffer that's been seen to be
     // acceptable.
     if cfg!(windows) {
         BufferedReader::with_capacity(8 * 1024, stdin_raw())

branches/try2/src/libstd/io/timer.rs

@@ -218,7 +218,7 @@ mod test {
     iotest!(fn test_io_timer_oneshot_then_sleep() {
         let mut timer = Timer::new().unwrap();
         let rx = timer.oneshot(100000000000);
-        timer.sleep(1); // this should invalidate rx
+        timer.sleep(1); // this should inalidate rx
 
         assert_eq!(rx.recv_opt(), Err(()));
     })
@@ -352,7 +352,7 @@ mod test {
         let mut timer1 = Timer::new().unwrap();
         timer1.oneshot(1);
         let mut timer2 = Timer::new().unwrap();
-        // while sleeping, the previous timer should fire and not have its
+        // while sleeping, the prevous timer should fire and not have its
         // callback do something terrible.
         timer2.sleep(2);
     })
@@ -361,7 +361,7 @@ mod test {
         let mut timer1 = Timer::new().unwrap();
         timer1.periodic(1);
         let mut timer2 = Timer::new().unwrap();
-        // while sleeping, the previous timer should fire and not have its
+        // while sleeping, the prevous timer should fire and not have its
         // callback do something terrible.
         timer2.sleep(2);
     })

branches/try2/src/libstd/num/strconv.rs

@@ -636,7 +636,7 @@ pub fn from_str_bytes_common<T:NumCast+Zero+One+PartialEq+PartialOrd+Div<T,T>+
                     if accum_positive && accum <= last_accum { return NumStrConv::inf(); }
                     if !accum_positive && accum >= last_accum { return NumStrConv::neg_inf(); }
 
-                    // Detect overflow by reversing the shift-and-add process
+                    // Detect overflow by reversing the shift-and-add proccess
                     if accum_positive &&
                         (last_accum != ((accum - cast(digit as int).unwrap())/radix_gen.clone())) {
                         return NumStrConv::inf();

branches/try2/src/libstd/os.rs

@@ -320,7 +320,7 @@ pub fn env_as_bytes() -> Vec<(Vec<u8>,Vec<u8>)> {
 /// let key = "HOME";
 /// match std::os::getenv(key) {
 ///     Some(val) => println!("{}: {}", key, val),
-///     None => println!("{} is not defined in the environment.", key)
+///     None => println!("{} is not defined in the environnement.", key)
 /// }
 /// ```
 pub fn getenv(n: &str) -> Option<String> {

branches/try2/src/libstd/path/windows.rs

@@ -186,7 +186,7 @@ impl GenericPathUnsafe for Path {
         ret
     }
 
-    /// See `GenericPathUnsafe::set_filename_unchecked`.
+    /// See `GenericPathUnsafe::set_filename_unchecekd`.
     ///
     /// # Failure
     ///

branches/try2/src/libstd/rt/thread.rs

@@ -243,7 +243,7 @@ mod imp {
                 // EINVAL means |stack_size| is either too small or not a
                 // multiple of the system page size.  Because it's definitely
                 // >= PTHREAD_STACK_MIN, it must be an alignment issue.
-                // Round up to the nearest page and try again.
+                // Round up to the neareast page and try again.
                 let page_size = os::page_size();
                 let stack_size = (stack_size + page_size - 1) & (-(page_size - 1) - 1);
                 assert_eq!(pthread_attr_setstacksize(&mut attr, stack_size as libc::size_t), 0);

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

@@ -1,12 +1,42 @@
-// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
+// The Computer Language Benchmarks Game
+// http://benchmarksgame.alioth.debian.org/
 //
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
+// contributed by the Rust Project Developers
+
+// Copyright (c) 2014 The Rust Project Developers
+//
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+//
+// - Redistributions of source code must retain the above copyright
+//   notice, this list of conditions and the following disclaimer.
+//
+// - Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer in
+//   the documentation and/or other materials provided with the
+//   distribution.
+//
+// - Neither the name of "The Computer Language Benchmarks Game" nor
+//   the name of "The Computer Language Shootout Benchmarks" nor the
+//   names of its contributors may be used to endorse or promote
+//   products derived from this software without specific prior
+//   written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+// OF THE POSSIBILITY OF SUCH DAMAGE.
 
 use std::cmp::max;