Skip to content

Rollup of 9 pull requests - #40206

Merged
bors merged 19 commits into
rust-lang:masterfrom
GuillaumeGomez:rollup
Mar 2, 2017
Merged

Rollup of 9 pull requests#40206
bors merged 19 commits into
rust-lang:masterfrom
GuillaumeGomez:rollup

Conversation

GuillaumeGomezand others added 19 commits February 28, 2017 11:22
…4445.
It prevents the test to fail on ppc64el at least.
Part of rust-lang#39015
The line '.expect("failed to read line");' is partly started with a
lower case 'f' and partly with an uppercase one, adding additional
spurious changes to otherwise clean diffs if each sample is
copy-and-pasted over the previous.
This change starts the string with an uppercase everywhere which is in
line with the style of the other strings.
Unit-like structs doc: Improve code sample
r? @steveklabnik
BTW it seems that
```Rust
let p = Proton {};
```
compiles without an error. That's why I didn't add it to the example. It's about consistency anyway.
…tx, r=petrochenkov
Add compile fail test for abi_ptx
Issue rust-lang#39059.
Add a reference to the dl library to the Makefile of the test issue-2…
…4445.
It prevents the test to fail on ppc64el at least.
Part of rust-lang#39015
…ng-game-readme, r=steveklabnik
doc: fix inconsistency in error output in guessing-game.md
The line '.expect("failed to read line");' is partly started with a
lower case 'f' and partly with an uppercase one, adding additional
spurious changes to otherwise clean diffs if each sample is
copy-and-pasted over the previous.
This change starts the string with an uppercase everywhere which is in
line with the style of the other strings.
…labnik
Add abi_x86_interrupt to the unstable book
This PR closesrust-lang#40181.
Fix wrong word used in book page "const and static"
@rust-highfive

Copy link
Copy Markdown
Contributor

r? @steveklabnik

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

@GuillaumeGomez

Copy link
Copy Markdown
MemberAuthor

@bors: r+ p=1

@bors

bors commented Mar 2, 2017

Copy link
Copy Markdown
Collaborator

📌 Commit ad0a356 has been approved by GuillaumeGomez

@bors

bors commented Mar 2, 2017

Copy link
Copy Markdown
Collaborator

⌛ Testing commit ad0a356 with merge 90ccb2c...

@bors

bors commented Mar 2, 2017

Copy link
Copy Markdown
Collaborator

💔 Test failed - status-travis

@arielb1

Copy link
Copy Markdown
Contributor

@bors retry

@bors

bors commented Mar 2, 2017

Copy link
Copy Markdown
Collaborator

⌛ Testing commit ad0a356 with merge 8ae411e...

bors added a commit that referenced this pull request Mar 2, 2017
Rollup of 9 pull requests
- Successful merges: #40081, #40144, #40168, #40169, #40170, #40173, #40175, #40191, #40194
- Failed merges:
@bors

bors commented Mar 2, 2017

Copy link
Copy Markdown
Collaborator

☀️ Test successful - status-appveyor, status-travis
Approved by: GuillaumeGomez
Pushing 8ae411e to master...

@bors
bors merged commit ad0a356 into rust-lang:masterMar 2, 2017
@GuillaumeGomez
GuillaumeGomez deleted the rollup branch March 2, 2017 17:02
@CentrilCentril added the rollup A PR which is a rollup label Oct 2, 2019
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

rollupA PR which is a rollup

Projects

None yet

Development

Successfully merging this pull request may close these issues.

12 participants

@GuillaumeGomez@rust-highfive@bors@arielb1@steveklabnik@Centril@MajorBreakfast@topecongiro@iKevinY@er-1@d-e-s-o@letmaik