---

yaml
---
r: 98223
b: refs/heads/master
c: d2e3133
h: refs/heads/master
i:
  98221: 045aa3f
  98219: f601931
  98215: e75d207
  98207: 57844fd
v: v3

Author: hdima

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: c0578b4a4132c3c3117fe33a4e3c9e0b134ccaff
+refs/heads/master: d2e31338779f177c596f08be863c71ea550bcb97
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: b6400f998497c3958f40997a71756ead344a776d
 refs/heads/try: c274a6888410ce3e357e014568b43310ed787d36

trunk/.gitignore

@@ -79,8 +79,6 @@ src/.DS_Store
 /doc/native
 /doc/rustc
 /doc/syntax
-/doc/rustuv
-/doc/rustpkg
 /nd/
 /llvm/
 version.md
@@ -97,4 +95,3 @@ src/etc/dl
 build/
 i686-pc-mingw32/
 src/librustc/lib/llvmdeps.rs
-*.pot

trunk/.gitmodules

@@ -1,11 +1,11 @@
 [submodule "src/llvm"]
 	path = src/llvm
-	url = https://github.com/rust-lang/llvm.git
+	url = https://github.com/luqmana/llvm.git
 	branch = master
 [submodule "src/libuv"]
 	path = src/libuv
-	url = https://github.com/rust-lang/libuv.git
+	url = https://github.com/alexcrichton/libuv.git
 	branch = master
 [submodule "src/gyp"]
 	path = src/gyp
-	url = https://github.com/rust-lang/gyp.git
+	url = https://github.com/alexcrichton/gyp.git

trunk/AUTHORS.txt

@@ -225,7 +225,6 @@ Lindsey Kuper <[email protected]>
 Luca Bruno <[email protected]>
 Luis de Bethencourt <[email protected]>
 Luqman Aden <[email protected]>
-lyuts <[email protected]>
 Magnus Auvinen <[email protected]>
 Mahmut Bulut <[email protected]>
 maikklein <[email protected]>
@@ -241,7 +240,6 @@ Martin DeMello <[email protected]>
 Marvin Löbel <[email protected]>
 Matt Brubeck <[email protected]>
 Matt Carberry <[email protected]>
-Matthew Auld <[email protected]>
 Matthew Iselin <[email protected]>
 Matthew McPherrin <[email protected]>
 Matthew O'Connor <[email protected]>

trunk/CONTRIBUTING.md

@@ -2,7 +2,7 @@
 
 If you're just reporting a bug, please see:
 
-http://static.rust-lang.org/doc/master/complement-bugreport.html
+https://github.com/mozilla/rust/wiki/HOWTO-submit-a-Rust-bug-report
 
 ## Pull request procedure
 

trunk/COPYRIGHT

@@ -6,7 +6,7 @@ terms.
 
 Longer version:
 
-The Rust Project is copyright 2014, The Rust Project
+The Rust Project is copyright 2013, The Rust Project
 Developers (given in the file AUTHORS.txt).
 
 Licensed under the Apache License, Version 2.0

trunk/LICENSE-MIT

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

trunk/Makefile.in

@@ -33,7 +33,7 @@
 # stageN - this is the system root, corresponding to, e.g. /usr
 #   bin - binaries compiled for the host
 #   lib - libraries used by the host compiler
-#     rustlib - rustc's own place to organize libraries
+#     rustc - rustc's own place to organize libraries
 #       $(target) - target-specific artifacts
 #         bin - binaries for target architectures
 #         lib - libraries for target architectures
@@ -154,11 +154,11 @@ endif
 
 # version-string calculation
 CFG_GIT_DIR := $(CFG_SRC_DIR).git
-CFG_RELEASE = 0.10-pre
+CFG_RELEASE = 0.9
 CFG_VERSION = $(CFG_RELEASE)
 # windows exe's need numeric versions - don't use anything but
 # numbers and dots here
-CFG_VERSION_WIN = 0.10
+CFG_VERSION_WIN = 0.9
 
 # since $(CFG_GIT) may contain spaces (especially on Windows),
 # we need to escape them. (" " to r"\ ")
@@ -371,9 +371,6 @@ DRIVER_CRATE := $(S)src/driver/driver.rs
 LLVM_COMPONENTS=x86 arm mips ipo bitreader bitwriter linker asmparser jit mcjit \
                 interpreter instrumentation
 
