Split `core::slice` to smaller mods #76311

tesuji · 2020-09-04T03:49:58Z

Unfortunately the #[lang = "slice"] is too big (3003 lines), I cannot split it further.

Note for reviewer:

I split to multiple commits for easier reviewing, but I could git squash them all to one if requested.
Recommend pulling this change locally and using advanced git diff viewer or this command:
```
git show --reverse --color-moved=dimmed-zebra master..
```

I split core/slice/mod.rs to these modules:

ascii: For operations on [u8].
cmp: For comparison operations on [T], like PartialEq and SliceContains impl.
index: For indexing operations like Index/IndexMut and SliceIndex.
iter: For Iterator definitions and implementation on [T].
- macros: For iterator! and forward_iterator! macros.
raw: For free function to create &[T] or &mut [T] from pointer + length or a reference.

The heapsort wrapper in mod.rs is removed in favor of reexport from sort::heapsort.

tesuji · 2020-09-04T04:51:34Z

cc #60302
r? @Mark-Simulacrum for review or reassignment
@rustbot modify labels: +S-waiting-on-review

library/core/src/slice/raw.rs

bors · 2020-09-04T15:01:52Z

☔ The latest upstream changes (presumably #75207) made this pull request unmergeable. Please resolve the merge conflicts.

pickfire · 2020-09-04T15:35:09Z

Interesting, I didn't know about --color-moved=dimmed-zebra.

bors · 2020-09-10T00:37:05Z

☔ The latest upstream changes (presumably #76540) made this pull request unmergeable. Please resolve the merge conflicts.

Note that reviewers usually do not review pull requests until merge conflicts are resolved! Once you resolve the conflicts, you should change the labels applied by bors to indicate that your PR is ready for review. Post this as a comment to change the labels:

@rustbot modify labels: +S-waiting-on-review -S-waiting-on-author

tesuji · 2020-09-10T04:27:33Z

Rebased.

tesuji · 2020-09-11T11:02:44Z

r? @lcnr

bors · 2020-09-12T06:14:32Z

☔ The latest upstream changes (presumably #75021) made this pull request unmergeable. Please resolve the merge conflicts.

Note that reviewers usually do not review pull requests until merge conflicts are resolved! Once you resolve the conflicts, you should change the labels applied by bors to indicate that your PR is ready for review. Post this as a comment to change the labels:

@rustbot modify labels: +S-waiting-on-review -S-waiting-on-author

tesuji · 2020-09-13T04:19:25Z

Rebased.

bors · 2020-09-14T00:48:15Z

☔ The latest upstream changes (presumably #76678) made this pull request unmergeable. Please resolve the merge conflicts.

Note that reviewers usually do not review pull requests until merge conflicts are resolved! Once you resolve the conflicts, you should change the labels applied by bors to indicate that your PR is ready for review. Post this as a comment to change the labels:

@rustbot modify labels: +S-waiting-on-review -S-waiting-on-author

tesuji · 2020-09-14T05:21:54Z

Rebased.

tesuji · 2020-09-14T05:27:24Z

Rebasing merge conflicts in these pull requests is kinda painful without being reviewed.
I have to make sure the rebase don't miss any details.
I am going to close these PRs and tell the associated issue #60302 that it is a won't fix issue.

lcnr · 2020-09-14T06:29:51Z

will try to review this today, sorry for being silent this weekend

bors · 2020-09-15T05:25:34Z

📌 Commit 6655ad7 has been approved by lcnr

bors · 2020-09-15T06:59:40Z

⌛ Testing commit 6655ad7 with merge 4aa7dc2038d4fe5064c83fe5737e3b7c0d086829...

bors · 2020-09-15T07:42:08Z

💔 Test failed - checks-actions

lcnr · 2020-09-15T09:05:28Z

I think you have to update

rust/src/tools/clippy/clippy_lints/src/utils/paths.rs

Line 109 in 6cae281

pub const SLICE_ITER: [&str; 3] = ["core", "slice", "Iter"];

to fix this.

tesuji · 2020-09-15T10:26:07Z

Oh, my fool. Thought that a spurious failure in the previous error.
Filed rust-lang/rust-clippy#6047 to improve the situation.

lcnr · 2020-09-15T11:22:09Z

@bors r+ rollup=never

bors · 2020-09-15T11:22:11Z

📌 Commit c65050d has been approved by lcnr

bors · 2020-09-15T12:16:04Z

⌛ Testing commit c65050d with merge 4c1966f...

bors · 2020-09-15T14:22:28Z

☀️ Test successful - checks-actions, checks-azure
Approved by: lcnr
Pushing 4c1966f to master...

Using <Iter>::new instead of exposing internal fields As requested in rust-lang#76311 (comment)

ecstatic-morse · 2020-09-21T23:32:56Z

Hi! This PR showed up in the weekly perf triage report. It resulted in a moderate improvement in instruction counts (up to -1.9% on full builds of html5ever-opt). However, most other benchmarks regressed very slightly.

I've observed some other module splitting PRs that have unexpected effects on performance. I wonder why that is? In any case, I don't think there's anything to be done here. Thanks @lzutao.

bjorn3 · 2020-09-24T14:05:11Z

Every module contributes one codegen unit (before cgu merging). By splitting a module you get more codegen units. This can have an effect on performance.

tesuji force-pushed the split_core-slice branch 2 times, most recently from e6f14b0 to c09dc3f Compare September 4, 2020 04:47

tesuji mentioned this pull request Sep 4, 2020

Split up files with // ignore-tidy-filelength #60302

Open

12 tasks

rustbot added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Sep 4, 2020

rust-highfive assigned Mark-Simulacrum Sep 4, 2020

tesuji commented Sep 4, 2020

View reviewed changes

library/core/src/slice/raw.rs Outdated Show resolved Hide resolved

jyn514 added C-cleanup Category: PRs that clean code up or issues documenting cleanup. T-libs-api Relevant to the library API team, which will review and decide on the PR/issue. labels Sep 4, 2020

tesuji force-pushed the split_core-slice branch from c09dc3f to 5466e83 Compare September 4, 2020 12:26

tesuji force-pushed the split_core-slice branch from 5466e83 to 4e00eed Compare September 4, 2020 15:20

tesuji force-pushed the split_core-slice branch 3 times, most recently from 2d15cfe to a485264 Compare September 7, 2020 02:47

tesuji force-pushed the split_core-slice branch from a485264 to b4a46b9 Compare September 10, 2020 04:23

rust-highfive assigned lcnr and unassigned Mark-Simulacrum Sep 11, 2020

tesuji force-pushed the split_core-slice branch from b4a46b9 to 80727a1 Compare September 13, 2020 04:19

tesuji force-pushed the split_core-slice branch from 80727a1 to 7a3c20e Compare September 14, 2020 05:21

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 Sep 15, 2020

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 Sep 15, 2020

Fix clippy hard-code slice::Iter path

c65050d

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 Sep 15, 2020

bors added the merged-by-bors This PR was explicitly merged by bors. label Sep 15, 2020

bors merged commit 4c1966f into rust-lang:master Sep 15, 2020

rustbot added this to the 1.48.0 milestone Sep 15, 2020

tesuji deleted the split_core-slice branch September 15, 2020 14:28

This was referenced Sep 15, 2020

Add array_windows fn #75026

Merged

Fix liballoc test suite for Miri #76662

Merged

tesuji mentioned this pull request Sep 16, 2020

Using <Iter>::new instead of exposing internal fields #76787

Merged

bors added a commit to rust-lang-ci/rust that referenced this pull request Sep 18, 2020

Auto merge of rust-lang#76787 - lzutao:slice_iters_new, r=lcnr

c6ab8e5

Using <Iter>::new instead of exposing internal fields As requested in rust-lang#76311 (comment)

Split core::slice to smaller mods #76311

Split core::slice to smaller mods #76311

Uh oh!

Conversation

tesuji commented Sep 4, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

tesuji commented Sep 4, 2020

Uh oh!

Uh oh!

bors commented Sep 4, 2020

Uh oh!

pickfire commented Sep 4, 2020

Uh oh!

bors commented Sep 10, 2020

Uh oh!

tesuji commented Sep 10, 2020

Uh oh!

tesuji commented Sep 11, 2020

Uh oh!

bors commented Sep 12, 2020

Uh oh!

tesuji commented Sep 13, 2020

Uh oh!

bors commented Sep 14, 2020

Uh oh!

tesuji commented Sep 14, 2020

Uh oh!

tesuji commented Sep 14, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

lcnr commented Sep 14, 2020

Uh oh!

bors commented Sep 15, 2020

Uh oh!

bors commented Sep 15, 2020

Uh oh!

bors commented Sep 15, 2020

Uh oh!

lcnr commented Sep 15, 2020

Uh oh!

tesuji commented Sep 15, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

lcnr commented Sep 15, 2020

Uh oh!

bors commented Sep 15, 2020

Uh oh!

bors commented Sep 15, 2020

Uh oh!

bors commented Sep 15, 2020

Uh oh!

ecstatic-morse commented Sep 21, 2020

Uh oh!

bjorn3 commented Sep 24, 2020

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

9 participants

Split `core::slice` to smaller mods #76311

Split `core::slice` to smaller mods #76311

tesuji commented Sep 4, 2020 •

edited

Loading

tesuji commented Sep 14, 2020 •

edited

Loading

tesuji commented Sep 15, 2020 •

edited

Loading