---

yaml
---
r: 152252
b: refs/heads/try2
c: 96cc48f
h: refs/heads/master
v: v3

Author: huonw

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

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 \
-                 url log regex graphviz core rlibc alloc debug
+		 workcache url log regex graphviz core rlibc alloc debug
 HOST_CRATES := syntax rustc rustdoc fourcc hexfloat regex_macros fmt_macros
 CRATES := $(TARGET_CRATES) $(HOST_CRATES)
 TOOLS := compiletest rustdoc rustc
@@ -88,6 +88,7 @@ DEPS_test := std collections getopts serialize term time regex
 DEPS_time := std serialize sync
 DEPS_rand := core
 DEPS_url := std collections
+DEPS_workcache := std serialize collections log
 DEPS_log := std sync
 DEPS_regex := std collections
 DEPS_regex_macros = syntax std regex
@@ -101,6 +102,7 @@ TOOL_SOURCE_rustdoc := $(S)src/driver/driver.rs
 TOOL_SOURCE_rustc := $(S)src/driver/driver.rs
 
 ONLY_RLIB_core := 1
+ONLY_RLIB_libc := 1
 ONLY_RLIB_rlibc := 1
 ONLY_RLIB_alloc := 1
 ONLY_RLIB_rand := 1

branches/try2/src/README.md

@@ -5,37 +5,26 @@ Source layout:
 | Path                | Description                                               |
 | ------------------- | --------------------------------------------------------- |
 | `librustc/`         | The self-hosted compiler                                  |
-| `liballoc/`         | Rust's core allocation library                            |
-| `libcore/`          | The Rust core library                                     |
-| `libdebug/`         | Debugging utilities                                       |
 | `libstd/`           | The standard library (imported and linked by default)     |
+| `libextra/`         | The "extras" library (slightly more peripheral code)      |
 | `libgreen/`         | The M:N runtime library                                   |
 | `libnative/`        | The 1:1 runtime library                                   |
 | `libsyntax/`        | The Rust parser and pretty-printer                        |
+| `libcollections/`   | A collection of useful data structures and containers     |
+| `libnum/`           | Extended number support library (complex, rational, etc)  |
 | `libtest/`          | Rust's test-runner code                                   |
 | ------------------- | --------------------------------------------------------- |
 | `libarena/`         | The arena (a fast but limited) memory allocator           |
-| `libbacktrace/`     | The libbacktrace library                                  |
-| `libcollections/`   | A collection of useful data structures and containers     |
 | `libflate/`         | Simple compression library                                |
-| `libfmt_macros/`    | Macro support for format strings                          |
 | `libfourcc/`        | Data format identifier library                            |
 | `libgetopts/`       | Get command-line-options library                          |
 | `libglob/`          | Unix glob patterns library                                |
-| `libgraphviz/`      | Generating files for Graphviz                             |
-| `libhexfloat/`      | Hexadecimal floating-point literals                       |
-| `liblibc/`          | Bindings for the C standard library                       |
-| `liblog/`           | Utilities for program-wide and customizable logging       |
-| `libnum/`           | Extended number support library (complex, rational, etc)  |
-| `librand/`          | Random numbers and distributions                          |
 | `libregex/`         | Regular expressions                                       |
-| `libregex_macros/`  | The regex! syntax extension                               |
 | `libsemver/`        | Rust's semantic versioning library                        |
 | `libserialize/`     | Encode-Decode types library                               |
 | `libsync/`          | Concurrency mechanisms and primitives                     |
 | `libterm/`          | ANSI color library for terminals                          |
 | `libtime/`          | Time operations library                                   |
-| `liburl/`           | URL handling lirary                                       |
 | `libuuid/`          | UUID's handling code                                      |
 | ------------------- | --------------------------------------------------------- |
 | `rt/`               | The runtime system                                        |

branches/try2/src/doc/complement-cheatsheet.md

@@ -4,7 +4,7 @@
 
 **Int to string**
 
-Use [`ToStr`](std/to_str/trait.ToStr.html).
+Use [`ToStr`](../std/to_str/trait.ToStr.html).
 
 ~~~
 let x: int = 42;
@@ -13,8 +13,8 @@ let y: String = x.to_str().to_string();
 
 **String to int**
 
-Use [`FromStr`](std/from_str/trait.FromStr.html), and its helper function,
-[`from_str`](std/from_str/fn.from_str.html).
+Use [`FromStr`](../std/from_str/trait.FromStr.html), and its helper function,
+[`from_str`](../std/from_str/fn.from_str.html).
 
 ~~~
 let x: Option<int> = from_str("42");
@@ -35,8 +35,8 @@ let y: String = format!("{:X}", x);   // uppercase hexadecimal
 
 **String to int, in non-base-10**
 
