---

yaml
---
r: 148091
b: refs/heads/try2
c: aa1839b
h: refs/heads/master
i:
  148089: 3b9728e
  148087: 1945d59
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: 280553c98842c62b5addc6c0ae444a0ec21ee530
+refs/heads/try2: aa1839bd693176f03f372fb34baa7b19b5030af7
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

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/Makefile.in

@@ -416,6 +416,7 @@ export CFG_ENABLE_MINGW_CROSS
 export CFG_PREFIX
 export CFG_LIBDIR
 export CFG_RUSTLIBDIR
+export LIBDIR_RELATIVE
 
 ######################################################################
 # Subprograms
@@ -433,12 +434,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))/$$(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,17 @@ 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
@@ -560,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
@@ -576,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
 
@@ -751,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
@@ -770,21 +771,21 @@ 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/$CFG_RUSTLIBDIR/$t/bin
+            make_dir $h/stage$i/$LIBDIR_RELATIVE/$CFG_RUSTLIBDIR/$t/bin
 
             # target lib dir
-            make_dir $h/stage$i/$CFG_LIBDIR/$CFG_RUSTLIBDIR/$t/$CFG_LIBDIR
+            make_dir $h/stage$i/$LIBDIR_RELATIVE/$CFG_RUSTLIBDIR/$t/lib
         done
 
         # Fix stage0:
-        make_dir $h/stage0/$CFG_LIBDIR/rustc/$t/bin
-        make_dir $h/stage0/$CFG_LIBDIR/rustc/$t/$CFG_LIBDIR
+        make_dir $h/stage0/$LIBDIR_RELATIVE/rustc/$t/bin
+        make_dir $h/stage0/$LIBDIR_RELATIVE/rustc/$t/$LIBDIR_RELATIVE
 
     done
 
@@ -1039,6 +1040,7 @@ 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/guide-macros.md

@@ -278,6 +278,7 @@ return result + val;
 This solves the indentation problem. But if we have a lot of chained matches
 like this, we might prefer to write a single macro invocation. The input
 pattern we want is clear:
+
 ~~~~
 # macro_rules! b(
     ( $( ($e:expr) ~ ($p:pat) else $err:stmt ; )*
@@ -304,6 +305,7 @@ input patterns:
     ( binds $( $bind_res:ident ),* )
 # => (0))
 ~~~~
+
 ...and:
 
 ~~~~

branches/try2/doc/guide-tasks.md

@@ -263,6 +263,7 @@ With `extra::future`, rust has a mechanism for requesting a computation and gett
 later.
 
 The basic example below illustrates this.
+
 ~~~
 # fn make_a_sandwich() {};
 fn fib(n: u64) -> u64 {
@@ -283,6 +284,7 @@ the future needs to be mutable so that it can save the result for next time `get
 
 Here is another example showing how futures allow you to background computations. The workload will
 be distributed on the available cores.
+
 ~~~
 # use std::vec;
 fn partial_sum(start: uint) -> f64 {
@@ -317,6 +319,7 @@ acts as a reference to the shared data and only this reference is shared and clo
 
 Here is a small example showing how to use Arcs. We wish to run concurrently several computations on
 a single large vector of floats. Each task needs the full vector to perform its duty.
+
 ~~~
 # use std::vec;
 # use std::rand;
@@ -348,14 +351,17 @@ fn main() {
 The function `pnorm` performs a simple computation on the vector (it computes the sum of its items
 at the power given as argument and takes the inverse power of this value). The Arc on the vector is
 created by the line
+
 ~~~
 # use extra::arc::Arc;
 # use std::vec;
 # use std::rand;
 # let numbers = vec::from_fn(1000000, |_| rand::random::<f64>());
 let numbers_arc=Arc::new(numbers);
 ~~~
+
 and a clone of it is sent to each task
+
 ~~~
 # use extra::arc::Arc;
 # use std::vec;
@@ -365,9 +371,11 @@ and a clone of it is sent to each task
 # let (port, chan)  = Chan::new();
 chan.send(numbers_arc.clone());
 ~~~
+
 copying only the wrapper and not its contents.
 
 Each task recovers the underlying data by
+
 ~~~
 # use extra::arc::Arc;
 # use std::vec;
@@ -379,6 +387,7 @@ Each task recovers the underlying data by
 # let local_arc : Arc<~[f64]> = port.recv();
 let task_numbers = local_arc.get();
 ~~~
+
 and can use it as if it were local.
 
 The `arc` module also implements Arcs around mutable data that are not covered here.

branches/try2/doc/rust.md

@@ -845,6 +845,7 @@ If a sequence of such redirections form a cycle or cannot be resolved unambiguou
 they represent a compile-time error.
 
 An example of re-exporting:
+
 ~~~~
 # fn main() { }
 mod quux {
@@ -868,6 +869,7 @@ All rules regarding accessing declared modules in `use` declarations applies to
 and `extern mod` declarations.
 
 An example of what will and will not work for `use` items:
+
 ~~~~
 # #[allow(unused_imports)];
 use foo::extra;          // good: foo is at the root of the crate
@@ -1184,6 +1186,7 @@ a = Cat;
 ~~~~
 
 Enumeration constructors can have either named or unnamed fields:
+
 ~~~~
 enum Animal {
     Dog (~str, f64),

branches/try2/doc/tutorial.md

@@ -2788,13 +2788,15 @@ For example, if we move the `animals` module above into its own file...
 mod plants;
 mod animals;
 ~~~
+
 ~~~ {.ignore}
 // src/animals.rs or src/animals/mod.rs
 mod fish;
 mod mammals {
     mod humans;
 }
 ~~~
+
 ...then the source files of `mod animals`'s submodules can
 either be placed right next to that of its parents, or in a subdirectory if `animals` source file is:
 
@@ -2957,6 +2959,7 @@ pub fn bar() { println("Baz!"); }
 There also exist two short forms for importing multiple names at once:
 
 1. Explicit mention multiple names as the last element of an `use` path:
+
 ~~~
 use farm::{chicken, cow};
 # mod farm {
@@ -2967,6 +2970,7 @@ use farm::{chicken, cow};
 ~~~
 
 2. Import everything in a module with a wildcard:
+
 ~~~
 use farm::*;
 # mod farm {

branches/try2/mk/clean.mk

@@ -44,7 +44,7 @@ clean-misc:
 	$(Q)rm -Rf $(DOCS)
 	$(Q)rm -Rf $(GENERATED)
 	$(Q)rm -Rf tmp/*
-	$(Q)rm -Rf rust-stage0-*.tar.bz2 $(PKG_NAME)-*.tar.gz dist
+	$(Q)rm -Rf rust-stage0-*.tar.bz2 $(PKG_NAME)-*.tar.gz $(PKG_NAME)-*.exe dist
 	$(Q)rm -Rf $(foreach ext, \
                  html aux cp fn ky log pdf pg toc tp vr cps epub, \
                  $(wildcard doc/*.$(ext)))

branches/try2/mk/host.mk

@@ -149,7 +149,7 @@ $$(HLIB$(2)_H_$(4))/$(CFG_LIBNATIVE_$(4)): \
 $$(HBIN$(2)_H_$(4))/:
 	mkdir -p $$@
 
-ifneq ($(CFG_LIBDIR),bin)
+ifneq ($(LIBDIR_RELATIVE),bin)
 $$(HLIB$(2)_H_$(4))/:
 	mkdir -p $$@
 endif

branches/try2/mk/install.mk

@@ -63,7 +63,7 @@ ISTAGE = 2
 
 PREFIX_ROOT = $(CFG_PREFIX)
 PREFIX_BIN = $(PREFIX_ROOT)/bin
-PREFIX_LIB = $(PREFIX_ROOT)/$(CFG_LIBDIR)
+PREFIX_LIB = $(CFG_LIBDIR)
 
 define INSTALL_PREPARE_N
   # $(1) is the target triple
@@ -76,7 +76,7 @@ TL$(1)$(2) = $$(TLIB$$(ISTAGE)_T_$(1)_H_$(2))
 # PT{R,B,L} == Prefix Target {Root, Bin, Lib}
 PTR$(1)$(2) = $$(PREFIX_LIB)/$(CFG_RUSTLIBDIR)/$(1)
 PTB$(1)$(2) = $$(PTR$(1)$(2))/bin
-PTL$(1)$(2) = $$(PTR$(1)$(2))/$(CFG_LIBDIR)
+PTL$(1)$(2) = $$(PTR$(1)$(2))/lib
 
 endef