---

yaml
---
r: 107214
b: refs/heads/dist-snap
c: ebc079c
h: refs/heads/master
v: v3

Author: bors

[refs]

@@ -6,7 +6,7 @@ refs/heads/try: f64fdf524a434f0e5cd0bc91d09c144723f3c90d
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c
-refs/heads/dist-snap: 1812a7b540e929bb1688880541fb4c8e3b80bf6d
+refs/heads/dist-snap: ebc079c787aead54b23c81cfc1d7522fe513b1b5
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
 refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0

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

@@ -410,12 +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
@@ -433,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))/$$(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/dist-snap/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
 
@@ -800,10 +801,12 @@ do
     make_dir $h/test/doc-tutorial
     make_dir $h/test/doc-guide-ffi
     make_dir $h/test/doc-guide-macros
-    make_dir $h/test/doc-guide-borrowed-ptr
+    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
 
@@ -1038,6 +1041,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/dist-snap/doc/complement-cheatsheet.md

@@ -6,113 +6,116 @@
 
 Use [`ToStr`](http://static.rust-lang.org/doc/master/std/to_str/trait.ToStr.html).
 
-```rust
+~~~
 let x: int = 42;
 let y: ~str = x.to_str();
-```
+~~~
 
 **String to int**
 
 Use [`FromStr`](http://static.rust-lang.org/doc/master/std/from_str/trait.FromStr.html), and its helper function, [`from_str`](http://static.rust-lang.org/doc/master/std/from_str/fn.from_str.html).
 
-```rust
+~~~
 let x: Option<int> = from_str("42");
 let y: int = x.unwrap();
-```
+~~~
 
 **Int to string, in non-base-10**
 
 Use [`ToStrRadix`](http://static.rust-lang.org/doc/master/std/num/trait.ToStrRadix.html).
 
-```rust
+~~~
 use std::num::ToStrRadix;
 
 let x: int = 42;
 let y: ~str = x.to_str_radix(16);
-```
+~~~
 
 **String to int, in non-base-10**
 
 Use [`FromStrRadix`](http://static.rust-lang.org/doc/master/std/num/trait.FromStrRadix.html), and its helper function, [`from_str_radix`](http://static.rust-lang.org/doc/master/std/num/fn.from_str_radix.html).
 
-```rust
+~~~
 use std::num::from_str_radix;
 
-let x: Option<int> = from_str_radix("deadbeef", 16);
-let y: int = x.unwrap();
-```
+let x: Option<i64> = from_str_radix("deadbeef", 16);
+let y: i64 = x.unwrap();
+~~~
 
 # File operations
 
 ## How do I read from a file?
 
 Use [`File::open`](http://static.rust-lang.org/doc/master/std/io/fs/struct.File.html#method.open) to create a [`File`](http://static.rust-lang.org/doc/master/std/io/fs/struct.File.html) struct, which implements the [`Reader`](http://static.rust-lang.org/doc/master/std/io/trait.Reader.html) trait.
 
-```rust
+~~~ {.xfail-test}
 use std::path::Path;
 use std::io::fs::File;
 
 let path : Path   = Path::new("Doc-FAQ-Cheatsheet.md");
 let on_error      = || fail!("open of {:?} failed", path);
 let reader : File = File::open(&path).unwrap_or_else(on_error);
-```
+~~~
 
 ## How do I iterate over the lines in a file?
 
 Use the [`lines`](http://static.rust-lang.org/doc/master/std/io/trait.Buffer.html#method.lines) method on a [`BufferedReader`](http://static.rust-lang.org/doc/master/std/io/buffered/struct.BufferedReader.html).
 
-```rust
+~~~
 use std::io::buffered::BufferedReader;
+# use std::io::mem::MemReader;
+
+# let reader = MemReader::new(~[]);
 
 let mut reader = BufferedReader::new(reader);
 for line in reader.lines() {
     print!("line: {}", line);
 }
-```
+~~~
 
 # String operations
 
 ## How do I search for a substring?
 
 Use the [`find_str`](http://static.rust-lang.org/doc/master/std/str/trait.StrSlice.html#tymethod.find_str) method.
 
-```rust
+~~~
 let str = "Hello, this is some random string";
 let index: Option<uint> = str.find_str("rand");
-```
+~~~
 
 # Containers
 
 ## How do I get the length of a vector?
 
 The [`Container`](http://static.rust-lang.org/doc/master/std/container/trait.Container.html) trait provides the `len` method.
 
-```rust
+~~~
 let u: ~[u32] = ~[0, 1, 2];
 let v: &[u32] = &[0, 1, 2, 3];
 let w: [u32, .. 5] = [0, 1, 2, 3, 4];
 
 println!("u: {}, v: {}, w: {}", u.len(), v.len(), w.len()); // 3, 4, 5
-```
+~~~
 
 ## How do I iterate over a vector?
 
 Use the [`iter`](http://static.rust-lang.org/doc/master/std/vec/trait.ImmutableVector.html#tymethod.iter) method.
 
-```rust
+~~~
 let values: ~[int] = ~[1, 2, 3, 4, 5];
 for value in values.iter() {  // value: &int
     println!("{}", *value);
 }
-```
+~~~
 
 (See also [`mut_iter`](http://static.rust-lang.org/doc/master/std/vec/trait.MutableVector.html#tymethod.mut_iter) which yields `&mut int` and [`move_iter`](http://static.rust-lang.org/doc/master/std/vec/trait.OwnedVector.html#tymethod.move_iter) which yields `int` while consuming the `values` vector.)
 
 # Type system
 
 ## How do I store a function in a struct?
 
-```rust
+~~~
 struct Foo {
     myfunc: fn(int, uint) -> i32
 }
@@ -131,24 +134,27 @@ fn main() {
     println!("{}", (f.myfunc)(1, 2));
     println!("{}", (g.myfunc)(3, 4));
 }
-```
+~~~
 
 Note that the parenthesis surrounding `f.myfunc` are necessary: they are how Rust disambiguates field lookup and method call. The `'a` on `FooClosure` is the lifetime of the closure's environment pointer.
 
 ## How do I express phantom types?
 
 [Phantom types](http://www.haskell.org/haskellwiki/Phantom_type) are those that cannot be constructed at compile time. To express these in Rust, zero-variant `enum`s can be used:
 
-```rust
+~~~
 enum Open {}
 enum Closed {}
-```
+~~~
 
 Phantom types are useful for enforcing state at compile time. For example:
 
-```rust
+~~~
 struct Door<State>(~str);
 
+struct Open;
+struct Closed;
+
 fn close(Door(name): Door<Open>) -> Door<Closed> {
     Door::<Closed>(name)
 }
@@ -157,40 +163,45 @@ fn open(Door(name): Door<Closed>) -> Door<Open> {
     Door::<Open>(name)
 }
 
-let _ = close(Door::<Open>(~"front"));   // ok
+let _ = close(Door::<Open>(~"front"));
+~~~
+
+Attempting to close a closed door is prevented statically:
+
+~~~ {.xfail-test}
 let _ = close(Door::<Closed>(~"front")); // error: mismatched types: expected `main::Door<main::Open>` but found `main::Door<main::Closed>`
-```
+~~~
 
 # FFI (Foreign Function Interface)
 
 ## C function signature conversions
 
-Description           | C signature                                  | Equivalent Rust signature
-----------------------|----------------------------------------------|------------------------------------------
-no parameters         | `void foo(void);`                            | `fn foo();`
-return value          | `int foo(void);`                             | `fn foo() -> c_int;`
-function parameters   | `void foo(int x, int y);`                    | `fn foo(x: int, y: int);`
-in-out pointers       | `void foo(const int* in_ptr, int* out_ptr);` | `fn foo(in_ptr: *c_int, out_ptr: *mut c_int);`
+Description            C signature                                    Equivalent Rust signature
+---------------------- ---------------------------------------------- ------------------------------------------
+no parameters          `void foo(void);`                              `fn foo();`
+return value           `int foo(void);`                               `fn foo() -> c_int;`
+function parameters    `void foo(int x, int y);`                      `fn foo(x: int, y: int);`
+in-out pointers        `void foo(const int* in_ptr, int* out_ptr);`   `fn foo(in_ptr: *c_int, out_ptr: *mut c_int);`
 
 Note: The Rust signatures should be wrapped in an `extern "ABI" { ... }` block.
 
 ### Representing opaque handles
 
 You might see things like this in C APIs:
 
-```c
+~~~ {.notrust}
 typedef struct Window Window;
 Window* createWindow(int width, int height);
-```
+~~~
 
 You can use a zero-element `enum` ([phantom type](#how-do-i-express-phantom-types)) to represent the opaque object handle. The FFI would look like this:
 
-```rust
+~~~ {.xfail-test}
 enum Window {}
 extern "C" {
     fn createWindow(width: c_int, height: c_int) -> *Window;
 }
-```
+~~~
 
 Using a phantom type ensures that the handles cannot be (safely) constructed in client code.
 
@@ -200,4 +211,4 @@ For small examples, have full type annotations, as much as is reasonable, to kee
 
 Similar documents for other programming languages:
 
-  * [http://pleac.sourceforge.net/](http://pleac.sourceforge.net)  
+  * [http://pleac.sourceforge.net/](http://pleac.sourceforge.net)