auto merge of #18368 : alexcrichton/rust/rollup, r=alexcrichton

Author: bors

.mailmap

@@ -5,8 +5,104 @@
 # email addresses.
 #
 
-Elly Jones <[email protected]>
-ILyoan <[email protected]>
+Aaron Todd <[email protected]>
+Ahmed Charles <[email protected]> <[email protected]>
+Alex Lyon <[email protected]> <[email protected]>
+Alex Rønne Petersen <[email protected]>
+Andreas Gal <[email protected]> <[email protected]>
+Andrew Poelstra <[email protected]> <[email protected]>
+Anton Löfgren <[email protected]> <[email protected]>
+Ariel Ben-Yehuda <[email protected]> <[email protected]>
+Austin Seipp <[email protected]> <[email protected]>
+Ben Alpert <[email protected]> <[email protected]>
+Benjamin Jackman <[email protected]>
+Björn Steinbrink <[email protected]> <[email protected]>
+blake2-ppc <[email protected]> <blake2-ppc>
+Boris Egorov <[email protected]> <[email protected]>
+Brian Anderson <[email protected]> <[email protected]>
+Brian Dawn <[email protected]>
+Carl-Anton Ingmarsson <[email protected]> <[email protected]>
+Carol Willing <[email protected]>
+Chris Pressey <[email protected]>
+Clark Gaebel <[email protected]> <[email protected]>
+David Klein <[email protected]>
+David Manescu <[email protected]> <[email protected]>
+Damien Schoof <[email protected]>
+Derek Chiang <[email protected]> Derek Chiang (Enchi Jiang) <[email protected]>
+Dylan Braithwaite <[email protected]> <[email protected]>
+Eduardo Bautista <[email protected]> <[email protected]>
+Eduardo Bautista <[email protected]> <=>
+Elliott Slaughter <[email protected]> <[email protected]>
+Elly Fong-Jones <[email protected]>
+Eric Holk <[email protected]> <[email protected]>
+Eric Holk <[email protected]> <[email protected]>
+Eric Holmes <[email protected]>
+Eric Reed <[email protected]> <[email protected]>
+Erick Tryzelaar <[email protected]> <[email protected]>
+Evgeny Sologubov
+Falco Hirschenberger <[email protected]> <[email protected]>
+Gareth Daniel Smith <[email protected]>
+Georges Dubus <[email protected]> <[email protected]>
+Graham Fawcett <[email protected]> <[email protected]>
+Graydon Hoare <[email protected]> <[email protected]>
+Heather <[email protected]> <[email protected]>
+Heather <[email protected]> <[email protected]>
+Ilyong Cho <[email protected]>
+J. J. Weber <[email protected]>
+Jakub Bukaj <[email protected]>
+Jakub Bukaj <[email protected]> <[email protected]>
+James Deng <[email protected]> <[email protected]>
+James Miller <[email protected]> <[email protected]>
+Jason Orendorff <[email protected]> <[email protected]>
+Jason Orendorff <[email protected]> <[email protected]>
+Jeremy Letang <[email protected]>
+Jihyun Yu <[email protected]> jihyun <[email protected]>
+Jihyun Yu <[email protected]> <[email protected]>
+John Clements <[email protected]> <[email protected]>
+Jorge Aparicio <[email protected]> <[email protected]>
+Jonathan Bailey <[email protected]> <[email protected]>
 Junyoung Cho <[email protected]>
+Jyun-Yan You <[email protected]> <[email protected]>
+Kang Seonghoon <[email protected]> <[email protected]>
+Keegan McAllister <[email protected]> <[email protected]>
+Kyeongwoon Lee <[email protected]>
+Lee Wondong <[email protected]>
+Lennart Kudling <[email protected]>
+Lindsey Kuper <[email protected]> <[email protected]>
+Lindsey Kuper <[email protected]> <[email protected]>
+Luqman Aden <[email protected]> <[email protected]>
+Luqman Aden <[email protected]> <[email protected]>
+Luke Metz <[email protected]>
+Makoto Nakashima <[email protected]> <[email protected]>
+Makoto Nakashima <[email protected]> gifnksm <[email protected]>
+Margaret Meyerhofer <[email protected]> <mmeyerho@andrew>
+Mark Sinclair <[email protected]>
+Mark Sinclair <[email protected]> =Mark Sinclair <[email protected]>
+Matt Brubeck <[email protected]> <[email protected]>
+Matthew Auld <[email protected]>
+Matthew McPherrin <[email protected]> <[email protected]>
 Matthijs Hofstra <[email protected]>
+Michael Williams <[email protected]>
+Michael Woerister <michaelwoerister@gmail> <[email protected]>
+Michael Woerister <michaelwoerister@gmail> <michaelwoerister@posteo>
+Neil Pankey <[email protected]> <[email protected]>
+Philipp Brüschweiler <[email protected]> <[email protected]>
+Philipp Brüschweiler <[email protected]> <[email protected]>
+Pradeep Kumar <[email protected]>
+Richard Diamond <[email protected]> <[email protected]>
 Rob Arnold <[email protected]>
+Robert Gawdzik <[email protected]> Robert Gawdzik ☢ <[email protected]>
+Robert Millar <[email protected]>
+Ryan Scheel <[email protected]>
+Seonghyun Kim <[email protected]>
+Simon Barber-Dueck <[email protected]> Simon BD <simon@server>
+Simon Sapin <[email protected]> <[email protected]>
+startling <[email protected]>
+Steven Fackler <[email protected]> <[email protected]>
+Steven Stewart-Gallus <[email protected]> <[email protected]>
+Tim Chevalier <[email protected]> <[email protected]>
+Torsten Weber <[email protected]> <[email protected]>
+William Ting <[email protected]> <[email protected]>
+Youngsoo Son <[email protected]> <[email protected]>
+Zack Corr <[email protected]> <[email protected]>
+Zack Slayton <[email protected]>

configure

@@ -989,6 +989,7 @@ do
     make_dir $h/test/doc-guide-container
     make_dir $h/test/doc-guide-tasks
     make_dir $h/test/doc-guide-plugin
+    make_dir $h/test/doc-guide-crates
     make_dir $h/test/doc-rust
 done
 

mk/docs.mk

@@ -27,7 +27,7 @@
 ######################################################################
 DOCS := index intro tutorial guide guide-ffi guide-macros guide-lifetimes \
 	guide-tasks guide-container guide-pointers guide-testing \
-	guide-plugin complement-bugreport \
+	guide-plugin guide-crates complement-bugreport \
 	complement-lang-faq complement-design-faq complement-project-faq rust \
     rustdoc guide-unsafe guide-strings reference
 

src/doc/guide-crates.md

@@ -452,7 +452,7 @@ fn main() {
 
 Rust will give us a compile-time error:
 
-```{rust,ignore}
+```{notrust,ignore}
    Compiling phrases v0.0.1 (file:///home/you/projects/phrases)
 /home/you/projects/phrases/src/main.rs:4:5: 4:40 error: a value named `hello` has already been imported in this module
 /home/you/projects/phrases/src/main.rs:4 use phrases::japanese::greetings::hello;

src/doc/guide-plugin.md

@@ -56,7 +56,7 @@ extern crate rustc;
 
 use syntax::codemap::Span;
 use syntax::parse::token::{IDENT, get_ident};
-use syntax::ast::{TokenTree, TTTok};
+use syntax::ast::{TokenTree, TtToken};
 use syntax::ext::base::{ExtCtxt, MacResult, DummyResult, MacExpr};
 use syntax::ext::build::AstBuilder;  // trait for expr_uint
 use rustc::plugin::Registry;
@@ -71,7 +71,7 @@ fn expand_rn(cx: &mut ExtCtxt, sp: Span, args: &[TokenTree])
         ("I",    1)];
 
     let text = match args {
-        [TTTok(_, IDENT(s, _))] => get_ident(s).to_string(),
+        [TtToken(_, IDENT(s, _))] => get_ident(s).to_string(),
         _ => {
             cx.span_err(sp, "argument should be a single identifier");
             return DummyResult::any(sp);
@@ -151,8 +151,7 @@ higher-level syntax elements like expressions:
 fn expand_foo(cx: &mut ExtCtxt, sp: Span, args: &[TokenTree])
         -> Box<MacResult+'static> {
 
-    let mut parser =
-        parse::new_parser_from_tts(cx.parse_sess(), cx.cfg(), args.to_slice())
+    let mut parser = cx.new_parser_from_tts(args);
 
     let expr: P<Expr> = parser.parse_expr();
 ```

src/doc/guide-pointers.md

@@ -416,7 +416,7 @@ great detail, so if you want the full details, check that out.
 
 In general, prefer stack allocation over heap allocation. Using references to
 stack allocated information is preferred whenever possible. Therefore,
-references are the default pointer type you should use, unless you have
+references are the default pointer type you should use, unless you have a
 specific reason to use a different type. The other types of pointers cover when
 they're appropriate to use in their own best practices sections.
 

src/doc/guide-strings.md

@@ -14,8 +14,8 @@ Rust has two main types of strings: `&str` and `String`.
 
 # &str
 
-The first kind is a `&str`. This is pronounced a 'string slice.' String literals
-are of the type `&str`:
+The first kind is a `&str`. This is pronounced a 'string slice'.
+String literals are of the type `&str`:
 
 ```{rust}
 let string = "Hello there.";
@@ -121,8 +121,8 @@ Both of these lines will print `12`.
 To compare a String to a constant string, prefer `as_slice()`...
 
 ```{rust}
-fn compare(string: String) {
-    if string.as_slice() == "Hello" {
+fn compare(x: String) {
+    if x.as_slice() == "Hello" {
         println!("yes");
     }
 }
@@ -131,8 +131,8 @@ fn compare(string: String) {
 ... over `to_string()`:
 
 ```{rust}
-fn compare(string: String) {
-    if string == "Hello".to_string() {
+fn compare(x: String) {
+    if x == "Hello".to_string() {
         println!("yes");
     }
 }