---

yaml
---
r: 122733
b: refs/heads/snap-stage3
c: 1fefa5b
h: refs/heads/master
i:
  122731: b6cdb4d
v: v3

Author: alexcrichton

[refs]

@@ -1,7 +1,7 @@
 ---
 refs/heads/master: 1bff1ff810dcfa8064c11e2b84473f053d1f69f1
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
-refs/heads/snap-stage3: 5d5c20647f45f2eb74f337e5434bbe63b0c43345
+refs/heads/snap-stage3: 1fefa5b5149211c7acd11fd2ab78d9ca9873ed92
 refs/heads/try: 2e9d9477b848cec778ca3f07ecdf0aea6ade23de
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

branches/snap-stage3/.travis.yml

@@ -41,7 +41,7 @@ script: |
     if [[ $LLVM_VERSION != '3.4' ]]; then exit 0; fi
   fi &&
   make tidy &&
-  make -j4 rustc-stage1 RUSTFLAGS='-Z time-passes' &&
+  travis_wait make -j4 rustc-stage1 &&
   make check-stage1-std check-stage1-rpass check-stage1-cfail check-stage1-rfail check-stage1-doc
 
 env:

branches/snap-stage3/AUTHORS.txt

@@ -487,6 +487,7 @@ TyOverby <[email protected]>
 Tycho Sci <[email protected]>
 Tyler Bindon <[email protected]>
 U-NOV2010\eugals
+User Jyyou <[email protected]>
 Utkarsh Kukreti <[email protected]>
 Uwe Dauernheim <[email protected]>
 Vadim Chugunov <[email protected]>

branches/snap-stage3/README.md

@@ -54,26 +54,10 @@ documentation.
     When complete, `make install` will place several programs into
     `/usr/local/bin`: `rustc`, the Rust compiler, and `rustdoc`, the
     API-documentation tool.
+    system.
 3. Read the [tutorial].
 4. Enjoy!
 
