Separate Ident Types for Different Specificities #530
Merged
Conversation
This file contains hidden or 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
rydrman
added
maintenance
Closed
rydrman
force-pushed
the
256-ident-types
branch
from
7463218 to
fc985e8
Compare
rydrman
changed the title
|
This is all ready for review now, apologies for the larger commits, I wanted to have the tests passing on each on in case of rebasing |
Codecov Report
@@ Coverage Diff @@
## master #530 +/- ##
==========================================
- Coverage 58.96% 58.90% -0.07%
==========================================
Files 207 213 +6
Lines 14696 14910 +214
==========================================
+ Hits 8666 8783 +117
- Misses 6030 6127 +97
📣 We’re building smart automated test selection to slash your CI/CD build times. Learn more |
rydrman
force-pushed
the
256-ident-types
branch
2 times, most recently
from
6cf13cd to
ddc22f9
Compare
jrray
reviewed
Nov 18, 2022
jrray
reviewed
Nov 18, 2022
jrray
reviewed
Nov 18, 2022
rydrman
force-pushed
the
256-ident-types
branch
from
db5bceb to
3043738
Compare
rydrman
force-pushed
the
256-ident-types
branch
from
3043738 to
97e8c9a
Compare
|
@jrray this PR underpins pretty much everything that I have going and I'd like to get it in soon, if possible. Before we reach anything that diverges the code base too much... |
dcookspi
reviewed
Jan 4, 2023
The pattern is <base>/<target> which allows for defining different spcificity levels as well as nice composition of different ident types. This initial commit defines different ident types as well as an AnyIdent with an optional build that replaces the old ident nearly everywhere. Next steps are to use more specific identifier types where applicable Signed-off-by: Ryan Bottriell <ryan@bottriell.ca>
This mean that the v0 spec type needed to be updated to be generic over the internal ident type, as well as the storage interfaces using the appropriate ident types for loading recipes vs packages. This was largely an exercise in refactoring and separating logic that used to be conditional on the presence of a build into distict functions instead. Signed-off-by: Ryan Bottriell <ryan@bottriell.ca>
Uses macros to share common 'inheritance' instead of having a deref implementation. This works better accross types where dereferencing to the base is not as useful as the target (eg located idents) but also creates a safer usage where ident types are not converted silently, instead needing an explicit conversion call by the developer. Additionally, add a HasLocation trait to complete the set. Signed-off-by: Ryan Bottriell <ryan@bottriell.ca>
Signed-off-by: Ryan Bottriell <ryan@bottriell.ca>
Signed-off-by: Ryan Bottriell <ryan@bottriell.ca>
rydrman
force-pushed
the
256-ident-types
branch
from
741933c to
f4ee76d
Compare
Signed-off-by: Ryan Bottriell <ryan@bottriell.ca>
|
Apparently, there are some new clippy lints in 1.66 - I've fixed those now, as well |
dcookspi
approved these changes
Jan 5, 2023
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.
Building on top of #529, this changeset updates the
Identtype to be a generic type so that we can define different versions of it for the recipe/version-only vs package/build identifiers. The general semantics is that each identifier is composed of two types (Base/Target). The main benefit of this is that it can dereference to theBasetype, meaning that theBuildIdentcan also be used as a reference to aVersionIdent(it's base).Along with
VersionIdent = Ident<PkgNameBuf, Version>andBuildIdent = Ident<VersionIdent, Build>there is anAnyIdent = Ident<VersionIdent, Option<Build>which I used to replace everything in this first refactoring pass, but aim to replace where appropriate before this MR is ready.I've also introduced the
HasVersion,HasBuild, andHasLocationtraits in order to have useful bounds for functions that take more than one flavor of ident.TODO:
HasLocationimplemented byLocatedBuildIdentandLocatedVersionIdentas_andto_conversions for sanity checking in implementations