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

unix/vxworks: make DirEntry slightly smaller #77674

Merged
merged 3 commits into from
Oct 9, 2020
Merged

unix/vxworks: make DirEntry slightly smaller #77674

merged 3 commits into from
Oct 9, 2020

Conversation

cuviper
Copy link
Member

@cuviper cuviper commented Oct 7, 2020

DirEntry contains a ReadDir handle, which used to just be a wrapper
on Arc<InnerReadDir>. Commit af75314 added end_of_stream: bool
which is not needed by DirEntry, but adds 8 bytes after padding. We
can let DirEntry have an Arc<InnerReadDir> directly to avoid that.

@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 Oct 7, 2020
@dtolnay
Copy link
Member

dtolnay commented Oct 7, 2020

@bors r+

@bors
Copy link
Contributor

bors commented Oct 7, 2020

📌 Commit 12c94b27f3c703eede3ab7621c5e8eaaa7ef4daa 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 Oct 7, 2020
@bors
Copy link
Contributor

bors commented Oct 8, 2020

⌛ Testing commit 12c94b27f3c703eede3ab7621c5e8eaaa7ef4daa with merge 13edb9ca1cd1b2f50b7cb0d685d3db5ed59c35ec...

@bors
Copy link
Contributor

bors commented Oct 8, 2020

💔 Test failed - checks-actions

@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 Oct 8, 2020
@m-ou-se m-ou-se mentioned this pull request Oct 8, 2020
Merged
@cuviper
Copy link
Member Author

cuviper commented Oct 8, 2020

Fixed a clone that I had missed...

@bors r=dtolnay

@bors
Copy link
Contributor

bors commented Oct 8, 2020

📌 Commit 5f76201 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 Oct 8, 2020
Dylan-DPC-zz pushed a commit to Dylan-DPC-zz/rust that referenced this pull request Oct 8, 2020
@Dylan-DPC
Rollup merge of rust-lang#77674 - cuviper:direntry-diet, r=dtolnay
16889df 
unix/vxworks: make DirEntry slightly smaller

`DirEntry` contains a `ReadDir` handle, which used to just be a wrapper
on `Arc<InnerReadDir>`. Commit af75314 added `end_of_stream: bool`
which is not needed by `DirEntry`, but adds 8 bytes after padding. We
can let `DirEntry` have an `Arc<InnerReadDir>` directly to avoid that.
@Dylan-DPC-zz Dylan-DPC-zz mentioned this pull request Oct 8, 2020
Closed
@jonas-schievink
Copy link
Contributor

@bors r- rollup=iffy failed in #77712 (comment)

@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 Oct 8, 2020
cuviper added 2 commits October 9, 2020 10:00
@cuviper
unix/vxworks: make DirEntry slightly smaller
c1297ec 
`DirEntry` contains a `ReadDir` handle, which used to just be a wrapper
on `Arc<InnerReadDir>`. Commit af75314 added `end_of_stream: bool`
which is not needed by `DirEntry`, but adds 8 bytes after padding. We
can let `DirEntry` have an `Arc<InnerReadDir>` directly to avoid that.
@cuviper
remove ReadDir.end_of_stream on targets that don't use it
365e00a
@cuviper
Copy link
Member Author

cuviper commented Oct 9, 2020

Well that's annoying -- that end_of_stream has always been unused in practice on some targets, but the derive(Clone) that I removed was counting as a use. I've added more conditionals, but I'll pause for re-review just in case.

@cuviper cuviper removed the S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. label Oct 9, 2020
@cuviper cuviper added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Oct 9, 2020
@cuviper @dtolnay
simplify the cfg in ReadDir construction
1d06b07 
Co-authored-by: David Tolnay <dtolnay@gmail.com>
@dtolnay
Copy link
Member

dtolnay commented Oct 9, 2020

@bors r+ rollup=iffy

@bors
Copy link
Contributor

bors commented Oct 9, 2020

📌 Commit 1d06b07 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 Oct 9, 2020
@bors
Copy link
Contributor

bors commented Oct 9, 2020

⌛ Testing commit 1d06b07 with merge 5ddef54...

@bors
Copy link
Contributor

bors commented Oct 9, 2020

☀️ Test successful - checks-actions, checks-azure
Approved by: dtolnay
Pushing 5ddef54 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Oct 9, 2020
@bors bors merged commit 5ddef54 into rust-lang:master Oct 9, 2020
@rustbot rustbot added this to the 1.49.0 milestone Oct 9, 2020
@cuviper cuviper deleted the direntry-diet branch October 9, 2020 23:21
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
merged-by-bors This PR was explicitly merged by bors. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Milestone
1.49.0
Development

Successfully merging this pull request may close these issues.
6 participants
@cuviper @rust-highfive @dtolnay @bors @jonas-schievink @rustbot