Skip to content

Rollup of 7 pull requests - #42245

Merged
bors merged 19 commits into
rust-lang:masterfrom
frewsxcv:rollup
May 26, 2017
Merged

Rollup of 7 pull requests#42245
bors merged 19 commits into
rust-lang:masterfrom
frewsxcv:rollup

Conversation

@frewsxcv

@frewsxcvfrewsxcv commented May 26, 2017

Copy link
Copy Markdown
Contributor

scottmcmand others added 19 commits May 23, 2017 03:08
@scottmcm
Give step_trait a distinct tracking issue from step_by
794e572
iterator_step_by has decoupled their futures, so the tracking issue should split.
@callahad
Remove superfluous ;; sequences
94b074f
Charlie Somerville
Fix 'associate type' typo
8019430
@brson
Remove stray lockfile
435e1ce
@venkatagiri
regression test forrust-lang#36379
0530339
@venkatagiri
regression test forrust-lang#38954
6b151ef
@venkatagiri
regression test forrust-lang#39362
04ac7c3
@venkatagiri
regression test forrust-lang#38160
9ee9abc
@venkatagiri
regression test forrust-lang#37665
95436c6
regression test for rust-lang#37550
@venkatagiri
regression test forrust-lang#37550
2160b4a
@citizen428
Update documentation for indexing/slicing methods
bbf1dc4
See rust-lang#39911
@king6cong
doc rewording
e66388d
@frewsxcv
Rollup merge ofrust-lang#42169- scottmcm:new-step-trait-issue, r=al…
7e47327
…excrichton
Give step_trait a distinct tracking issue from step_by
iterator_step_by has decoupled their futures, so the tracking issue should split.
Old issue: rust-lang#27741
New issue: rust-lang#42168
r? @alexcrichton (another follow-up to closed PR rust-lang#42110 (comment))
@frewsxcv
Rollup merge ofrust-lang#42215- callahad:remove-superfluous-semis, …
2188210
…r=Mark-Simulacrum
Remove superfluous `;;` sequences
Ran across a doubled `;;` in the docstring for `str::split`. Grep found a few more. :)
@frewsxcv
Rollup merge ofrust-lang#42216- charliesome:associate-type-typo, r=…
b872097
…petrochenkov
Fix 'associate type' typo
I came across an error message mentioning an 'associate type'.
Since this is the only instance of this term in rustc (it's 'associated type' everywhere else), I think this might be a typo.
@frewsxcv
Rollup merge ofrust-lang#42224- brson:lockfile, r=nikomatsakis
2451f65
Remove stray lockfile
@frewsxcv
Rollup merge ofrust-lang#42230- venkatagiri:ice_regression_tests, r…
2c3aa91
…=Mark-Simulacrum
regression tests for ICEs
closesrust-lang#36379closesrust-lang#37550closesrust-lang#37665closesrust-lang#38160closesrust-lang#38954closesrust-lang#39362
r? @Mark-Simulacrum
@frewsxcv
Rollup merge ofrust-lang#42236- citizen428:docs/unchecked-indexing-…
854196a
…slicing, r=GuillaumeGomez
Update documentation for indexing/slicing methods
See rust-lang#39911
r? @steveklabnik
@frewsxcv
Rollup merge ofrust-lang#42241- king6cong:master, r=steveklabnik
252a286
doc rewording
@frewsxcv

frewsxcv commented May 26, 2017

Copy link
Copy Markdown
ContributorAuthor

@bors r+ p=10

@bors

bors commented May 26, 2017

Copy link
Copy Markdown
Collaborator

📌 Commit 252a286 has been approved by frewsxcv

@rust-highfive

rust-highfive commented May 26, 2017

Copy link
Copy Markdown
Contributor

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @BurntSushi (or someone else) soon.

If any changes to this PR are deemed necessary, please add them as extra commits. This ensures that the reviewer can see what has changed since they last reviewed the code. Due to the way GitHub handles out-of-date commits, this should also make it reasonably obvious what issues have or haven't been addressed. Large or tricky changes may require several passes of review and changes.

Please see the contribution instructions for more information.

@bors

bors commented May 26, 2017

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 252a286 with merge 256e497...

bors added a commit that referenced this pull request May 26, 2017
@bors
Auto merge of#42245- frewsxcv:rollup, r=frewsxcv
256e497
Rollup of 7 pull requests
- Successful merges: #42169, #42215, #42216, #42224, #42230, #42236, #42241
- Failed merges:
@bors

bors commented May 26, 2017

Copy link
Copy Markdown
Collaborator

☀️ Test successful - status-appveyor, status-travis
Approved by: frewsxcv
Pushing 256e497 to master...

@borsbors mentioned this pull request May 26, 2017
Merged
@bors
bors merged commit 252a286 into rust-lang:masterMay 26, 2017
This was referenced May 26, 2017
Merged
Merged
@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

Reviewers

No reviews

Assignees

@BurntSushiBurntSushi

Labels

rollupA PR which is a rollup

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

11 participants

@frewsxcv@bors@rust-highfive@BurntSushi@Centril@scottmcm@callahad@brson@venkatagiri@citizen428@king6cong