Skip to content

Rollup of 6 pull requests #29444

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 19 commits into from
Oct 29, 2015
Merged

Rollup of 6 pull requests #29444

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
b1e3baa
Merge same colors together
mdinger Oct 24, 2015
11c7bdd
Add colors for rustdoc primitives, type, and macros links
mdinger Oct 24, 2015
b6f5e72
Small fix in the book
pmarcelll Oct 27, 2015
d0a84e0
Add some debug printouts to librustc_privacy
nikomatsakis Oct 27, 2015
ad8dcb6
Mention in the docs, that `assert!` has a second version with a custo…
pmarcelll Oct 27, 2015
19996d4
The `source_did` may not be local, so don't unwrap the
nikomatsakis Oct 27, 2015
90b776e
Add diverging functions `-> !` to syntax index
Oct 28, 2015
c9edcdb
Tweak the add-authors.sh script
brson Oct 28, 2015
418ef78
Update mailmap
brson Oct 28, 2015
f32205d
Update AUTHORS.txt for 1.4
brson Oct 28, 2015
93db1e2
Update mailmap
brson Oct 28, 2015
049e729
Update AUTHORS.txt for 1.5
brson Oct 28, 2015
e6ad039
Auto merge of #29415 - nikomatsakis:issue-29161, r=nikomatsakis
bors Oct 28, 2015
43c553a
Rollup merge of #29264 - mdinger:colorify, r=steveklabnik
steveklabnik Oct 29, 2015
3f3b55b
Rollup merge of #29405 - pmarcelll:docs-fix, r=steveklabnik
steveklabnik Oct 29, 2015
2f0b4dd
Rollup merge of #29417 - pmarcelll:assert-doc, r=steveklabnik
steveklabnik Oct 29, 2015
f1bc7f5
Rollup merge of #29435 - djrollins:diverging-function-doc, r=Manishearth
steveklabnik Oct 29, 2015
319e97b
Rollup merge of #29437 - brson:authors, r=alexcrichton
steveklabnik Oct 29, 2015
0809eaa
Rollup merge of #29438 - jethrogb:topic/book-rbstrlit, r=alexcrichton
steveklabnik Oct 29, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 12 additions & 1 deletion .mailmap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,11 @@ Aaron Todd <[email protected]>
Abhishek Chanda <[email protected]> Abhishek Chanda <[email protected]>
Ahmed Charles <[email protected]> <[email protected]>
Aydin Kim <[email protected]> aydin.kim <[email protected]>
Alex Burka <[email protected]> Alex Burka <[email protected]>
Alex Lyon <[email protected]> <[email protected]>
Alex Newman <[email protected]> Alex HotShot Newman <[email protected]>
Alex Rønne Petersen <[email protected]>
Alfie John <[email protected]> Alfie John <[email protected]>
Andreas Gal <[email protected]> <[email protected]>
Andrew Kuchev <[email protected]> Andrew <[email protected]>
Andrew Poelstra <[email protected]> <[email protected]>
Expand All @@ -20,6 +22,7 @@ Ariel Ben-Yehuda <[email protected]> arielb1 <[email protected]>
Ariel Ben-Yehuda <[email protected]> Ariel Ben-Yehuda <[email protected]>
Austin Seipp <[email protected]> <[email protected]>
Ben Alpert <[email protected]> <[email protected]>
Ben Sago <[email protected]> Ben S <[email protected]> Ben S <[email protected]>
Benjamin Jackman <[email protected]>
Björn Steinbrink <[email protected]> <[email protected]>
blake2-ppc <[email protected]> <blake2-ppc>
Expand All @@ -29,9 +32,11 @@ Brian Dawn <[email protected]>
Carl-Anton Ingmarsson <[email protected]> <[email protected]>
Carol (Nichols || Goulding) <[email protected]> Carol Nichols <[email protected]>
Carol Willing <[email protected]>
Chris C Cerami <[email protected]> Chris C Cerami <[email protected]>
Chris Pressey <[email protected]>
Clark Gaebel <[email protected]> <[email protected]>
Corey Farwell <[email protected]> Corey Farwell <[email protected]>
Corey Richardson <[email protected]> Elaine "See More" Nemo <[email protected]>
David Klein <[email protected]>
David Manescu <[email protected]> <[email protected]>
Damien Schoof <[email protected]>
Expand All @@ -51,7 +56,7 @@ Erick Tryzelaar <[email protected]> <[email protected]>
Evgeny Sologubov
Falco Hirschenberger <[email protected]> <[email protected]>
Felix S. Klock II <[email protected]> Felix S Klock II <[email protected]>
Gareth Daniel Smith <[email protected]>
Gareth Daniel Smith <[email protected]> gareth <gareth@gareth-N56VM.(none)>
Georges Dubus <[email protected]> <[email protected]>
Graham Fawcett <[email protected]> <[email protected]>
Graydon Hoare <[email protected]> Graydon Hoare <[email protected]>
Expand Down Expand Up @@ -99,9 +104,11 @@ Matthew McPherrin <[email protected]> <[email protected]>
Matthijs Hofstra <[email protected]>
Michael Williams <[email protected]>
Michael Woerister <michaelwoerister@gmail> <[email protected]> <michaelwoerister@posteo> Michael Woerister <michaelwoerister@posteo>
Ms2ger <[email protected]> <[email protected]>
Neil Pankey <[email protected]> <[email protected]>
Nicholas Mazzuca <[email protected]> Nicholas <[email protected]>
Oliver Schneider <[email protected]> <[email protected]> <[email protected]> Oliver 'ker' Schneider <[email protected]>
Oliver Schneider <[email protected]> Oliver Schneider <[email protected]> Oliver Schneider <[email protected]> Oliver Schneider <[email protected]>
Ožbolt Menegatti <[email protected]> gareins <[email protected]>
Paul Faria <[email protected]> Paul Faria <[email protected]>
Peer Aramillo Irizar <[email protected]> parir <[email protected]>
Expand All @@ -116,6 +123,7 @@ Rob Arnold <[email protected]>
Robert Foss <[email protected]> robertfoss <[email protected]>
Robert Gawdzik <[email protected]> Robert Gawdzik ☢ <[email protected]>
Robert Millar <[email protected]>
Ruud van Asseldonk <[email protected]> Ruud van Asseldonk <[email protected]>
Ryan Scheel <[email protected]>
Sean Gillespie <[email protected]> swgillespie <[email protected]>
Seonghyun Kim <[email protected]>
Expand All @@ -125,11 +133,14 @@ startling <[email protected]>
Steven Fackler <[email protected]> <[email protected]>
Steven Stewart-Gallus <[email protected]> <[email protected]>
Tamir Duberstein <[email protected]> Tamir Duberstein <[email protected]>
Thiago Pontes <[email protected]> thiagopnts <[email protected]>
Ticki <[email protected]> Ticki <@>
Tim Chevalier <[email protected]> <[email protected]>
Torsten Weber <[email protected]> <[email protected]>
Ulrik Sverdrup <[email protected]> Ulrik Sverdrup <root@localhost>
Ulrik Sverdrup <[email protected]> bluss <[email protected]> bluss <bluss>
Vadim Petrochenkov <[email protected]> petrochenkov <[email protected]>
Vitali Haravy <[email protected]> Vitali Haravy <[email protected]>
William Ting <[email protected]> <[email protected]>
Xuefeng Wu <[email protected]> Xuefeng Wu <[email protected]> XuefengWu <[email protected]>
Youngsoo Son <[email protected]> <[email protected]>
Expand Down
Loading