-# Only build these LLVM tools
-LLVM_TOOLS=bugpoint llc llvm-ar llvm-as llvm-dis llvm-mc opt
-
 define DEF_LLVM_VARS
 # The configure script defines these variables with the target triples
 # separated by Z. This defines new ones with the expected format.
@@ -413,15 +410,11 @@ export CFG_SRC_DIR
 export CFG_BUILD_DIR
 export CFG_VERSION
 export CFG_VERSION_WIN
-export CFG_RELEASE
 export CFG_BUILD
 export CFG_LLVM_ROOT
 export CFG_ENABLE_MINGW_CROSS
 export CFG_PREFIX
 export CFG_LIBDIR
-export CFG_RUSTLIBDIR
-export CFG_LIBDIR_RELATIVE
-export CFG_DISABLE_INJECT_STD_VERSION
 
 ######################################################################
 # Subprograms
@@ -439,12 +432,12 @@ define SREQ
 # Destinations of artifacts for the host compiler
 HROOT$(1)_H_$(3) = $(3)/stage$(1)
 HBIN$(1)_H_$(3) = $$(HROOT$(1)_H_$(3))/bin
-HLIB$(1)_H_$(3) = $$(HROOT$(1)_H_$(3))/$$(CFG_LIBDIR_RELATIVE)
+HLIB$(1)_H_$(3) = $$(HROOT$(1)_H_$(3))/$$(CFG_LIBDIR)
 
 # Destinations of artifacts for target architectures
-TROOT$(1)_T_$(2)_H_$(3) = $$(HLIB$(1)_H_$(3))/$$(CFG_RUSTLIBDIR)/$(2)
+TROOT$(1)_T_$(2)_H_$(3) = $$(HLIB$(1)_H_$(3))/rustc/$(2)
 TBIN$(1)_T_$(2)_H_$(3) = $$(TROOT$(1)_T_$(2)_H_$(3))/bin
-TLIB$(1)_T_$(2)_H_$(3) = $$(TROOT$(1)_T_$(2)_H_$(3))/lib
+TLIB$(1)_T_$(2)_H_$(3) = $$(TROOT$(1)_T_$(2)_H_$(3))/$$(CFG_LIBDIR)
 
 # The name of the standard and extra libraries used by rustc
 HSTDLIB_DEFAULT$(1)_H_$(3) = \

trunk/README.md

@@ -7,49 +7,50 @@ documentation.
 
 ### Windows
 
-1. Download and use the [installer and MinGW][win-wiki].
+1. Download and use the [installer][win-exe].
 2. Read the [tutorial].
 2. Enjoy!
 
-> ***Note:*** Windows users can read the detailed
-> [getting started][wiki-start] notes on the wiki.
+> ***Note:*** Windows users should read the detailed
+> [getting started][wiki-start] notes on the wiki. Even when using
+> the binary installer the Windows build requires a MinGW installation,
+> the precise details of which are not discussed here.
 
 [tutorial]: http://static.rust-lang.org/doc/tutorial.html
 [wiki-start]: https://github.com/mozilla/rust/wiki/Note-getting-started-developing-Rust
-[win-wiki]: https://github.com/mozilla/rust/wiki/Using-Rust-on-Windows
+[win-exe]: http://static.rust-lang.org/dist/rust-0.9-install.exe
 
 ### Linux / OS X
 
