Combine FsRepository and OpenFsRepository #1156
Open
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
jrray
force-pushed
the
open-repo-type-state
branch
2 times, most recently
from
4e29bbf to
086c6b9
Compare
jrray
changed the base branch from
repo-ext-traits
to
refactor-renderer-for-win
jrray
force-pushed
the
open-repo-type-state
branch
from
086c6b9 to
d08ddba
Compare
rydrman
reviewed
Feb 21, 2025
crates/spfs/src/clean_test.rs
Outdated
| @@ -269,7 +269,7 @@ async fn test_clean_manifest_renders(tmpdir: tempfile::TempDir) { | |||
| .expect("failed to clean repo"); | |||
| println!("{result:#?}"); | |||
|
|
|||
| let files = list_files(fs_repo.renders.as_ref().unwrap().renders.root()); | |||
| let files = list_files(fs_repo.fs_impl.renders.as_ref().unwrap().renders.root()); | |||
There was a problem hiding this comment.
Would it work to use an impl std::ops::Deref on the repo type to avoid needing all these new field accessors?
Use the type state pattern to combine these two types into a single
type. This is some groundwork for creating new types to represent repos
that have renders or not. This code doesn't make much use of the type
state pattern yet.
`FsRepository` used to represent a repo that may not be opened yet, this
is now represented by the type alias:
type MaybeOpenFsRepository = FsRepository<MaybeOpenFsRepositoryImpl>
An already opened repository has the same name, but is now a type alias:
type OpenFsRepository = FsRepository<OpenFsRepositoryImpl>
The original types have been renamed to these *Impl names:
FsRepository -> MaybeOpenFsRepositoryImpl
OpenFsRepository -> OpenFsRepositoryImpl
Signed-off-by: J Robert Ray <[email protected]>
Allow some places to not have to write `fs_impl`. Signed-off-by: J Robert Ray <[email protected]>
jrray
force-pushed
the
open-repo-type-state
branch
from
d08ddba to
ad7d528
Compare
jrray
commented
Mar 29, 2025
| FS: FsRepositoryOps, | ||
| { | ||
| fn has_renders(&self) -> bool { | ||
| self.fs_impl.has_renders() |
There was a problem hiding this comment.
Note that Deref can't be used in cases like this where it would get interpreted as a recursive call instead.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Use the type state pattern to combine these two types into a single type. This is some groundwork for creating new types to represent repos that have renders or not.
FsRepositoryused to represent a repo that may not be opened yet, this is now represented by the type alias:An already opened repository has the same name, but is now a type alias:
The original types have been renamed to these *Impl names: