---

yaml
---
r: 135035
b: refs/heads/master
c: 655b726
h: refs/heads/master
i:
  135033: 2861d93
  135031: b9413f0
v: v3

Author: alexcrichton

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 2257e231a7e0c455b61c60414a65e89f01cbf509
+refs/heads/master: 655b7269c865b8ff446296bdb7640c6ad5c4f965
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 7eb9337dace88c5ded431aa7507f06d50619131b
 refs/heads/try: 14378ea357c06c23607ca61ade44f60a7a64a1c7

trunk/configure

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

trunk/mk/stage0.mk

@@ -3,8 +3,11 @@
 $(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 \

trunk/src/doc/guide-pointers.md

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

trunk/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 so, for example, to ignore a test on windows you can
-write `#[ignore(cfg(target_os = "win32"))]`.
+by configuration using the `cfg_attr` attribute so, for example, to ignore a
+test on windows you can write `#[cfg_attr(windows, ignore)]`.
 
 Tests that are intended to fail can be annotated with the
 `should_fail` attribute. The test will be run, and if it causes its

trunk/src/doc/guide.md

@@ -1507,6 +1507,7 @@ 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
@@ -4324,8 +4325,6 @@ 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);
 
@@ -4489,8 +4488,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 returns
-only the elements that that closure returned `true` for:
+returns `true` or `false`. The new iterator `filter()` produces
+only the elements that that closure returns `true` for:
 
 ```{rust}
 for i in range(1i, 100i).filter(|x| x % 2 == 0) {

trunk/src/etc/licenseck.py

@@ -46,6 +46,7 @@
     "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