Handle targets with more than one family #44
Merged
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
Rust 1.58 introduces a couple of targets with multiple target families. To handle this, introduce a new `Families` newtype wrapper which can contain any number of families. Handle both the const case and the non-const one. Unfortunately this is an unavoidable breaking change to the `TargetInfo` data model.
Jake-Shadle
requested changes
Feb 4, 2022
Comment on lines
+96
to
+118
| #[inline] | ||
| pub fn new(val: impl IntoIterator<Item = Family>) -> Self { | ||
| let mut families: Vec<_> = val.into_iter().collect(); | ||
| families.sort_unstable(); | ||
| Self(Cow::Owned(families)) | ||
| } | ||
|
|
||
| /// Constructs a new instance of this field from a static slice of `&'static str`. | ||
| /// | ||
| /// `val` must be in sorted order: this constructor cannot check for that due to | ||
| /// limitations in current versions of Rust. | ||
| #[inline] | ||
| pub const fn new_const(val: &'static [Family]) -> Self { | ||
| // TODO: Check that val is sorted. | ||
| Self(Cow::Borrowed(val)) | ||
| } | ||
|
|
||
| /// Returns true if this list of families contains a given family. | ||
| pub fn contains(&self, val: &Family) -> bool { | ||
| // This relies on the sorted-ness of its contents. | ||
| self.0.binary_search(val).is_ok() | ||
| } | ||
| } |
There was a problem hiding this comment.
Given that the maximum for a reasonable target is 2, at least at this time, it feels like sorting/binary searching is unnecessary and should just be linear.
There was a problem hiding this comment.
Thanks! Note that while the binary searching is probably unnecessary, the sorting is not: incorrectly sorted lists will cause the Eq, Hash and Ord implementations to behave incorrectly.
Jake-Shadle
approved these changes
Feb 4, 2022
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.
Checklist
Description of Changes
Rust 1.58 introduces a couple of targets with multiple target families.
To handle this, introduce a new
Familiesnewtype wrapper which cancontain any number of families. Handle both the const case and the
non-const one.
Unfortunately this is an unavoidable breaking change to the
TargetInfodata model.
(I missed this while updating targets to 1.58 earlier, and discovered the issue while testing it out.)