---

yaml
---
r: 163817
b: refs/heads/master
c: b9c3b56
h: refs/heads/master
i:
  163815: 21e81cf
v: v3

Author: Alfie John

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 444fa1b7cffcd99ca5b8abb51acf979f06a25899
+refs/heads/master: b9c3b5693ad599dafa64559089f92233015dd633
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 8443b09e361b96d1f9b7f45a65ed0d31c0e86e70
 refs/heads/try: 20cbbffeefc1f35e2ea63afce7b42fbd79611d42

trunk/mk/crates.mk

@@ -53,7 +53,7 @@ TARGET_CRATES := libc std flate arena term \
                  serialize getopts collections test time rand \
                  log regex graphviz core rbml alloc rustrt \
                  unicode
-RUSTC_CRATES := rustc rustc_typeck rustc_borrowck rustc_driver rustc_trans rustc_back rustc_llvm 
+RUSTC_CRATES := rustc rustc_typeck rustc_driver rustc_trans rustc_back rustc_llvm 
 HOST_CRATES := syntax $(RUSTC_CRATES) rustdoc regex_macros fmt_macros
 CRATES := $(TARGET_CRATES) $(HOST_CRATES)
 TOOLS := compiletest rustdoc rustc
@@ -67,12 +67,11 @@ DEPS_std := core libc rand alloc collections rustrt unicode \
 	native:rust_builtin native:backtrace
 DEPS_graphviz := std
 DEPS_syntax := std term serialize log fmt_macros arena libc
-DEPS_rustc_driver := arena flate getopts graphviz libc rustc rustc_back rustc_borrowck \
+DEPS_rustc_driver := arena flate getopts graphviz libc rustc rustc_back \
                      rustc_typeck log syntax serialize rustc_llvm rustc_trans
 DEPS_rustc_trans := arena flate getopts graphviz libc rustc rustc_back \
 	                log syntax serialize rustc_llvm
 DEPS_rustc_typeck := rustc syntax
-DEPS_rustc_borrowck := rustc log graphviz syntax
 DEPS_rustc := syntax flate arena serialize getopts rbml \
               time log graphviz rustc_llvm rustc_back
 DEPS_rustc_llvm := native:rustllvm libc std
@@ -118,10 +117,9 @@ ONLY_RLIB_unicode := 1
 DOC_CRATES := $(filter-out rustc, \
               $(filter-out rustc_trans, \
               $(filter-out rustc_typeck, \
-              $(filter-out rustc_borrowck, \
               $(filter-out rustc_driver, \
-              $(filter-out syntax, $(CRATES)))))))
-COMPILER_DOC_CRATES := rustc rustc_trans rustc_borrowck rustc_typeck rustc_driver syntax
+              $(filter-out syntax, $(CRATES))))))
+COMPILER_DOC_CRATES := rustc rustc_trans rustc_typeck rustc_driver syntax
 
 # This macro creates some simple definitions for each crate being built, just
 # some munging of all of the parameters above.

trunk/mk/dist.mk

