refactor: mark enabled ephemeral timer duration as NonZero - #8495
Merged
Conversation
link2xt
commented
Jul 30, 2026
| Enabled { | ||
| /// Timer duration in seconds. | ||
| /// | ||
| /// The value cannot be 0. |
Collaborator
Author
There was a problem hiding this comment.
The most interesting change is here.
Collaborator
Author
|
Slightly related to #8493, in the end the timer is stored in SQLite with 0 treated as a special value. |
link2xt
commented
Jul 30, 2026
| if duration == 0 { | ||
| Self::Disabled | ||
| } else { | ||
| if let Some(duration) = NonZero::<u32>::new(duration) { |
Collaborator
Author
There was a problem hiding this comment.
This is probably the only code that got less ugly as a result.
link2xt
commented
Jul 30, 2026
| Err(rusqlite::types::FromSqlError::OutOfRange(value)) | ||
| } | ||
| }) | ||
| u32::column_result(value).map(Self::from_u32) |
Collaborator
Author
There was a problem hiding this comment.
This could have been done independently of the NonZero change.
hpk42
reviewed
Jul 30, 2026
hpk42
reviewed
Jul 30, 2026
hpk42
reviewed
Jul 30, 2026
link2xt
force-pushed
the
link2xt/ephemeral-timer-duration-nonzero
branch
3 times, most recently
from
July 31, 2026 21:58
54585ba to
43e958e
Compare
link2xt
force-pushed
the
link2xt/ephemeral-timer-duration-nonzero
branch
from
July 31, 2026 23:27
43e958e to
6eaf31c
Compare
Now the type system ensures that Timer::Enabled never stores 0 value inside accidentally, it is impossible to put 0 there without unsafe code.
link2xt
force-pushed
the
link2xt/ephemeral-timer-duration-nonzero
branch
from
July 31, 2026 23:28
6eaf31c to
e2d9d1c
Compare
link2xt
enabled auto-merge (rebase)
July 31, 2026 23:30
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Now the type system ensures that Timer::Enabled
never stores 0 value inside accidentally,
it is impossible to put 0 there without unsafe code.