This repository has been archived by the owner on Oct 23, 2022. It is now read-only.
Split Entry into two different enums to remove unnecessary expects #272
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
c410-f3r
force-pushed
the
unwraps
branch
2 times, most recently
from
b95deaf to
aa9fe29
Compare
c410-f3r
force-pushed
the
unwraps
branch
2 times, most recently
from
c0b8743 to
6ca7533
Compare
koivunej
approved these changes
Jul 31, 2020
Comment on lines
492
to
511
| pub fn as_entry(&self) -> Entry<'_> { | ||
| use InnerKind::*; | ||
| match &self.kind { | ||
| RootDirectory(cid) | BucketAtRoot(cid) => { | ||
| Entry::RootDirectory(cid, &self.path, &self.metadata) | ||
| InnerKind::Bucket(cid) => Entry::Bucket(cid, &self.path), | ||
| InnerKind::Directory(cid) => { | ||
| Entry::Metadata(MetadataEntry::Directory(cid, &self.path, &self.metadata)) | ||
| } | ||
| InnerKind::File(cid, _, sz) => { | ||
| Entry::Metadata(MetadataEntry::File(cid, &self.path, &self.metadata, *sz)) | ||
| } | ||
| InnerKind::RootBucket(cid) => { | ||
| Entry::Metadata(MetadataEntry::Directory(cid, &self.path, &self.metadata)) | ||
| } | ||
| InnerKind::RootDirectory(cid) | InnerKind::BucketAtRoot(cid) => Entry::Metadata( | ||
| MetadataEntry::RootDirectory(cid, &self.path, &self.metadata), | ||
| ), | ||
| InnerKind::Symlink(cid) => { | ||
| Entry::Metadata(MetadataEntry::Symlink(cid, &self.path, &self.metadata)) | ||
| } | ||
| RootBucket(cid) => Entry::Directory(cid, &self.path, &self.metadata), | ||
| Bucket(cid) => Entry::Bucket(cid, &self.path), | ||
| Directory(cid) => Entry::Directory(cid, &self.path, &self.metadata), | ||
| File(cid, _, sz) => Entry::File(cid, &self.path, &self.metadata, *sz), | ||
| Symlink(cid) => Entry::Symlink(cid, &self.path, &self.metadata), | ||
| } | ||
| } |
There was a problem hiding this comment.
In hindsight this seems "really obvious" change, great idea!
Thinking of this naming or meaningwise the difference between the cases might be more on the Entry::Metadata meaning "is standalone entry [which might have non-empty metadata]" and Entry::Bucket meaning "is continuation [or 'just more links']" but as I think the doc comments on Entry variants already cover this detail nicely so no need to change this right now.
EDIT: fmt
|
@koivunej Thanks That is all regarding removing |
|
bors r+ |
|
Build succeeded: |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Second take on #200
Entryis now composed ofBucket(...)andMetadata(MetadataEntry { ... })to separate things that have and doesn't have metadata, which avoids returning optional values derived from a single entry-point.Next PR will address the newly introduced double matching while iterating over
continue_walkbut it will require deeper logical changes.