From f90c01f702f6a98b041f766b6a1d857bc1b9afef Mon Sep 17 00:00:00 2001 From: Conrad Ludgate Date: Mon, 11 Sep 2023 09:26:05 +0100 Subject: replace chrono with time (#806) * replace chrono with time * Fix test chrono usage --------- Co-authored-by: Ellie Huxtable --- Cargo.lock | 131 ++++++++++++++----------------------------------------------- 1 file changed, 30 insertions(+), 101 deletions(-) (limited to 'Cargo.lock') diff --git a/Cargo.lock b/Cargo.lock index b7f287a5..38af009d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -54,15 +54,6 @@ version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0942ffc6dcaadf03badf6e6a2d0228460359d5e34b57ccdc720b7382dfbd5ec5" -[[package]] -name = "android_system_properties" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311" -dependencies = [ - "libc", -] - [[package]] name = "anstream" version = "0.3.2" @@ -160,7 +151,6 @@ dependencies = [ "atuin-server", "atuin-server-postgres", "base64 0.21.2", - "chrono", "clap", "clap_complete", "colored", @@ -181,6 +171,7 @@ dependencies = [ "semver", "serde", "serde_json", + "time", "tiny-bip39", "tokio", "tracing", @@ -197,7 +188,6 @@ dependencies = [ "async-trait", "atuin-common", "base64 0.21.2", - "chrono", "clap", "config", "crypto_secretbox", @@ -229,6 +219,7 @@ dependencies = [ "shellexpand", "sql-builder", "sqlx", + "time", "tokio", "typed-builder", "urlencoding", @@ -240,12 +231,12 @@ dependencies = [ name = "atuin-common" version = "16.0.0" dependencies = [ - "chrono", "eyre", "pretty_assertions", "rand 0.8.5", "serde", "sqlx", + "time", "typed-builder", "uuid", ] @@ -260,8 +251,6 @@ dependencies = [ "atuin-server-database", "axum", "base64 0.21.2", - "chrono", - "chronoutil", "config", "eyre", "fs-err", @@ -271,6 +260,7 @@ dependencies = [ "semver", "serde", "serde_json", + "time", "tokio", "tower", "tower-http", @@ -284,10 +274,9 @@ version = "16.0.0" dependencies = [ "async-trait", "atuin-common", - "chrono", - "chronoutil", "eyre", "serde", + "time", "tracing", "uuid", ] @@ -299,10 +288,10 @@ dependencies = [ "async-trait", "atuin-common", "atuin-server-database", - "chrono", "futures-util", "serde", "sqlx", + "time", "tracing", "uuid", ] @@ -515,31 +504,6 @@ dependencies = [ "cpufeatures", ] -[[package]] -name = "chrono" -version = "0.4.22" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfd4d1b31faaa3a89d7934dbded3111da0d2ef28e3ebccdb4f0179f5929d1ef1" -dependencies = [ - "iana-time-zone", - "js-sys", - "num-integer", - "num-traits", - "serde", - "time 0.1.45", - "wasm-bindgen", - "winapi", -] - -[[package]] -name = "chronoutil" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43a58c924bb772aa201da3acf5308c46b60275c64e6d3bc89c23dd63d71e83fd" -dependencies = [ - "chrono", -] - [[package]] name = "cipher" version = "0.3.0" @@ -838,6 +802,9 @@ name = "deranged" version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7684a49fb1af197853ef7b2ee694bc1f5b4179556f1e5710e1760c5db6f5e929" +dependencies = [ + "serde", +] [[package]] name = "diff" @@ -1419,29 +1386,6 @@ dependencies = [ "tokio-rustls", ] -[[package]] -name = "iana-time-zone" -version = "0.1.57" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fad5b825842d2b38bd206f3e81d6957625fd7f0a361e345c30e01a0ae2dd613" -dependencies = [ - "android_system_properties", - "core-foundation-sys", - "iana-time-zone-haiku", - "js-sys", - "wasm-bindgen", - "windows", -] - -[[package]] -name = "iana-time-zone-haiku" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f" -dependencies = [ - "cc", -] - [[package]] name = "idna" version = "0.4.0" @@ -1521,8 +1465,8 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9ffd2ac8397b9574daa4ffa7ede4427dd249cadaa900719d4b01154a5631d38b" dependencies = [ - "chrono", "logos", + "time", ] [[package]] @@ -1846,6 +1790,15 @@ dependencies = [ "libc", ] +[[package]] +name = "num_threads" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2819ce041d2ee131036f4fc9d6ae7ae125a3a40e97ba64d04fe799ad9dabbb44" +dependencies = [ + "libc", +] + [[package]] name = "number_prefix" version = "0.4.0" @@ -2478,7 +2431,7 @@ dependencies = [ "iso8601", "ring", "thiserror", - "time 0.3.25", + "time", "zeroize", ] @@ -2817,7 +2770,6 @@ dependencies = [ "atoi", "byteorder", "bytes", - "chrono", "crc", "crossbeam-queue", "dotenvy", @@ -2844,6 +2796,7 @@ dependencies = [ "smallvec", "sqlformat", "thiserror", + "time", "tokio", "tokio-stream", "tracing", @@ -2902,7 +2855,6 @@ dependencies = [ "bitflags 2.4.0", "byteorder", "bytes", - "chrono", "crc", "digest 0.10.7", "dotenvy", @@ -2930,6 +2882,7 @@ dependencies = [ "sqlx-core", "stringprep", "thiserror", + "time", "tracing", "uuid", "whoami", @@ -2945,7 +2898,6 @@ dependencies = [ "base64 0.21.2", "bitflags 2.4.0", "byteorder", - "chrono", "crc", "dotenvy", "etcetera", @@ -2971,6 +2923,7 @@ dependencies = [ "sqlx-core", "stringprep", "thiserror", + "time", "tracing", "uuid", "whoami", @@ -2983,7 +2936,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "be4c21bf34c7cae5b283efb3ac1bcc7670df7561124dc2f8bdc0b59be40f79a2" dependencies = [ "atoi", - "chrono", "flume", "futures-channel", "futures-core", @@ -2995,6 +2947,7 @@ dependencies = [ "percent-encoding", "serde", "sqlx-core", + "time", "tracing", "url", "uuid", @@ -3104,23 +3057,14 @@ dependencies = [ [[package]] name = "time" -version = "0.1.45" +version = "0.3.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b797afad3f312d1c66a56d11d0316f916356d11bd158fbc6ca6389ff6bf805a" -dependencies = [ - "libc", - "wasi 0.10.0+wasi-snapshot-preview1", - "winapi", -] - -[[package]] -name = "time" -version = "0.3.25" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0fdd63d58b18d663fbdf70e049f00a22c8e42be082203be7f26589213cd75ea" +checksum = "a79d09ac6b08c1ab3906a2f7cc2e81a0e27c7ae89c63812df75e52bef0751e07" dependencies = [ "deranged", "itoa", + "libc", + "num_threads", "serde", "time-core", "time-macros", @@ -3134,9 +3078,9 @@ checksum = "7300fbefb4dadc1af235a9cef3737cea692a9d97e1b9cbcd4ebdae6f8868e6fb" [[package]] name = "time-macros" -version = "0.2.11" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb71511c991639bb078fd5bf97757e03914361c48100d52878b8e52b46fb92cd" +checksum = "75c65469ed6b3a4809d987a41eb1dc918e9bc1d92211cbad7ae82931846f7451" dependencies = [ "time-core", ] @@ -3523,12 +3467,6 @@ version = "0.9.0+wasi-snapshot-preview1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" -[[package]] -name = "wasi" -version = "0.10.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f" - [[package]] name = "wasi" version = "0.11.0+wasi-snapshot-preview1" @@ -3661,15 +3599,6 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" -[[package]] -name = "windows" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" -dependencies = [ - "windows-targets 0.48.5", -] - [[package]] name = "windows-sys" version = "0.45.0" -- cgit v1.3.1