diff --git a/Cargo.lock b/Cargo.lock index 30cc7b73c..eb601e91f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -62,6 +62,12 @@ dependencies = [ "url", ] +[[package]] +name = "android-tzdata" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0" + [[package]] name = "android_system_properties" version = "0.1.5" @@ -637,12 +643,12 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "chrono" -version = "0.4.24" +version = "0.4.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e3c5919066adf22df73762e50cffcde3a758f2a848b113b586d1f86728b673b" +checksum = "ec837a71355b28f6556dbd569b37b3f363091c0bd4b2e735674521b4c5fd9bc5" dependencies = [ + "android-tzdata", "iana-time-zone", - "num-integer", "num-traits", "winapi", ] @@ -5052,11 +5058,9 @@ dependencies = [ "hmac", "hyper", "indexmap", - "itertools", "log", "num-traits", "phf_shared 0.11.1", - "prost", "rand 0.8.5", "rand_core 0.6.4", "regex", diff --git a/cargo/licenses.json b/cargo/licenses.json index ebe9fe719..31b5628c4 100644 --- a/cargo/licenses.json +++ b/cargo/licenses.json @@ -53,6 +53,15 @@ "license_file": null, "description": "HTML Sanitization" }, + { + "name": "android-tzdata", + "version": "0.1.1", + "authors": "RumovZ", + "repository": "https://github.com/RumovZ/android-tzdata", + "license": "Apache-2.0 OR MIT", + "license_file": null, + "description": "Parser for the Android-specific tzdata file" + }, { "name": "android_system_properties", "version": "0.1.5", @@ -80,6 +89,24 @@ "license_file": null, "description": "Anki's Rust library i18n code" }, + { + "name": "anki_io", + "version": "0.0.0", + "authors": "Ankitects Pty Ltd and contributors ", + "repository": null, + "license": "AGPL-3.0-or-later", + "license_file": null, + "description": "Utils for better I/O error reporting" + }, + { + "name": "anki_proto", + "version": "0.0.0", + "authors": "Ankitects Pty Ltd and contributors ", + "repository": null, + "license": "AGPL-3.0-or-later", + "license_file": null, + "description": "Anki's Rust library protobuf code" + }, { "name": "anstream", "version": "0.2.6", @@ -388,7 +415,7 @@ }, { "name": "chrono", - "version": "0.4.24", + "version": "0.4.26", "authors": null, "repository": "https://github.com/chronotope/chrono", "license": "Apache-2.0 OR MIT", @@ -712,7 +739,7 @@ }, { "name": "errno", - "version": "0.3.0", + "version": "0.3.1", "authors": "Chris Wong ", "repository": "https://github.com/lambda-fairy/rust-errno", "license": "Apache-2.0 OR MIT", @@ -1306,7 +1333,7 @@ }, { "name": "io-lifetimes", - "version": "1.0.9", + "version": "1.0.11", "authors": "Dan Gohman ", "repository": "https://github.com/sunfishcode/io-lifetimes", "license": "Apache-2.0 OR Apache-2.0 WITH LLVM-exception OR MIT", @@ -1378,7 +1405,7 @@ }, { "name": "libc", - "version": "0.2.140", + "version": "0.2.146", "authors": "The Rust Project Developers", "repository": "https://github.com/rust-lang/libc", "license": "Apache-2.0 OR MIT", @@ -1405,7 +1432,7 @@ }, { "name": "linux-raw-sys", - "version": "0.3.1", + "version": "0.3.8", "authors": "Dan Gohman ", "repository": "https://github.com/sunfishcode/linux-raw-sys", "license": "Apache-2.0 OR Apache-2.0 WITH LLVM-exception OR MIT", @@ -1639,7 +1666,7 @@ }, { "name": "num_enum", - "version": "0.5.11", + "version": "0.6.1", "authors": "Daniel Wagner-Hall |Daniel Henry-Mantilla |Vincent Esche ", "repository": "https://github.com/illicitonion/num_enum", "license": "Apache-2.0 OR BSD-3-Clause OR MIT", @@ -1648,7 +1675,7 @@ }, { "name": "num_enum_derive", - "version": "0.5.11", + "version": "0.6.1", "authors": "Daniel Wagner-Hall |Daniel Henry-Mantilla |Vincent Esche ", "repository": "https://github.com/illicitonion/num_enum", "license": "Apache-2.0 OR BSD-3-Clause OR MIT", @@ -1972,7 +1999,7 @@ }, { "name": "prost", - "version": "0.11.8", + "version": "0.11.9", "authors": "Dan Burkert |Lucio Franco ", "repository": "https://github.com/tokio-rs/prost", "license": "Apache-2.0", @@ -1981,7 +2008,7 @@ }, { "name": "prost-build", - "version": "0.11.8", + "version": "0.11.9", "authors": "Dan Burkert |Lucio Franco |Tokio Contributors ", "repository": "https://github.com/tokio-rs/prost", "license": "Apache-2.0", @@ -1990,16 +2017,25 @@ }, { "name": "prost-derive", - "version": "0.11.8", + "version": "0.11.9", "authors": "Dan Burkert |Lucio Franco |Tokio Contributors ", "repository": "https://github.com/tokio-rs/prost", "license": "Apache-2.0", "license_file": null, "description": "A Protocol Buffers implementation for the Rust Language." }, + { + "name": "prost-reflect", + "version": "0.11.4", + "authors": "Andrew Hickman ", + "repository": "https://github.com/andrewhickman/prost-reflect", + "license": "Apache-2.0 OR MIT", + "license_file": null, + "description": "A protobuf library extending prost with reflection support and dynamic messages." + }, { "name": "prost-types", - "version": "0.11.8", + "version": "0.11.9", "authors": "Dan Burkert |Lucio Franco ", "repository": "https://github.com/tokio-rs/prost", "license": "Apache-2.0", @@ -2188,7 +2224,7 @@ }, { "name": "rustix", - "version": "0.37.5", + "version": "0.37.20", "authors": "Dan Gohman |Jakub Konka ", "repository": "https://github.com/bytecodealliance/rustix", "license": "Apache-2.0 OR Apache-2.0 WITH LLVM-exception OR MIT", @@ -2305,7 +2341,7 @@ }, { "name": "serde", - "version": "1.0.159", + "version": "1.0.164", "authors": "Erick Tryzelaar |David Tolnay ", "repository": "https://github.com/serde-rs/serde", "license": "Apache-2.0 OR MIT", @@ -2323,7 +2359,7 @@ }, { "name": "serde_derive", - "version": "1.0.159", + "version": "1.0.164", "authors": "Erick Tryzelaar |David Tolnay ", "repository": "https://github.com/serde-rs/serde", "license": "Apache-2.0 OR MIT", @@ -2593,7 +2629,7 @@ }, { "name": "tempfile", - "version": "3.5.0", + "version": "3.6.0", "authors": "Steven Allen |The Rust Project Developers|Ashley Mannix |Jason White ", "repository": "https://github.com/Stebalien/tempfile", "license": "Apache-2.0 OR MIT", diff --git a/rslib/Cargo.toml b/rslib/Cargo.toml index e8060ca4b..8d7cd95cc 100644 --- a/rslib/Cargo.toml +++ b/rslib/Cargo.toml @@ -52,9 +52,6 @@ percent-encoding-iri = { git = "https://github.com/ankitects/rust-url.git", rev # pinned as any changes could invalidate sqlite indexes unicase = "=2.6.0" -# keep this at 0.4.19 until an Android-compatible update is ready -chrono = { version = "0.4.19", default-features = false, features = ["std", "clock"] } - criterion = { version = "0.4.0", optional = true } ammonia = "3.3.0" @@ -64,6 +61,7 @@ axum = { version = "0.6.12", features = ["multipart", "macros", "headers"] } axum-client-ip = "0.3.1" blake3 = "1.3.3" bytes = "1.4.0" +chrono = { version = "0.4.26", default-features = false, features = ["std", "clock"] } coarsetime = "0.1.23" convert_case = "0.6.0" difflib = "0.4.0" diff --git a/tools/workspace-hack/Cargo.toml b/tools/workspace-hack/Cargo.toml index 6551cf0e6..9b4657225 100644 --- a/tools/workspace-hack/Cargo.toml +++ b/tools/workspace-hack/Cargo.toml @@ -28,11 +28,9 @@ hashbrown = { version = "0.12", features = ["raw"] } hmac = { version = "0.12", default-features = false, features = ["reset"] } hyper = { version = "0.14", features = ["full"] } indexmap = { version = "1", default-features = false, features = ["std"] } -itertools = { version = "0.10" } log = { version = "0.4", default-features = false, features = ["std"] } num-traits = { version = "0.2" } phf_shared = { version = "0.11", default-features = false, features = ["std"] } -prost = { version = "0.11" } rand = { version = "0.8", features = ["small_rng"] } rand_core = { version = "0.6", default-features = false, features = ["std"] } regex = { version = "1" } @@ -58,21 +56,44 @@ zstd-sys = { version = "2", default-features = false, features = ["legacy", "std [build-dependencies] bytes = { version = "1" } cc = { version = "1", default-features = false, features = ["parallel"] } +clap = { version = "4", features = ["cargo", "derive", "wrap_help"] } +clap_builder = { version = "4", default-features = false, features = ["cargo", "color", "std", "suggestions", "usage", "wrap_help"] } +crossbeam-utils = { version = "0.8" } either = { version = "1" } +flate2 = { version = "1" } +futures-channel = { version = "0.3", features = ["sink"] } +futures-io = { version = "0.3" } +futures-util = { version = "0.3", features = ["channel", "io", "sink"] } getrandom = { version = "0.2", default-features = false, features = ["std"] } hashbrown = { version = "0.12", features = ["raw"] } +hmac = { version = "0.12", default-features = false, features = ["reset"] } +hyper = { version = "0.14", features = ["full"] } indexmap = { version = "1", default-features = false, features = ["std"] } -itertools = { version = "0.10" } log = { version = "0.4", default-features = false, features = ["std"] } +num-traits = { version = "0.2" } phf_shared = { version = "0.11", default-features = false, features = ["std"] } -prost = { version = "0.11" } rand = { version = "0.8", features = ["small_rng"] } rand_core = { version = "0.6", default-features = false, features = ["std"] } regex = { version = "1" } regex-syntax = { version = "0.6" } +scopeguard = { version = "1" } serde = { version = "1", features = ["alloc", "derive", "rc"] } serde_json = { version = "1", features = ["raw_value"] } +sha2 = { version = "0.10" } +snafu = { version = "0.7", features = ["backtraces"] } syn-dff4ba8e3ae991db = { package = "syn", version = "1", features = ["extra-traits", "fold", "full", "visit", "visit-mut"] } syn-f595c2ba2a3f28df = { package = "syn", version = "2", features = ["extra-traits", "full", "visit-mut"] } +time = { version = "0.3", features = ["formatting", "parsing"] } +tokio = { version = "1", features = ["full"] } +tokio-util = { version = "0.7", features = ["codec", "io"] } +tracing = { version = "0.1", features = ["log", "max_level_trace", "release_max_level_debug"] } +tracing-core = { version = "0.1" } +url = { version = "2", features = ["serde"] } +zip = { version = "0.6" } +zstd-5ef9efb8ec2df382 = { package = "zstd", version = "0.12", features = ["zstdmt"] } +zstd-a6292c17cd707f01 = { package = "zstd", version = "0.11" } +zstd-safe-a490c3000a992113 = { package = "zstd-safe", version = "6", default-features = false, features = ["arrays", "legacy", "std", "zdict_builder", "zstdmt"] } +zstd-safe-cdf1610d3e1514e9 = { package = "zstd-safe", version = "5", default-features = false, features = ["arrays", "legacy", "std", "zdict_builder"] } +zstd-sys = { version = "2", default-features = false, features = ["legacy", "std", "zdict_builder", "zstdmt"] } ### END HAKARI SECTION