Skip to content

Rollup of 6 pull requests #35951

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 12 commits into from
Aug 24, 2016
Merged

Rollup of 6 pull requests #35951

merged 12 commits into from
Aug 24, 2016

Conversation

GuillaumeGomez
Copy link
Member

tbu- and others added 12 commits August 23, 2016 02:05
@tbu-
Change a weird line break in core::str
0f9cb1b
@brson
Update rust-installer. Fixes rust-lang#35840
f863ea3
@frewsxcv
Mark panicking tests as should_panic instead of no_run.
66a2578
@matthew-piziak
replace Div example with something more evocative of division
2cad78d 
Analogous to PR rust-lang#35860.

r? @GuillaumeGomez
@creativcoder
Update E0195 to new error format
5ec6f39
@tshepang
doc: one line too many
59723c3
@GuillaumeGomez
Rollup merge of rust-lang#35910 - tbu-:pr_weird_linebreak, r=alexcric…
bc94019 
…hton

Change a weird line break in `core::str`
@GuillaumeGomez
Rollup merge of rust-lang#35912 - brson:rust-installer, r=alexcrichton
21d4ec9 
Update rust-installer. Fixes rust-lang#35840

cc @Diggsey
@GuillaumeGomez
Rollup merge of rust-lang#35913 - frewsxcv:panic, r=steveklabnik
e3e4390 
Mark panicking tests as `should_panic` instead of `no_run`.

None
@GuillaumeGomez
Rollup merge of rust-lang#35936 - matthew-piziak:div-rational-example…
ed4c0fd 
…, r=GuillaumeGomez

replace `Div` example with something more evocative of division

Analogous to PR rust-lang#35860.

r? @GuillaumeGomez
@GuillaumeGomez
Rollup merge of rust-lang#35939 - creativcoder:e0195, r=jonathandturner
142dc49 
Update E0195 to new error format

Fixes rust-lang#35511
Part of rust-lang#35233

r? @jonathandturner
@GuillaumeGomez
Rollup merge of rust-lang#35949 - tshepang:excess, r=GuillaumeGomez
16d459f 
doc: one line too many
@GuillaumeGomez
Copy link
Member Author

@bors: r+ p=1

@bors
Copy link
Collaborator

bors commented Aug 23, 2016

📌 Commit 16d459f has been approved by GuillaumeGomez

@rust-highfive
Copy link
Contributor

r? @alexcrichton

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

@bors
Copy link
Collaborator

bors commented Aug 23, 2016

⌛ Testing commit 16d459f with merge a66fa96...

bors added a commit that referenced this pull request Aug 23, 2016
@bors
Auto merge of #35951 - GuillaumeGomez:rollup, r=GuillaumeGomez
a66fa96 
Rollup of 6 pull requests

- Successful merges: #35910, #35912, #35913, #35936, #35939, #35949
- Failed merges: #35395
@bors
Copy link
Collaborator

bors commented Aug 24, 2016

☀️ Test successful - auto-linux-32-nopt-t, auto-linux-32-opt, auto-linux-64-cargotest, auto-linux-64-cross-freebsd, auto-linux-64-debug-opt, auto-linux-64-nopt-t, auto-linux-64-opt, auto-linux-64-opt-no-mir, 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-opt, auto-mac-64-opt-rustbuild, auto-mac-cross-ios-opt, auto-win-gnu-32-opt, auto-win-gnu-32-opt-rustbuild, auto-win-gnu-64-opt, auto-win-msvc-32-opt, auto-win-msvc-64-cargotest, auto-win-msvc-64-opt, auto-win-msvc-64-opt-no-mir, auto-win-msvc-64-opt-rustbuild
Approved by: GuillaumeGomez
Pushing a66fa96 to master...

@bors bors merged commit 16d459f into rust-lang:master Aug 24, 2016
@GuillaumeGomez GuillaumeGomez deleted the rollup branch August 24, 2016 09:21
@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.