diff options
| author | bors <bors@rust-lang.org> | 2013-03-20 16:42:47 -0700 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2013-03-20 16:42:47 -0700 |
| commit | b12714eff5dd2ccde118c520444990216739e006 (patch) | |
| tree | 1c741e92773a414eabc5c09c25568135bb5b6253 /src/libstd | |
| parent | 6f3d1686b2353f8df196aecd5bc2772f86508e41 (diff) | |
| parent | a29934a61b0ade13ef799a9aa9e95c0be940e0f5 (diff) | |
| download | rust-b12714eff5dd2ccde118c520444990216739e006.tar.gz rust-b12714eff5dd2ccde118c520444990216739e006.zip | |
auto merge of #5455 : pcwalton/rust/framework, r=catamorphism
r? @catamorphism
Diffstat (limited to 'src/libstd')
| -rw-r--r-- | src/libstd/time.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libstd/time.rs b/src/libstd/time.rs index d768eef9a8c..c72b3675c4c 100644 --- a/src/libstd/time.rs +++ b/src/libstd/time.rs @@ -819,8 +819,8 @@ priv fn do_strftime(format: &str, tm: &Tm) -> ~str { 'M' => fmt!("%02d", tm.tm_min as int), 'm' => fmt!("%02d", tm.tm_mon as int + 1), 'n' => ~"\n", - 'P' => if tm.tm_hour as int < 12 { ~"am" } else { ~"pm" }, - 'p' => if tm.tm_hour as int < 12 { ~"AM" } else { ~"PM" }, + 'P' => if (tm.tm_hour as int) < 12 { ~"am" } else { ~"pm" }, + 'p' => if (tm.tm_hour as int) < 12 { ~"AM" } else { ~"PM" }, 'R' => { fmt!("%s:%s", parse_type('H', tm), |