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

sdroege · 2018-05-29T07:42:50Z

…sistent docs order

See #47115 (comment)

rust-highfive · 2018-05-29T07:43:01Z

r? @dtolnay

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

dtolnay

Thanks!

dtolnay · 2018-05-29T07:47:09Z

@bors r+ rollup

bors · 2018-05-29T07:47:10Z

📌 Commit 5b1be00 has been approved by dtolnay

bors · 2018-05-30T16:34:25Z

🔒 Merge conflict

…dtolnay Move slice::exact_chunks directly above exact_chunks_mut for more con… …sistent docs order See rust-lang#47115 (comment)

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 · 2018-06-03T21:30:45Z

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

…sistent docs order See rust-lang#47115 (comment)

sdroege · 2018-06-04T06:04:05Z

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

dtolnay · 2018-06-04T06:09:35Z

@bors r+ rollup

bors · 2018-06-04T06:09:36Z

📌 Commit eb3a734 has been approved by dtolnay

bors · 2018-06-04T06:09:47Z

⌛ Testing commit eb3a734 with merge b10957fd77ca7d437b5c8ce434f7bf1a87f90526...

bors · 2018-06-04T07:04:10Z

💔 Test failed - status-travis

rust-highfive · 2018-06-04T07:04:11Z

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)

rust-highfive · 2018-06-04T07:04:15Z

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 · 2018-06-04T07:06:16Z

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

dtolnay · 2018-06-04T07:16:33Z

Looks like #40474.

@bors retry

bors · 2018-06-04T07:16:43Z

⌛ Testing commit eb3a734 with merge 6eafab0...

Move slice::exact_chunks directly above exact_chunks_mut for more con… …sistent docs order See #47115 (comment)

bors · 2018-06-04T09:57:56Z

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

rust-highfive assigned dtolnay May 29, 2018

rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label May 29, 2018

dtolnay approved these changes May 29, 2018

View reviewed changes

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 mentioned this pull request May 29, 2018

Tracking issue for chunks_exact/_mut; slice chunks with exact size #47115

Closed

1 task

kennytm mentioned this pull request May 30, 2018

Rollup of 12 pull requests #51214

Closed

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

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

eb3a734

…sistent docs order See rust-lang#47115 (comment)

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

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 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

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 added a commit that referenced this pull request Jun 4, 2018

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 merged commit eb3a734 into rust-lang:master Jun 4, 2018

Uh oh!

Conversation

sdroege commented May 29, 2018

Uh oh!

rust-highfive commented May 29, 2018

Uh oh!

dtolnay left a comment

Choose a reason for hiding this comment

Uh oh!

dtolnay commented May 29, 2018

Uh oh!

bors commented May 29, 2018

Uh oh!

bors commented May 30, 2018

Uh oh!

sdroege commented Jun 3, 2018

Uh oh!

sdroege commented Jun 4, 2018

Uh oh!

dtolnay commented Jun 4, 2018

Uh oh!

bors commented Jun 4, 2018

Uh oh!

bors commented Jun 4, 2018

Uh oh!

bors commented Jun 4, 2018

Uh oh!

rust-highfive commented Jun 4, 2018

Uh oh!

rust-highfive commented Jun 4, 2018

Uh oh!

sdroege commented Jun 4, 2018

Uh oh!

dtolnay commented Jun 4, 2018

Uh oh!

bors commented Jun 4, 2018

Uh oh!

bors commented Jun 4, 2018

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants