---

yaml
---
r: 89855
b: refs/heads/master
c: ade310c
h: refs/heads/master
i:
  89853: 3a4ef16
  89851: d35a326
  89847: bfe2beb
  89839: a7b06d4
  89823: 103594e
  89791: 884d7f1
  89727: c3de7fe
  89599: cd5d9e2
v: v3

Author: bors

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 20627c7430afd700cf0b462c372d9086c7c51f0a
+refs/heads/master: ade310cbb6e949b27285ca592e34371c1cc6677f
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: a6d3e57dca68fde4effdda3e4ae2887aa535fcd6
 refs/heads/try: b160761e35efcd1207112b3b782c06633cf441a8

trunk/.gitignore

@@ -89,3 +89,4 @@ config.stamp
 src/etc/dl
 .settings/
 build/
+i686-pc-mingw32/

trunk/doc/favicon.inc

@@ -0,0 +1 @@
+<link rel="shortcut icon" href="http://www.rust-lang.org/favicon.ico" />

trunk/doc/manual.inc

@@ -4,4 +4,9 @@
     display: block;
     padding-left: 2em;
   }
-</style>
+  #influences blockquote p:last-child {
+    display: block;
+    line-height: 1.428571429;
+    color: #999999;
+  }
+</style>

trunk/doc/rust.css

@@ -2,7 +2,7 @@
  * Copyright 2013 The Rust Project Developers. See the COPYRIGHT
  * file at the top-level directory of this distribution and at
  * http://rust-lang.org/COPYRIGHT.
- * With elements taken from Bootstrap v3.0.0 (Apache v2.0 licensed).
+ * With elements taken from Bootstrap v3.0.2 (MIT licensed).
  *
  * Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
  * http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
