Commit 71f91328 authored by Brad King's avatar Brad King Committed by Kitware Robot

Merge topic 'chrono-0.4'

35e14129 chrono: update to 0.4
Acked-by: Kitware Robot's avatarKitware Robot <kwrobot@kitware.com>
Reviewed-by: Ben Boeckel's avatarBen Boeckel <ben.boeckel@kitware.com>
Merge-request: !46
parents 367a6786 35e14129
......@@ -21,5 +21,5 @@ log = "~0.3"
regex = "~0.2"
tempdir = "~0.3"
chrono = "~0.3"
chrono = "~0.4"
error-chain = ">= 0.9, < 0.11"
......@@ -6,7 +6,7 @@
// option. This file may not be copied, modified, or distributed
// except according to those terms.
use crates::chrono::{DateTime, UTC};
use crates::chrono::{DateTime, Utc};
use crates::regex::Regex;
use crates::tempdir::TempDir;
......@@ -82,7 +82,7 @@ impl MergeCommand {
}
/// Set the authorship date of the merge.
pub fn author_date(&mut self, when: &DateTime<UTC>) -> &mut Self {
pub fn author_date(&mut self, when: &DateTime<Utc>) -> &mut Self {
self.command
.env("GIT_AUTHOR_DATE", when.to_rfc2822());
self
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment