---

yaml
---
r: 135101
b: refs/heads/auto
c: 2257e23
h: refs/heads/master
i:
  135099: 74ae5da
v: v3

Author: pcwalton

[refs]

@@ -13,7 +13,7 @@ refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0
 refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
 refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
 refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
-refs/heads/auto: 1ebf456fb02c54fe821f0739da0aba6c25b28c25
+refs/heads/auto: 2257e231a7e0c455b61c60414a65e89f01cbf509
 refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167
 refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c
 refs/tags/0.1: b19db808c2793fe2976759b85a355c3ad8c8b336

branches/auto/configure

@@ -488,7 +488,7 @@ esac
 
 # Continue supporting the old --enable-nightly flag to transition the bots
 # XXX Remove me
-if [ ! -z "$CFG_ENABLE_NIGHTLY" ]
+if [ $CFG_ENABLE_NIGHTLY -eq 1 ]
 then
     CFG_RELEASE_CHANNEL=nightly
     putvar CFG_RELEASE_CHANNEL

branches/auto/mk/stage0.mk

@@ -3,11 +3,8 @@
 $(HBIN0_H_$(CFG_BUILD))/:
 	mkdir -p $@
 
-# On windows these two are the same, so cause a redifinition warning
-ifneq ($(HBIN0_H_$(CFG_BUILD)),$(HLIB0_H_$(CFG_BUILD)))
 $(HLIB0_H_$(CFG_BUILD))/:
 	mkdir -p $@
-endif
 
 $(SNAPSHOT_RUSTC_POST_CLEANUP): \
 		$(S)src/snapshots.txt \

branches/auto/src/doc/guide-pointers.md

@@ -505,7 +505,6 @@ As being similar to this C code:
 {
     int *x;
     x = (int *)malloc(sizeof(int));
-    *x = 5;
 
     // stuff happens
 

branches/auto/src/doc/guide-testing.md

@@ -72,8 +72,8 @@ is not used.
 Tests that should not be run can be annotated with the `ignore`
 attribute. The existence of these tests will be noted in the test
 runner output, but the test will not be run. Tests can also be ignored
-by configuration using the `cfg_attr` attribute so, for example, to ignore a
-test on windows you can write `#[cfg_attr(windows, ignore)]`.
+by configuration so, for example, to ignore a test on windows you can
+write `#[ignore(cfg(target_os = "win32"))]`.
 
 Tests that are intended to fail can be annotated with the
 `should_fail` attribute. The test will be run, and if it causes its

branches/auto/src/doc/guide.md

@@ -1507,7 +1507,6 @@ You can create an array with just square brackets:
 
 ```{rust}
 let nums = [1i, 2i, 3i];
-let nums = [1i, ..20]; // Shorthand for an array of 20 elements all initialized to 1
 ```
 
 So what's the difference? An array has a fixed size, so you can't add or
@@ -4325,6 +4324,8 @@ and so we tell it that we want a vector of integers.
 is one:
 
 ```{rust}
+let one_to_one_hundred = range(0i, 100i);
+
 let greater_than_forty_two = range(0i, 100i)
                              .find(|x| *x >= 42);
 
@@ -4488,8 +4489,8 @@ This will print
 ```
 
 `filter()` is an adapter that takes a closure as an argument. This closure
-returns `true` or `false`. The new iterator `filter()` produces
-only the elements that that closure returns `true` for:
+returns `true` or `false`. The new iterator `filter()` produces returns
+only the elements that that closure returned `true` for:
 
 ```{rust}
 for i in range(1i, 100i).filter(|x| x % 2 == 0) {

branches/auto/src/etc/licenseck.py

@@ -46,7 +46,6 @@
     "test/bench/shootout-chameneos-redux.rs", # BSD
     "test/bench/shootout-fannkuch-redux.rs", # BSD
     "test/bench/shootout-fasta.rs", # BSD
-    "test/bench/shootout-fasta-redux.rs", # BSD
     "test/bench/shootout-k-nucleotide.rs", # BSD
     "test/bench/shootout-mandelbrot.rs", # BSD
     "test/bench/shootout-meteor.rs", # BSD

branches/auto/src/liballoc/boxed.rs

@@ -96,12 +96,6 @@ pub trait BoxAny {
     /// `Err(Self)` if it isn't.
     #[unstable = "naming conventions around accessing innards may change"]
     fn downcast<T: 'static>(self) -> Result<Box<T>, Self>;
-
-    /// Deprecated; this method has been renamed to `downcast`.
-    #[deprecated = "use downcast instead"]
-    fn move<T: 'static>(self) -> Result<Box<T>, Self> {
-        self.downcast::<T>()
-    }
 }
 
 #[stable]