-1. Make sure you have installed the dependencies:
-    * `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
-    * `curl`
-2. Download and build Rust:
-
+1. Install the prerequisites (if not already installed)
+    * 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
+    * curl
+2. Download and build Rust
     You can either download a [tarball] or build directly from the [repo].
-
+    
     To build from the [tarball] do:
-
+    
         $ curl -O http://static.rust-lang.org/dist/rust-0.9.tar.gz
         $ tar -xzf rust-0.9.tar.gz
         $ cd rust-0.9
-
+    
     Or to build from the [repo] do:
 
         $ git clone https://github.com/mozilla/rust.git
         $ cd rust
 
     Now that you have Rust's source code, you can configure and build it:
-
+    
         $ ./configure
         $ make && make install
-
-    > ***Note:*** You may need to use `sudo make install` if you do not normally have
-    > permission to modify the destination directory. The install locations can
-    > be adjusted by passing a `--prefix` argument to `configure`. Various other
-    > options are also supported, pass `--help` for more information on them.
+    
+    You may need to use `sudo make install` if you do not normally have
+    permission to modify the destination directory. The install locations can
+    be adjusted by passing a `--prefix` argument to `configure`. Various other
+    options are also supported, pass `--help` for more information on them.
 
     When complete, `make install` will place several programs into
     `/usr/local/bin`: `rustc`, the Rust compiler; `rustdoc`, the
@@ -75,20 +76,22 @@ Snapshot binaries are currently built and tested on several platforms:
 * Linux (various distributions), x86 and x86-64
 * OSX 10.6 ("Snow Leopard") or greater, x86 and x86-64
 
-You may find that other platforms work, but these are our officially
+You may find that other platforms work, but these are our "tier 1"
 supported build environments that are most likely to work.
 
-Rust currently needs about 1.5 GiB of RAM to build without swapping; if it hits
+Rust currently needs about 1.8G of RAM to build without swapping; if it hits
 swap, it will take a very long time to build.
 
-There is a lot more documentation in the [wiki].
+There is lots more documentation in the [wiki].
 
 [wiki]: https://github.com/mozilla/rust/wiki
 
+
 ## License
 
 Rust is primarily distributed under the terms of both the MIT license
 and the Apache License (Version 2.0), with portions covered by various
 BSD-like licenses.
 
 See LICENSE-APACHE, LICENSE-MIT, and COPYRIGHT for details.
+

trunk/RELEASES.txt

@@ -1,7 +1,7 @@
 Version 0.9 (January 2014)
 --------------------------
 
-   * ~1800 changes, numerous bugfixes
+   * ~1600 changes, numerous bugfixes
 
    * Language
       * The `float` type has been removed. Use `f32` or `f64` instead.
@@ -22,9 +22,6 @@ Version 0.9 (January 2014)
       * `@fn`s have been removed.
       * `do` only works with procs in order to make it obvious what the cost
         of `do` is.
-      * Single-element tuple-like structs can no longer be dereferenced to
-        obtain the inner value. A more comprehensive solution for overloading
-        the dereference operator will be provided in the future.
       * The `#[link(...)]` attribute has been replaced with
         `#[crate_id = "name#vers"]`.
       * Empty `impl`s must be terminated with empty braces and may not be
@@ -35,8 +32,6 @@ Version 0.9 (January 2014)
       * `printf!` and `printfln!` (old-style formatting) removed in favor of
         `print!` and `println!`.
       * `mut` works in patterns now, as in `let (mut x, y) = (1, 2);`.
-      * The `extern mod foo (name = "bar")` syntax has been removed. Use
-        `extern mod foo = "bar"` instead.
       * New reserved keywords: `alignof`, `offsetof`, `sizeof`.
       * Macros can have attributes.
       * Macros can expand to items with attributes.
@@ -81,7 +76,6 @@ Version 0.9 (January 2014)
         variables. Currently behind the `thread_local` feature gate.
       * The `return` keyword may be used in closures.
       * Types that can be copied via a memcpy implement the `Pod` kind.
-      * The `cfg` attribute can now be used on struct fields and enum variants.
 
    * Libraries
       * std: The `option` and `result` API's have been overhauled to make them
@@ -96,14 +90,9 @@ Version 0.9 (January 2014)
       * std: The reference counted pointer type `extra::rc` moved into std.
       * std: The `Gc` type in the `gc` module will replace `@` (it is currently
         just a wrapper around it).
-      * std: The `Either` type has been removed.
       * std: `fmt::Default` can be implemented for any type to provide default
         formatting to the `format!` macro, as in `format!("{}", myfoo)`.
       * std: The `rand` API continues to be tweaked.
-      * std: The `rust_begin_unwind` function, useful for insterting breakpoints
-        on failure in gdb, is now named `rust_fail`.
-      * std: The `each_key` and `each_value` methods on `HashMap` have been
-        replaced by the `keys` and `values` iterators.
       * std: Functions dealing with type size and alignment have moved from the
         `sys` module to the `mem` module.
       * std: The `path` module was written and API changed.