Skip to content

Rollup of 6 pull requests #26212

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

Merged
merged 12 commits into from
Jun 11, 2015
Merged

Rollup of 6 pull requests #26212

merged 12 commits into from
Jun 11, 2015

Conversation

Stebalien and others added 12 commits June 10, 2015 12:25
These errors all relate to type checking, specifically the number of function
arguments, and occur in librustc_typeck::check::check_argument_types.
…xcrichton

These errors all relate to type checking, specifically the number of function arguments, and occur in librustc_typeck::check::check_argument_types.

Resolves part of rust-lang#24407.
core: impl Clone for option::IntoIter and iter::Once
In the discussion of returning closures, it seems like the example code got simplified, but only the later copies got fixed. The final working code has `factory` returning `|x| x + num`, but the earlier code has `|x| vec.push(x)`.

The first form seemed to have more distracting characteristics, and the code wasn't right anyway, so I changed them to all use the second form, and updated the error messages.

r? @steveklabnik
Converts the size calculation in the explanation from a fenced code block to an indented one. I think it looks better when not rendered, and is the same rendered.
@rust-highfive
Copy link
Contributor

r? @pcwalton

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

@Manishearth
Copy link
Member Author

@bors: r+

@bors
Copy link
Collaborator

bors commented Jun 11, 2015

📌 Commit e50675d has been approved by Manishearth

@bors
Copy link
Collaborator

bors commented Jun 11, 2015

⌛ Testing commit e50675d with merge deff2f5...

bors added a commit that referenced this pull request Jun 11, 2015
@bors bors merged commit e50675d into rust-lang:master Jun 11, 2015
@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.

9 participants