From b1e3baa5b477652e125890dba9ef101f841b8d15 Mon Sep 17 00:00:00 2001 From: mdinger Date: Fri, 23 Oct 2015 20:41:44 -0400 Subject: [PATCH 01/11] Merge same colors together --- src/librustdoc/html/static/main.css | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/librustdoc/html/static/main.css b/src/librustdoc/html/static/main.css index 5e27eab8575e..7d6dd1063dbf 100644 --- a/src/librustdoc/html/static/main.css +++ b/src/librustdoc/html/static/main.css @@ -415,9 +415,9 @@ a { .content span.mod, .content a.mod, block a.current.mod { color: #4d76ae; } .content span.enum, .content a.enum, .block a.current.enum { color: #5e9766; } .content span.struct, .content a.struct, .block a.current.struct { color: #e53700; } -.content span.fn, .content a.fn, .block a.current.fn { color: #8c6067; } -.content span.method, .content a.method, .block a.current.method { color: #8c6067; } -.content span.tymethod, .content a.tymethod, .block a.current.tymethod { color: #8c6067; } +.content span.fn, .content a.fn, .block a.current.fn, +.content span.method, .content a.method, .block a.current.method, +.content span.tymethod, .content a.tymethod, .block a.current.tymethod, .content .fnname { color: #8c6067; } .block a.current.crate { font-weight: 500; } From 11c7bdd160d70b2ed92b11f0699f993a54267447 Mon Sep 17 00:00:00 2001 From: mdinger Date: Fri, 23 Oct 2015 21:59:48 -0400 Subject: [PATCH 02/11] Add colors for rustdoc primitives, type, and macros links --- src/librustdoc/html/format.rs | 4 ++-- src/librustdoc/html/static/main.css | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/librustdoc/html/format.rs b/src/librustdoc/html/format.rs index d12c5d2c6fb6..79585a94cd0f 100644 --- a/src/librustdoc/html/format.rs +++ b/src/librustdoc/html/format.rs @@ -378,7 +378,7 @@ fn primitive_link(f: &mut fmt::Formatter, Some(&LOCAL_CRATE) => { let len = CURRENT_LOCATION_KEY.with(|s| s.borrow().len()); let len = if len == 0 {0} else {len - 1}; - try!(write!(f, "", + try!(write!(f, "", repeat("../").take(len).collect::(), prim.to_url_str())); needs_termination = true; @@ -398,7 +398,7 @@ fn primitive_link(f: &mut fmt::Formatter, }; match loc { Some(root) => { - try!(write!(f, "", + try!(write!(f, "", root, path.0.first().unwrap(), prim.to_url_str())); diff --git a/src/librustdoc/html/static/main.css b/src/librustdoc/html/static/main.css index 7d6dd1063dbf..a90bf17601fe 100644 --- a/src/librustdoc/html/static/main.css +++ b/src/librustdoc/html/static/main.css @@ -415,6 +415,9 @@ a { .content span.mod, .content a.mod, block a.current.mod { color: #4d76ae; } .content span.enum, .content a.enum, .block a.current.enum { color: #5e9766; } .content span.struct, .content a.struct, .block a.current.struct { color: #e53700; } +.content a.primitive { color: #39a7bf; } +.content a.type { color: #e57300; } +.content a.macro { color: #068000; } .content span.fn, .content a.fn, .block a.current.fn, .content span.method, .content a.method, .block a.current.method, .content span.tymethod, .content a.tymethod, .block a.current.tymethod, From b6f5e7238af29cd2d3b9f00f54ba2ac78a4a28e2 Mon Sep 17 00:00:00 2001 From: Marcell Pardavi Date: Tue, 27 Oct 2015 19:02:47 +0100 Subject: [PATCH 03/11] Small fix in the book Fixes #29401. r? @steveklabnik --- src/doc/trpl/the-stack-and-the-heap.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/doc/trpl/the-stack-and-the-heap.md b/src/doc/trpl/the-stack-and-the-heap.md index f30dacc485aa..0bc2ca263d5b 100644 --- a/src/doc/trpl/the-stack-and-the-heap.md +++ b/src/doc/trpl/the-stack-and-the-heap.md @@ -97,7 +97,7 @@ Because `0` was taken by the first frame, `1` and `2` are used for `foo()`’s stack frame. It grows upward, the more functions we call. -There’s some important things we have to take note of here. The numbers 0, 1, +There are some important things we have to take note of here. The numbers 0, 1, and 2 are all solely for illustrative purposes, and bear no relationship to the actual numbers the computer will actually use. In particular, the series of addresses are in reality going to be separated by some number of bytes that From ad8dcb64bf88bcfbf7bf12c09b6bc7d0e2e3accc Mon Sep 17 00:00:00 2001 From: Marcell Pardavi Date: Wed, 28 Oct 2015 00:56:27 +0100 Subject: [PATCH 04/11] Mention in the docs, that `assert!` has a second version with a custom message I recently discovered that this is not mentioned in the docs, only in the examples, and it's not evident for people coming from C++ r? @steveklabnik --- src/libcore/macros.rs | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/libcore/macros.rs b/src/libcore/macros.rs index bb112327abf4..5b5f59d5ddbb 100644 --- a/src/libcore/macros.rs +++ b/src/libcore/macros.rs @@ -34,6 +34,8 @@ macro_rules! panic { /// This will invoke the `panic!` macro if the provided expression cannot be /// evaluated to `true` at runtime. /// +/// This macro has a second version, where a custom panic message can be provided. +/// /// # Examples /// /// ``` @@ -99,6 +101,9 @@ macro_rules! assert_eq { /// This will invoke the `panic!` macro if the provided expression cannot be /// evaluated to `true` at runtime. /// +/// Like `assert!`, this macro also has a second version, where a custom panic +/// message can be provided. +/// /// Unlike `assert!`, `debug_assert!` statements are only enabled in non /// optimized builds by default. An optimized build will omit all /// `debug_assert!` statements unless `-C debug-assertions` is passed to the From 90b776e5c7eb898307236af111f6396447ab3a1d Mon Sep 17 00:00:00 2001 From: Daniel Rollins Date: Wed, 28 Oct 2015 19:56:57 +0000 Subject: [PATCH 05/11] Add diverging functions `-> !` to syntax index Resolves #29431 --- src/doc/trpl/syntax-index.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/doc/trpl/syntax-index.md b/src/doc/trpl/syntax-index.md index 7e03bb72cad5..0353fa9f39d1 100644 --- a/src/doc/trpl/syntax-index.md +++ b/src/doc/trpl/syntax-index.md @@ -60,6 +60,7 @@ * `-` (`- expr`): arithmetic negation. Overloadable (`Neg`). * `-=` (`var -= expr`): arithmetic subtraction & assignment. * `->` (`fn(…) -> type`, `|…| -> type`): function and closure return type. See [Functions], [Closures]. +* `-> !` (`fn(…) -> !`, `|…| -> !`): diverging function or closure. See [Diverging Functions]. * `.` (`expr.ident`): member access. See [Structs], [Method Syntax]. * `..` (`..`, `expr..`, `..expr`, `expr..expr`): right-exclusive range literal. * `..` (`..expr`): struct literal update syntax. See [Structs (Update syntax)]. @@ -189,6 +190,7 @@ [Crates and Modules (Importing External Crates)]: crates-and-modules.html#importing-external-crates [Crates and Modules (Importing Modules with `use`)]: crates-and-modules.html#importing-modules-with-use [Crates and Modules (Re-exporting with `pub use`)]: crates-and-modules.html#re-exporting-with-pub-use +[Diverging Functions]: functions.html#diverging-functions [Enums]: enums.html [Foreign Function Interface]: ffi.html [Functions (Early Returns)]: functions.html#early-returns From c9edcdb270b3723ae27a543d6438c96439b43f5a Mon Sep 17 00:00:00 2001 From: Brian Anderson Date: Wed, 28 Oct 2015 13:13:55 -0700 Subject: [PATCH 06/11] Tweak the add-authors.sh script --- src/etc/add-authors.sh | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/etc/add-authors.sh b/src/etc/add-authors.sh index 917053cc205e..3ae0ec73957e 100644 --- a/src/etc/add-authors.sh +++ b/src/etc/add-authors.sh @@ -18,6 +18,11 @@ # changes. If there are incorrect additions fix it by editing # .mailmap and re-running the script. +if [ "${1-}" = "" ]; then + echo "Usage: add-authors.sh 1.0.0..rust-lang/master" + exit 1 +fi + set -u -e range="$1" @@ -27,6 +32,6 @@ tmp_file="./AUTHORS.txt.tmp" old_authors="$(cat "$authors_file" | tail -n +2 | sed "/^$/d" | sort)" new_authors="$(git log "$range" --format="%aN <%aE>" | sort | uniq)" -echo "Rust was written by these fine people:\n" > "$tmp_file" -echo "$old_authors\n$new_authors" | sort | uniq >> "$tmp_file" +printf "%s\n\n" "Rust was written by these fine people:" > "$tmp_file" +printf "%s\n%s" "$old_authors" "$new_authors" | sort | uniq >> "$tmp_file" mv -f "$tmp_file" "$authors_file" From 418ef78c5c1eeacdd955bdd118e0e72191ae7f92 Mon Sep 17 00:00:00 2001 From: Brian Anderson Date: Wed, 28 Oct 2015 13:23:08 -0700 Subject: [PATCH 07/11] Update mailmap --- .mailmap | 7 ++++++- AUTHORS.txt | 3 --- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.mailmap b/.mailmap index 0f06604fa534..233e55e83d0c 100644 --- a/.mailmap +++ b/.mailmap @@ -9,6 +9,7 @@ Aaron Todd Abhishek Chanda Abhishek Chanda Ahmed Charles Aydin Kim aydin.kim +Alex Burka Alex Burka Alex Lyon Alex Newman Alex HotShot Newman Alex Rønne Petersen @@ -32,6 +33,7 @@ Carol Willing Chris Pressey Clark Gaebel Corey Farwell Corey Farwell +Corey Richardson Elaine "See More" Nemo David Klein David Manescu Damien Schoof @@ -51,7 +53,7 @@ Erick Tryzelaar Evgeny Sologubov Falco Hirschenberger Felix S. Klock II Felix S Klock II -Gareth Daniel Smith +Gareth Daniel Smith gareth Georges Dubus Graham Fawcett Graydon Hoare Graydon Hoare @@ -99,6 +101,7 @@ Matthew McPherrin Matthijs Hofstra Michael Williams Michael Woerister Michael Woerister +Ms2ger Neil Pankey Nicholas Mazzuca Nicholas Oliver Schneider Oliver 'ker' Schneider @@ -125,10 +128,12 @@ startling Steven Fackler Steven Stewart-Gallus Tamir Duberstein Tamir Duberstein +Thiago Pontes thiagopnts Ticki Ticki <@> Tim Chevalier Torsten Weber Ulrik Sverdrup Ulrik Sverdrup +Ulrik Sverdrup bluss bluss Vadim Petrochenkov petrochenkov William Ting Xuefeng Wu Xuefeng Wu XuefengWu diff --git a/AUTHORS.txt b/AUTHORS.txt index 310a91b2d16f..1e3707e26356 100644 --- a/AUTHORS.txt +++ b/AUTHORS.txt @@ -143,8 +143,6 @@ Birunthan Mohanathas Björn Steinbrink blake2-ppc Blake Loring -bluss -bluss Boris Egorov bors Bouke van der Bijl @@ -1078,7 +1076,6 @@ Thad Guidry Theo Belaire theptrk Thiago Carvalho -thiagopnts Thiago Pontes Thomas Backman Thomas Bracht Laumann Jespersen From f32205d4ffbee25cb1c15c01d47f2bf10b023ce9 Mon Sep 17 00:00:00 2001 From: Brian Anderson Date: Wed, 28 Oct 2015 13:28:57 -0700 Subject: [PATCH 08/11] Update AUTHORS.txt for 1.4 --- AUTHORS.txt | 214 +++++++++++++++++++++++++++++++--------------------- 1 file changed, 129 insertions(+), 85 deletions(-) diff --git a/AUTHORS.txt b/AUTHORS.txt index 1e3707e26356..58f10df1c460 100644 --- a/AUTHORS.txt +++ b/AUTHORS.txt @@ -1,5 +1,6 @@ Rust was written by these fine people: +A.J. Gardner Aaron Friel Aaron Gallagher <_@habnab.it> Aaron Laursen @@ -10,6 +11,7 @@ Aaron Turon Aaron Weiss Abhishek Chanda Adam Bozanich +Adam Crume Adam Heins Adam Jacob Adam Roben @@ -22,7 +24,6 @@ Agoston Szepessy Ahmed Charles Aidan Cully Aidan Hobson Sayers -A.J. Gardner Akos Kiss Akshay Chiwhane Alan Andrade @@ -30,6 +31,17 @@ Alan Cutter Alan Williams Aleksander Balicki Aleksandr Koshlo +Aleksey Kladov +Alex Burka +Alex Crichton +Alex Gaynor +Alex Lyon +Alex Newman +Alex Ozdemir +Alex Quach +Alex Rønne Petersen +Alex Stokes +Alex Whitney Alexander Artemenko Alexander Bliskovsky Alexander Campbell @@ -40,27 +52,20 @@ Alexander Polakov Alexander Stavonin Alexandre Gagnon Alexandros Tasos -Alex Burka -Alex Crichton +AlexDenisov <1101.debian@gmail.com> Alexei Sholik -Alex Gaynor Alexis Beingessner -Alex Lyon -Alex Newman -Alex Quach -Alex Rønne Petersen -Alex Stokes -Alex Whitney Alfie John -Alisdair Owens Ali Smesseim +Alisdair Owens Aljaž "g5pw" Srebrnič Amol Mundayoor Amy Unger Anatoly Ikorsky Anders Kaseorg -Andrea Canciani Andre Arko +Andre Bogus +Andrea Canciani Andreas Gal Andreas Martens Andreas Neuhaus @@ -99,6 +104,7 @@ Armin Preiml Armin Ronacher Arpad Borsos Artem +Artem Shitov Arthur Liao arthurprs arturo @@ -117,7 +123,6 @@ bachm Barosl Lee bcoopers Ben Alpert -benaryorg Ben Ashford Ben Blum ben fleis @@ -125,15 +130,17 @@ Ben Foppa Ben Gamari Ben Gesoff Ben Harris +Ben Kelly +Ben Noordhuis +Ben Sago +Ben Striegel +benaryorg Benjamin Adamson Benjamin Herr Benjamin Jackman Benjamin Kircher Benjamin Peterson -Ben Kelly -Ben Noordhuis -Ben Sago -Ben Striegel +benshu Bheesham Persaud Bilal Husain Bill Fallon @@ -141,8 +148,8 @@ Bill Myers Bill Wendling Birunthan Mohanathas Björn Steinbrink -blake2-ppc Blake Loring +blake2-ppc Boris Egorov bors Bouke van der Bijl @@ -171,12 +178,12 @@ Bryan Dunsmore Byron Williams Cadence Marseille Caitlin Potter +Cam Jackson Cameron Zwarich Camille Roussel Camille TJHOA -Cam Jackson -Carl-Anton Ingmarsson Carl Lerche +Carl-Anton Ingmarsson Carlos Galarza Carol (Nichols || Goulding) Carol Willing @@ -184,12 +191,14 @@ Carter Hinsley Carter Tazio Schonwald CarVac Caspar Krieger +Cesar Eduardo Barros Chase Southwood Ches Martin chitra Chloe <5paceToast@users.noreply.github.com> Chris Double Chris Hellmuth +Chris Krycho Chris Morgan Chris Nixon Chris Peterson @@ -197,6 +206,7 @@ Chris Pressey Chris Sainty Chris Shea Chris Thorn +Chris Wong Christian Persson Christian Stadelmann Christian Weinz @@ -204,7 +214,7 @@ Christoph Burgdorf Christopher Bergqvist Christopher Chambers Christopher Kendell -Chris Wong +christopherdumas chromatic Chuck Bassett Chuck Ries @@ -226,10 +236,11 @@ Corey Ford Corey Richardson Cornel Punga crhino -Cristian Kubis Cristi Burcă +Cristian Kubis critiqjo Cruz Julian Bishop +Daan Rijks Damian Gryski Damien Grassart Damien Radtke @@ -238,6 +249,10 @@ Dan Albert Dan Burkert Dan Callahan Dan Connolly +Dan Luu +Dan Schatzberg +Dan W. <1danwade@gmail.com> +Dan Yang Daniel Albert Daniel Brooks Daniel Fagnan @@ -256,10 +271,6 @@ Daniel Ramos Daniel Rosenwasser Daniel Ursache Dogariu Daniil Smirnov -Dan Luu -Dan Schatzberg -Dan W. <1danwade@gmail.com> -Dan Yang Darin Morrison darkf Darrell Hamilton @@ -296,9 +307,9 @@ Diggory Blake Diggory Hardy Dimitri Krassovski Dirk Gadsden +Dirk Leifeld Dirkjan Bussink Dirkjan Ochtman -Dirk Leifeld Div Shekhar diwic DJUrsus @@ -306,13 +317,14 @@ dmgawel Dmitry Ermolov Dmitry Promsky Dmitry Vasiliev -Dominick Allen -Dominic van Berkel -Dominik Inführ Do Nhat Minh +Dominic van Berkel +Dominick Allen +Dominik Inführ +Don Petersen +Dong Zhou donkopotamus Donovan Preston -Don Petersen Douglas Young Drew Crawford Drew Willcoxon @@ -320,6 +332,7 @@ Duane Edwards Duncan Regan Dylan Braithwaite Dylan Ede +Dylan McKay Dzmitry Malyshau Earl St Sauver econoplas @@ -336,8 +349,8 @@ Eljay Elliott Slaughter Elly Fong-Jones elszben -emanueLczirai Emanuel Rylke +emanueLczirai Emeliov Dmitrii Emilio Cobos Álvarez Emily Dunham @@ -346,12 +359,12 @@ Eric Biggers Eric Holk Eric Holmes Eric Kidd -Erick Rivas -Erick Tryzelaar Eric Martin Eric Platon Eric Reed Eric Ye +Erick Rivas +Erick Tryzelaar Erik Lyon Erik Michaels-Ober Erik Price @@ -385,9 +398,9 @@ Florian Wilkens Florian Zeitz fort Francisco Souza +Frank McSherry frankamp Franklin Chen -Frank McSherry Franziska Hinkelmann free-Runner FuGangqiang @@ -397,8 +410,8 @@ Gábor Horváth Gábor Lehel Gabriel gamazeps -Gareth Daniel Smith gareth +Gareth Daniel Smith Garming Sam Garrett Heel Gary Linscott @@ -419,8 +432,8 @@ github-monoculture Gleb Kozyrev Glenn Willen Gonçalo Cabrita <_@gmcabrita.com> -Grahame Bowland Graham Fawcett +Grahame Bowland Graydon Hoare Greg Chapple Grigoriy @@ -445,11 +458,12 @@ Honza Strnad Huachao Huang Hugo Jobling Hugo van der Wijst +Hunan Rostomyan Huon Wilson Hyeon Kim Ian Connolly -Ian Daniher Ian D. Bollinger +Ian Daniher Ignacio Corderi Igor Bukanov Igor Strebezhev @@ -461,13 +475,18 @@ Isaac Aggrey Isaac Dupree Isaac Ge Ivan Enderlin -Ivano Coppola +Ivan Jager Ivan Petkov Ivan Radanov Ivanov Ivan Ukhov +Ivano Coppola Iven Hsu +J Bailey +J. J. Weber +J.C. Moyer Jack Heizer Jack Moffitt +Jack Wilson Jacob Edelman Jacob Harris Cryer Kragh Jacob Hegna @@ -479,6 +498,7 @@ Jake Hickey Jake Kaufman Jake Kerr Jake Scott +Jake Shadle Jakub Bukaj Jakub Vrána Jakub Wieczorek @@ -486,18 +506,18 @@ James Deng James Hurst James Lal James Laverack -jamesluke James Miller James Perry James Rowe James Sanders James Tranovich +jamesluke Jan Andersson Jan Bujak -Jan-Erik Rediger Jan Kobler Jan Likar Jan Niklas Hasse +Jan-Erik Rediger Jannis Harder Jannis Redmann Jared Roesch @@ -513,9 +533,7 @@ jatinn Jauhien Piatlicki Jay Anderson Jay True -J Bailey jbranchaud -J.C. Moyer Jeaye Jed Davis Jed Estep @@ -543,23 +561,22 @@ Jihyeok Seo Jihyun Yu Jim Apple Jim Blandy +Jim Radford Jimmie Elvenmark Jimmy Lu Jimmy Zelinskie -Jim Radford Jiří Stránský -J. J. Weber jmgrosen jmu303 João Oliveira Joe Pletcher Joe Schafer +Johann Hofmann +Johann Tuffe Johannes Hoff Johannes Löthberg Johannes Muenzel Johannes Oertel -Johann Hofmann -Johann Tuffe John Albietz John Barker John Clements @@ -573,18 +590,20 @@ John Louis Walker John Schmidt John Simon John Talling +John Thomas John Van Enk John Zhang joliv +Jon Haddad +Jon Morton Jonas Hietala +Jonas Schievink Jonathan Bailey Jonathan Boyett Jonathan Hansford Jonathan Reem Jonathan S Jonathan Sternberg -Jon Haddad -Jon Morton JONNALAGADDA Srinivas jooert Joonas Javanainen @@ -595,6 +614,7 @@ Jorge Aparicio Jorge Israel Peña Joris Rehm Jormundir +Jørn Lode Jose Narvaez Joseph Crail Joseph Martin @@ -607,8 +627,9 @@ Joshua Clark Joshua Landau Joshua Wise Joshua Yanovski -JP-Ellis +jotomicron JP Sugarbroad +JP-Ellis jrincayc Julia Evans Julian Orth @@ -669,13 +690,14 @@ Leif Arne Storset LemmingAvalanche Lennart Kudling Leo Correa -Leonids Maslovs Leo Testard +Leonids Maslovs leunggamciu Liam Monahan Liigo Zhuang Lindsey Kuper Lionel Flandrin +llogiq Logan Chien Loïc Damien Lorenz @@ -699,9 +721,10 @@ Makoto Kato Makoto Nakashima Manish Goregaokar Manuel Hoffmann -marcell +Marc-Antoine Perennou Marcel Müller Marcel Rodrigues +marcell Marcus Klaas Margaret Meyerhofer Marijn Haverbeke @@ -712,16 +735,19 @@ Mark Lacey <641@rudkx.com> Mark Mossberg Mark Rowe Mark Sinclair +Mark Vian +Marko Lalic Markus Siemens Markus Unterwaditzer Markus Westerlind -Mark Vian +Marti Raudsepp Martin DeMello Martin Olsson Martin Pool -Marti Raudsepp +Martin Wernstål Marvin Löbel masklinn +Matěj Grabovský Matej Lach Mateusz Czapliński Mathieu David @@ -733,6 +759,10 @@ Matt Carberry Matt Coffin Matt Cox Matt Friedman +Matt McPherrin +Matt Murphy +Matt Roche +Matt Windsor Matthew Astley Matthew Auld Matthew Iselin @@ -741,16 +771,12 @@ Matthew O'Connor Matthias Einwag Matthijs Hofstra Matthijs van der Vleuten -Matt McPherrin -Matt Murphy -Matt Roche -Matt Windsor Mátyás Mustoha -Maxime Quandalle -Maximilian Haack -Maxim Kolganov Max Jacobson Max Penet +Maxim Kolganov +Maxime Quandalle +Maximilian Haack Maya Nitu mchaput mdinger @@ -760,6 +786,7 @@ Michael Alexander Michael Arntzenius Michael Bebenita Michael Budde +Michael Choate Michael Dagitses Michael Darakananda Michael Fairley @@ -769,6 +796,7 @@ Michael Layzell Michael Letterle Michael Macias Michael Matuzak +Michael McConville Michael Neumann Michael Pankov Michael Park @@ -783,15 +811,16 @@ Michael Wu Michael Zhou Michał Czardybon Michał Krasnoborski +Mick Koch Mickaël Delahaye Mickaël Raybaud-Roig Mickaël Salaün -Mick Koch midinastasurazz Mihnea Dobrescu-Balaur Mike Boutin Mike Dilger Mike English +Mike Marcacci Mike Pedersen Mike Robinson Mike Sampson @@ -801,8 +830,8 @@ mitaa mitchmindtree Mohammed Attia moonglum -mrec mr.Shu +mrec Ms2ger Mukilan Thiagarajan Murarth @@ -810,19 +839,21 @@ musitdev Nafis nathan dotz Nathan Froyd -Nathaniel Herman -Nathaniel Theis +Nathan Kleyn Nathan Long Nathan Stoddard Nathan Typanski Nathan Wilson Nathan Zadoks +Nathaniel Herman +Nathaniel Theis Neil Pankey Nelo Onyiah Nelson Chen NiccosSystem Nicholas Bishop Nicholas Mazzuca +Nicholas Seckar Nick Cameron Nick Desaulniers Nick Fitzgerald @@ -838,8 +869,10 @@ Nif Ward Nikita Pekin Niklas Koep Niko Matsakis +Nikolay Kondratyev Nils Liberg Nils Winter +Niranjan Padmanabhan noam Noam Yorav-Raphael NODA, Kai @@ -847,6 +880,7 @@ Noufal Ibrahim novalis nsf nwin +O S K Chaitanya Oak OGINO Masanori OlegTsyba @@ -856,12 +890,12 @@ olivren Olle Jonsson olombard Or Brostovski -Oren Hazi Or Neeman +Oren Hazi Orphée Lafond-Lummis Orpheus Lummis osa1 -O S K Chaitanya +Overmind JIANG Ožbolt Menegatti P1start Pablo Brasero @@ -896,16 +930,17 @@ Peter Elmers Peter Hull Peter Marheine Peter Minten +Peter Reid Peter Schuller Peter Williams Peter Zotov Petter Remen pez Phil Dawes +Phil Ruffwind Philip Munksgaard Philipp Brüschweiler Philipp Gesang -Phil Ruffwind Pierre Baillet Piotr Czarnecki Piotr Jawniak @@ -942,15 +977,17 @@ Renato Alves Renato Riccieri Santos Zannon Reuben Morais reus -Ricardo Martins Ricardo M. Correia -Richard Diamond +Ricardo Martins Rich Lane +Richard Diamond Richo Healey Rick Waldron Ricky Taylor rjz Rob Arnold +Rob Hoelz +Rob Young Robert Buonpastore Robert Clipsham Robert Foss @@ -958,11 +995,9 @@ Robert Gawdzik Robert Irelan Robert Knight Robert Millar -Rob Hoelz Robin Gloster Robin Kruppe Robin Stocker -Rob Young Rohit Joshi Roland Tanglao Rolf Timmermans @@ -971,6 +1006,7 @@ Ron Dahlgren Rory O’Kane Roy Crihfield Roy Frostig +Ruby Rüdiger Sonderfeld rundrop1 Russell Johnston @@ -983,7 +1019,8 @@ Ryan Prichard Ryan Riginding Ryan Scheel Ryman -らいどっと +Ryo Munakata +S Pradeep Kumar Sae-bom Kim Salem Talha saml @@ -1017,8 +1054,8 @@ Sébastien Crozet Sébastien Marie Sebastien Martini Sébastien Paolacci -Seonghyun Kim Seo Sanghyeon +Seonghyun Kim Sergio Benitez Seth Faxon Seth Pink @@ -1028,12 +1065,13 @@ Shamir Khodzha sheroze1123 Shmuale Mark SiegeLord -Simonas Kazlauskas Simon Barber-Dueck Simon Kern +Simon Mazur Simon Persson Simon Sapin Simon Wollwage +Simonas Kazlauskas simplex Sindre Johansen sinkuu @@ -1041,7 +1079,6 @@ Skyler smenardpw Son sp3d -S Pradeep Kumar Squeaky startling Stefan Bucur @@ -1089,13 +1126,15 @@ Till Hoeppner Tim Brooks Tim Chevalier Tim Cuthbertson +Tim JIANG Tim Joseph Dumol Tim Kuehn -Timon Rapp -Timothée Ravier +Tim Neumann Tim Parenti Tim Ringenbach Tim Taubert +Timon Rapp +Timothée Ravier tinaun Tincan Ting-Yu Lin @@ -1104,10 +1143,10 @@ Tobba Tobias Bucher Toby Scrace Tohava -Tomas Sedovic Tom Chittenden Tom Jakubowski Tom Lee +Tomas Sedovic Tommy M. McGuire Tomoki Aonuma Toni Cárdenas @@ -1121,11 +1160,11 @@ Tristan Storch tshakah Tshepang Lekhonkhobe Tuncer Ayaz +Ty Overby Tycho Sci Tyler Bindon Tyler Thrailkill tynopex -Ty Overby Ulrik Sverdrup Ulysse Carion User Jyyou @@ -1135,6 +1174,7 @@ Vadim Chugunov Vadim Petrochenkov Valentin Tsatskin Valerii Hiora +Viacheslav Chimishuk Victor Berger Victor van den Elzen Victory @@ -1154,6 +1194,7 @@ Vladimir Rutsky Vladimir Smola Vojtech Kral Volker Mische +w00ns Wade Mealing Wangshan Lu WebeWizard @@ -1164,30 +1205,32 @@ Wesley Wiser whataloadofwhat wickerwaka Wilfred Hughes +Will Will Andrews Will Engler Will Hipschman William Throwe William Ting Willson Mock -Will +Without Boats Wojciech Ogrodowczyk wonyong kim xales -Xuefeng Wu -XuefengWu -Xuefeng Wu +Xiao Chuan Yu Xue Fuqiao +Xuefeng Wu +Xuefeng Wu +XuefengWu Yasuhiro Fujii YawarRaza7349 Yazhong Liu Yehuda Katz Yongqian Li York Xiang +Young Wu Young-il Choi Youngmin Yoo Youngsoo Son -Young Wu Yuri Albuquerque Yuri Kunde Schlesner Z1 @@ -1199,4 +1242,5 @@ Zbigniew Siciarz Ziad Hatahet zofrex Zooko Wilcox-O'Hearn +らいどっと 克雷 From 93db1e2b6ab7712cdedc9bdf9d87ab8dbc68a28e Mon Sep 17 00:00:00 2001 From: Brian Anderson Date: Wed, 28 Oct 2015 13:33:55 -0700 Subject: [PATCH 09/11] Update mailmap --- .mailmap | 6 ++++++ AUTHORS.txt | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/.mailmap b/.mailmap index 233e55e83d0c..8eaf8f16e4b6 100644 --- a/.mailmap +++ b/.mailmap @@ -13,6 +13,7 @@ Alex Burka Alex Burka Alex Lyon Alex Newman Alex HotShot Newman Alex Rønne Petersen +Alfie John Alfie John Andreas Gal Andrew Kuchev <0coming.soon@gmail.com> Andrew <0coming.soon@gmail.com> Andrew Poelstra @@ -21,6 +22,7 @@ Ariel Ben-Yehuda arielb1 Ariel Ben-Yehuda Ariel Ben-Yehuda Austin Seipp Ben Alpert +Ben Sago Ben S Ben S Benjamin Jackman Björn Steinbrink blake2-ppc @@ -30,6 +32,7 @@ Brian Dawn Carl-Anton Ingmarsson Carol (Nichols || Goulding) Carol Nichols Carol Willing +Chris C Cerami Chris C Cerami Chris Pressey Clark Gaebel Corey Farwell Corey Farwell @@ -105,6 +108,7 @@ Ms2ger Neil Pankey Nicholas Mazzuca Nicholas Oliver Schneider Oliver 'ker' Schneider +Oliver Schneider Oliver Schneider Oliver Schneider Oliver Schneider Ožbolt Menegatti gareins Paul Faria Paul Faria Peer Aramillo Irizar parir @@ -119,6 +123,7 @@ Rob Arnold Robert Foss robertfoss Robert Gawdzik Robert Gawdzik ☢ Robert Millar +Ruud van Asseldonk Ruud van Asseldonk Ryan Scheel Sean Gillespie swgillespie Seonghyun Kim @@ -135,6 +140,7 @@ Torsten Weber Ulrik Sverdrup Ulrik Sverdrup Ulrik Sverdrup bluss bluss Vadim Petrochenkov petrochenkov +Vitali Haravy Vitali Haravy William Ting Xuefeng Wu Xuefeng Wu XuefengWu Youngsoo Son diff --git a/AUTHORS.txt b/AUTHORS.txt index 58f10df1c460..31f3a9e5bf09 100644 --- a/AUTHORS.txt +++ b/AUTHORS.txt @@ -150,7 +150,7 @@ Birunthan Mohanathas Björn Steinbrink Blake Loring blake2-ppc -Boris Egorov +Boris Egorov bors Bouke van der Bijl Brad King @@ -610,7 +610,7 @@ Joonas Javanainen Jordan Humphreys Jordan Woehr Jordi Boggiano -Jorge Aparicio +Jorge Aparicio Jorge Israel Peña Joris Rehm Jormundir From 049e729bcb703772a251d6876835497e6947702c Mon Sep 17 00:00:00 2001 From: Brian Anderson Date: Wed, 28 Oct 2015 13:42:20 -0700 Subject: [PATCH 10/11] Update AUTHORS.txt for 1.5 --- AUTHORS.txt | 57 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 57 insertions(+) diff --git a/AUTHORS.txt b/AUTHORS.txt index 31f3a9e5bf09..f0b3fe19e5c3 100644 --- a/AUTHORS.txt +++ b/AUTHORS.txt @@ -59,6 +59,7 @@ Alfie John Ali Smesseim Alisdair Owens Aljaž "g5pw" Srebrnič +Amit Aryeh Levy Amol Mundayoor Amy Unger Anatoly Ikorsky @@ -70,6 +71,7 @@ Andreas Gal Andreas Martens Andreas Neuhaus Andreas Ots +Andreas Sommer Andreas Tolfsen Andrei Formiga Andrei Oprea @@ -95,6 +97,7 @@ Anthony Juckel Anton Löfgren Antti Keränen Aram Visser +arcnmx Arcterus Areski Belaid Ariel Ben-Yehuda @@ -121,6 +124,7 @@ Axel Viala Aydin Kim bachm Barosl Lee +Bastien Dejean bcoopers Ben Alpert Ben Ashford @@ -132,6 +136,7 @@ Ben Gesoff Ben Harris Ben Kelly Ben Noordhuis +Ben S Ben Sago Ben Striegel benaryorg @@ -146,6 +151,7 @@ Bilal Husain Bill Fallon Bill Myers Bill Wendling +billpmurphy Birunthan Mohanathas Björn Steinbrink Blake Loring @@ -175,6 +181,7 @@ Brian Quinlan Brody Holden Bruno de Oliveira Abinader Bryan Dunsmore +Bryce Van Dyk Byron Williams Cadence Marseille Caitlin Potter @@ -185,6 +192,7 @@ Camille TJHOA Carl Lerche Carl-Anton Ingmarsson Carlos Galarza +Carlos Liam Carol (Nichols || Goulding) Carol Willing Carter Hinsley @@ -192,11 +200,14 @@ Carter Tazio Schonwald CarVac Caspar Krieger Cesar Eduardo Barros +Charlotte Spencer Chase Southwood Ches Martin chitra Chloe <5paceToast@users.noreply.github.com> +Chris C Cerami Chris Double +Chris Drake Chris Hellmuth Chris Krycho Chris Morgan @@ -228,15 +239,19 @@ Cole Mickens Cole Reynolds Colin Davidson Colin Sherratt +Colin Wallace Colin Walters comex Conrad Kleinespel +Corentin Henry Corey Farwell Corey Ford Corey Richardson Cornel Punga +Craig Hills crhino Cristi Burcă +Cristi Cobzarenco Cristian Kubis critiqjo Cruz Julian Bishop @@ -255,11 +270,13 @@ Dan W. <1danwade@gmail.com> Dan Yang Daniel Albert Daniel Brooks +Daniel Carral Daniel Fagnan Daniel Farina Daniel Griffen Daniel Grunwald Daniel Hofstetter +Daniel Keep Daniel Lobato García Daniel Luz Daniel MacDougall @@ -274,11 +291,13 @@ Daniil Smirnov Darin Morrison darkf Darrell Hamilton +Dato Simó Dave Herman Dave Hodder Dave Huseby David Campbell David Creswick +David Elliott David Forsythe David Halperin David King @@ -288,13 +307,16 @@ David Manescu David Rajchenbach-Teller David Reid David Renshaw +David Ripton David Ross David Stygstra +David Szotten David Vazgenovich Shakaryan David Voit Davis Silverman defuz Denis Defreyne +DenisKolodin Derecho Derek Chiang Derek Guenther @@ -323,6 +345,7 @@ Dominick Allen Dominik Inführ Don Petersen Dong Zhou +Dongie Agnir donkopotamus Donovan Preston Douglas Young @@ -349,6 +372,7 @@ Eljay Elliott Slaughter Elly Fong-Jones elszben +Emanuel Czirai Emanuel Rylke emanueLczirai Emeliov Dmitrii @@ -379,6 +403,7 @@ Evan Klitzke Evan McClanahan Evgeny Sologubov Fabian Deutsch +Fabiano Beselga Fabrice Desré FakeKane Falco Hirschenberger @@ -430,6 +455,7 @@ Gil Cottle Gioele Barabucci github-monoculture Gleb Kozyrev +glendc Glenn Willen Gonçalo Cabrita <_@gmcabrita.com> Graham Fawcett @@ -471,6 +497,7 @@ Ilya Dmitrichenko Ilyong Cho Ingo Blechschmidt inrustwetrust +Irving A.J. Rivas Z. Isaac Aggrey Isaac Dupree Isaac Ge @@ -483,6 +510,7 @@ Ivano Coppola Iven Hsu J Bailey J. J. Weber +J. Ryan Stinnett J.C. Moyer Jack Heizer Jack Moffitt @@ -502,10 +530,12 @@ Jake Shadle Jakub Bukaj Jakub Vrána Jakub Wieczorek +James Bell James Deng James Hurst James Lal James Laverack +James McGlashan James Miller James Perry James Rowe @@ -555,6 +585,7 @@ Jesse Ray Jesse Ruderman Jessy Diamond Exum Jesús Espino +Jethro Beekman jethrogb Jexell Jihyeok Seo @@ -615,7 +646,9 @@ Jorge Israel Peña Joris Rehm Jormundir Jørn Lode +Jose Narvaez Jose Narvaez +Joseph Caudle Joseph Crail Joseph Martin Joseph Rushton Wakeling @@ -660,6 +693,7 @@ Kevin Rauwolf Kevin Walter Kevin Yap kgv +kickinbahk Kieran Hunt Kiet Tran Kim Røen @@ -676,6 +710,7 @@ Kubilay Kocak kulakowski kwantam Kyeongwoon Lee +Kyle Robinson Young Lai Jiangshan Lars Bergstrom Laurence Tratt @@ -685,6 +720,7 @@ Lawrence Velázquez Leah Hanson Lee Aronson Lee Jeffery +Lee Jenkins Lee Wondong Leif Arne Storset LemmingAvalanche @@ -725,6 +761,7 @@ Marc-Antoine Perennou Marcel Müller Marcel Rodrigues marcell +Marcello Seri Marcus Klaas Margaret Meyerhofer Marijn Haverbeke @@ -791,6 +828,7 @@ Michael Dagitses Michael Darakananda Michael Fairley Michael Gehring +Michael Howell Michael Kainer Michael Layzell Michael Letterle @@ -880,11 +918,15 @@ Noufal Ibrahim novalis nsf nwin +nxnfufunezn O S K Chaitanya Oak OGINO Masanori OlegTsyba Oliver Schneider +Oliver Schneider +Oliver Schneider +Oliver Schneider Olivier Saut olivren Olle Jonsson @@ -900,6 +942,7 @@ Ožbolt Menegatti P1start Pablo Brasero Palmer Cox +panicbit Paolo Falabella Parker Moore Pascal Hertleif @@ -941,6 +984,7 @@ Phil Ruffwind Philip Munksgaard Philipp Brüschweiler Philipp Gesang +Philipp Oppermann Pierre Baillet Piotr Czarnecki Piotr Jawniak @@ -977,8 +1021,10 @@ Renato Alves Renato Riccieri Santos Zannon Reuben Morais reus +Reza Akhavan Ricardo M. Correia Ricardo Martins +Ricardo Signes Rich Lane Richard Diamond Richo Healey @@ -991,6 +1037,7 @@ Rob Young Robert Buonpastore Robert Clipsham Robert Foss +Robert Gardner Robert Gawdzik Robert Irelan Robert Knight @@ -1048,12 +1095,14 @@ Sean T Allen Sebastian Gesemann Sebastian N. Fernandez Sebastian Rasmussen +Sebastian Wicki Sebastian Zaha Sébastien Chauvel Sébastien Crozet Sébastien Marie Sebastien Martini Sébastien Paolacci +Seeker14491 Seo Sanghyeon Seonghyun Kim Sergio Benitez @@ -1075,6 +1124,7 @@ Simonas Kazlauskas simplex Sindre Johansen sinkuu +skeleten Skyler smenardpw Son @@ -1082,6 +1132,7 @@ sp3d Squeaky startling Stefan Bucur +Stefan O'Rear Stefan Plantikow Stepan Koltsov Sterling Greene @@ -1107,6 +1158,7 @@ Taras Shpot tav Taylor Hutchison Ted Horst +Ted Mielczarek Tero Hänninen th0114nd Thad Guidry @@ -1203,19 +1255,23 @@ Wei-Ming Yang Wendell Smith Wesley Wiser whataloadofwhat +whitequark wickerwaka Wilfred Hughes Will Will Andrews Will Engler Will Hipschman +Will Speak William Throwe William Ting Willson Mock +Willy Aguirre Without Boats Wojciech Ogrodowczyk wonyong kim xales +Xavier Shay Xiao Chuan Yu Xue Fuqiao Xuefeng Wu @@ -1227,6 +1283,7 @@ Yazhong Liu Yehuda Katz Yongqian Li York Xiang +Yoshito Komatsu Young Wu Young-il Choi Youngmin Yoo From 14eef41378d6137cf67b903f8f3167d5b60f4964 Mon Sep 17 00:00:00 2001 From: Jethro Beekman Date: Wed, 28 Oct 2015 14:32:48 -0700 Subject: [PATCH 11/11] Book: Update raw/byte string literal in syntax index The raw byte string literal syntax in the syntax index was incorrect. Also added links to the reference for raw and/or byte string literals. --- src/doc/trpl/syntax-index.md | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/doc/trpl/syntax-index.md b/src/doc/trpl/syntax-index.md index 7e03bb72cad5..258648b45047 100644 --- a/src/doc/trpl/syntax-index.md +++ b/src/doc/trpl/syntax-index.md @@ -99,9 +99,9 @@ * `'ident`: named lifetime or loop label. See [Lifetimes], [Loops (Loops Labels)]. * `…u8`, `…i32`, `…f64`, `…usize`, …: numeric literal of specific type. * `"…"`: string literal. See [Strings]. -* `r"…"`, `r#"…"#`, `r##"…"##`, …: raw string literal. -* `b"…"`: byte string literal. -* `rb"…"`, `rb#"…"#`, `rb##"…"##`, …: raw byte string literal. +* `r"…"`, `r#"…"#`, `r##"…"##`, …: raw string literal, escape characters are not processed. See [Reference (Raw String Literals)]. +* `b"…"`: byte string literal, constructs a `[u8]` instead of a string. See [Reference (Byte String Literals)]. +* `br"…"`, `br#"…"#`, `br##"…"##`, …: raw byte string literal, combination of raw and byte string literal. See [Reference (Raw Byte String Literals)]. * `'…'`: character literal. See [Primitive Types (`char`)]. * `b'…'`: ASCII byte literal. @@ -217,6 +217,9 @@ [Primitive Types (Tuple Indexing)]: primitive-types.html#tuple-indexing [Primitive Types (Tuples)]: primitive-types.html#tuples [Raw Pointers]: raw-pointers.html +[Reference (Byte String Literals)]: ../reference.html#byte-string-literals +[Reference (Raw Byte String Literals)]: ../reference.html#raw-byte-string-literals +[Reference (Raw String Literals)]: ../reference.html#raw-string-literals [References and Borrowing]: references-and-borrowing.html [Strings]: strings.html [Structs (Update syntax)]: structs.html#update-syntax