---

yaml
---
r: 149367
b: refs/heads/try2
c: 5611463
h: refs/heads/master
i:
  149365: 9381265
  149363: 716a372
  149359: 1479abd
v: v3

Author: dylanbraithwaite

[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: ace204a74548947914d08a7feca694941106175d
+refs/heads/try2: 56114633e88ecb6621ffdd9d69ec0efc32140c60
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/Makefile.in

@@ -19,17 +19,13 @@
 #
 # First, start with one of these build targets:
 #
-#   * all - The default. Build a complete, bootstrapped compiler.
+#   * all - The default. Builds a complete, bootstrapped compiler.
 #           `rustc` will be in `${target-triple}/stage2/bin/`. Run it
 #           directly from the build directory if you like. This also
 #           comes with docs in `doc/`.
 #
 #   * check - Run the complete test suite
 #
-#   * clean - Clean the build repertory. It is advised to run this
-#             command if you want to build Rust again, after an update
-#             of the git repository.
-#
 #   * install - Install Rust. Note that installation is not necessary
 #               to use the compiler.
 #
@@ -107,7 +103,7 @@
 #
 # </tips>
 #
-# <nitty-gritty>
+# <nittygritty>
 #
 # # The Rust Build System
 #
@@ -156,12 +152,12 @@
 # libraries are managed and versioned without polluting the common
 # areas of the filesystem.
 #
-# General rust binaries may still live in the host bin directory; they
+# General rust binaries may stil live in the host bin directory; they
 # will just link against the libraries in the target lib directory.
 #
 # Admittedly this is a little convoluted.
 #
-# </nitty-gritty>
+# </nittygritty>
 #
 
 ######################################################################

branches/try2/mk/main.mk

@@ -446,13 +446,13 @@ all: $(ALL_TARGET_RULES) $(GENERATED) docs
 # $(1) is the name of the doc <section> in Makefile.in
 # pick everything between tags | remove first line | remove last line
 # | remove extra (?) line | strip leading `#` from lines
-SHOW_DOCS = $(Q)awk '/<$(1)>/,/<\/$(1)>/' $(S)/Makefile.in | sed '1d' | sed '$$d' | sed 's/^\# \?//'
+SHOW_DOCS = $(Q)awk '/$(1)/,/<\/$(1)>/' $(S)/Makefile.in | sed '1d' | sed '$$d' | sed 's/^\# \?//'
 
 help:
 	$(call SHOW_DOCS,help)
 
-tips:
-	$(call SHOW_DOCS,tips)
+hot-tips:
+	$(call SHOW_DOCS,hottips)
 
 nitty-gritty:
-	$(call SHOW_DOCS,nitty-gritty)
+	$(call SHOW_DOCS,nittygritty)

branches/try2/src/compiler-rt

@@ -1 +1 @@
-Subproject commit f4b221571ce6f05714c1f1c6fa48f1393499989c
+Subproject commit d4606f1818dd8dfeaa3e509cd1cbac4482c3513e

branches/try2/src/doc/tutorial.md

@@ -1750,24 +1750,6 @@ closures, but they also own them: that is, no other code can access
 them. Owned closures are used in concurrent code, particularly
 for spawning [tasks][tasks].
 
-Closures can be used to spawn tasks.
-A practical example of this pattern is found when using the `spawn` function,
-which starts a new task.
-
-~~~~
-use std::task::spawn;
-
-// proc is the closure which will be spawned.
-spawn(proc() {
-    debug!("I'm a new task")
-});
-~~~~
-
-> ***Note:*** If you want to see the output of `debug!` statements, you will need to turn on
-> `debug!` logging.  To enable `debug!` logging, set the RUST_LOG environment
-> variable to the name of your crate, which, for a file named `foo.rs`, will be
-> `foo` (e.g., with bash, `export RUST_LOG=foo`).
-
 ## Closure compatibility
 
 Rust closures have a convenient subtyping property: you can pass any kind of
@@ -1789,6 +1771,45 @@ call_twice(function);
 > in small ways. At the moment they can be unsound in some
 > scenarios, particularly with non-copyable types.
 
+## Do syntax
+
+The `do` expression makes it easier to call functions that take procedures
+as arguments.
+
+Consider this function that takes a procedure:
+
+~~~~
+fn call_it(op: proc(v: int)) {
+    op(10)
+}
+~~~~
+
+As a caller, if we use a closure to provide the final operator
+argument, we can write it in a way that has a pleasant, block-like
+structure.
+
+~~~~
+# fn call_it(op: proc(v: int)) { }
+call_it(proc(n) {
+    println!("{}", n);
+});
+~~~~
+
+A practical example of this pattern is found when using the `spawn` function,
+which starts a new task.
+
+~~~~
+use std::task::spawn;
+spawn(proc() {
+    debug!("I'm a new task")
+});
+~~~~
+
+If you want to see the output of `debug!` statements, you will need to turn on
+`debug!` logging.  To enable `debug!` logging, set the RUST_LOG environment
+variable to the name of your crate, which, for a file named `foo.rs`, will be
+`foo` (e.g., with bash, `export RUST_LOG=foo`).
+
 # Methods
 
 Methods are like functions except that they always begin with a special argument,

branches/try2/src/libextra/json.rs

@@ -59,7 +59,6 @@ the code for these traits: `#[deriving(Decodable, Encodable)]`
 To encode using Encodable :
 
 ```rust
-extern crate extra;
 extern crate serialize;
 use extra::json;
 use std::io;
@@ -99,7 +98,6 @@ A basic `ToJson` example using a TreeMap of attribute name / attribute value:
 
 
 ```rust
-extern crate extra;
 extern crate collections;
 
 use extra::json;
@@ -130,7 +128,6 @@ fn main() {
 To decode a JSON string using `Decodable` trait :
 
 ```rust
-extern crate extra;
 extern crate serialize;
 use serialize::Decodable;
 
@@ -157,7 +154,6 @@ Create a struct called TestStruct1 and serialize and deserialize it to and from
 using the serialization API, using the derived serialization code.
 
 ```rust
-extern crate extra;
 extern crate serialize;
 use extra::json;
 use serialize::{Encodable, Decodable};
@@ -190,7 +186,6 @@ This example use the ToJson impl to deserialize the JSON string.
 Example of `ToJson` trait implementation for TestStruct1.
 
 ```rust
-extern crate extra;
 extern crate serialize;
 extern crate collections;
 

branches/try2/src/libnative/io/file.rs

@@ -571,9 +571,7 @@ pub fn readdir(p: &CString) -> IoResult<~[Path]> {
                         else {
                             let fp_vec = vec::from_buf(
                                 fp_buf, wcslen(fp_buf) as uint);
-                            let fp_trimmed = str::truncate_utf16_at_nul(fp_vec);
-                            let fp_str = str::from_utf16(fp_trimmed)
-                                    .expect("rust_list_dir_wfd_fp_buf returned invalid UTF-16");
+                            let fp_str = str::from_utf16(fp_vec);
                             paths.push(Path::new(fp_str));
                         }
                         more_files = FindNextFileW(find_handle, wfd_ptr as HANDLE);