---

yaml
---
r: 151338
b: refs/heads/try2
c: b43d7b0
h: refs/heads/master
v: v3

Author: EdorianDark

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

branches/try2/AUTHORS.txt

@@ -362,7 +362,6 @@ Raphael Speyer <[email protected]>
 reedlepee <[email protected]>
 Reuben Morais <[email protected]>
 Richard Diamond <[email protected]>
-Richo Healey <[email protected]>
 Rick Waldron <[email protected]>
 Rob Arnold <[email protected]>
 Rob Hoelz <[email protected]>

branches/try2/CONTRIBUTING.md

@@ -33,11 +33,11 @@ message explaining why.
 
 In the licensing header at the beginning of any files you change,
 please make sure the listed date range includes the current year.  For
-example, if it's 2014, and you change a Rust file that was created in
+example, if it's 2013, and you change a Rust file that was created in
 2010, it should begin:
 
 ```
-// Copyright 2010-2014 The Rust Project Developers.
+// Copyright 2010-2013 The Rust Project Developers.
 ```
 
 For more details, please refer to

branches/try2/LICENSE-MIT

@@ -1,4 +1,5 @@
-Copyright (c) 2014 The Rust Project Developers
+Copyright (c) 2006-2009 Graydon Hoare
+Copyright (c) 2009-2014 Mozilla Foundation
 
 Permission is hereby granted, free of charge, to any
 person obtaining a copy of this software and associated

branches/try2/README.md

@@ -20,7 +20,7 @@ documentation.
 ## Building from Source
 
 1. Make sure you have installed the dependencies:
-    * `g++` 4.7 or `clang++` 3.x
+    * `g++` 4.4 or `clang++` 3.x
     * `python` 2.6 or later (but not 3.x)
     * `perl` 5.0 or later
     * GNU `make` 3.81 or later

branches/try2/mk/crates.mk

@@ -51,7 +51,7 @@
 
 TARGET_CRATES := libc std green rustuv native flate arena glob term semver \
                  uuid serialize sync getopts collections num test time rand \
-		 workcache url log regex graphviz
+		 workcache url log regex
 HOST_CRATES := syntax rustc rustdoc fourcc hexfloat regex_macros
 CRATES := $(TARGET_CRATES) $(HOST_CRATES)
 TOOLS := compiletest rustdoc rustc
@@ -67,7 +67,6 @@ DEPS_rustdoc := rustc native:sundown serialize sync getopts collections \
                 test time
 DEPS_flate := std native:miniz
 DEPS_arena := std collections
-DEPS_graphviz := std
 DEPS_glob := std
 DEPS_serialize := std collections log
 DEPS_term := std collections

branches/try2/mk/platform.mk

@@ -330,7 +330,7 @@ CFG_PATH_MUNGE_arm-unknown-linux-gnueabihf := true
 CFG_LDPATH_arm-unknown-linux-gnueabihf :=
 CFG_RUN_arm-unknown-linux-gnueabihf=$(2)
 CFG_RUN_TARG_arm-unknown-linux-gnueabihf=$(call CFG_RUN_arm-unknown-linux-gnueabihf,,$(2))
-RUSTC_FLAGS_arm-unknown-linux-gnueabihf := -C target-feature=+v6,+vfp2
+RUSTC_FLAGS_arm-unknown-linux-gnueabihf := -C target-feature=+v7,+vfp3
 RUSTC_CROSS_FLAGS_arm-unknown-linux-gnueabihf :=
 
 # arm-unknown-linux-gnueabi configuration

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

@@ -186,7 +186,7 @@ enum List<T> {
     Nil,
     Cons(T, ~List<T>),
 }
-
+    
 fn main() {
     let list: List<int> = Cons(1, ~Cons(2, ~Cons(3, ~Nil)));
     println!("{:?}", list);
@@ -251,7 +251,7 @@ struct.
 
 > **Note**: the `@` form of managed pointers is deprecated and behind a
 > feature gate (it requires a `#![feature(managed_pointers)]` attribute on
-> the crate root). There are replacements, currently
+> the crate root; remember the semicolon!). There are replacements, currently 
 > there is `std::rc::Rc` and `std::gc::Gc` for shared ownership via reference
 > counting and garbage collection respectively.
 
@@ -266,7 +266,7 @@ struct Point {
     x: int,
     y: int,
 }
