Skip to content
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.

Sign up for GitHub

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

GNU coreutils date-like time zone formatting #759

Merged
merged 10 commits into from
Aug 17, 2022
Merged

GNU coreutils date-like time zone formatting #759

Changes from 2 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
12ef137
Implement "GNU coreutils date"-like time zone formatting
jarkonik Aug 6, 2022
4e068bf
add change to changelog
jarkonik Aug 6, 2022
c57fd3f
fix
jarkonik Aug 6, 2022
2009135
fix docs
jarkonik Aug 6, 2022
e0c74d4
fix clippy error
jarkonik Aug 6, 2022
7abaa7a
add feature annotation
jarkonik Aug 6, 2022
d30d492
Rename enum, dont use Option
jarkonik Aug 16, 2022
eab88d4
remove loop
esheppa Aug 17, 2022
7430c0e
Merge pull request #1 from esheppa/jarkonik-gnu-coreutils-formatting-ext
jarkonik Aug 17, 2022
3a2dc4a
Adjust docs
jarkonik Aug 17, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 11 additions & 24 deletions src/format/strftime.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -403,30 +403,17 @@ impl<'a> Iterator for StrftimeItems<'a> {
}
'+' => fix!(RFC3339),
':' => {
let mut num_colon = 1;

let result = loop {
match next!() {
':' => {
num_colon += 1;
}
'z' => {
break Ok(());
}
_ => {
break Err(Item::Error);
}
}
};

match result {
Ok(_) => match num_colon {
1 => fix!(TimezoneOffsetColon),
2 => fix!(TimezoneOffsetDoubleColon),
3 => fix!(TimezoneOffsetTripleColon),
_ => Item::Error,
},
Err(e) => e,
if self.remainder.starts_with("::z") {
self.remainder = &self.remainder[3..];
fix!(TimezoneOffsetTripleColon)
} else if self.remainder.starts_with(":z") {
self.remainder = &self.remainder[2..];
fix!(TimezoneOffsetDoubleColon)
} else if self.remainder.starts_with('z') {
self.remainder = &self.remainder[1..];
fix!(TimezoneOffsetColon)
} else {
Item::Error
}
}
'.' => match next!() {
Expand Down