Skip to content

Minor cleanup for slice::Chunks and ChunksMut - #47113

Merged
bors merged 2 commits into
rust-lang:masterfrom
sdroege:chunks-size-field
Jan 3, 2018
Merged

Minor cleanup for slice::Chunks and ChunksMut#47113
bors merged 2 commits into
rust-lang:masterfrom
sdroege:chunks-size-field

Conversation

@sdroege

@sdroegesdroege commented Jan 2, 2018

Copy link
Copy Markdown
Contributor

This only renames the size field to chunk_size in one of them for consistency, and changes an assertion to check for != 0 instead of > 0.

@rust-highfive

rust-highfive commented Jan 2, 2018

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 @dtolnay (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.

frewsxcv
frewsxcv reviewed Jan 2, 2018
View reviewed changes
Comment threadsrc/libcore/slice/mod.rs Outdated

@frewsxcvfrewsxcvJan 2, 2018

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

size here needs to be updated

@sdroegesdroegeJan 2, 2018

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

Indeed, thanks. Sorry for that!

@sdroege

sdroege commented Jan 2, 2018

Copy link
Copy Markdown
ContributorAuthor

Also fixed another case of size in the documentation of both structs

dtolnay
dtolnay approved these changes Jan 3, 2018
View reviewed changes

@dtolnaydtolnay left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Thanks!

@dtolnay

dtolnay commented Jan 3, 2018

Copy link
Copy Markdown
Member

@bors r+ rollup

@bors

bors commented Jan 3, 2018

Copy link
Copy Markdown
Collaborator

📌 Commit c096b3a has been approved by dtolnay

kennytm added a commit to kennytm/rust that referenced this pull request Jan 3, 2018
@kennytm
Rollup merge ofrust-lang#47113- sdroege:chunks-size-field, r=dtolnay
219e72c
Minor cleanup for slice::Chunks and ChunksMut
This only renames the `size` field to `chunk_size` in one of them for consistency, and changes an assertion to check for != 0 instead of > 0.
@kennytmkennytm mentioned this pull request Jan 3, 2018
Merged
@sdroegesdroege mentioned this pull request Jan 3, 2018
Merged
bors added a commit that referenced this pull request Jan 3, 2018
@bors
Auto merge of#47151- kennytm:rollup, r=kennytm
b107f72
Rollup of 9 pull requests
- Successful merges: #47104, #47107, #47113, #47117, #47118, #47121, #47125, #47134, #47145
- Failed merges:
@bors
bors merged commit c096b3a into rust-lang:masterJan 3, 2018
sdroege added a commit to sdroege/rust that referenced this pull request Jan 3, 2018
@sdroege
Fix compilation of TrustedRandomAccess impl for slice::Chunks
3f29e2b
rust-lang#47113 renamed the private size
field to chunk_size for consistency.
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@dtolnaydtolnaydtolnay approved these changes
+1 more reviewer
@frewsxcvfrewsxcvfrewsxcv left review comments
Reviewers whose approvals may not affect merge requirements

Assignees

@dtolnaydtolnay

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@sdroege@rust-highfive@dtolnay@bors@frewsxcv