fix(date): treat composite strftime specifiers as atomic#11752
Open
Abusalah0 wants to merge 3 commits intouutils:mainfrom
Open
fix(date): treat composite strftime specifiers as atomic#11752Abusalah0 wants to merge 3 commits intouutils:mainfrom
Abusalah0 wants to merge 3 commits intouutils:mainfrom
Conversation
|
GNU testsuite comparison: |
sylvestre
reviewed
Apr 11, 2026
src/uu/date/src/format_modifiers.rs
Outdated
| matches!( | ||
| specifier.chars().last(), | ||
| Some('A' | 'a' | 'B' | 'b' | 'h' | 'Z' | 'p' | 'P' | 'e' | 'k' | 'l') | ||
| Some( |
Contributor
There was a problem hiding this comment.
The new matches! arm now lists 18 letters across many lines. Since every composite is also space-padded by default, you can express
that relationship directly:
fn is_space_padded_specifier(specifier: &str) -> bool {
is_atomic_composite_specifier(specifier)
|| matches!(
specifier.chars().last(),
Some('A' | 'a' | 'B' | 'b' | 'h' | 'Z' | 'p' | 'P' | 'e' | 'k' | 'l')
)
}
no ?
Author
There was a problem hiding this comment.
Yes Thank you,, I Updated it as suggested.
sylvestre
reviewed
Apr 11, 2026
|
|
||
| #[test] | ||
| fn test_date_strftime_composite_modifiers_are_atomic() { | ||
| let test_cases = [ |
Contributor
There was a problem hiding this comment.
There are no tests for, e.g.:
- %^c → SAT JUN 15 03:04:05 2024
- %#c → swap-cased composite
- %^D → no-op on 06/15/24 (still 06/15/24)
Author
There was a problem hiding this comment.
I just added tests for these Cases.
|
GNU testsuite comparison: |
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
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.
Fixes #11657
Summary
GNU
datetreats compositestrftimedirectives (such as%D,%F,%T,%r,%R,%c,%x,%X) as atomic units. Formatting modifiers should apply to the full rendered result, not propagate into inner sub-fields.Previously, uutils expanded composite directives (e.g.
%D → %m/%d/%y) and applied modifiers to each inner specifier, leading to incorrect output such as:+%-D → 6/15/24
where GNU correctly produces:
+%-D → 06/15/24
Fix
The fix is implemented in
src/date/format/format_modifiers.rs:%D,%F,%T,%r,%R,%c,%x,%X-,0, width adjustments) into expanded sub-fieldsTests
Changes in
tests/by-util/test_date.rs:%+10Dtest to verify width and padding behavior