@@ -93,6 +93,7 @@ p {
 a {
 	text-decoration: none;
 	color: #428BCA;
+	background: transparent;
 }
 a:hover, a:focus {
 	color: #2A6496;
@@ -114,7 +115,7 @@ h5 a:link, h5 a:visited {color: black;}
 /* Code
    ========================================================================== */
 pre, code {
-	font-family: Monaco, Menlo, Consolas, "Courier New", monospace;
+	font-family: Menlo, Monaco, Consolas, "Courier New", monospace;
 	border-radius: 4px;
 }
 pre {
@@ -141,7 +142,7 @@ pre code {
 	color: inherit;
 	white-space: pre-wrap;
 	background-color: transparent;
-	border: 0;
+	border-radius: 0;
 }
 
 /* Code highlighting */
@@ -158,7 +159,7 @@ pre code {
 .cm-s-default span.cm-string {color: #a11;}
 .cm-s-default span.cm-string-2 {color: #f50;}
 .cm-s-default span.cm-meta {color: #555;}
-.cm-s-default span.cm-error {color: #f00;}
+/*.cm-s-default span.cm-error {color: #f00;}*/
 .cm-s-default span.cm-qualifier {color: #555;}
 .cm-s-default span.cm-builtin {color: #30a;}
 .cm-s-default span.cm-bracket {color: #cc7;}
@@ -187,7 +188,7 @@ pre code {
 }
 #versioninfo a.hash {
 	color: gray;
-	font-size: 60%;
+	font-size: 70%;
 }
 
 blockquote {
@@ -303,4 +304,4 @@ hr {
 	table td, table th {
 		background-color: #fff !important;
 	}
-}
+}

trunk/doc/rustpkg.md

@@ -120,7 +120,7 @@ Thus, there should be no need to pass a `-L` flag to rustpkg to tell it where to
 
 # Custom build scripts
 
-A file called `pkg.rs` at the root level in a workspace is called a *package script*.
+A file called `pkg.rs` at the root level in a package directory is called a *package script*.
 If a package script exists, rustpkg executes it to build the package
 rather than inferring crates as described previously.
 

trunk/doc/tutorial-ffi.md

@@ -303,7 +303,7 @@ conventions. Rust provides a way to tell the compiler which convention to use:
 #[cfg(target_os = "win32", target_arch = "x86")]
 #[link_name = "kernel32"]
 extern "stdcall" {
-    fn SetEnvironmentVariableA(n: *u8, v: *u8) -> int;
+    fn SetEnvironmentVariableA(n: *u8, v: *u8) -> std::libc::c_int;
 }
 ~~~~
 

trunk/doc/tutorial-macros.md

@@ -210,10 +210,10 @@ solves the problem.
 
 # Macro argument pattern matching
 
-Now consider code like the following:
-
 ## Motivation
 
+Now consider code like the following:
+
 ~~~~
 # enum t1 { good_1(t2, uint), bad_1 };
 # pub struct t2 { body: t3 }

trunk/doc/tutorial-rustpkg.md

@@ -27,7 +27,6 @@ $ rustc main.rs
 main.rs:1:0: 1:17 error: can't find crate for `hello`
 main.rs:1 extern mod hello;
           ^~~~~~~~~~~~~~~~~
-
 ~~~~
 
 This makes sense, as we haven't gotten it from anywhere yet!  Luckily for us,
@@ -216,7 +215,7 @@ a function that can be sensibly tested:
 #[license = "MIT"];
 
 pub fn is_even(i: uint) -> bool {
-	i % 2 == 0
+    i % 2 == 0
 }
 ~~~
 
@@ -230,9 +229,9 @@ use hello::is_even;
 
 #[test]
 fn test_is_even() {
-   assert!(is_even(0));
-   assert!(!is_even(1));
-   assert!(is_even(2));	
+    assert!(is_even(0));
+    assert!(!is_even(1));
+    assert!(is_even(2));
 }
 ~~~
 

trunk/doc/tutorial-tasks.md

@@ -104,8 +104,8 @@ an environment that it carries across tasks.
 let child_task_number = generate_task_number();
 
 do spawn {
-   // Capture it in the remote task
-   println!("I am child number {}", child_task_number);
+    // Capture it in the remote task
+    println!("I am child number {}", child_task_number);
 }
 ~~~
 

trunk/doc/tutorial.md

@@ -804,7 +804,7 @@ confusing numbers that correspond to different units.
 We've already seen several function definitions. Like all other static
 declarations, such as `type`, functions can be declared both at the
 top level and inside other functions (or in modules, which we'll come
-back to [later](#modules-and-crates)). The `fn` keyword introduces a
+back to [later](#crates-and-the-module-system)). The `fn` keyword introduces a
 function. A function has an argument list, which is a parenthesized
 list of `expr: type` pairs separated by commas. An arrow `->`
 separates the argument list and the function's return type.
@@ -2550,18 +2550,21 @@ fn main() {
 ~~~~
 
 And here an example with multiple files:
+
 ~~~{.ignore}
 // a.rs - crate root
 use b::foo;
 mod b;
 fn main() { foo(); }
 ~~~
+
 ~~~{.ignore}
 // b.rs
 use b::c::bar;
 pub mod c;
 pub fn foo() { bar(); }
 ~~~
+
 ~~~
 // c.rs
 pub fn bar() { println("Baz!"); }
@@ -2711,10 +2714,10 @@ extend with the `-L` switch).
 However, Rust also ships with rustpkg, a package manager that is able to automatically download and build
 libraries if you use it for building your crate. How it works is explained [here][rustpkg],
 but for this tutorial it's only important to know that you can optionally annotate an
-`extern mod` statement with an package id that rustpkg can use to identify it:
+`extern mod` statement with a package id that rustpkg can use to identify it:
 
 ~~~ {.ignore}
-extern mod rust = "github.com/mozilla/rust"; // pretend Rust is an simple library
+extern mod rust = "github.com/mozilla/rust"; // pretend Rust is a simple library
 ~~~
 
 [rustpkg]: rustpkg.html
@@ -2730,7 +2733,7 @@ the link name and the version. It also hashes the filename and the symbols in a
 based on the link metadata, allowing you to use two different versions of the same library in a crate
 without conflict.
 
-Therefor, if you plan to compile your crate as a library, you should annotate it with that information:
+Therefore, if you plan to compile your crate as a library, you should annotate it with that information:
 
 ~~~~
 // lib.rs
@@ -2746,8 +2749,8 @@ Therefor, if you plan to compile your crate as a library, you should annotate it
 You can also in turn require in a `extern mod` statement that certain link metadata items match some criteria.
 For that, Rust currently parses a comma-separated list of name/value pairs that appear after
 it, and ensures that they match the attributes provided in the `link` attribute of a crate file.
-This enables you to, eg, pick a a crate based on it's version number, or to link an library under an
-different name. For example, this two mod statements would both accept and select the crate define above:
+This enables you to, e.g., pick a crate based on its version number, or link a library under a
+different name. For example, these two `mod` statements would both accept and select the crate define above:
 
 ~~~~ {.xfail-test}
 extern mod farm(vers = "2.5");
@@ -2836,15 +2839,15 @@ This allows you to use common types and functions like `Option<T>` or `println`
 without needing to import them. And if you need something from `std` that's not in the prelude,
 you just have to import it with an `use` statement.
 
-For example, it re-exports `println` which is defined in `std::io::println`:
+For example, it re-exports `println` which is defined in `std::io::stdio::println`:
 
 ~~~
-use puts = std::rt::io::stdio::println;
+use puts = std::io::stdio::println;
 
 fn main() {
     println("println is imported per default.");
-    puts("Doesn't hinder you from importing it under an different name yourself.");
-    ::std::rt::io::stdio::println("Or from not using the automatic import.");
+    puts("Doesn't hinder you from importing it under a different name yourself.");
+    ::std::io::stdio::println("Or from not using the automatic import.");
 }
 ~~~