summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNora Widdecke <nora@sequoia-pgp.org>2022-11-16 10:10:21 +0100
committerNora Widdecke <nora@sequoia-pgp.org>2022-11-16 10:10:21 +0100
commit2dbf666108a1f78dd65fa21e0b1d3257c48ff38c (patch)
tree12a62a4b010d690db9a28df819c342224d5efad5
parent59b6c8b04f45403a0a723511a2766e064e40f072 (diff)
sq: Update to chrono 0.4.23nora/chrono_0.4.23
-rw-r--r--sq/src/commands/certify.rs4
-rw-r--r--sq/src/commands/key.rs2
-rw-r--r--sq/src/commands/revoke.rs2
-rw-r--r--sq/src/sq_cli/types.rs6
4 files changed, 8 insertions, 6 deletions
diff --git a/sq/src/commands/certify.rs b/sq/src/commands/certify.rs
index d3121dd8..73f872e6 100644
--- a/sq/src/commands/certify.rs
+++ b/sq/src/commands/certify.rs
@@ -45,7 +45,7 @@ pub fn certify(config: Config, c: certify::Command)
let time = if let Some(t) = c.time {
let time = SystemTime::from(
- crate::parse_iso8601(&t, chrono::NaiveTime::from_hms(0, 0, 0))
+ crate::parse_iso8601(&t, chrono::NaiveTime::default())
.context(format!("Parsing --time {}", t))?);
Some(time)
} else {
@@ -122,7 +122,7 @@ pub fn certify(config: Config, c: certify::Command)
let now = builder.signature_creation_time()
.unwrap_or_else(std::time::SystemTime::now);
let expiration = SystemTime::from(
- crate::parse_iso8601(&t, chrono::NaiveTime::from_hms(0, 0, 0))?);
+ crate::parse_iso8601(&t, chrono::NaiveTime::default())?);
let validity = expiration.duration_since(now)?;
builder = builder.set_signature_creation_time(now)?
.set_signature_validity_period(validity)?;
diff --git a/sq/src/commands/key.rs b/sq/src/commands/key.rs
index f6f8b729..86c842e4 100644
--- a/sq/src/commands/key.rs
+++ b/sq/src/commands/key.rs
@@ -72,7 +72,7 @@ fn generate(
let now = builder.creation_time()
.unwrap_or_else(std::time::SystemTime::now);
let expiration = SystemTime::from(
- crate::parse_iso8601(&t, chrono::NaiveTime::from_hms(0, 0, 0))?);
+ crate::parse_iso8601(&t, chrono::NaiveTime::default())?);
let validity = expiration.duration_since(now)?;
builder = builder.set_creation_time(now)
.set_validity_period(validity);
diff --git a/sq/src/commands/revoke.rs b/sq/src/commands/revoke.rs
index c07b3497..5496812f 100644
--- a/sq/src/commands/revoke.rs
+++ b/sq/src/commands/revoke.rs
@@ -314,7 +314,7 @@ a revocation certificate for that User ID anyways, specify '--force'"));
k.fingerprint().to_hex(),
chrono::DateTime::<chrono::offset::Utc>
::from(k.creation_time())
- .date(),
+ .date_naive(),
k.key_flags().unwrap_or_else(KeyFlags::empty));
}
if ! have_valid {
diff --git a/sq/src/sq_cli/types.rs b/sq/src/sq_cli/types.rs
index e5ee306e..1d31db4d 100644
--- a/sq/src/sq_cli/types.rs
+++ b/sq/src/sq_cli/types.rs
@@ -140,8 +140,10 @@ impl std::str::FromStr for Time {
type Err = anyhow::Error;
fn from_str(s: &str) -> anyhow::Result<Time> {
- let time =
- Time::parse_iso8601(s, chrono::NaiveTime::from_hms(0, 0, 0))?;
+ let time = Time::parse_iso8601(
+ s,
+ chrono::NaiveTime::from_hms_opt(0, 0, 0).unwrap(),
+ )?;
Ok(Time { time })
}
}