unix/vxworks: make DirEntry slightly smaller by cuviper · Pull Request #77674 · rust-lang/rust

cuviper · 2020-10-07T21:53:58Z

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 · 2020-10-07T21:54:03Z

r? @dtolnay

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

dtolnay · 2020-10-07T22:03:22Z

@bors r+

bors · 2020-10-07T22:03:23Z

📌 Commit 12c94b27f3c703eede3ab7621c5e8eaaa7ef4daa has been approved by dtolnay

bors · 2020-10-08T03:34:44Z

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

bors · 2020-10-08T03:58:49Z

💔 Test failed - checks-actions

cuviper · 2020-10-08T15:10:11Z

Fixed a clone that I had missed...

@bors r=dtolnay

bors · 2020-10-08T15:10:12Z

📌 Commit 5f76201 has been approved by dtolnay

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.

jonas-schievink · 2020-10-08T21:05:45Z

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

`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 · 2020-10-09T17:02:22Z

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.

Co-authored-by: David Tolnay <dtolnay@gmail.com>

dtolnay · 2020-10-09T17:59:13Z

@bors r+ rollup=iffy

bors · 2020-10-09T17:59:15Z

📌 Commit 1d06b07 has been approved by dtolnay

bors · 2020-10-09T19:06:50Z

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

bors · 2020-10-09T21:01:44Z

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

rust-highfive assigned dtolnay Oct 7, 2020

rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Oct 7, 2020

dtolnay approved these changes Oct 7, 2020
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 Oct 7, 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 Oct 8, 2020

m-ou-se mentioned this pull request Oct 8, 2020
Vxworks / Unix deduplication #77666
Merged

cuviper force-pushed the direntry-diet branch from 12c94b2 to 5f76201Compare October 8, 2020 15:09

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 mentioned this pull request Oct 8, 2020
Rollup of 8 pull requests #77712
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 Oct 8, 2020

cuviper added 2 commits October 9, 2020 10:00

remove ReadDir.end_of_stream on targets that don't use it
365e00a

cuviper force-pushed the direntry-diet branch from 5f76201 to 365e00aCompare October 9, 2020 17:02

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 added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Oct 9, 2020

dtolnay reviewed Oct 9, 2020
View reviewed changes

Comment threadlibrary/std/src/sys/unix/fs.rs Outdated

simplify the cfg in ReadDir construction
1d06b07
Co-authored-by: David Tolnay <dtolnay@gmail.com>

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 added the merged-by-bors This PR was explicitly merged by bors. label Oct 9, 2020

bors merged commit 5ddef54 into rust-lang:masterOct 9, 2020

rustbot added this to the 1.49.0 milestone Oct 9, 2020

cuviper deleted the direntry-diet branch October 9, 2020 23:21

Uh oh!

Uh oh!

Conversation

cuviper commented Oct 7, 2020

Uh oh!

rust-highfive commented Oct 7, 2020

Uh oh!

dtolnay commented Oct 7, 2020

Uh oh!

bors commented Oct 7, 2020

Uh oh!

bors commented Oct 8, 2020

Uh oh!

bors commented Oct 8, 2020

Uh oh!

cuviper commented Oct 8, 2020

Uh oh!

bors commented Oct 8, 2020

Uh oh!

jonas-schievink commented Oct 8, 2020

Uh oh!

cuviper commented Oct 9, 2020

Uh oh!

Uh oh!

dtolnay commented Oct 9, 2020

Uh oh!

bors commented Oct 9, 2020

Uh oh!

bors commented Oct 9, 2020

Uh oh!

bors commented Oct 9, 2020

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants