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

Jump to bottom

DelayFormat now works with alignment and width #320

Merged
merged 3 commits into from
Jun 25, 2019
Merged

DelayFormat now works with alignment and width #320

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8b2444c
DelayFormat now works with alignment and width
SamokhinIlya Jun 21, 2019
f57ac36
add test and format every item into String first, then pad it
SamokhinIlya Jun 23, 2019
5b0818e
changed back from impl Trait in fn parameter to support older compile…
SamokhinIlya Jun 23, 2019
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
Prev Previous commit
changed back from impl Trait in fn parameter to support older compile… 
…r versions
  • Loading branch information
@SamokhinIlya
SamokhinIlya committed Jun 23, 2019
commit 5b0818e0a1ba1dac59b984b4d6ad26f29aad2b41
8 changes: 5 additions & 3 deletions src/format/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -334,13 +334,15 @@ const BAD_FORMAT: ParseError = ParseError(ParseErrorKind::BadFormat);

/// Tries to format given arguments with given formatting items.
/// Internally used by `DelayedFormat`.
pub fn format<'a>(
pub fn format<'a, I>(
w: &mut fmt::Formatter,
date: Option<&NaiveDate>,
time: Option<&NaiveTime>,
off: Option<&(String, FixedOffset)>,
items: impl Iterator<Item=Item<'a>>,
) -> fmt::Result {
items: I,
) -> fmt::Result
where I: Iterator<Item=Item<'a>>
{
// full and abbreviated month and weekday names
static SHORT_MONTHS: [&'static str; 12] =
["Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"];
Expand Down