---

yaml
---
r: 148086
b: refs/heads/try2
c: 4329fc6
h: refs/heads/master
v: v3

Author: bors

[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: 116773a4eb63c6e595d35d228513cddb1adf4053
+refs/heads/try2: 4329fc6730e381b3b06f9987327072c50a739ad4
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/doc/guide-macros.md

@@ -278,6 +278,7 @@ return result + val;
 This solves the indentation problem. But if we have a lot of chained matches
 like this, we might prefer to write a single macro invocation. The input
 pattern we want is clear:
+
 ~~~~
 # macro_rules! b(
     ( $( ($e:expr) ~ ($p:pat) else $err:stmt ; )*
@@ -304,6 +305,7 @@ input patterns:
     ( binds $( $bind_res:ident ),* )
 # => (0))
 ~~~~
+
 ...and:
 
 ~~~~

branches/try2/doc/guide-tasks.md

@@ -263,6 +263,7 @@ With `extra::future`, rust has a mechanism for requesting a computation and gett
 later.
 
 The basic example below illustrates this.
+
 ~~~
 # fn make_a_sandwich() {};
 fn fib(n: u64) -> u64 {
@@ -283,6 +284,7 @@ the future needs to be mutable so that it can save the result for next time `get
 
 Here is another example showing how futures allow you to background computations. The workload will
 be distributed on the available cores.
+
 ~~~
 # use std::vec;
 fn partial_sum(start: uint) -> f64 {
@@ -317,6 +319,7 @@ acts as a reference to the shared data and only this reference is shared and clo
 
 Here is a small example showing how to use Arcs. We wish to run concurrently several computations on
 a single large vector of floats. Each task needs the full vector to perform its duty.
+
 ~~~
 # use std::vec;
 # use std::rand;
@@ -348,14 +351,17 @@ fn main() {
 The function `pnorm` performs a simple computation on the vector (it computes the sum of its items
 at the power given as argument and takes the inverse power of this value). The Arc on the vector is
 created by the line
+
 ~~~
 # use extra::arc::Arc;
 # use std::vec;
 # use std::rand;
 # let numbers = vec::from_fn(1000000, |_| rand::random::<f64>());
 let numbers_arc=Arc::new(numbers);
 ~~~
+
 and a clone of it is sent to each task
+
 ~~~
 # use extra::arc::Arc;
 # use std::vec;
@@ -365,9 +371,11 @@ and a clone of it is sent to each task
 # let (port, chan)  = Chan::new();
 chan.send(numbers_arc.clone());
 ~~~
+
 copying only the wrapper and not its contents.
 
 Each task recovers the underlying data by
+
 ~~~
 # use extra::arc::Arc;
 # use std::vec;
@@ -379,6 +387,7 @@ Each task recovers the underlying data by
 # let local_arc : Arc<~[f64]> = port.recv();
 let task_numbers = local_arc.get();
 ~~~
+
 and can use it as if it were local.
 
 The `arc` module also implements Arcs around mutable data that are not covered here.

branches/try2/doc/rust.md

@@ -845,6 +845,7 @@ If a sequence of such redirections form a cycle or cannot be resolved unambiguou
 they represent a compile-time error.
 
 An example of re-exporting:
+
 ~~~~
 # fn main() { }
 mod quux {
@@ -868,6 +869,7 @@ All rules regarding accessing declared modules in `use` declarations applies to
 and `extern mod` declarations.
 
 An example of what will and will not work for `use` items:
+
 ~~~~
 # #[allow(unused_imports)];
 use foo::extra;          // good: foo is at the root of the crate
@@ -1184,6 +1186,7 @@ a = Cat;
 ~~~~
 
 Enumeration constructors can have either named or unnamed fields:
+
 ~~~~
 enum Animal {
     Dog (~str, f64),

branches/try2/doc/tutorial.md

@@ -2790,13 +2790,15 @@ For example, if we move the `animals` module above into its own file...
 mod plants;
 mod animals;
 ~~~
+
 ~~~ {.ignore}
 // src/animals.rs or src/animals/mod.rs
 mod fish;
 mod mammals {
     mod humans;
 }
 ~~~
+
 ...then the source files of `mod animals`'s submodules can
 either be placed right next to that of its parents, or in a subdirectory if `animals` source file is:
 
@@ -2959,6 +2961,7 @@ pub fn bar() { println("Baz!"); }
 There also exist two short forms for importing multiple names at once:
 
 1. Explicit mention multiple names as the last element of an `use` path:
+
 ~~~
 use farm::{chicken, cow};
 # mod farm {
@@ -2969,6 +2972,7 @@ use farm::{chicken, cow};
 ~~~
 
 2. Import everything in a module with a wildcard:
+
 ~~~
 use farm::*;
 # mod farm {

branches/try2/src/compiletest/compiletest.rs

@@ -13,7 +13,6 @@
 #[allow(non_camel_case_types)];
 #[deny(warnings)];
 
-#[cfg(stage0)] extern mod green;
 extern mod extra;
 
 use std::os;

branches/try2/src/driver/driver.rs

@@ -8,8 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-#[cfg(stage0)] extern mod green;
-
 #[cfg(rustpkg)]
 extern mod this = "rustpkg";
 

branches/try2/src/libextra/bitv.rs

@@ -80,7 +80,7 @@ impl SmallBitv {
             self.bits |= 1<<i;
         }
         else {
-            self.bits &= !(1<<i as uint);
+            self.bits &= !(1<<i);
         }
     }