aboutsummaryrefslogtreecommitdiffstats
path: root/atuin-client
diff options
context:
space:
mode:
authorBenjamin Vergnaud <9599845+bvergnaud@users.noreply.github.com>2022-10-21 21:21:14 +0200
committerGitHub <noreply@github.com>2022-10-21 20:21:14 +0100
commit8b9aae7076f39a1ebeecb3e2b823503f437812fa (patch)
tree713e9b55cc8a4fef65a576f6f3f1bf5a88c6e847 /atuin-client
parentBump clap from 4.0.15 to 4.0.18 (#578) (diff)
downloadatuin-8b9aae7076f39a1ebeecb3e2b823503f437812fa.zip
docs: add more details about date parsing in the stats command (#579)
* docs: add more details about date parsing in the stats command * chore: Replace chrono-english crate with interim
Diffstat (limited to 'atuin-client')
-rw-r--r--atuin-client/Cargo.toml2
-rw-r--r--atuin-client/src/settings.rs9
2 files changed, 6 insertions, 5 deletions
diff --git a/atuin-client/Cargo.toml b/atuin-client/Cargo.toml
index d22210ca..44ebc48e 100644
--- a/atuin-client/Cargo.toml
+++ b/atuin-client/Cargo.toml
@@ -31,7 +31,7 @@ eyre = "0.6"
directories = "4"
uuid = { version = "1.2", features = ["v4"] }
whoami = "1.1.2"
-chrono-english = "0.1.4"
+interim = { version = "0.1.0", features = ["chrono"] }
config = { version = "0.13", default-features = false, features = ["toml"] }
serde = { version = "1.0.145", features = ["derive"] }
serde_json = "1.0.86"
diff --git a/atuin-client/src/settings.rs b/atuin-client/src/settings.rs
index b743a154..ec7d9fe0 100644
--- a/atuin-client/src/settings.rs
+++ b/atuin-client/src/settings.rs
@@ -55,6 +55,7 @@ impl FilterMode {
}
// FIXME: Can use upstream Dialect enum if https://github.com/stevedonovan/chrono-english/pull/16 is merged
+// FIXME: Above PR was merged, but dependency was changed to interim (fork of chrono-english) in the ... interim
#[derive(Clone, Debug, Deserialize, Copy)]
pub enum Dialect {
#[serde(rename = "us")]
@@ -64,11 +65,11 @@ pub enum Dialect {
Uk,
}
-impl From<Dialect> for chrono_english::Dialect {
- fn from(d: Dialect) -> chrono_english::Dialect {
+impl From<Dialect> for interim::Dialect {
+ fn from(d: Dialect) -> interim::Dialect {
match d {
- Dialect::Uk => chrono_english::Dialect::Uk,
- Dialect::Us => chrono_english::Dialect::Us,
+ Dialect::Uk => interim::Dialect::Uk,
+ Dialect::Us => interim::Dialect::Us,
}
}
}