diff options
| author | bors <bors@rust-lang.org> | 2014-07-03 21:46:47 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2014-07-03 21:46:47 +0000 |
| commit | 5d5c20647f45f2eb74f337e5434bbe63b0c43345 (patch) | |
| tree | 155aab01cbadfe647f739c31ce46b29b792ea7ae /src/libtime | |
| parent | dd812ccbb56193c36819993dea25912788b447f0 (diff) | |
| parent | 9bd6479912990046947913f160f69bc550dd3817 (diff) | |
| download | rust-5d5c20647f45f2eb74f337e5434bbe63b0c43345.tar.gz rust-5d5c20647f45f2eb74f337e5434bbe63b0c43345.zip | |
auto merge of #15377 : alexcrichton/rust/rollup, r=alexcrichton
Closes #15276 (Guide: if) Closes #15280 (std::os - Add join_paths, make setenv non-utf8 capable) Closes #15314 (Guide: functions) Closes #15327 (Simplify PatIdent to contain an Ident rather than a Path) Closes #15340 (Guide: add mutable binding section) Closes #15342 (Fix ICE with nested macro_rules!-style macros) Closes #15350 (Remove duplicated slash in install script path) Closes #15351 (correct a few spelling mistakes in the tutorial) Closes #15352 (librustc: Have the kind checker check sub-bounds in trait casts.) Closes #15359 (Fix spelling errors.) Closes #15361 (Rename set_broadast() to set_broadcast().) Closes #15366 (Simplify creating a parser from a token tree) Closes #15367 (Add examples for StrVector methods) Closes #15372 (Vec::grow should use reserve_additional, Vec::reserve should check against capacity) Closes #15373 (Fix minor issues in the documentation of libtime.)
Diffstat (limited to 'src/libtime')
| -rw-r--r-- | src/libtime/lib.rs | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/libtime/lib.rs b/src/libtime/lib.rs index f52a032961d..98544a1218a 100644 --- a/src/libtime/lib.rs +++ b/src/libtime/lib.rs @@ -330,7 +330,7 @@ impl Tm { * Returns a time string formatted according to RFC 822. * * local: "Thu, 22 Mar 2012 07:53:18 PST" - * utc: "Thu, 22 Mar 2012 14:53:18 UTC" + * utc: "Thu, 22 Mar 2012 14:53:18 GMT" */ pub fn rfc822(&self) -> String { if self.tm_gmtoff == 0_i32 { @@ -351,7 +351,8 @@ impl Tm { } /** - * Returns a time string formatted according to ISO 8601. + * Returns a time string formatted according to RFC 3999. RFC 3999 is + * compatible with ISO 8601. * * local: "2012-02-22T07:53:18-07:00" * utc: "2012-02-22T14:53:18Z" |