@@ -48,6 +48,7 @@ PKG_FILES := \
     $(S)configure $(S)Makefile.in              \
     $(S)man                                    \
     $(addprefix $(S)src/,                      \
+      README.md                                \
       compiletest                              \
       doc                                      \
       driver                                   \
@@ -122,16 +123,15 @@ PKG_EXE = dist/$(PKG_NAME)-$(CFG_BUILD).exe
 $(PKG_EXE): rust.iss modpath.iss upgrade.iss LICENSE.txt rust-logo.ico \
             $(CSREQ3_T_$(CFG_BUILD)_H_$(CFG_BUILD)) \
             dist-prepare-win
-	$(Q)rm -rf tmp/dist/win/gcc
-	$(CFG_PYTHON) $(S)src/etc/make-win-dist.py tmp/dist/win/rust tmp/dist/win/gcc $(CFG_BUILD)
+	$(CFG_PYTHON) $(S)src/etc/make-win-dist.py tmp/dist/win $(CFG_BUILD)
 	@$(call E, ISCC: $@)
 	$(Q)$(CFG_ISCC) $<
 
 $(eval $(call DEF_PREPARE,win))
 
 dist-prepare-win: PREPARE_HOST=$(CFG_BUILD)
 dist-prepare-win: PREPARE_TARGETS=$(CFG_BUILD)
-dist-prepare-win: PREPARE_DEST_DIR=tmp/dist/win/rust
+dist-prepare-win: PREPARE_DEST_DIR=tmp/dist/win
 dist-prepare-win: PREPARE_DIR_CMD=$(DEFAULT_PREPARE_DIR_CMD)
 dist-prepare-win: PREPARE_BIN_CMD=$(DEFAULT_PREPARE_BIN_CMD)
 dist-prepare-win: PREPARE_LIB_CMD=$(DEFAULT_PREPARE_LIB_CMD)

trunk/mk/tests.mk

@@ -21,7 +21,7 @@ $(eval $(call RUST_CRATE,coretest))
 
 TEST_TARGET_CRATES = $(filter-out core unicode,$(TARGET_CRATES)) coretest
 TEST_DOC_CRATES = $(DOC_CRATES)
-TEST_HOST_CRATES = $(filter-out rustc_typeck rustc_borrowck rustc_trans,$(HOST_CRATES))
+TEST_HOST_CRATES = $(filter-out rustc_typeck rustc_trans,$(HOST_CRATES))
 TEST_CRATES = $(TEST_TARGET_CRATES) $(TEST_HOST_CRATES)
 
 ######################################################################

trunk/src/README.md

@@ -0,0 +1,66 @@
+This is a preliminary version of the Rust compiler, libraries and tools.
+
+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)     |
+| `libsyntax/`        | The Rust parser and pretty-printer                        |
+| `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                                        |
+| `rt/rust_*.c`       | - Some of the runtime services                            |
+| `rt/vg`             | - Valgrind headers                                        |
+| `rt/msvc`           | - MSVC support                                            |
+| `rt/sundown`        | - The Markdown library used by rustdoc                    |
+| ------------------- | --------------------------------------------------------- |
+| `compiletest/`      | The test runner                                           |
+| `test/`             | Testsuite                                                 |
+| `test/codegen`      | - Tests for the LLVM IR infrastructure                    |
+| `test/compile-fail` | - Tests that should fail to compile                       |
+| `test/debug-info`   | - Tests for the `debuginfo` tool                          |
+| `test/run-fail`     | - Tests that should compile, run and fail                 |
+| `test/run-make`     | - Tests that depend on a Makefile infrastructure          |
+| `test/run-pass`     | - Tests that should compile, run and succeed              |
+| `test/bench`        | - Benchmarks and miscellaneous                            |
+| `test/pretty`       | - Pretty-printer tests                                    |
+| `test/auxiliary`    | - Dependencies of tests                                   |
+| ------------------- | --------------------------------------------------------- |
+| `librustdoc/`       | The Rust API documentation tool                           |
+| ------------------- | --------------------------------------------------------- |
+| `llvm/`             | The LLVM submodule                                        |
+| `rustllvm/`         | LLVM support code                                         |
+| ------------------- | --------------------------------------------------------- |
+| `etc/`              | Scripts, editors support, misc                            |
+
+
+NOTE: This list (especially the second part of the table which contains modules and libraries)
+is highly volatile and subject to change.

trunk/src/doc/guide-crates.md

@@ -32,7 +32,7 @@ two languages for those phrases to be in. We'll use this module layout:
               +---------+   |   +-----------+
               |             +---| farewells |
 +---------+   |                 +-----------+
-| phrases |---+
+| phrases |---+ 
 +---------+   |                  +-----------+
               |              +---| greetings |
               +----------+   |   +-----------+
@@ -219,7 +219,7 @@ Put this in `src/english/greetings.rs`:
 
 fn hello() -> String {
     "Hello!".to_string()
-}
+}  
 ```
 
 Put this in `src/english/farewells.rs`:
@@ -229,7 +229,7 @@ Put this in `src/english/farewells.rs`:
 
 fn goodbye() -> String {
     "Goodbye.".to_string()
-}
+} 
 ```
 
 Put this in `src/japanese/greetings.rs`:
@@ -239,7 +239,7 @@ Put this in `src/japanese/greetings.rs`:
 
 fn hello() -> String {
     "こんにちは".to_string()
-}
+}  
 ```
 
 Of course, you can copy and paste this from this web page, or just type
