-
Notifications
You must be signed in to change notification settings - Fork 645
Switch to using imported module idents for marking version requirements #335
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.
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
Merged
Merged
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
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
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
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,57 @@ | ||
| pub use spacetimedb_lib::VersionTuple; | ||
|
|
||
| const MODULE_PREFIX: &str = "spacetime_"; | ||
|
|
||
| pub fn determine_spacetime_abi<I>( | ||
| imports: impl IntoIterator<Item = I>, | ||
| get_module: impl Fn(&I) -> &str, | ||
| ) -> Result<Option<VersionTuple>, AbiVersionError> { | ||
| let it = imports.into_iter().filter_map(|imp| { | ||
| let s = get_module(&imp); | ||
| let err = || AbiVersionError::Parse { module: s.to_owned() }; | ||
| s.strip_prefix(MODULE_PREFIX).map(|ver| { | ||
| let (major, minor) = ver.split_once('.').ok_or_else(err)?; | ||
| let (major, minor) = Option::zip(major.parse().ok(), minor.parse().ok()).ok_or_else(err)?; | ||
| Ok(VersionTuple { major, minor }) | ||
| }) | ||
| }); | ||
| itertools::process_results(it, |mut it| try_reduce(&mut it, refine_ver_req))? | ||
| } | ||
|
|
||
| // TODO: replace with Iterator::try_reduce once stabilized | ||
| fn try_reduce<I: Iterator, E>( | ||
| it: &mut I, | ||
| f: impl FnMut(I::Item, I::Item) -> Result<I::Item, E>, | ||
| ) -> Result<Option<I::Item>, E> { | ||
| let Some(first) = it.next() else { return Ok(None) }; | ||
| it.try_fold(first, f).map(Some) | ||
| } | ||
|
|
||
| fn refine_ver_req(ver: VersionTuple, new: VersionTuple) -> Result<VersionTuple, AbiVersionError> { | ||
| if ver.major != new.major { | ||
| Err(AbiVersionError::MultipleMajor(ver.major, new.major)) | ||
| } else { | ||
| Ok(Ord::max(ver, new)) | ||
| } | ||
| } | ||
|
|
||
| pub fn verify_supported(implements: VersionTuple, got: VersionTuple) -> Result<(), AbiVersionError> { | ||
| if implements.supports(got) { | ||
| Ok(()) | ||
| } else { | ||
| Err(AbiVersionError::UnsupportedVersion { implements, got }) | ||
| } | ||
| } | ||
|
|
||
| #[derive(thiserror::Error, Debug)] | ||
| pub enum AbiVersionError { | ||
| #[error("import module {module:?} has malformed version string")] | ||
| Parse { module: String }, | ||
| #[error("module cannot depend on both major version {0} and major version {1}")] | ||
| MultipleMajor(u16, u16), | ||
| #[error("abi version {got} is not supported (host implements {implements})")] | ||
| UnsupportedVersion { | ||
| got: VersionTuple, | ||
| implements: VersionTuple, | ||
| }, | ||
| } |
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
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Nit: let's just inline the string here, same as Rust does. It's a bit weird to edit two parts of version in two places.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
sure 👍
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I meant inline minor into the same string too, so that it's just
spacetime_6.0like in Rust.