---

yaml
---
r: 127756
b: refs/heads/master
c: fd10d20
h: refs/heads/master
v: v3

Author: ftxqxd

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 49a970f2449a78f28b6c301e542d38593094ca77
+refs/heads/master: fd10d209cdceedcb95e51025e624be749e0cc5f9
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: aa98b25c4f0c10729dff37c699904ad57b8fbda8
 refs/heads/try: d9c23fcbaea89871667272a67ecb8d3a512162f3

trunk/.gitignore

@@ -1,94 +1,90 @@
-*.a
-*.aux
-*.bc
+*~
+\#*\#
+\#*
+.#*
+*.x86
+*.llvm
+*.out
 *.boot
-*.bz2
-*.cmi
-*.cmo
+*.rustc
 *.cmx
-*.cp
-*.cps
-*.d
-*.dSYM
-*.def
-*.diff
 *.dll
-*.dylib
-*.elc
-*.epub
+*.def
 *.exe
+*.a
+*.rlib
+*.so
+*.dylib
+*.orig
+*.cmo
+*.cmi
+*.dSYM
+*.d
+*.o
+*.ll
+*.bc
+*.aux
+*.cp
 *.fn
-*.html
 *.ky
-*.ll
-*.llvm
+*.cps
 *.log
-*.o
-*.orig
-*.out
-*.patch
 *.pdf
+*.epub
+*.html
 *.pg
-*.pot
-*.pyc
-*.rej
-*.rlib
-*.rustc
-*.so
-*.swo
-*.swp
-*.tmp
 *.toc
 *.tp
 *.vr
-*.x86
-*~
-.#*
-.DS_Store
-.cproject
+*.patch
+*.diff
+*.rej
+*.swp
+*.swo
+*.tmp
+*.pyc
+*.elc
 .hg/
 .hgignore
+.cproject
 .project
-.settings/
 .valgrindrc
-/*-*-*-*/
-/*-*-*/
+lexer.ml
+TAGS
+TAGS.emacs
+TAGS.vi
+version.ml
+version.texi
 /Makefile
-/build
-/dist/
-/dl/
-/doc
-/inst/
-/llvm/
-/mingw-build/
-/nd/
+config.mk
 /rt/
 /rustllvm/
-/src/libunicode/DerivedCoreProperties.txt
-/src/libunicode/EastAsianWidth.txt
-/src/libunicode/HangulSyllableType.txt
-/src/libunicode/PropList.txt
-/src/libunicode/Scripts.txt
-/src/libunicode/UnicodeData.txt
+/test/
+/inst/
+/mingw-build/
+src/.DS_Store
+/tmp/
+/dist/
 /stage0/
+/dl/
 /stage1/
 /stage2/
 /stage3/
-/test/
-/tmp/
-TAGS
-TAGS.emacs
-TAGS.vi
-\#*
-\#*\#
-config.mk
-config.stamp
+*.bz2
+/doc
+/nd/
+/llvm/
+version.md
 keywords.md
-lexer.ml
-src/.DS_Store
+x86_64-apple-darwin/
+x86_64-unknown-linux-gnu/
+i686-unknown-linux-gnu/
+tmp.*.rs
+config.stamp
+.DS_Store
 src/etc/dl
+.settings/
+/build
+i686-pc-mingw32/
 src/librustc_llvm/llvmdeps.rs
-tmp.*.rs
-version.md
-version.ml
-version.texi
+*.pot

trunk/CONTRIBUTING.md

@@ -16,8 +16,7 @@ please do two things:
 
 2. Run the full Rust test suite with the `make check` command.  You're
    not off the hook even if you just stick to documentation; code
-   examples in the docs are tested as well! Although for simple
-   wording or grammar fixes, this is probably unnecessary.
+   examples in the docs are tested as well!
 
 Pull requests will be treated as "review requests", and we will give
 feedback we expect to see corrected on

trunk/README.md

@@ -32,7 +32,7 @@ documentation.
 
     To build from the [tarball] do:
 
-        $ curl -O https://static.rust-lang.org/dist/rust-nightly.tar.gz
+        $ curl -O http://static.rust-lang.org/dist/rust-nightly.tar.gz
         $ tar -xzf rust-nightly.tar.gz
         $ cd rust-nightly
 