-### Building on Windows
-
-To easily build on windows we can use [MSYS2](http://sourceforge.net/projects/msys2/):
-
-1. Grab the latest MSYS2 installer and go through the installer.
-2. Now from the MSYS2 terminal we want to install the mingw64 toolchain and the other
-   tools we need.
-
-        $ pacman -S mingw-w64-i686-toolchain
-        $ pacman -S base-devel
-
-3. With that now start `mingw32_shell.bat` from where you installed MSYS2 (i.e. `C:\msys`).
-4. From there just navigate to where you have Rust's source code, configure and build it:
-
-        $ ./configure --build=i686-pc-mingw32
-        $ make && make install
-
 [repo]: https://github.com/rust-lang/rust
 [tarball]: http://static.rust-lang.org/dist/rust-nightly.tar.gz
 [tutorial]: http://doc.rust-lang.org/tutorial.html

branches/snap-stage3/RELEASES.txt

@@ -1,7 +1,7 @@
-Version 0.11.0 (July 2014)
+Version 0.11 (July 2014)
 -------------------------
 
-  * ~1700 changes, numerous bugfixes
+  * ~1700 cahnges, numerous bugfixes
 
   * Language
     * ~[T] has been removed from the language. This type is superseded by
@@ -13,25 +13,26 @@ Version 0.11.0 (July 2014)
     * @T has been removed from the language. This type is superseded by the
       standard library's std::gc::Gc<T> type.
     * Struct fields are now all private by default.
-    * Vector indices and shift amounts are both required to be a `uint`
+    * Vector indices and shift amounts are both required to be a `uint` now
       instead of any integral type.
     * Byte character, byte string, and raw byte string literals are now all
       supported by prefixing the normal literal with a `b`.
     * Multiple ABIs are no longer allowed in an ABI string
-    * The syntax for lifetimes on closures/procedures has been tweaked
-      slightly: `<'a>|A, B|: 'b + K -> T`
-    * Floating point modulus has been removed from the language; however it
-      is still provided by a library implementation.
+    * The syntax for lifetimes on clousres/procedures has been tweaked
+      slightly.
+    * Floating point modulus has been removed from the language, it is still
+      provided by a library implementation, however.
     * Private enum variants are now disallowed.
     * The `priv` keyword has been removed from the language.
     * A closure can no longer be invoked through a &-pointer.
     * The `use foo, bar, baz;` syntax has been removed from the language.
     * The transmute intrinsic no longer works on type parameters.
     * Statics now allow blocks/items in their definition.
     * Trait bounds are separated from objects with + instead of : now.
-    * Objects can no longer be read while they are mutably borrowed.
+    * Mutably borrowed objects can no longer be read while they are
+      borrowed.
     * The address of a static is now marked as insignificant unless the
-      #[inline(never)] attribute is placed it.
+      #[inline(never)] attribute is placed on a static.
     * The #[unsafe_destructor] attribute is now behind a feature gate.
     * Struct literals are no longer allowed in ambiguous positions such as
       if, while, match, and for..in.
@@ -47,13 +48,13 @@ Version 0.11.0 (July 2014)
   * Libraries
     * The standard library is now a "facade" over a number of underlying
       libraries. This means that development on the standard library should
-      be speeder due to smaller crates, as well as a clearer line between
+      be speeder due to less to compile, as well as a clearer line between
       all dependencies.
     * A new library, libcore, lives under the standard library's facade
       which is Rust's "0-assumption" library, suitable for embedded and
       kernel development for example.
     * A regex crate has been added to the standard distribution. This crate
-      includes statically compiled regular expressions.
+      includes statically compiled regulard expressions.
     * The unwrap/unwrap_err methods on Result require a Show bound for
       better error messages.
     * The return types of the std::comm primitives have been centralized
@@ -71,11 +72,11 @@ Version 0.11.0 (July 2014)
     * A graphviz crate has been added for creating .dot files.
     * The std::cast module has been migrated into std::mem.
     * The std::local_data api has been migrated from freestanding functions
-      to being based on methods.
+      to based on methods.
     * The Pod trait has been renamed to Copy.
     * jemalloc has been added as the default allocator for types.
-    * The API for allocating memory has been changed to use proper alignment
-      and sized deallocation
+    * The api for allocating memory in rust has been modified for sized
+      deallocation as well as using proper alignment.
     * Connecting a TcpStream or binding a TcpListener is now based on a
       string address and a u16 port. This allows connecting to a hostname as
       opposed to an IP.
@@ -99,11 +100,11 @@ Version 0.11.0 (July 2014)
       discovery of breaking changes.
     * The compiler will now try to suggest how to annotate lifetimes if a
       lifetime-related error occurs.
-    * Debug info continues to be improved greatly with general bug fixes and
-      better support for situations like link time optimization (LTO).
+    * Debug info continues to be improved greatly with better support for
+      situations such as LTO and general bug fixes.
     * Usage of syntax extensions when cross-compiling has been fixed.
-    * Functionality equivalent to GCC & Clang's -ffunction-sections,
-      -fdata-sections and --gc-sections has been enabled by default
+    * The equivalent of ffunction-sections and fdata-sections have been
+      enabled by default with the equivalent of --gc-sections.
     * The compiler is now stricter about where it will load module files
       from when a module is declared via `mod foo;`.
     * The #[phase(syntax)] attribute has been renamed to #[phase(plugin)].
@@ -127,7 +128,7 @@ Version 0.11.0 (July 2014)
     * Cross-compiling to mipsel is now supported.
     * Stability attributes are now inherited by default and no longer apply
       to intra-crate usage, only inter-crate usage.
-    * Error message related to non-exhaustive match expressions have been
+    * Error message related to non-exhaustive match statements have been
       greatly improved.
 
 Version 0.10 (April 2014)

branches/snap-stage3/man/rustdoc.1

@@ -38,15 +38,6 @@ directory to load plugins from (default: /tmp/rustdoc_ng/plugins)
 -L --library-path <val>
 directory to add to crate search path
 .TP
---html-in-header <val>
-file to add to <head>
-.TP
---html-before-content <val>
-file to add in <body>, before content
-.TP
---html-after-content <val>
-file to add in <body>, after content
-.TP
 -h, --help
 Print help
 

branches/snap-stage3/mk/dist.mk

@@ -54,7 +54,6 @@ PKG_FILES := \
       driver                                   \
       etc                                      \
       $(foreach crate,$(CRATES),lib$(crate))   \
-      libcoretest                              \
       libbacktrace                             \
       rt                                       \
       rustllvm                                 \

branches/snap-stage3/mk/docs.mk

@@ -35,16 +35,16 @@ DOCS := index intro tutorial guide guide-ffi guide-macros guide-lifetimes \
 PDF_DOCS := tutorial rust
 
 RUSTDOC_DEPS_rust := doc/full-toc.inc
-RUSTDOC_FLAGS_rust := --html-in-header=doc/full-toc.inc
+RUSTDOC_FLAGS_rust := --markdown-in-header=doc/full-toc.inc
 
 L10N_LANGS := ja
 
 # Generally no need to edit below here.
 
 # The options are passed to the documentation generators.
-RUSTDOC_HTML_OPTS_NO_CSS = --html-before-content=doc/version_info.html \
-	--html-in-header=doc/favicon.inc \
-	--html-after-content=doc/footer.inc \
+RUSTDOC_HTML_OPTS_NO_CSS = --markdown-before-content=doc/version_info.html \
+	--markdown-in-header=doc/favicon.inc \
+	--markdown-after-content=doc/footer.inc \
 	--markdown-playground-url='http://play.rust-lang.org/'
 
 RUSTDOC_HTML_OPTS = $(RUSTDOC_HTML_OPTS_NO_CSS) --markdown-css rust.css

branches/snap-stage3/mk/platform.mk

@@ -461,7 +461,6 @@ CFG_PATH_MUNGE_i686-pc-mingw32 :=
 CFG_LDPATH_i686-pc-mingw32 :=$(CFG_LDPATH_i686-pc-mingw32):$(PATH)
 CFG_RUN_i686-pc-mingw32=PATH="$(CFG_LDPATH_i686-pc-mingw32):$(1)" $(2)
 CFG_RUN_TARG_i686-pc-mingw32=$(call CFG_RUN_i686-pc-mingw32,$(HLIB$(1)_H_$(CFG_BUILD)),$(2))
-RUSTC_FLAGS_i686-pc-mingw32=-C link-args="-Wl,--large-address-aware"
 
 # i586-mingw32msvc configuration
 CC_i586-mingw32msvc=$(CFG_MINGW32_CROSS_PATH)/bin/i586-mingw32msvc-gcc

branches/snap-stage3/mk/tests.mk

@@ -14,12 +14,7 @@
 ######################################################################
 
 # The names of crates that must be tested
-
-# libcore tests are in a separate crate
-DEPS_coretest :=
-$(eval $(call RUST_CRATE,coretest))
-
-TEST_TARGET_CRATES = $(filter-out core,$(TARGET_CRATES)) coretest
+TEST_TARGET_CRATES = $(TARGET_CRATES)
 TEST_DOC_CRATES = $(DOC_CRATES)
 TEST_HOST_CRATES = $(HOST_CRATES)
 TEST_CRATES = $(TEST_TARGET_CRATES) $(TEST_HOST_CRATES)
@@ -177,7 +172,7 @@ check-notidy: cleantmptestlogs cleantestlibs all check-stage2
 	$(Q)$(CFG_PYTHON) $(S)src/etc/check-summary.py tmp/*.log
 
 check-lite: cleantestlibs cleantmptestlogs \
-	$(foreach crate,$(TEST_TARGET_CRATES),check-stage2-$(crate)) \
+	$(foreach crate,$(TARGET_CRATES),check-stage2-$(crate)) \
 	check-stage2-rpass \
 	check-stage2-rfail check-stage2-cfail check-stage2-rmake
 	$(Q)$(CFG_PYTHON) $(S)src/etc/check-summary.py tmp/*.log

branches/snap-stage3/src/compiletest/compiletest.rs

@@ -42,7 +42,7 @@ pub mod common;
 pub mod errors;
 
 #[start]
-fn start(argc: int, argv: *const *const u8) -> int {
+fn start(argc: int, argv: **u8) -> int {
     green::start(argc, argv, rustuv::event_loop, main)
 }
 

branches/snap-stage3/src/doc/guide-ffi.md

@@ -50,19 +50,19 @@ use libc::{c_int, size_t};
 
 #[link(name = "snappy")]
 extern {
-    fn snappy_compress(input: *const u8,
+    fn snappy_compress(input: *u8,
                        input_length: size_t,
                        compressed: *mut u8,
                        compressed_length: *mut size_t) -> c_int;
-    fn snappy_uncompress(compressed: *const u8,
+    fn snappy_uncompress(compressed: *u8,
                          compressed_length: size_t,
                          uncompressed: *mut u8,
                          uncompressed_length: *mut size_t) -> c_int;
     fn snappy_max_compressed_length(source_length: size_t) -> size_t;
-    fn snappy_uncompressed_length(compressed: *const u8,
+    fn snappy_uncompressed_length(compressed: *u8,
                                   compressed_length: size_t,
                                   result: *mut size_t) -> c_int;
-    fn snappy_validate_compressed_buffer(compressed: *const u8,
+    fn snappy_validate_compressed_buffer(compressed: *u8,
                                          compressed_length: size_t) -> c_int;
 }
 # fn main() {}
@@ -82,7 +82,7 @@ the allocated memory. The length is less than or equal to the capacity.
 ~~~~
 # extern crate libc;
 # use libc::{c_int, size_t};
-# unsafe fn snappy_validate_compressed_buffer(_: *const u8, _: size_t) -> c_int { 0 }
+# unsafe fn snappy_validate_compressed_buffer(_: *u8, _: size_t) -> c_int { 0 }
 # fn main() {}
 pub fn validate_compressed_buffer(src: &[u8]) -> bool {
     unsafe {
@@ -106,7 +106,7 @@ the true length after compression for setting the length.
 ~~~~
 # extern crate libc;
 # use libc::{size_t, c_int};
-# unsafe fn snappy_compress(a: *const u8, b: size_t, c: *mut u8,
+# unsafe fn snappy_compress(a: *u8, b: size_t, c: *mut u8,
 #                           d: *mut size_t) -> c_int { 0 }
 # unsafe fn snappy_max_compressed_length(a: size_t) -> size_t { a }
 # fn main() {}
@@ -132,11 +132,11 @@ format and `snappy_uncompressed_length` will retrieve the exact buffer size requ
 ~~~~
 # extern crate libc;
 # use libc::{size_t, c_int};
-# unsafe fn snappy_uncompress(compressed: *const u8,
+# unsafe fn snappy_uncompress(compressed: *u8,
 #                             compressed_length: size_t,
 #                             uncompressed: *mut u8,
 #                             uncompressed_length: *mut size_t) -> c_int { 0 }
-# unsafe fn snappy_uncompressed_length(compressed: *const u8,
+# unsafe fn snappy_uncompressed_length(compressed: *u8,
 #                                      compressed_length: size_t,
 #                                      result: *mut size_t) -> c_int { 0 }
 # fn main() {}
@@ -418,7 +418,7 @@ Unsafe functions, on the other hand, advertise it to the world. An unsafe functi
 this:
 
 ~~~~
-unsafe fn kaboom(ptr: *const int) -> int { *ptr }
+unsafe fn kaboom(ptr: *int) -> int { *ptr }
 ~~~~
 
 This function can only be called from an `unsafe` block or another `unsafe` function.
@@ -453,7 +453,7 @@ use std::ptr;
 
 #[link(name = "readline")]
 extern {
-    static mut rl_prompt: *const libc::c_char;
+    static mut rl_prompt: *libc::c_char;
 }
 
 fn main() {
@@ -478,7 +478,7 @@ extern crate libc;
 #[link(name = "kernel32")]
 #[allow(non_snake_case_functions)]
 extern "stdcall" {
-    fn SetEnvironmentVariableA(n: *const u8, v: *const u8) -> libc::c_int;
+    fn SetEnvironmentVariableA(n: *u8, v: *u8) -> libc::c_int;
 }
 # fn main() { }
 ~~~~

branches/snap-stage3/src/doc/guide-macros.md

@@ -355,7 +355,6 @@ macro_rules! biased_match_rec (
             _ => { $err }
         }
     );
-    // Produce the requested values
     ( binds $( $bind_res:ident ),* ) => ( ($( $bind_res ),*) )
 )
 
@@ -365,7 +364,7 @@ macro_rules! biased_match (
     ( $( ($e:expr) ~ ($p:pat) else $err:stmt ; )*
       binds $bind_res:ident
     ) => (
-        let $bind_res = biased_match_rec!(
+        let ( $( $bind_res ),* ) = biased_match_rec!(
             $( ($e) ~ ($p) else $err ; )*
             binds $bind_res
         );

branches/snap-stage3/src/doc/guide-runtime.md

@@ -245,7 +245,7 @@ extern crate green;
 extern crate rustuv;
 
 #[start]
-fn start(argc: int, argv: *const *const u8) -> int {
+fn start(argc: int, argv: **u8) -> int {
     green::start(argc, argv, rustuv::event_loop, main)
 }
 
@@ -261,9 +261,7 @@ inside of an OS thread.
 extern crate native;
 
 #[start]
-fn start(argc: int, argv: *const *const u8) -> int {
-    native::start(argc, argv, main)
-}
+fn start(argc: int, argv: **u8) -> int { native::start(argc, argv, main) }
 
 fn main() {}
 ~~~

branches/snap-stage3/src/doc/guide-tasks.md

@@ -457,8 +457,6 @@ the string in response.  The child terminates when it receives `0`.
 Here is the function that implements the child task:
 
 ~~~
-#![allow(deprecated)]
-
 use std::comm::DuplexStream;
 # fn main() {
 fn stringifier(channel: &DuplexStream<String, uint>) {
@@ -483,8 +481,6 @@ response itself is simply the stringified version of the received value,
 Here is the code for the parent task:
 
 ~~~
-#![allow(deprecated)]
-
 use std::comm::duplex;
 # use std::task::spawn;
 # use std::comm::DuplexStream;