-
+    
 fn main() {
     let a = ~Point { x: 10, y: 20 };
     let b = a;
@@ -297,7 +297,7 @@ struct Point {
     x: int,
     y: int,
 }
-
+    
 fn main() {
     let a = @Point { x: 10, y: 20 };
     let b = a;
@@ -361,7 +361,7 @@ So how is this hard? Well, because we're ignoring ownership, the compiler needs
 to take great care to make sure that everything is safe. Despite their complete
 safety, a reference's representation at runtime is the same as that of
 an ordinary pointer in a C program. They introduce zero overhead. The compiler
-does all safety checks at compile time.
+does all safety checks at compile time. 
 
 This theory is called 'region pointers,' and involve a concept called
 'lifetimes'. Here's the simple explanation: would you expect this code to
@@ -477,7 +477,7 @@ fn main() {
 You may think that this gives us terrible performance: return a value and then
 immediately box it up?!?! Isn't that the worst of both worlds? Rust is smarter
 than that. There is no copy in this code. `main` allocates enough room for the
-`@int`, passes a pointer to that memory into `foo` as `x`, and then `foo` writes
+`@int`, passes a pointer to that memory into `foo` as `x`, and then `foo` writes 
 the value straight into that pointer. This writes the return value directly into
 the allocated box.
 

branches/try2/src/doc/guide-tasks.md

@@ -48,7 +48,13 @@ concurrency at this writing:
 * [`std::task`] - All code relating to tasks and task scheduling,
 * [`std::comm`] - The message passing interface,
 * [`sync::DuplexStream`] - An extension of `pipes::stream` that allows both sending and receiving,
+* [`sync::SyncSender`] - An extension of `pipes::stream` that provides synchronous message sending,
+* [`sync::SyncReceiver`] - An extension of `pipes::stream` that acknowledges each message received,
+* [`sync::rendezvous`] - Creates a stream whose channel, upon sending a message, blocks until the
+    message is received.
 * [`sync::Arc`] - The Arc (atomically reference counted) type, for safely sharing immutable data,
+* [`sync::RWArc`] - A dual-mode Arc protected by a reader-writer lock,
+* [`sync::MutexArc`] - An Arc with mutable data protected by a blocking mutex,
 * [`sync::Semaphore`] - A counting, blocking, bounded-waiting semaphore,
 * [`sync::Mutex`] - A blocking, bounded-waiting, mutual exclusion lock with an associated
     FIFO condition variable,
@@ -64,8 +70,13 @@ concurrency at this writing:
 [`std::task`]: std/task/index.html
 [`std::comm`]: std/comm/index.html
 [`sync::DuplexStream`]: sync/struct.DuplexStream.html
+[`sync::SyncSender`]: sync/struct.SyncSender.html
+[`sync::SyncReceiver`]: sync/struct.SyncReceiver.html
+[`sync::rendezvous`]: sync/fn.rendezvous.html
 [`sync::Arc`]: sync/struct.Arc.html
-[`sync::Semaphore`]: sync/raw/struct.Semaphore.html
+[`sync::RWArc`]: sync/struct.RWArc.html
+[`sync::MutexArc`]: sync/struct.MutexArc.html
+[`sync::Semaphore`]: sync/struct.Semaphore.html
 [`sync::Mutex`]: sync/struct.Mutex.html
 [`sync::RWLock`]: sync/struct.RWLock.html
 [`sync::Barrier`]: sync/struct.Barrier.html
@@ -89,10 +100,7 @@ closure in the new task.
 fn print_message() { println!("I am running in a different task!"); }
 spawn(print_message);
 
-// Print something profound in a different task using a `proc` expression
-// The `proc` expression evaluates to an (unnamed) owned closure.
-// That closure will call `println!(...)` when the spawned task runs.
-
+// Print something more profound in a different task using a lambda expression
 spawn(proc() println!("I am also running in a different task!") );
 ~~~~
 

branches/try2/src/doc/intro.md

@@ -370,7 +370,7 @@ fn main() {
 ```
 
 This example is starting to get more subtle,
-but it hints at the powerful composability of Rust's concurrent types.
+but it hints at the powerful compositionality of Rust's concurrent types.
 This time we've put our array of numbers inside a `Mutex` and then put *that* inside the `Arc`.
 Like immutable data,
 `Mutex`es are sharable,

branches/try2/src/doc/tutorial.md

@@ -90,7 +90,7 @@ supported build environments that are most likely to work.
 To build from source you will also need the following prerequisite
 packages:
 
-* g++ 4.7 or clang++ 3.x
+* g++ 4.4 or clang++ 3.x
 * python 2.6 or later (but not 3.x)
 * perl 5.0 or later
 * gnu make 3.81 or later
@@ -468,16 +468,19 @@ Unlike in C, there is no "falling through" between arms: only one arm
 executes, and it doesn't have to explicitly `break` out of the
 construct when it is finished.
 
-A `match` arm consists of a *pattern*, then a fat arrow `=>`, followed
-by an *action* (expression). Each case is separated by commas. It is
-often convenient to use a block expression for each case, in which case
-the commas are optional as shown below. Literals are valid patterns and
-match only their own value. A single arm may match multiple different
-patterns by combining them with the pipe operator (`|`), so long as every
-pattern binds the same set of variables. Ranges of numeric literal
-patterns can be expressed with two dots, as in `M..N`. The underscore
-(`_`) is a wildcard pattern that matches any single value. (`..`) is a
-different wildcard that can match one or more fields in an `enum` variant.
+A `match` arm consists of a *pattern*, then an arrow `=>`, followed by
+an *action* (expression). Literals are valid patterns and match only
+their own value. A single arm may match multiple different patterns by
+combining them with the pipe operator (`|`), so long as every pattern
+binds the same set of variables. Ranges of numeric literal patterns
+can be expressed with two dots, as in `M..N`. The underscore (`_`) is
+a wildcard pattern that matches any single value. (`..`) is a different
+wildcard that can match one or more fields in an `enum` variant.
+
+The patterns in a match arm are followed by a fat arrow, `=>`, then an
+expression to evaluate. Each case is separated by commas. It's often
+convenient to use a block expression for each case, in which case the
+commas are optional.
 
 ~~~
 # let my_number = 1;
@@ -1413,7 +1416,7 @@ contains a point, but allocated in a different location:
 
 ~~~
 # struct Point { x: f64, y: f64 }
-let on_the_stack :  Point =  Point { x: 3.0, y: 4.0 };
+let on_the_stack : Point  =  Point { x: 3.0, y: 4.0 };
 let owned_box    : ~Point = ~Point { x: 7.0, y: 9.0 };
 ~~~
 
@@ -1717,103 +1720,38 @@ environment (sometimes referred to as "capturing" variables in their
 environment). For example, you couldn't write the following:
 
 ~~~~ {.ignore}
-let x = 3;
+let foo = 10;
 
-// `fun` cannot refer to `x`
-fn fun() -> () { println!("{}", x); }
+fn bar() -> int {
+   return foo; // `bar` cannot refer to `foo`
+}
 ~~~~
 
-A _closure_ does support accessing the enclosing scope; below we will create
-2 _closures_ (nameless functions). Compare how `||` replaces `()` and how
-they try to access `x`:
-
-~~~~ {.ignore}
-let x = 3;
+Rust also supports _closures_, functions that can access variables in
+the enclosing scope.
 
-// `fun` is an invalid definition
-fn  fun       () -> () { println!("{}", x) }  // cannot capture from enclosing scope
-let closure = || -> () { println!("{}", x) }; // can capture from enclosing scope
-
-// `fun_arg` is an invalid definition
-fn  fun_arg       (arg: int) -> () { println!("{}", arg + x) }  // cannot capture
-let closure_arg = |arg: int| -> () { println!("{}", arg + x) }; // can capture
-//                      ^
-// Requires a type because the implementation needs to know which `+` to use.
-// In the future, the implementation may not need the help.
+~~~~
+fn call_closure_with_ten(b: |int|) { b(10); }
 
-fun();          // Still won't work
-closure();      // Prints: 3
+let captured_var = 20;
+let closure = |arg| println!("captured_var={}, arg={}", captured_var, arg);
 
-fun_arg(7);     // Still won't work
-closure_arg(7); // Prints: 10
+call_closure_with_ten(closure);
 ~~~~
 
 Closures begin with the argument list between vertical bars and are followed by
 a single expression. Remember that a block, `{ <expr1>; <expr2>; ... }`, is
 considered a single expression: it evaluates to the result of the last
 expression it contains if that expression is not followed by a semicolon,
-otherwise the block evaluates to `()`, the unit value.
-
-In general, return types and all argument types must be specified
-explicitly for function definitions.  (As previously mentioned in the
-[Functions section](#functions), omitting the return type from a
-function declaration is synonymous with an explicit declaration of
-return type unit, `()`.)
+otherwise the block evaluates to `()`.
 
-~~~~ {.ignore}
-fn  fun   (x: int)         { println!("{}", x) } // this is same as saying `-> ()`
-fn  square(x: int) -> uint { (x * x) as uint }   // other return types are explicit
+The types of the arguments are generally omitted, as is the return type,
+because the compiler can almost always infer them. In the rare case where the
+compiler needs assistance, though, the arguments and return types may be
+annotated.
 
-// Error: mismatched types: expected `()` but found `uint`
-fn  badfun(x: int)         { (x * x) as uint }
 ~~~~
-
-On the other hand, the compiler can usually infer both the argument
-and return types for a closure expression; therefore they are often
-omitted, since both a human reader and the compiler can deduce the
-types from the immediate context.  This is in contrast to function
-declarations, which require types to be specified and are not subject
-to type inference. Compare:
-
-~~~~ {.ignore}
-// `fun` as a function declaration cannot infer the type of `x`, so it must be provided
-fn  fun       (x: int) { println!("{}", x) }
-let closure = |x     | { println!("{}", x) }; // infers `x: int`, return type `()`
-
-// For closures, omitting a return type is *not* synonymous with `-> ()`
-let add_3   = |y     | { 3i + y }; // infers `y: int`, return type `int`.
-
-fun(10);            // Prints 10
-closure(20);        // Prints 20
-closure(add_3(30)); // Prints 33
-
-fun("String"); // Error: mismatched types
-
-// Error: mismatched types
-// inference already assigned `closure` the type `|int| -> ()`
-closure("String");
-~~~~
-
-In cases where the compiler needs assistance, the arguments and return
-types may be annotated on closures, using the same notation as shown
-earlier.  In the example below, since different types provide an
-implementation for the operator `*`, the argument type for the `x`
-parameter must be explicitly provided.
-
-~~~~{.ignore}
-// Error: the type of `x` must be known to be used with `x * x`
-let square = |x     | -> uint { (x * x) as uint };
-~~~~
-
-In the corrected version, the argument type is explicitly annotated,
-while the return type can still be inferred.
-
-~~~~
-let square_explicit = |x: int| -> uint { (x * x) as uint };
-let square_infer    = |x: int|         { (x * x) as uint };
-
-println!("{}", square_explicit(20));  // 400
-println!("{}", square_infer(-20));    // 400
+let square = |x: int| -> uint { (x * x) as uint };
 ~~~~
 
 There are several forms of closure, each with its own role. The most
@@ -2584,18 +2522,11 @@ for `Eq` and can be used with the equality operators, and that a value
 of type `ABC` can be randomly generated and converted to a string:
 
 ~~~
-extern crate rand;
-
 #[deriving(Eq)]
 struct Circle { radius: f64 }
 
-#[deriving(Rand, Show)]
+#[deriving(Clone, Show)]
 enum ABC { A, B, C }
-
-fn main() {
-    // Use the Show trait to print "A, B, C."
-    println!("{}, {}, {}", A, B, C);
-}
 ~~~
 
 The full list of derivable traits is `Eq`, `TotalEq`, `Ord`,

branches/try2/src/etc/emacs/README.md

@@ -12,12 +12,11 @@ To install manually, check out this repository and add this to your
 
 ```lisp
 (add-to-list 'load-path "/path/to/rust-mode/")
-(autoload 'rust-mode "rust-mode" nil t)
-(add-to-list 'auto-mode-alist '("\\.rs\\'" . rust-mode))
+(require 'rust-mode)
 ```
 
-This associates `rust-mode` with `.rs` files. To enable it explicitly, do
-<kbd>M-x rust-mode</kbd>.
+`rust-mode` will automatically be associated with `.rs` files. To enable it
+explicitly, do <kbd>M-x rust-mode</kbd>.
 
 ### `package.el` installation via Marmalade or MELPA
 

branches/try2/src/etc/emacs/rust-mode.el

@@ -169,7 +169,7 @@
 ;; Font-locking definitions and helpers
 (defconst rust-mode-keywords
   '("as"
-    "box" "break"
+    "break"
     "continue" "crate"
     "do"
     "else" "enum" "extern"