---

yaml
---
r: 148207
b: refs/heads/try2
c: 29e82c6
h: refs/heads/master
i:
  148205: 6e14ab8
  148203: 7fcdae4
  148199: 944c05e
  148191: c0c18b7
v: v3

Author: bors

[refs]

@@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
 refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
-refs/heads/try2: 6bbd2ed98e2332d4ba7164b7c35b9b67e0257ab3
+refs/heads/try2: 29e82c65b47130fb431aaca0b33935ecfcd09d85
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/.gitignore

@@ -95,3 +95,4 @@ src/etc/dl
 build/
 i686-pc-mingw32/
 src/librustc/lib/llvmdeps.rs
+*.pot

branches/try2/.gitmodules

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

branches/try2/AUTHORS.txt

@@ -225,6 +225,7 @@ 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]>
@@ -240,6 +241,7 @@ 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]>

branches/try2/COPYRIGHT

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

branches/try2/LICENSE-MIT

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

branches/try2/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
-#     rustc - rustc's own place to organize libraries
+#     rustlib - rustc's own place to organize libraries
 #       $(target) - target-specific artifacts
 #         bin - binaries for target architectures
 #         lib - libraries for target architectures
@@ -410,11 +410,14 @@ 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 LIBDIR_RELATIVE
 
 ######################################################################
 # Subprograms
@@ -432,12 +435,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)
+HLIB$(1)_H_$(3) = $$(HROOT$(1)_H_$(3))/$$(LIBDIR_RELATIVE)
 
 # Destinations of artifacts for target architectures
-TROOT$(1)_T_$(2)_H_$(3) = $$(HLIB$(1)_H_$(3))/rustc/$(2)
+TROOT$(1)_T_$(2)_H_$(3) = $$(HLIB$(1)_H_$(3))/$$(CFG_RUSTLIBDIR)/$(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))/$$(CFG_LIBDIR)
+TLIB$(1)_T_$(2)_H_$(3) = $$(TROOT$(1)_T_$(2)_H_$(3))/lib
 
 # The name of the standard and extra libraries used by rustc
 HSTDLIB_DEFAULT$(1)_H_$(3) = \

branches/try2/RELEASES.txt

@@ -1,7 +1,7 @@
 Version 0.9 (January 2014)
 --------------------------
 
-   * ~1600 changes, numerous bugfixes
+   * ~1800 changes, numerous bugfixes
 
    * Language
       * The `float` type has been removed. Use `f32` or `f64` instead.
@@ -22,6 +22,9 @@ 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
@@ -32,6 +35,8 @@ 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.
@@ -76,6 +81,7 @@ 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
@@ -90,9 +96,14 @@ 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.

branches/try2/configure

@@ -397,7 +397,18 @@ valopt sysconfdir "/etc" "install system configuration files"
 valopt datadir "${CFG_PREFIX}/share" "install data"
 valopt infodir "${CFG_PREFIX}/share/info" "install additional info"
 valopt mandir "${CFG_PREFIX}/share/man" "install man pages in PATH"
-valopt libdir "${CFG_PREFIX}/lib" "install libraries"
+
+# On windows we just store the libraries in the bin directory because
+# there's no rpath
+# FIXME: Thise needs to parameterized over target triples. Do it in platform.mk
+LIBDIR_RELATIVE=lib
+if [ "$CFG_OSTYPE" = "pc-mingw32" ]
+then
+    LIBDIR_RELATIVE=bin
+fi
+
+valopt libdir "${CFG_PREFIX}/${LIBDIR_RELATIVE}" "install libraries"
+valopt rustlibdir "rustlib" "subdirectory name for rustc's libraries"
 
 # Validate Options
 step_msg "validating $CFG_SELF args"
@@ -559,10 +570,10 @@ then
         step_msg "on OS X 10.9, forcing use of clang"
         CFG_ENABLE_CLANG=1
         putvar CFG_ENABLE_CLANG
-    else 
-        # on OS X, with xcode 5 and newer, certain developers may have 
+    else
+        # on OS X, with xcode 5 and newer, certain developers may have
         # cc, gcc and g++ point to a  mixture of clang and gcc
-        # if so, this will create very strange build errors 
+        # if so, this will create very strange build errors
         # this last stanza is to detect some such problems and save the future rust
         # contributor some time solving that issue.
         # this detection could be generalized to other OSes aside from OS X
@@ -575,8 +586,8 @@ then
         # note that for xcode 5, g++ points to clang, not clang++
         if !((chk_cc gcc clang  && chk_cc g++ clang) ||
             (chk_cc gcc gcc  &&( chk_cc g++ g++ || chk g++ gcc))) then
-            err "the gcc and g++ in your path point to different compilers. 
-Check which versions are in your path with  cc --version and g++ --version. 
+            err "the gcc and g++ in your path point to different compilers.
+Check which versions are in your path with  cc --version and g++ --version.
 To resolve this problem, either fix your PATH  or run configure with --enable-clang"
         fi
 
@@ -750,15 +761,6 @@ do
   done
 done
 