-Use [`FromStrRadix`](std/num/trait.FromStrRadix.html), and its helper
-function, [`from_str_radix`](std/num/fn.from_str_radix.html).
+Use [`FromStrRadix`](../std/num/trait.FromStrRadix.html), and its helper
+function, [`from_str_radix`](../std/num/fn.from_str_radix.html).
 
 ~~~
 use std::num;
@@ -48,7 +48,7 @@ let y: i64 = x.unwrap();
 **Vector of Bytes to String**
 
 To return a Borrowed String Slice (&str) use the str helper function
-[`from_utf8`](std/str/fn.from_utf8.html).
+[`from_utf8`](../std/str/fn.from_utf8.html).
 
 ~~~
 use std::str;
@@ -58,7 +58,7 @@ let x: &str = str::from_utf8(bytes).unwrap();
 ~~~
 
 To return an Owned String use the str helper function
-[`from_utf8_owned`](std/str/fn.from_utf8_owned.html).
+[`from_utf8_owned`](../std/str/fn.from_utf8_owned.html).
 
 ~~~
 use std::str;
@@ -68,8 +68,8 @@ let x: Option<String> =
 let y: String = x.unwrap();
 ~~~
 
-To return a [`MaybeOwned`](std/str/type.MaybeOwned.html) use the str helper
-function [`from_utf8_lossy`](std/str/fn.from_utf8_owned.html).
+To return a [`MaybeOwned`](../std/str/enum.MaybeOwned.html) use the str helper
+function [`from_utf8_lossy`](../std/str/fn.from_utf8_owned.html).
 This function also replaces non-valid utf-8 sequences with U+FFFD replacement
 character.
 
@@ -103,11 +103,11 @@ contained data as a `&mut [T]`.
 ## How do I read from a file?
 
 Use