@@ -75,7 +75,7 @@ To easily build on windows we can use [MSYS2](http://sourceforge.net/projects/ms
         $ make && make install
 
 [repo]: https://github.com/rust-lang/rust
-[tarball]: https://static.rust-lang.org/dist/rust-nightly.tar.gz
+[tarball]: http://static.rust-lang.org/dist/rust-nightly.tar.gz
 [tutorial]: http://doc.rust-lang.org/tutorial.html
 
 ## Notes

trunk/configure

@@ -557,21 +557,13 @@ fi
 
 if [ ! -z "$CFG_ENABLE_LOCAL_RUST" ]
 then
-    system_rustc=$(which rustc)
-    if [ -f ${CFG_LOCAL_RUST_ROOT}/bin/rustc${BIN_SUF} ]
+    if [ ! -f ${CFG_LOCAL_RUST_ROOT}/bin/rustc${BIN_SUF} ]
     then
-        : # everything already configured
-    elif [ -n "$system_rustc" ]
-    then
-        # we assume that rustc is in a /bin directory
-        CFG_LOCAL_RUST_ROOT=${system_rustc%/bin/rustc}
-    else
         err "no local rust to use"
+    else
+        LRV=`${CFG_LOCAL_RUST_ROOT}/bin/rustc${BIN_SUF} --version`
+        step_msg "using rustc at: ${CFG_LOCAL_RUST_ROOT} with version: $LRV"
     fi
-
-    LRV=`${CFG_LOCAL_RUST_ROOT}/bin/rustc${BIN_SUF} --version`
-    step_msg "using rustc at: ${CFG_LOCAL_RUST_ROOT} with version: $LRV"
-    putvar CFG_LOCAL_RUST_ROOT
 fi
 
 # Force freebsd to build with clang; gcc doesn't like us there

trunk/mk/docs.mk

@@ -285,7 +285,7 @@ doc/$(1)/:
 $(2) += doc/$(1)/index.html
 doc/$(1)/index.html: CFG_COMPILER_HOST_TRIPLE = $(CFG_TARGET)
 doc/$(1)/index.html: $$(LIB_DOC_DEP_$(1)) doc/$(1)/
-	@$$(call E, rustdoc: $$@)
+	@$$(call E, rustdoc $$@)
 	$$(Q)$$(RUSTDOC) --cfg dox --cfg stage2 $$<
 endef
 

trunk/mk/main.mk

@@ -139,10 +139,6 @@ endif
 RUSTFLAGS_STAGE0 += -C prefer-dynamic
 RUSTFLAGS_STAGE1 += -C prefer-dynamic
 
-# Landing pads require a lot of codegen. We can get through bootstrapping faster
-# by not emitting them.
-RUSTFLAGS_STAGE0 += -Z no-landing-pads
-
 # platform-specific auto-configuration
 include $(CFG_SRC_DIR)mk/platform.mk
 

trunk/mk/platform.mk

@@ -377,7 +377,7 @@ RUSTC_CROSS_FLAGS_arm-unknown-linux-gnueabi :=
 # mipsel-linux configuration
 CC_mipsel-linux=mipsel-linux-gcc
 CXX_mipsel-linux=mipsel-linux-g++
-CPP_mipsel-linux=mipsel-linux-gcc
+CPP_mipsel-linux=mipsel-linux-gcc 
 AR_mipsel-linux=mipsel-linux-ar
 CFG_LIB_NAME_mipsel-linux=lib$(1).so
 CFG_STATIC_LIB_NAME_mipsel-linux=lib$(1).a
@@ -641,7 +641,7 @@ define CFG_MAKE_TOOLCHAIN
 	CXX_$(1)=$(CROSS_PREFIX_$(1))$(CXX_$(1))
 	CPP_$(1)=$(CROSS_PREFIX_$(1))$(CPP_$(1))
 	AR_$(1)=$(CROSS_PREFIX_$(1))$(AR_$(1))
-	RUSTC_CROSS_FLAGS_$(1)=-C linker=$$(call FIND_COMPILER,$$(CC_$(1))) \
+	RUSTC_CROSS_FLAGS_$(1)=-C linker=$$(call FIND_COMPILER,$$(CXX_$(1))) \
 	    -C ar=$$(call FIND_COMPILER,$$(AR_$(1))) $(RUSTC_CROSS_FLAGS_$(1))
 
 	RUSTC_FLAGS_$(1)=$$(RUSTC_CROSS_FLAGS_$(1)) $(RUSTC_FLAGS_$(1))

trunk/src/compiletest/common.rs

@@ -136,7 +136,7 @@ pub struct Config {
     // Extra parameter to run adb on arm-linux-androideabi
     pub adb_path: String,
 
-    // Extra parameter to run test suite on arm-linux-androideabi
+    // Extra parameter to run test sute on arm-linux-androideabi
     pub adb_test_dir: String,
 
     // status whether android device available or not

trunk/src/compiletest/runtest.rs

@@ -325,7 +325,7 @@ fn run_debuginfo_gdb_test(config: &Config, props: &TestProps, testfile: &Path) {
     let DebuggerCommands { commands, check_lines, .. } = parse_debugger_commands(testfile, "gdb");
     let mut cmds = commands.connect("\n");
 
-    // compile test file (it should have 'compile-flags:-g' in the header)
+    // compile test file (it shoud have 'compile-flags:-g' in the header)
     let compiler_run_result = compile_test(config, props, testfile);
     if !compiler_run_result.status.success() {
         fatal_proc_rec("compilation failed!", &compiler_run_result);
@@ -520,7 +520,7 @@ fn run_debuginfo_lldb_test(config: &Config, props: &TestProps, testfile: &Path)
 
     let config = &mut config;
 
-    // compile test file (it should have 'compile-flags:-g' in the header)
+    // compile test file (it shoud have 'compile-flags:-g' in the header)
     let compile_result = compile_test(config, props, testfile);
     if !compile_result.status.success() {
         fatal_proc_rec("compilation failed!", &compile_result);

trunk/src/doc/complement-design-faq.md

@@ -1,4 +1,4 @@
-% The Rust Design FAQ
+% Rust Design FAQ
 
 This document describes decisions were arrived at after lengthy discussion and
 experimenting with alternatives. Please do not propose reversing them unless
@@ -50,15 +50,15 @@ non-deterministic behavior. Rust provides the tools to make using a GC
 possible and even pleasant, but it should not be a requirement for
 implementing the language.
 
-## Non-`Sync` `static mut` is unsafe
+## Non-`Share` `static mut` is unsafe
 
-Types which are [`Sync`][sync] are thread-safe when multiple shared
-references to them are used concurrently. Types which are not `Sync` are not
+Types which are [`Share`][share] are thread-safe when multiple shared
+references to them are used concurrently. Types which are not `Share` are not
 thread-safe, and thus when used in a global require unsafe code to use.
 
-[sync]: http://doc.rust-lang.org/core/kinds/trait.Sync.html
+[share]: http://doc.rust-lang.org/core/kinds/trait.Share.html
 
-### If mutable static items that implement `Sync` are safe, why is taking &mut SHARABLE unsafe?
+### If mutable static items that implement `Share` are safe, why is taking &mut SHARABLE unsafe?
 
 Having multiple aliasing `&mut T`s is never allowed. Due to the nature of
 globals, the borrow checker cannot possibly ensure that a static obeys the

trunk/src/doc/complement-lang-faq.md

@@ -1,4 +1,4 @@
-% The Rust Language FAQ
+% Language FAQ
 
 ## Are there any big programs written in it yet? I want to read big samples.
 

trunk/src/doc/complement-project-faq.md

@@ -1,4 +1,4 @@
-% The Rust Project FAQ
+% Project FAQ
 
 # What is this project's goal, in one sentence?
 

trunk/src/doc/guide-pointers.md

@@ -655,7 +655,7 @@ This part is coming soon.
 # Returning Pointers
 
 In many languages with pointers, you'd return a pointer from a function
-so as to avoid copying a large data structure. For example:
+so as to avoid a copying a large data structure. For example:
 
 ```{rust}
 struct BigStruct {

trunk/src/doc/guide-strings.md

@@ -1,4 +1,4 @@
-% The Guide to Rust Strings
+% The Strings Guide
 
 Strings are an important concept to master in any programming language. If you
 come from a managed language background, you may be surprised at the complexity

trunk/src/doc/guide-unsafe.md

@@ -1,4 +1,4 @@
-% Writing Unsafe and Low-Level Code in Rust
+% Writing Safe Unsafe and Low-Level Code
 
 # Introduction
 
@@ -699,10 +699,10 @@ Other features provided by lang items include:
 - stack unwinding and general failure; the `eh_personality`, `fail_`
   and `fail_bounds_checks` lang items.
 - the traits in `std::kinds` used to indicate types that satisfy
-  various kinds; lang items `send`, `sync` and `copy`.
+  various kinds; lang items `send`, `share` and `copy`.
 - the marker types and variance indicators found in
   `std::kinds::markers`; lang items `covariant_type`,
-  `contravariant_lifetime`, `no_sync_bound`, etc.
+  `contravariant_lifetime`, `no_share_bound`, etc.
 
 Lang items are loaded lazily by the compiler; e.g. if one never uses
 `Box` then there is no need to define functions for `exchange_malloc`