-# On windows we just store the libraries in the bin directory because
-# there's no rpath
-# FIXME: Thise needs to parameterized over target triples. Do it in platform.mk
-CFG_LIBDIR=lib
-if [ "$CFG_OSTYPE" = "pc-mingw32" ]
-then
-    CFG_LIBDIR=bin
-fi
-
 for h in $CFG_HOST
 do
     for t in $CFG_TARGET
@@ -769,16 +771,16 @@ do
             make_dir $h/stage$i/bin
 
             # host lib dir
-            make_dir $h/stage$i/$CFG_LIBDIR
+            make_dir $h/stage$i/$LIBDIR_RELATIVE
 
             # host test dir
             make_dir $h/stage$i/test
 
             # target bin dir
-            make_dir $h/stage$i/$CFG_LIBDIR/rustc/$t/bin
+            make_dir $h/stage$i/$LIBDIR_RELATIVE/$CFG_RUSTLIBDIR/$t/bin
 
             # target lib dir
-            make_dir $h/stage$i/$CFG_LIBDIR/rustc/$t/$CFG_LIBDIR
+            make_dir $h/stage$i/$LIBDIR_RELATIVE/$CFG_RUSTLIBDIR/$t/lib
         done
     done
 
@@ -792,12 +794,14 @@ do
     make_dir $h/test/debug-info
     make_dir $h/test/codegen
     make_dir $h/test/doc-tutorial
-    make_dir $h/test/doc-tutorial-ffi
-    make_dir $h/test/doc-tutorial-macros
-    make_dir $h/test/doc-tutorial-borrowed-ptr
-    make_dir $h/test/doc-tutorial-container
-    make_dir $h/test/doc-tutorial-tasks
-    make_dir $h/test/doc-tutorial-conditions
+    make_dir $h/test/doc-guide-ffi
+    make_dir $h/test/doc-guide-macros
+    make_dir $h/test/doc-guide-lifetimes
+    make_dir $h/test/doc-guide-pointers
+    make_dir $h/test/doc-guide-container
+    make_dir $h/test/doc-guide-tasks
+    make_dir $h/test/doc-guide-conditions
+    make_dir $h/test/doc-complement-cheatsheet
     make_dir $h/test/doc-rust
 done
 
@@ -1031,6 +1035,8 @@ putvar CFG_HOST
 putvar CFG_TARGET
 putvar CFG_C_COMPILER
 putvar CFG_LIBDIR
+putvar CFG_RUSTLIBDIR
+putvar LIBDIR_RELATIVE
 putvar CFG_DISABLE_MANAGE_SUBMODULES
 putvar CFG_ANDROID_CROSS_PATH
 putvar CFG_MINGW32_CROSS_PATH

branches/try2/doc/complement-bugreport.md

@@ -0,0 +1,48 @@
+% HOWTO submit a RUST bug report
+
+# I think I found a bug in the compiler!
+
+   If you see this message: ''error: internal compiler error: unexpected failure'',
+then you have definitely found a bug in the compiler. It's also possible that
+your code is not well-typed, but if you saw this message, it's still a bug in
+error reporting.
+
+   If you see a message about an LLVM assertion failure, then you have also
+definitely found a bug in the compiler. In both of these cases, it's not your
+fault and you should report a bug!
+
+   If you see a compiler error message that you think is meant for users to see,
+but it confuses you, *that's a bug too*. If it wasn't clear to you, then it's
+an error message we want to improve, so please report it so that we can try
+to make it better.
+
+# I don't want to waste the Rust devs' time! How do I know the bug I found isn't a bug that already exists in the issue tracker?
+
+   If you don't have much time, then don't worry about that. Just submit the bug.
+If it's a duplicate, somebody will notice that and close it. No one will laugh
+at you, we promise (and if someone did, they would be violating the Rust
+[code of conduct](https://github.com/mozilla/rust/wiki/Note-development-policy code of conduct)).
+
+   If you have more time, it's very helpful if you can type the text of the error
+message you got [into the issue tracker search box](https://github.com/mozilla/rust/issues)
+to see if there's an existing bug that resembles your problem. If there is,
+and it's an open bug, you can comment on that issue and say you ran into it too.
+This will encourage devs to fix it. But again, don't let this stop you from
+submitting a bug. We'd rather have to do the work of closing duplicates than
+miss out on valid bug reports.
+
+# What information should I include in a bug report?
+
+    It's helpful to include your specific OS (for example: Mac OS X 10.8.3,
+Windows 7, Ubuntu 12.0.4) and your hardware architecture (for example: i686, x86_64).
+It's also helpful to copy/paste the output of re-running the erroneous rustc
+commmand with the `-v` flag. Finally, if you can run the offending command under gdb,
+pasting a stack trace can be useful; to do so, you will need to set a breakpoint on `rust_begin_unwind`.
+
+# I submitted a bug, but nobody has commented on it! I'm sad.
+
+   This is sad, but does happen sometimes, since we're short-staffed. If you
+submit a bug and you haven't received a comment on it within 3 business days,
+it's entirely reasonable to either ask on the #rust IRC channel,
+or post on the [rust-dev mailing list](https://mail.mozilla.org/listinfo/rust-dev)
+to ask what the status of the bug is.