Skip to content
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

Rollup of 4 pull requests #32229

Merged
merged 9 commits into from
Mar 13, 2016
Merged

Rollup of 4 pull requests #32229

merged 9 commits into from
Mar 13, 2016

Conversation

Manishearth
Copy link
Member

nikomatsakis and others added 9 commits March 9, 2016 17:44
@nikomatsakis
Do not report errors from regionck if other errors were already
59279b5 
reported during the lifetime of this inferencer. Fixes rust-lang#30580.
@nikomatsakis
Add comment explaining purpose of test
0ddc17d
@srinivasreddy
Removed integer suffixes in libsyntax crate
b308ed0
@Manishearth
Don't allow values for codegen-units less than 1 (fixes rust-lang#32191)
8e3ccd9
@cantino
Fix minor typos in doc.rust-lang.org/book
56ab2a1
@Manishearth
Rollup merge of rust-lang#32164 - nikomatsakis:fewer-errors, r=eddyb
511cb30 
Do not report errors from regionck if other errors were already reported

Do not report errors from regionck if other errors were already reported during the lifetime of this inferencer. Fixes rust-lang#30580.

r? @arielb1
@Manishearth
Rollup merge of rust-lang#32179 - srinivasreddy:remove_int_suffix, r=…
07b9e89 
…steveklabnik

Removed integer suffixes in libsyntax crate
@Manishearth
Rollup merge of rust-lang#32212 - Manishearth:ice-cu, r=eddyb
d7f7ab9 
Don't allow values for codegen-units less than 1

r? @eddyb

fixes rust-lang#32191
@Manishearth
Rollup merge of rust-lang#32218 - cantino:minor_book_typo_fixes, r=st…
2e21ff1 
…eveklabnik

Fix minor typos in doc.rust-lang.org/book

I've made a few typo and grammar fixes as I've been working through the book.
@Manishearth
Copy link
Member Author

@bors r+ p=20

@bors
Copy link
Collaborator

bors commented Mar 13, 2016

📌 Commit 2e21ff1 has been approved by Manishearth

@bors
Copy link
Collaborator

bors commented Mar 13, 2016

⌛ Testing commit 2e21ff1 with merge 1c8b245...

bors added a commit that referenced this pull request Mar 13, 2016
@bors
Auto merge of #32229 - Manishearth:rollup, r=Manishearth
1c8b245 
Rollup of 4 pull requests

- Successful merges: #32164, #32179, #32212, #32218
- Failed merges:
@bors
Copy link
Collaborator

bors commented Mar 13, 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-rustbuild, auto-linux-64-x-android-t, 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-64-nopt-t, auto-win-gnu-64-opt, auto-win-msvc-32-opt, auto-win-msvc-64-opt

@bors bors merged commit 2e21ff1 into rust-lang:master Mar 13, 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
No one assigned
Labels
rollup A PR which is a rollup
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@Manishearth @bors @Centril @nikomatsakis @srinivasreddy @cantino