@@ -253,7 +253,7 @@ Put this in `src/japanese/farewells.rs`:
 
 fn goodbye() -> String {
     "さようなら".to_string()
-}
+} 
 ```
 
 (This is "Sayoonara", if you're curious.)
@@ -381,11 +381,11 @@ $ cargo run
 /home/you/projects/phrases/src/japanese/greetings.rs:1:1: 3:2 warning: code is never used: `hello`, #[warn(dead_code)] on by default
 /home/you/projects/phrases/src/japanese/greetings.rs:1 fn hello() -> String {
 /home/you/projects/phrases/src/japanese/greetings.rs:2     "こんにちは".to_string()
-/home/you/projects/phrases/src/japanese/greetings.rs:3 }
+/home/you/projects/phrases/src/japanese/greetings.rs:3 } 
 /home/you/projects/phrases/src/japanese/farewells.rs:1:1: 3:2 warning: code is never used: `goodbye`, #[warn(dead_code)] on by default
 /home/you/projects/phrases/src/japanese/farewells.rs:1 fn goodbye() -> String {
 /home/you/projects/phrases/src/japanese/farewells.rs:2     "さようなら".to_string()
-/home/you/projects/phrases/src/japanese/farewells.rs:3 }
+/home/you/projects/phrases/src/japanese/farewells.rs:3 } 
      Running `target/phrases`
 Hello in English: Hello!
 Goodbye in English: Goodbye.
@@ -452,7 +452,7 @@ fn main() {
 
 Rust will give us a compile-time error:
 
-```{notrust}
+```{notrust,ignore}
    Compiling phrases v0.0.1 (file:///home/you/projects/phrases)
 /home/you/projects/phrases/src/main.rs:4:5: 4:40 error: a value named `hello` has already been imported in this module
 /home/you/projects/phrases/src/main.rs:4 use phrases::japanese::greetings::hello;

trunk/src/doc/guide-error-handling.md

@@ -2,7 +2,7 @@
 
 > The best-laid plans of mice and men
 > Often go awry
->
+> 
 > "Tae a Moose", Robert Burns
 
 Sometimes, things just go wrong. It's important to have a plan for when the
@@ -76,7 +76,7 @@ fn main() {
 
 This will give us an error:
 
-```{notrust}
+```{notrust,ignore}
 error: non-exhaustive patterns: `_` not covered [E0004]
 ```
 
@@ -189,7 +189,7 @@ panic!("boom");
 
 gives
 
