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.

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

Rollup of 5 pull requests #36446

Merged
merged 10 commits into from
Sep 13, 2016
Merged

Rollup of 5 pull requests #36446

merged 10 commits into from
Sep 13, 2016

Conversation

Kylo Ginsberg and others added 10 commits September 10, 2016 07:58
The first branch of the if statement already checks if `buf.len() >= self.buf.capacity()`, which makes the `cmp::min(buf.len(), self.buf.capacity())` redundant: the result will always be `buf.len()`. Therefore, we can pass the `buf` slice directly into `Write::write`.
Update E0297 to new error format

Fixes rust-lang#35521.
Part of rust-lang#35233.

I didn't attempt the bonus of narrowing the span to focus on the "for `<pattern>`" piece (it's my first time contributing), but I'm happy to do so given some hints.

r? @jonathandturner
…mp, r=aturon

Remove unnecessary `cmp::min` from BufWriter::write

The first branch of the if statement already checks if `buf.len() >= self.buf.capacity()`, which makes the `cmp::min(buf.len(), self.buf.capacity())` redundant: the result will always be `buf.len()`. Therefore, we can pass the `buf` slice directly into `Write::write`.
@rust-highfive
Copy link
Collaborator

r? @alexcrichton

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

@GuillaumeGomez
Copy link
Member Author

@bors: r+ rollup

@bors
Copy link
Contributor

bors commented Sep 13, 2016

📌 Commit c05424f has been approved by GuillaumeGomez

@GuillaumeGomez
Copy link
Member Author

@bors: rollup- p=1

@bors
Copy link
Contributor

bors commented Sep 13, 2016

⌛ Testing commit c05424f with merge 58450c0...

bors added a commit that referenced this pull request Sep 13, 2016
Rollup of 5 pull requests

- Successful merges: #36357, #36380, #36389, #36397, #36402
- Failed merges:
@bors bors merged commit c05424f into rust-lang:master Sep 13, 2016
@GuillaumeGomez GuillaumeGomez deleted the rollup branch September 13, 2016 12:07
@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
Labels
rollup A PR which is a rollup
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants