Skip to content

Rollup of 7 pull requests #32621

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

Jump to bottom
Merged
merged 14 commits into from
Mar 30, 2016
Merged

Rollup of 7 pull requests #32621

merged 14 commits into from
Mar 30, 2016

Conversation

steveklabnik
Copy link
Member

tshepang and others added 14 commits March 29, 2016 00:56
@tshepang
doc: first letter should be upper case
cc762c2
@durka
verb agreement in core::convert docs
0af3e70
@tshepang
doc: fix typo
05d0aa6
@tshepang
doc: "mut" not needed for the examples
cd92e9f
@CryZe
Fix panic_fmt in the Book
e9b1c3c 
While implementing panic_fmt for the GameCube I noticed that the parameters given to it were completely broken. Turns out that panic_fmt requires the C ABI to work correctly. This should be fixed in the documentation, so that others don't make the same mistake. Thanks to mbrubeck in the IRC for helping me figure this out.

Not specifying extern for lang_items correctly should potentially also be a compiler error.
@tshepang
doc: "of the" seems more correct than "to the"
65cdf5d 
It's also less ambiguous
@tshepang
doc: no need for an explicit iter()
fd78ae8
@steveklabnik
Rollup merge of rust-lang#32580 - durka:patch-17, r=steveklabnik
9f403ab 
verb agreement in core::convert docs
@steveklabnik
Rollup merge of rust-lang#32591 - CryZe:patch-1, r=steveklabnik
6f885c3 
Fix panic_fmt in the Book

While implementing panic_fmt for the GameCube I noticed that the parameters given to it were completely broken. Turns out that panic_fmt requires the C ABI to work correctly. This should be fixed in the documentation, so that others don't make the same mistake. Thanks to mbrubeck in the IRC for helping me figure this out.

Not specifying extern for lang_items correctly should potentially also be a compiler error.
@steveklabnik
Rollup merge of rust-lang#32603 - tshepang:capitalise, r=bluss
662e7af 
doc: first letter should be upper case
@steveklabnik
Rollup merge of rust-lang#32605 - tshepang:not-needed, r=Manishearth
45d633d 
doc: "mut" not needed for the examples
@steveklabnik
Rollup merge of rust-lang#32606 - tshepang:typo, r=bluss
1978a99 
doc: fix typo
@steveklabnik
Rollup merge of rust-lang#32607 - tshepang:we-gots-intoiterator, r=ap…
709be98 
…asel422

doc: no need for an explicit iter()
@steveklabnik
Rollup merge of rust-lang#32608 - tshepang:grammar, r=aturon
2ba8606 
doc: "of the" seems more correct than "to the"

It's also less ambiguous
@rust-highfive
Copy link
Contributor

r? @alexcrichton

(rust_highfive has picked a reviewer for you, use r? to override)

@steveklabnik
Copy link
Member Author

@bors: r+ p=1

@bors
Copy link
Collaborator

bors commented Mar 30, 2016

📌 Commit 2ba8606 has been approved by steveklabnik

@bors
Copy link
Collaborator

bors commented Mar 30, 2016

⌛ Testing commit 2ba8606 with merge 4813f33...

@alexcrichton
Copy link
Member

@bors: retry force

@bors
Copy link
Collaborator

bors commented Mar 30, 2016

⌛ Testing commit 2ba8606 with merge d1bddba...

@bors
Copy link
Collaborator

bors commented Mar 30, 2016

💔 Test failed - auto-linux-cross-opt

@alexcrichton
Copy link
Member

@bors: retry force clean

@bors
Copy link
Collaborator

bors commented Mar 30, 2016

⌛ Testing commit 2ba8606 with merge 97c2c49...

@bors
Copy link
Collaborator

bors commented Mar 30, 2016

💔 Test failed - auto-win-msvc-64-opt-mir

@alexcrichton
Copy link
Member

@bors: retry force

On Wed, Mar 30, 2016 at 11:17 AM, bors notifications@github.com wrote:

[image: 💔] Test failed - auto-win-msvc-64-opt-mir
http://buildbot.rust-lang.org/builders/auto-win-msvc-64-opt-mir/builds/118

—
You are receiving this because you were mentioned.
Reply to this email directly or view it on GitHub
#32621 (comment)

@bors
Copy link
Collaborator

bors commented Mar 30, 2016

⌛ Testing commit 2ba8606 with merge 61815ab...

@bors
Copy link
Collaborator

bors commented Mar 30, 2016

💔 Test failed - auto-linux-64-x-armhf

@alexcrichton
Copy link
Member

@bors: retry

@bors
Copy link
Collaborator

bors commented Mar 30, 2016

⌛ Testing commit 2ba8606 with merge bfacabc...

bors added a commit that referenced this pull request Mar 30, 2016
@bors
Auto merge of #32621 - steveklabnik:rollup, r=steveklabnik
bfacabc 
Rollup of 7 pull requests

- Successful merges: #32580, #32591, #32603, #32605, #32606, #32607, #32608
- Failed merges:
@bors
Copy link
Collaborator

bors commented Mar 30, 2016

☀️ Test successful - auto-linux-32-nopt-t, auto-linux-32-opt, auto-linux-64-debug-opt, auto-linux-64-nopt-t, auto-linux-64-opt, auto-linux-64-opt-mir, auto-linux-64-opt-rustbuild, auto-linux-64-x-android-t, auto-linux-64-x-armhf, auto-linux-64-x-armsf, auto-linux-64-x-freebsd, auto-linux-64-x-netbsd, auto-linux-cross-opt, auto-linux-musl-64-opt, auto-mac-32-opt, auto-mac-64-nopt-t, auto-mac-64-opt, auto-mac-ios-opt, auto-win-gnu-32-nopt-t, auto-win-gnu-32-opt, auto-win-gnu-32-opt-rustbuild, auto-win-gnu-64-nopt-t, auto-win-gnu-64-opt, auto-win-msvc-32-opt, auto-win-msvc-64-opt, auto-win-msvc-64-opt-mir, auto-win-msvc-64-opt-rustbuild

@bors bors merged commit 2ba8606 into rust-lang:master Mar 30, 2016
@Centril Centril added the rollup A PR which is a rollup label Oct 2, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@alexcrichton alexcrichton

Labels
rollup A PR which is a rollup
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
8 participants
@steveklabnik @rust-highfive @bors @alexcrichton @Centril @tshepang @durka @CryZe