---

yaml
---
r: 128631
b: refs/heads/try
c: aa8602e
h: refs/heads/master
i:
  128629: facb02e
  128627: d8f82e8
  128623: efb754a
v: v3

Author: steveklabnik

[refs]

@@ -2,7 +2,7 @@
 refs/heads/master: 07d86b46a949a94223da714e35b343243e4ecce4
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: a86d9ad15e339ab343a12513f9c90556f677b9ca
-refs/heads/try: 12e0f72f517516ac4fce2aed85e6142e9b874bce
+refs/heads/try: aa8602e20a95a3b31f23997de59ba8f5f8991420
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c

branches/try/.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

branches/try/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
 

branches/try/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))

branches/try/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

branches/try/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);

branches/try/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

branches/try/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.
 
@@ -162,15 +162,4 @@ 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].
 
-## How fast is Rust?
-
-As always, this question is difficult to answer. There's still a lot of work to
-do on speed, and depending on what you're benchmarking, Rust has variable
-performance.
-
-That said, it is an explicit goal of Rust to be as fast as C++ for most things.
-Language decisions are made with performance in mind, and we want Rust to be as
-fast as possible. Given that Rust is built on top of LLVM, any performance
-improvements in it also help us be faster.
-
 [1]:log/index.html

branches/try/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?
 

branches/try/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

branches/try/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