-```{notrust}
+```{notrust,ignore}
 task '<main>' panicked at 'boom', hello.rs:2
 ```
 

trunk/src/doc/guide-ownership.md

@@ -93,7 +93,7 @@ must have a deallocation for each allocation. Rust handles this for you. It
 knows that our handle, `x`, is the owning reference to our box. Rust knows that
 `x` will go out of scope at the end of the block, and so it inserts a call to
 deallocate the memory at the end of the scope. Because the compiler does this
-for us, it's impossible to forget. We always have exactly one deallocation paired
+for us, it's impossible to forget. We always exaclty one deallocations paired
 with each of our allocations.
 
 This is pretty straightforward, but what happens when we want to pass our box
@@ -130,7 +130,7 @@ fn add_one(mut num: Box<int>) {
 
 This does not compile, and gives us an error:
 
-```{notrust}
+```{notrust,ignore}
 error: use of moved value: `x`
    println!("{}", x);
                   ^
@@ -186,11 +186,11 @@ This function takes ownership, because it takes a `Box`, which owns its
 contents. But then we give ownership right back.
 
 In the physical world, you can give one of your possessions to someone for a
-short period of time. You still own your possession, you're just letting someone
+short period of time. You still own your posession, you're just letting someone
 else use it for a while. We call that 'lending' something to someone, and that
 person is said to be 'borrowing' that something from you.
 
-Rust's ownership system also allows an owner to lend out a handle for a limited
+Rust's ownershp system also allows an owner to lend out a handle for a limited
 period. This is also called 'borrowing.' Here's a version of `add_one` which
 borrows its argument rather than taking ownership:
 
@@ -231,7 +231,7 @@ fn add_one(num: &int) -> int {
 
 Rust has a feature called 'lifetime elision,' which allows you to not write
 lifetime annotations in certain circumstances. This is one of them. Without
-eliding the lifetimes, `add_one` looks like this:
+eliding the liftimes, `add_one` looks like this:
 
 ```rust
 fn add_one<'a>(num: &'a int) -> int {
@@ -254,7 +254,7 @@ This part _declares_ our lifetimes. This says that `add_one` has one lifetime,
 fn add_two<'a, 'b>(...)
 ```
 
-Then in our parameter list, we use the lifetimes we've named:
+Then in our parameter list, we use the liftimes we've named:
 
 ```{rust,ignore}
 ...(num: &'a int) -> ...
@@ -279,7 +279,7 @@ fn main() {
 }
 ```
 
-As you can see, `struct`s can also have lifetimes. In a similar way to functions,
+As you can see, `struct`s can also have liftimes. In a similar way to functions,
 
 ```{rust}
 struct Foo<'a> {
@@ -295,7 +295,7 @@ x: &'a int,
 # }
 ```
 
-uses it. So why do we need a lifetime here? We need to ensure that any reference
+uses it. So why do we need a liftime here? We need to ensure that any reference
 to a `Foo` cannot outlive the reference to an `int` it contains.
 
 ## Thinking in scopes
@@ -406,7 +406,7 @@ fn main() {
 We try to make four `Wheel`s, each with a `Car` that it's attached to. But the
 compiler knows that on the second iteration of the loop, there's a problem:
 
-```{notrust}
+```{notrust,ignore}
 error: use of moved value: `car`
     Wheel { size: 360, owner: car };
                               ^~~

trunk/src/doc/guide-pointers.md

@@ -84,7 +84,7 @@ println!("{}", x + z);
 
 This gives us an error:
 
-```{notrust}
+```{notrust,ignore}
 hello.rs:6:24: 6:25 error: mismatched types: expected `int` but found `&int` (expected int but found &-ptr)
 hello.rs:6     println!("{}", x + z);
                                   ^
@@ -132,7 +132,7 @@ Pointers are useful in languages that are pass-by-value, rather than
 pass-by-reference. Basically, languages can make two choices (this is made
 up syntax, it's not Rust):
 
-```{ignore}
+```{notrust,ignore}
 func foo(x) {
     x = 5
 }
@@ -152,7 +152,7 @@ and therefore, can change its value. At the comment, `i` will be `5`.
 So what do pointers have to do with this? Well, since pointers point to a
 location in memory...
 
-```{ignore}
+```{notrust,ignore}
 func foo(&int x) {
     *x = 5
 }
@@ -179,7 +179,7 @@ but here are problems with pointers in other languages:
 Uninitialized pointers can cause a problem. For example, what does this program
 do?
 
-```{ignore}
+```{notrust,ignore}
 &int x;
 *x = 5; // whoops!
 ```
@@ -191,7 +191,7 @@ knows. This might be harmless, and it might be catastrophic.
 When you combine pointers and functions, it's easy to accidentally invalidate
 the memory the pointer is pointing to. For example:
 
-```{ignore}
+```{notrust,ignore}
 func make_pointer(): &int {
     x = 5;
 
@@ -213,7 +213,7 @@ As one last example of a big problem with pointers, **aliasing** can be an
 issue. Two pointers are said to alias when they point at the same location
 in memory. Like this:
 
-```{ignore}
+```{notrust,ignore}
 func mutate(&int i, int j) {
     *i = j;
 }
@@ -398,7 +398,7 @@ fn main() {
 
 It gives this error:
 
-```{notrust}
+```{notrust,ignore}
 test.rs:5:8: 5:10 error: cannot assign to `*x` because it is borrowed
 test.rs:5         *x -= 1;
                   ^~
@@ -522,7 +522,7 @@ boxes, though. As a rough approximation, you can treat this Rust code:
 
 As being similar to this C code:
 
-```{ignore}
+```{notrust,ignore}
 {
     int *x;
     x = (int *)malloc(sizeof(int));
@@ -626,7 +626,7 @@ fn main() {
 
 This prints:
 
-```{ignore}
+```{notrust,ignore}
 Cons(1, box Cons(2, box Cons(3, box Nil)))
 ```