Make ZoneVariant a closed, non-exhaustive enum
#5760
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
robertbastian
requested review from
sffc,
Manishearth,
zbraniecki and
a team
as code owners
|
/automerge |
Manishearth
previously approved these changes
Nov 1, 2024
sffc
reviewed
Nov 2, 2024
| match zone_variant { | ||
| ZoneVariant::Standard => &locations.pattern_standard, | ||
| ZoneVariant::Daylight => &locations.pattern_daylight, | ||
| _ => unreachable!(), |
There was a problem hiding this comment.
Nit: Annotate here and elsewhere that this is unreachable due to the tilde dependency
ffi/capi/src/timezone.rs
Outdated
| Some(icu_timezone::ZoneVariant::Daylight) => "dt", | ||
| Some(icu_timezone::ZoneVariant::Standard) => "st", | ||
| _ => return None, | ||
| }); | ||
| Some(()) | ||
| } | ||
|
|
||
| /// Sets the `zone_variant` field to "standard" time, which may or may | ||
| /// not correspond to a display name with "Standard" in its name. | ||
| #[diplomat::rust_link(icu::timezone::ZoneVariant::standard, FnInStruct)] |
ffi/capi/src/timezone.rs
Outdated
| @@ -211,17 +211,19 @@ pub mod ffi { | |||
| /// Sets the `zone_variant` field from a string. | |||
| /// | |||
| /// Returns null if the string is not a valid zone variant. | |||
| #[diplomat::rust_link(icu::timezone::ZoneVariant, Struct, compact)] | |||
| #[diplomat::rust_link(icu::timezone::ZoneVariant, Enum, compact)] | |||
| #[diplomat::rust_link(icu::timezone::ZoneVariant::from_str, FnInStruct, hidden)] | |||
| pub fn try_set_zone_variant(&mut self, id: &DiplomatStr) -> Option<()> { | |||
There was a problem hiding this comment.
Nit: Delete these old functions. New variants will get new functions.
sffc
approved these changes
Nov 3, 2024
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.
#5745