-[`File::open`](std/io/fs/struct.File.html#method.open)
+[`File::open`](../std/io/fs/struct.File.html#method.open)
 to create a
-[`File`](std/io/fs/struct.File.html)
+[`File`](../std/io/fs/struct.File.html)
 struct, which implements the
-[`Reader`](std/io/trait.Reader.html)
+[`Reader`](../std/io/trait.Reader.html)
 trait.
 
 ~~~ {.ignore}
@@ -121,8 +121,7 @@ let reader : File = File::open(&path).unwrap_or_else(on_error);
 
 ## How do I iterate over the lines in a file?
 
-Use the [`lines`](std/io/trait.Buffer.html#method.lines) method on a
-[`BufferedReader`](std/io/struct.BufferedReader.html).
+Use the [`lines`](../std/io/trait.Buffer.html#method.lines) method on a [`BufferedReader`](../std/io/buffered/struct.BufferedReader.html).
 
 ~~~
 use std::io::BufferedReader;
@@ -140,7 +139,7 @@ for line in reader.lines() {
 
 ## How do I search for a substring?
 
-Use the [`find_str`](std/str/trait.StrSlice.html#tymethod.find_str) method.
+Use the [`find_str`](../std/str/trait.StrSlice.html#tymethod.find_str) method.
 
 ~~~
 let str = "Hello, this is some random string";
@@ -151,7 +150,7 @@ let index: Option<uint> = str.find_str("rand");
 
 ## How do I get the length of a vector?
 
-The [`Container`](std/container/trait.Container.html) trait provides the `len` method.
+The [`Container`](../std/container/trait.Container.html) trait provides the `len` method.
 
 ~~~
 let u: Vec<u32> = vec![0, 1, 2];
@@ -163,7 +162,7 @@ println!("u: {}, v: {}, w: {}", u.len(), v.len(), w.len()); // 3, 4, 5
 
 ## How do I iterate over a vector?
 
-Use the [`iter`](std/slice/trait.ImmutableVector.html#tymethod.iter) method.
+Use the [`iter`](../std/vec/trait.ImmutableVector.html#tymethod.iter) method.
 
 ~~~
 let values: Vec<int> = vec![1, 2, 3, 4, 5];
@@ -172,9 +171,9 @@ for value in values.iter() {  // value: &int
 }
 ~~~
 
-(See also [`mut_iter`](std/slice/trait.MutableVector.html#tymethod.mut_iter)
+(See also [`mut_iter`](../std/vec/trait.MutableVector.html#tymethod.mut_iter)
 which yields `&mut int` and
-[`move_iter`](std/slice/trait.OwnedVector.html#tymethod.move_iter) which yields
+[`move_iter`](../std/vec/trait.OwnedVector.html#tymethod.move_iter) which yields
 `int` while consuming the `values` vector.)
 
 # Type system
@@ -255,7 +254,7 @@ Note: The Rust signatures should be wrapped in an `extern "ABI" { ... }` block.
 
 You might see things like this in C APIs:
 
-~~~c
+~~~ {.notrust}
 typedef struct Window Window;
 Window* createWindow(int width, int height);
 ~~~

branches/try2/src/doc/complement-lang-faq.md

@@ -21,7 +21,7 @@ Some examples that demonstrate different aspects of the language:
 * The extra library's [json] module. Enums and pattern matching
 
 [sprocketnes]: https://github.com/pcwalton/sprocketnes
-[hash]: https://github.com/mozilla/rust/blob/master/src/libstd/hash/mod.rs
+[hash]: https://github.com/mozilla/rust/blob/master/src/libstd/hash.rs
 [HashMap]: https://github.com/mozilla/rust/blob/master/src/libcollections/hashmap.rs
 [json]: https://github.com/mozilla/rust/blob/master/src/libserialize/json.rs
 
@@ -135,7 +135,7 @@ For simplicity, we do not plan to do so. Implementing automatic semicolon insert
 
 **Short answer** set the RUST_LOG environment variable to the name of your source file, sans extension.
 
-```sh
+```notrust,sh
 rustc hello.rs
 export RUST_LOG=hello
 ./hello
@@ -149,6 +149,6 @@ example we were setting RUST_LOG to the name of the hello crate. Multiple paths
 can be combined to control the exact logging you want to see. For example, when
 debugging linking in the compiler you might set
 `RUST_LOG=rustc::metadata::creader,rustc::util::filesearch,rustc::back::rpath`
-For a full description see [the logging crate][1].
+For a full description see [the language reference][1].
 
-[1]:log/index.html
+[1]:http://doc.rust-lang.org/doc/master/rust.html#logging-system

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

@@ -229,7 +229,7 @@ fn main() {
 
 C code:
 
-~~~~c
+~~~~ {.notrust}
 typedef void (*rust_callback)(int32_t);
 rust_callback cb;
 
@@ -296,7 +296,7 @@ fn main() {
 
 C code:
 
-~~~~c
+~~~~ {.notrust}
 typedef void (*rust_callback)(int32_t);
 void* cb_target;
 rust_callback cb;

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

@@ -67,7 +67,7 @@ Now we can call `compute_distance()`:
 # let on_the_stack :     Point  =     Point{x: 3.0, y: 4.0};
 # let on_the_heap  : Box<Point> = box Point{x: 7.0, y: 9.0};
 # fn compute_distance(p1: &Point, p2: &Point) -> f64 { 0.0 }
-compute_distance(&on_the_stack, on_the_heap);
+compute_distance(&on_the_stack, &*on_the_heap);
 ~~~
 
 Here, the `&` operator takes the address of the variable
@@ -77,10 +77,9 @@ value. We also call this _borrowing_ the local variable
 `on_the_stack`, because we have created an alias: that is, another
 name for the same data.
 
-In the case of `on_the_heap`, however, no explicit action is necessary. 
-The compiler will automatically convert a box box point to a reference like &point. 
-This is another form of borrowing; in this case, the contents of the owned box 
-are being lent out.
+For the second argument, we need to extract the contents of `on_the_heap`
+by derefercing with the `*` symbol. Now that we have the data, we need
+to create a reference with the `&` symbol.
 
 Whenever a caller lends data to a callee, there are some limitations on what
 the caller can do with the original. For example, if the contents of a
@@ -218,7 +217,7 @@ fn example3() -> int {
 To make this clearer, consider this diagram showing the state of
 memory immediately before the re-assignment of `x`:
 
-~~~ {.text}
+~~~ {.notrust}
     Stack               Exchange Heap
 
   x +-------------+
@@ -232,7 +231,7 @@ memory immediately before the re-assignment of `x`:
 
 Once the reassignment occurs, the memory will look like this:
 
-~~~ {.text}
+~~~ {.notrust}
     Stack               Exchange Heap
 
   x +-------------+          +---------+
@@ -329,7 +328,7 @@ to a pointer of type `&size` into the _interior of the enum_.
 To make this more clear, let's look at a diagram of memory layout in
 the case where `shape` points at a rectangle:
 
-~~~ {.text}
+~~~ {.notrust}
 Stack             Memory
 
 +-------+         +---------------+
@@ -354,7 +353,7 @@ to store that shape value would still be valid, _it would have a
 different type_! The following diagram shows what memory would look
 like if code overwrote `shape` with a circle:
 
-~~~ {.text}
+~~~ {.notrust}
 Stack             Memory
 
 +-------+         +---------------+

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

@@ -31,7 +31,7 @@ fn main() {
 
 And now I get an error:
 
-~~~text
+~~~ {.notrust}
 error: mismatched types: expected `&int` but found `<generic integer #0>` (expected &-ptr but found integral variable)
 ~~~
 
@@ -201,7 +201,7 @@ fn main() {
 
 This prints:
 
-~~~text
+~~~ {.notrust}
 Cons(1, box Cons(2, box Cons(3, box Nil)))
 ~~~
 
@@ -347,7 +347,7 @@ fn main() {
 
 It gives this error:
 
-~~~text
+~~~ {.notrust}
 test.rs:5:8: 5:10 error: cannot assign to `*x` because it is borrowed
 test.rs:5         *x -= 1;
                   ^~