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.

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

Move slice::exact_chunks directly above exact_chunks_mut for more con… #51151

Merged
merged 1 commit into from
Jun 4, 2018
Merged

Move slice::exact_chunks directly above exact_chunks_mut for more con… #51151

merged 1 commit into from
Jun 4, 2018
+35 −35

Conversation

sdroege
Copy link
Contributor

@sdroege sdroege commented May 29, 2018

…sistent docs order

See #47115 (comment)

@rust-highfive
Copy link
Collaborator

r? @dtolnay

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

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label May 29, 2018
dtolnay
dtolnay approved these changes May 29, 2018
View reviewed changes
Copy link
Member

@dtolnay dtolnay left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks!

@dtolnay
Copy link
Member

dtolnay commented May 29, 2018

@bors r+ rollup

@bors
Copy link
Contributor

bors commented May 29, 2018

📌 Commit 5b1be00 has been approved by dtolnay

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels May 29, 2018
@sdroege sdroege mentioned this pull request May 29, 2018
Closed
1 task
@kennytm kennytm mentioned this pull request May 30, 2018
Closed
@bors
Copy link
Contributor

bors commented May 30, 2018

🔒 Merge conflict

@bors bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels May 30, 2018
kennytm added a commit to kennytm/rust that referenced this pull request May 30, 2018
@kennytm
Rollup merge of rust-lang#51151 - sdroege:exact-chunks-docs-order, r=…
cc3f603 
…dtolnay

Move slice::exact_chunks directly above exact_chunks_mut for more con…

…sistent docs order

See rust-lang#47115 (comment)
bors added a commit that referenced this pull request May 30, 2018
@bors
Auto merge of #51214 - kennytm:rollup, r=kennytm
ab61e34 
Rollup of 12 pull requests

Successful merges:

 - #51050 (std::fs::DirEntry.metadata(): use fstatat instead of lstat when possible)
 - #51123 (Update build instructions)
 - #51127 (Add doc link from discriminant struct to function.)
 - #51146 (typeck: Do not pass the field check on field error)
 - #51147 (Stabilize SliceIndex trait.)
 - #51151 (Move slice::exact_chunks directly above exact_chunks_mut for more con…)
 - #51152 (Replace `if` with `if and only if` in the definition dox of `Sync`)
 - #51153 (Link panic and compile_error docs)
 - #51158 (Mention spec and indented blocks in doctest docs)
 - #51186 (Remove two redundant .nll.stderr files)
 - #51203 (Two minor `obligation_forest` tweaks.)
 - #51213 (fs: copy: Use File::set_permissions instead of fs::set_permissions)

Failed merges:
@sdroege
Copy link
Contributor Author

sdroege commented Jun 3, 2018

Should I rebase this PR or how are you usually handling merge conflicts?

@sdroege sdroege force-pushed the exact-chunks-docs-order branch from 5b1be00 to eb3a734 Compare June 4, 2018 06:03
@sdroege
Copy link
Contributor Author

sdroege commented Jun 4, 2018

Ah it says S-waiting-on-author. Rebased!

@dtolnay
Copy link
Member

dtolnay commented Jun 4, 2018

@bors r+ rollup

@bors
Copy link
Contributor

bors commented Jun 4, 2018

📌 Commit eb3a734 has been approved by dtolnay

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jun 4, 2018
@bors
Copy link
Contributor

bors commented Jun 4, 2018

⌛ Testing commit eb3a734 with merge b10957fd77ca7d437b5c8ce434f7bf1a87f90526...

@bors
Copy link
Contributor

bors commented Jun 4, 2018

💔 Test failed - status-travis

@rust-highfive
Copy link
Collaborator

The job x86_64-gnu-distcheck of your PR failed on Travis (raw log). Through arcane magic we have determined that the following fragments from the build log may contain information about the problem.

Click to expand the log. 
  0     0    0     0    0     0      0      0 --:--:--  0:00:15 --:--:--     0
  0     0    0     0    0     0      0      0 --:--:--  0:00:16 --:--:--     0
  0     0    0     0    0     0      0      0 --:--:--  0:00:17 --:--:--     0
  0     0    0     0    0     0      0      0 --:--:--  0:00:18 --:--:--     0
  0     0    0     0    0     0      0      0 --:--:--  0:00:19 --:--:--     0curl: (6) Could not resolve host: s3-us-west-1.amazonaws.com
[00:51:23] thread 'main' panicked at 'failed to download openssl source: exit code: 6', bootstrap/native.rs:575:17
[00:51:23] failed to run: /checkout/obj/build/bootstrap/debug/bootstrap test distcheck
[00:51:23] Build completed unsuccessfully in 0:48:45
travis_time:end:1784edee:start=1528092696390435797,finish=1528095780156801776,duration=3083766365979

I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact @TimNN. (Feature Requests)

@bors bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Jun 4, 2018
@rust-highfive
Copy link
Collaborator

The job x86_64-gnu-distcheck of your PR failed on Travis (raw log). Through arcane magic we have determined that the following fragments from the build log may contain information about the problem.

Click to expand the log. 
  0     0    0     0    0     0      0      0 --:--:--  0:00:15 --:--:--     0
  0     0    0     0    0     0      0      0 --:--:--  0:00:16 --:--:--     0
  0     0    0     0    0     0      0      0 --:--:--  0:00:17 --:--:--     0
  0     0    0     0    0     0      0      0 --:--:--  0:00:18 --:--:--     0
  0     0    0     0    0     0      0      0 --:--:--  0:00:19 --:--:--     0curl: (6) Could not resolve host: s3-us-west-1.amazonaws.com
[00:51:23] thread 'main' panicked at 'failed to download openssl source: exit code: 6', bootstrap/native.rs:575:17
[00:51:23] failed to run: /checkout/obj/build/bootstrap/debug/bootstrap test distcheck
[00:51:23] Build completed unsuccessfully in 0:48:45
travis_time:end:1784edee:start=1528092696390435797,finish=1528095780156801776,duration=3083766365979

I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact @TimNN. (Feature Requests)

@sdroege
Copy link
Contributor Author

sdroege commented Jun 4, 2018

This looks unrelated to my changes, openssl sources failed to download.

@dtolnay
Copy link
Member

dtolnay commented Jun 4, 2018

Looks like #40474.

@bors retry

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jun 4, 2018
@bors
Copy link
Contributor

bors commented Jun 4, 2018

⌛ Testing commit eb3a734 with merge 6eafab0...

bors added a commit that referenced this pull request Jun 4, 2018
@bors
Auto merge of #51151 - sdroege:exact-chunks-docs-order, r=dtolnay
6eafab0 
Move slice::exact_chunks directly above exact_chunks_mut for more con…

…sistent docs order

See #47115 (comment)
@bors
Copy link
Contributor

bors commented Jun 4, 2018

☀️ Test successful - status-appveyor, status-travis
Approved by: dtolnay
Pushing 6eafab0 to master...

@bors bors merged commit eb3a734 into rust-lang:master Jun 4, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dtolnay dtolnay dtolnay approved these changes

Assignees

@dtolnay dtolnay

Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@sdroege @rust-highfive @dtolnay @bors