dnrops
/
anki
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to Rust 1.74, and update most Rust deps 

hyper has been held back, as neither reqwest nor axum support 1.0 yet
This commit is contained in:
Damien Elmes 2023-11-27 12:23:56 +10:00
parent ecd4c3f172
commit 70b0fbde92
9 changed files with 528 additions and 414 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

602
Cargo.lock generated
View File

File diff suppressed because it is too large Load Diff

44
Cargo.toml
View File

@ -56,7 +56,7 @@ unicase = "=2.6.0" # any changes could invalidate sqlite indexes
ammonia = "3.3.0"
anyhow = "1.0.75"
apple-bundles = "0.17.0"
async-compression = { version = "0.4.4", features = ["zstd", "tokio"] }
async-compression = { version = "0.4.5", features = ["zstd", "tokio"] }
async-stream = "0.3.5"
async-trait = "0.1.74"
axum = { version = "0.6.20", features = ["multipart", "macros", "headers"] }
@ -66,70 +66,70 @@ bytes = "1.5.0"
camino = "1.1.6"
chrono = { version = "0.4.31", default-features = false, features = ["std", "clock"] }
clap = { version = "4.3.24", features = ["derive"] }
coarsetime = "0.1.29"
coarsetime = "0.1.33"
convert_case = "0.6.0"
criterion = { version = "0.5.1" }
csv = "1.3.0"
data-encoding = "2.4.0"
data-encoding = "2.5.0"
difflib = "0.4.0"
flate2 = "1.0.28"
fluent = "0.16.0"
fluent-bundle = "0.15.2"
fluent-syntax = "0.11.0"
fnv = "1.0.7"
futures = "0.3.28"
futures = "0.3.29"
glob = "0.3.1"
globset = "0.4.13"
globset = "0.4.14"
hex = "0.4.3"
htmlescape = "0.3.1"
hyper = "0.14.27"
id_tree = "1.8.0"
inflections = "1.1.1"
intl-memoizer = "0.5.1"
itertools = "0.11.0"
itertools = "0.12.0"
junction = "1.0.0"
lazy_static = "1.4.0"
maplit = "1.0.2"
nom = "7.1.3"
num-format = "0.4.4"
num_cpus = "1.16.0"
num_enum = "0.7.0"
num_enum = "0.7.1"
once_cell = "1.18.0"
phf = { version = "0.11.2", features = ["macros"] }
pin-project = "1.1.3"
plist = "1.5.1"
prettyplease = "0.2.15"
prost = "0.12.1"
prost-build = "0.12.1"
prost = "0.12.3"
prost-build = "0.12.3"
prost-reflect = "0.12.0"
prost-types = "0.12.1"
prost-types = "0.12.3"
pulldown-cmark = "0.9.3"
pyo3 = { version = "0.20.0", features = ["extension-module", "abi3", "abi3-py39"] }
rand = "0.8.5"
regex = "1.10.2"
reqwest = { version = "0.11.22", default-features = false, features = ["json", "socks", "stream", "multipart"] }
rusqlite = { version = "0.29.0", features = ["trace", "functions", "collation", "bundled"] }
rusqlite = { version = "0.30.0", features = ["trace", "functions", "collation", "bundled"] }
scopeguard = "1.2.0"
serde = { version = "1.0.189", features = ["derive"] }
serde = { version = "1.0.193", features = ["derive"] }
serde-aux = "4.2.0"
serde_json = "1.0.107"
serde_repr = "0.1.16"
serde_json = "1.0.108"
serde_repr = "0.1.17"
serde_tuple = "0.5.0"
sha1 = "0.10.6"
sha2 = { version = "0.10.8" }
simple-file-manifest = "0.11.0"
snafu = { version = "0.7.5", features = ["backtraces", "rust_1_61"] }
strum = { version = "0.25.0", features = ["derive"] }
syn = { version = "2.0.38", features = ["parsing", "printing"] }
syn = { version = "2.0.39", features = ["parsing", "printing"] }
tar = "0.4.40"
tempfile = "3.8.0"
termcolor = "1.3.0"
tokio = { version = "1.33", features = ["fs", "rt-multi-thread", "macros", "signal"] }
tokio-util = { version = "0.7.9", features = ["io"] }
tempfile = "3.8.1"
termcolor = "1.4.0"
tokio = { version = "1.34", features = ["fs", "rt-multi-thread", "macros", "signal"] }
tokio-util = { version = "0.7.10", features = ["io"] }
tower-http = { version = "0.4.4", features = ["trace"] }
tracing = { version = "0.1.40", features = ["max_level_trace", "release_max_level_debug"] }
tracing-appender = "0.2.2"
tracing-subscriber = { version = "0.3.17", features = ["fmt", "env-filter"] }
tracing-appender = "0.2.3"
tracing-subscriber = { version = "0.3.18", features = ["fmt", "env-filter"] }
tugger-windows-codesign = "0.10.0"
unic-langid = { version = "0.9.1", features = ["macros"] }
unic-ucd-category = "0.9.0"
@ -137,7 +137,7 @@ unicode-normalization = "0.1.22"
utime = "0.3.1"
walkdir = "2.4.0"
which = "5.0.0"
wiremock = "0.5.19"
wiremock = "0.5.21"
xz2 = "0.1.7"
zip = { version = "0.6.6", default-features = false, features = ["deflate", "time"] }
zstd = { version = "0.13.0", features = ["zstdmt"] }

284
cargo/licenses.json
View File

@ -19,7 +19,7 @@
},
{
"name": "ahash",
"version": "0.8.5",
"version": "0.8.6",
"authors": "Tom Kaitchuck <Tom.Kaitchuck@gmail.com>",
"repository": "https://github.com/tkaitchuck/ahash",
"license": "Apache-2.0 OR MIT",
@ -163,7 +163,7 @@
},
{
"name": "async-compression",
"version": "0.4.4",
"version": "0.4.5",
"authors": "Wim Looman <wim@nemo157.com>|Allen Bui <fairingrey@gmail.com>",
"repository": "https://github.com/Nullus157/async-compression",
"license": "Apache-2.0 OR MIT",
@ -469,7 +469,7 @@
},
{
"name": "coarsetime",
"version": "0.1.29",
"version": "0.1.33",
"authors": "Frank Denis <github@pureftpd.org>",
"repository": "https://github.com/jedisct1/rust-coarsetime",
"license": "ISC",
@ -523,7 +523,7 @@
},
{
"name": "cpufeatures",
"version": "0.2.10",
"version": "0.2.11",
"authors": "RustCrypto Developers",
"repository": "https://github.com/RustCrypto/utils",
"license": "Apache-2.0 OR MIT",
@ -613,7 +613,7 @@
},
{
"name": "data-encoding",
"version": "2.4.0",
"version": "2.5.0",
"authors": "Julien Cretin <git@ia0.eu>",
"repository": "https://github.com/ia0/data-encoding",
"license": "MIT",
@ -748,7 +748,7 @@
},
{
"name": "errno",
"version": "0.3.5",
"version": "0.3.7",
"authors": "Chris Wong <lambda.fairy@gmail.com>",
"repository": "https://github.com/lambda-fairy/rust-errno",
"license": "Apache-2.0 OR MIT",
@ -766,7 +766,7 @@
},
{
"name": "fallible-iterator",
"version": "0.2.0",
"version": "0.3.0",
"authors": "Steven Fackler <sfackler@gmail.com>",
"repository": "https://github.com/sfackler/rust-fallible-iterator",
"license": "Apache-2.0 OR MIT",
@ -883,7 +883,7 @@
},
{
"name": "form_urlencoded",
"version": "1.2.0",
"version": "1.2.1",
"authors": "The rust-url developers",
"repository": "https://github.com/servo/rust-url",
"license": "Apache-2.0 OR MIT",
@ -919,7 +919,7 @@
},
{
"name": "futures",
"version": "0.3.28",
"version": "0.3.29",
"authors": null,
"repository": "https://github.com/rust-lang/futures-rs",
"license": "Apache-2.0 OR MIT",
@ -928,7 +928,7 @@
},
{
"name": "futures-channel",
"version": "0.3.28",
"version": "0.3.29",
"authors": null,
"repository": "https://github.com/rust-lang/futures-rs",
"license": "Apache-2.0 OR MIT",
@ -937,7 +937,7 @@
},
{
"name": "futures-core",
"version": "0.3.28",
"version": "0.3.29",
"authors": null,
"repository": "https://github.com/rust-lang/futures-rs",
"license": "Apache-2.0 OR MIT",
@ -946,7 +946,7 @@
},
{
"name": "futures-executor",
"version": "0.3.28",
"version": "0.3.29",
"authors": null,
"repository": "https://github.com/rust-lang/futures-rs",
"license": "Apache-2.0 OR MIT",
@ -955,7 +955,7 @@
},
{
"name": "futures-io",
"version": "0.3.28",
"version": "0.3.29",
"authors": null,
"repository": "https://github.com/rust-lang/futures-rs",
"license": "Apache-2.0 OR MIT",
@ -973,7 +973,7 @@
},
{
"name": "futures-macro",
"version": "0.3.28",
"version": "0.3.29",
"authors": null,
"repository": "https://github.com/rust-lang/futures-rs",
"license": "Apache-2.0 OR MIT",
@ -982,7 +982,7 @@
},
{
"name": "futures-sink",
"version": "0.3.28",
"version": "0.3.29",
"authors": null,
"repository": "https://github.com/rust-lang/futures-rs",
"license": "Apache-2.0 OR MIT",
@ -991,7 +991,7 @@
},
{
"name": "futures-task",
"version": "0.3.28",
"version": "0.3.29",
"authors": null,
"repository": "https://github.com/rust-lang/futures-rs",
"license": "Apache-2.0 OR MIT",
@ -1009,7 +1009,7 @@
},
{
"name": "futures-util",
"version": "0.3.28",
"version": "0.3.29",
"authors": null,
"repository": "https://github.com/rust-lang/futures-rs",
"license": "Apache-2.0 OR MIT",
@ -1045,7 +1045,7 @@
},
{
"name": "getrandom",
"version": "0.2.10",
"version": "0.2.11",
"authors": "The Rand Project Developers",
"repository": "https://github.com/rust-random/getrandom",
"license": "Apache-2.0 OR MIT",
@ -1054,7 +1054,7 @@
},
{
"name": "gimli",
"version": "0.28.0",
"version": "0.28.1",
"authors": null,
"repository": "https://github.com/gimli-rs/gimli",
"license": "Apache-2.0 OR MIT",
@ -1063,7 +1063,7 @@
},
{
"name": "h2",
"version": "0.3.21",
"version": "0.3.22",
"authors": "Carl Lerche <me@carllerche.com>|Sean McArthur <sean@seanmonstar.com>",
"repository": "https://github.com/hyperium/h2",
"license": "MIT",
@ -1081,16 +1081,7 @@
},
{
"name": "hashbrown",
"version": "0.12.3",
"authors": "Amanieu d'Antras <amanieu@gmail.com>",
"repository": "https://github.com/rust-lang/hashbrown",
"license": "Apache-2.0 OR MIT",
"license_file": null,
"description": "A Rust port of Google's SwissTable hash map"
},
{
"name": "hashbrown",
"version": "0.14.2",
"version": "0.14.3",
"authors": "Amanieu d'Antras <amanieu@gmail.com>",
"repository": "https://github.com/rust-lang/hashbrown",
"license": "Apache-2.0 OR MIT",
@ -1180,7 +1171,7 @@
},
{
"name": "http",
"version": "0.2.9",
"version": "0.2.11",
"authors": "Alex Crichton <alex@alexcrichton.com>|Carl Lerche <me@carllerche.com>|Sean McArthur <sean@seanmonstar.com>",
"repository": "https://github.com/hyperium/http",
"license": "Apache-2.0 OR MIT",
@ -1243,7 +1234,7 @@
},
{
"name": "hyper-rustls",
"version": "0.24.1",
"version": "0.24.2",
"authors": null,
"repository": "https://github.com/rustls/hyper-rustls",
"license": "Apache-2.0 OR ISC OR MIT",
@ -1288,7 +1279,7 @@
},
{
"name": "idna",
"version": "0.4.0",
"version": "0.5.0",
"authors": "The rust-url developers",
"repository": "https://github.com/servo/rust-url/",
"license": "Apache-2.0 OR MIT",
@ -1297,16 +1288,7 @@
},
{
"name": "indexmap",
"version": "1.9.3",
"authors": null,
"repository": "https://github.com/bluss/indexmap",
"license": "Apache-2.0 OR MIT",
"license_file": null,
"description": "A hash table with consistent order and fast iteration."
},
{
"name": "indexmap",
"version": "2.0.2",
"version": "2.1.0",
"authors": null,
"repository": "https://github.com/bluss/indexmap",
"license": "Apache-2.0 OR MIT",
@ -1369,7 +1351,7 @@
},
{
"name": "itertools",
"version": "0.10.5",
"version": "0.11.0",
"authors": "bluss",
"repository": "https://github.com/rust-itertools/itertools",
"license": "Apache-2.0 OR MIT",
@ -1378,7 +1360,7 @@
},
{
"name": "itertools",
"version": "0.11.0",
"version": "0.12.0",
"authors": "bluss",
"repository": "https://github.com/rust-itertools/itertools",
"license": "Apache-2.0 OR MIT",
@ -1405,7 +1387,7 @@
},
{
"name": "js-sys",
"version": "0.3.64",
"version": "0.3.65",
"authors": "The wasm-bindgen Developers",
"repository": "https://github.com/rustwasm/wasm-bindgen/tree/master/crates/js-sys",
"license": "Apache-2.0 OR MIT",
@ -1423,7 +1405,7 @@
},
{
"name": "libc",
"version": "0.2.149",
"version": "0.2.150",
"authors": "The Rust Project Developers",
"repository": "https://github.com/rust-lang/libc",
"license": "Apache-2.0 OR MIT",
@ -1439,9 +1421,18 @@
"license_file": null,
"description": "libm in pure Rust"
},
{
"name": "libredox",
"version": "0.0.1",
"authors": "4lDO2 <4lDO2@protonmail.com>",
"repository": "https://gitlab.redox-os.org/redox-os/libredox.git",
"license": "MIT",
"license_file": null,
"description": "Redox stable ABI"
},
{
"name": "libsqlite3-sys",
"version": "0.26.0",
"version": "0.27.0",
"authors": "The rusqlite developers",
"repository": "https://github.com/rusqlite/rusqlite",
"license": "MIT",
@ -1450,7 +1441,7 @@
},
{
"name": "linux-raw-sys",
"version": "0.4.10",
"version": "0.4.11",
"authors": "Dan Gohman <dev@sunfishcode.online>",
"repository": "https://github.com/sunfishcode/linux-raw-sys",
"license": "Apache-2.0 OR Apache-2.0 WITH LLVM-exception OR MIT",
@ -1729,7 +1720,7 @@
},
{
"name": "num_enum",
"version": "0.7.0",
"version": "0.7.1",
"authors": "Daniel Wagner-Hall <dawagner@gmail.com>|Daniel Henry-Mantilla <daniel.henry.mantilla@gmail.com>|Vincent Esche <regexident@gmail.com>",
"repository": "https://github.com/illicitonion/num_enum",
"license": "Apache-2.0 OR BSD-3-Clause OR MIT",
@ -1738,7 +1729,7 @@
},
{
"name": "num_enum_derive",
"version": "0.7.0",
"version": "0.7.1",
"authors": "Daniel Wagner-Hall <dawagner@gmail.com>|Daniel Henry-Mantilla <daniel.henry.mantilla@gmail.com>|Vincent Esche <regexident@gmail.com>",
"repository": "https://github.com/illicitonion/num_enum",
"license": "Apache-2.0 OR BSD-3-Clause OR MIT",
@ -1765,7 +1756,7 @@
},
{
"name": "openssl",
"version": "0.10.57",
"version": "0.10.60",
"authors": "Steven Fackler <sfackler@gmail.com>",
"repository": "https://github.com/sfackler/rust-openssl",
"license": "Apache-2.0",
@ -1792,7 +1783,7 @@
},
{
"name": "openssl-sys",
"version": "0.9.93",
"version": "0.9.96",
"authors": "Alex Crichton <alex@alexcrichton.com>|Steven Fackler <sfackler@gmail.com>",
"repository": "https://github.com/sfackler/rust-openssl",
"license": "MIT",
@ -1855,7 +1846,7 @@
},
{
"name": "percent-encoding",
"version": "2.3.0",
"version": "2.3.1",
"authors": "The rust-url developers",
"repository": "https://github.com/servo/rust-url/",
"license": "Apache-2.0 OR MIT",
@ -2035,7 +2026,7 @@
},
{
"name": "proc-macro-crate",
"version": "1.3.1",
"version": "2.0.0",
"authors": "Bastian Köcher <git@kchr.de>",
"repository": "https://github.com/bkchr/proc-macro-crate",
"license": "Apache-2.0 OR MIT",
@ -2053,7 +2044,7 @@
},
{
"name": "proc-macro2",
"version": "1.0.69",
"version": "1.0.70",
"authors": "David Tolnay <dtolnay@gmail.com>|Alex Crichton <alex@alexcrichton.com>",
"repository": "https://github.com/dtolnay/proc-macro2",
"license": "Apache-2.0 OR MIT",
@ -2062,7 +2053,7 @@
},
{
"name": "prost",
"version": "0.12.1",
"version": "0.12.3",
"authors": "Dan Burkert <dan@danburkert.com>|Lucio Franco <luciofranco14@gmail.com|Tokio Contributors <team@tokio.rs>",
"repository": "https://github.com/tokio-rs/prost",
"license": "Apache-2.0",
@ -2071,7 +2062,7 @@
},
{
"name": "prost-build",
"version": "0.12.1",
"version": "0.12.3",
"authors": "Dan Burkert <dan@danburkert.com>|Lucio Franco <luciofranco14@gmail.com>|Tokio Contributors <team@tokio.rs>",
"repository": "https://github.com/tokio-rs/prost",
"license": "Apache-2.0",
@ -2080,7 +2071,7 @@
},
{
"name": "prost-derive",
"version": "0.12.1",
"version": "0.12.3",
"authors": "Dan Burkert <dan@danburkert.com>|Lucio Franco <luciofranco14@gmail.com>|Tokio Contributors <team@tokio.rs>",
"repository": "https://github.com/tokio-rs/prost",
"license": "Apache-2.0",
@ -2098,7 +2089,7 @@
},
{
"name": "prost-types",
"version": "0.12.1",
"version": "0.12.3",
"authors": "Dan Burkert <dan@danburkert.com>|Lucio Franco <luciofranco14@gmail.com|Tokio Contributors <team@tokio.rs>",
"repository": "https://github.com/tokio-rs/prost",
"license": "Apache-2.0",
@ -2222,24 +2213,6 @@
"license_file": null,
"description": "Core APIs for Rayon"
},
{
"name": "redox_syscall",
"version": "0.2.16",
"authors": "Jeremy Soller <jackpot51@gmail.com>",
"repository": "https://gitlab.redox-os.org/redox-os/syscall",
"license": "MIT",
"license_file": null,
"description": "A Rust library to access raw Redox system calls"
},
{
"name": "redox_syscall",
"version": "0.3.5",
"authors": "Jeremy Soller <jackpot51@gmail.com>",
"repository": "https://gitlab.redox-os.org/redox-os/syscall",
"license": "MIT",
"license_file": null,
"description": "A Rust library to access raw Redox system calls"
},
{
"name": "redox_syscall",
"version": "0.4.1",
@ -2251,7 +2224,7 @@
},
{
"name": "redox_users",
"version": "0.4.3",
"version": "0.4.4",
"authors": "Jose Narvaez <goyox86@gmail.com>|Wesley Hershberger <mggmugginsmc@gmail.com>",
"repository": "https://gitlab.redox-os.org/redox-os/users",
"license": "MIT",
@ -2350,7 +2323,7 @@
},
{
"name": "rusqlite",
"version": "0.29.0",
"version": "0.30.0",
"authors": "The rusqlite developers",
"repository": "https://github.com/rusqlite/rusqlite",
"license": "MIT",
@ -2377,7 +2350,7 @@
},
{
"name": "rustix",
"version": "0.38.20",
"version": "0.38.25",
"authors": "Dan Gohman <dev@sunfishcode.online>|Jakub Konka <kubkon@jakubkonka.com>",
"repository": "https://github.com/bytecodealliance/rustix",
"license": "Apache-2.0 OR Apache-2.0 WITH LLVM-exception OR MIT",
@ -2386,7 +2359,7 @@
},
{
"name": "rustls",
"version": "0.21.8",
"version": "0.21.9",
"authors": null,
"repository": "https://github.com/rustls/rustls",
"license": "Apache-2.0 OR ISC OR MIT",
@ -2404,7 +2377,7 @@
},
{
"name": "rustls-pemfile",
"version": "1.0.3",
"version": "1.0.4",
"authors": null,
"repository": "https://github.com/rustls/pemfile",
"license": "Apache-2.0 OR ISC OR MIT",
@ -2521,7 +2494,7 @@
},
{
"name": "serde",
"version": "1.0.189",
"version": "1.0.193",
"authors": "Erick Tryzelaar <erick.tryzelaar@gmail.com>|David Tolnay <dtolnay@gmail.com>",
"repository": "https://github.com/serde-rs/serde",
"license": "Apache-2.0 OR MIT",
@ -2539,7 +2512,7 @@
},
{
"name": "serde_derive",
"version": "1.0.189",
"version": "1.0.193",
"authors": "Erick Tryzelaar <erick.tryzelaar@gmail.com>|David Tolnay <dtolnay@gmail.com>",
"repository": "https://github.com/serde-rs/serde",
"license": "Apache-2.0 OR MIT",
@ -2548,7 +2521,7 @@
},
{
"name": "serde_json",
"version": "1.0.107",
"version": "1.0.108",
"authors": "Erick Tryzelaar <erick.tryzelaar@gmail.com>|David Tolnay <dtolnay@gmail.com>",
"repository": "https://github.com/serde-rs/json",
"license": "Apache-2.0 OR MIT",
@ -2575,7 +2548,7 @@
},
{
"name": "serde_repr",
"version": "0.1.16",
"version": "0.1.17",
"authors": "David Tolnay <dtolnay@gmail.com>",
"repository": "https://github.com/dtolnay/serde-repr",
"license": "Apache-2.0 OR MIT",
@ -2656,7 +2629,7 @@
},
{
"name": "smallvec",
"version": "1.11.1",
"version": "1.11.2",
"authors": "The Servo Project Developers",
"repository": "https://github.com/servo/rust-smallvec",
"license": "Apache-2.0 OR MIT",
@ -2773,7 +2746,7 @@
},
{
"name": "syn",
"version": "2.0.38",
"version": "2.0.39",
"authors": "David Tolnay <dtolnay@gmail.com>",
"repository": "https://github.com/dtolnay/syn",
"license": "Apache-2.0 OR MIT",
@ -2809,7 +2782,7 @@
},
{
"name": "tempfile",
"version": "3.8.0",
"version": "3.8.1",
"authors": "Steven Allen <steven@stebalien.com>|The Rust Project Developers|Ashley Mannix <ashleymannix@live.com.au>|Jason White <me@jasonwhite.io>",
"repository": "https://github.com/Stebalien/tempfile",
"license": "Apache-2.0 OR MIT",
@ -2890,7 +2863,7 @@
},
{
"name": "tinystr",
"version": "0.7.4",
"version": "0.7.5",
"authors": "The ICU4X Project Developers",
"repository": "https://github.com/unicode-org/icu4x",
"license": null,
@ -2917,7 +2890,7 @@
},
{
"name": "tokio",
"version": "1.33.0",
"version": "1.34.0",
"authors": "Tokio Contributors <team@tokio.rs>",
"repository": "https://github.com/tokio-rs/tokio",
"license": "MIT",
@ -2926,7 +2899,7 @@
},
{
"name": "tokio-macros",
"version": "2.1.0",
"version": "2.2.0",
"authors": "Tokio Contributors <team@tokio.rs>",
"repository": "https://github.com/tokio-rs/tokio",
"license": "MIT",
@ -2962,7 +2935,7 @@
},
{
"name": "tokio-util",
"version": "0.7.9",
"version": "0.7.10",
"authors": "Tokio Contributors <team@tokio.rs>",
"repository": "https://github.com/tokio-rs/tokio",
"license": "MIT",
@ -2980,7 +2953,7 @@
},
{
"name": "toml_edit",
"version": "0.19.15",
"version": "0.20.7",
"authors": "Andronik Ordian <write@reusable.software>|Ed Page <eopage@gmail.com>",
"repository": "https://github.com/toml-rs/toml",
"license": "Apache-2.0 OR MIT",
@ -3034,7 +3007,7 @@
},
{
"name": "tracing-appender",
"version": "0.2.2",
"version": "0.2.3",
"authors": "Zeki Sherif <zekshi@amazon.com>|Tokio Contributors <team@tokio.rs>",
"repository": "https://github.com/tokio-rs/tracing",
"license": "MIT",
@ -3061,7 +3034,7 @@
},
{
"name": "tracing-log",
"version": "0.1.4",
"version": "0.2.0",
"authors": "Tokio Contributors <team@tokio.rs>",
"repository": "https://github.com/tokio-rs/tracing",
"license": "MIT",
@ -3070,7 +3043,7 @@
},
{
"name": "tracing-subscriber",
"version": "0.3.17",
"version": "0.3.18",
"authors": "Eliza Weisman <eliza@buoyant.io>|David Barsky <me@davidbarsky.com>|Tokio Contributors <team@tokio.rs>",
"repository": "https://github.com/tokio-rs/tracing",
"license": "MIT",
@ -3250,7 +3223,7 @@
},
{
"name": "url",
"version": "2.4.1",
"version": "2.5.0",
"authors": "The rust-url developers",
"repository": "https://github.com/servo/rust-url",
"license": "Apache-2.0 OR MIT",
@ -3277,7 +3250,7 @@
},
{
"name": "uuid",
"version": "1.5.0",
"version": "1.6.1",
"authors": "Ashley Mannix<ashleymannix@live.com.au>|Christopher Armstrong|Dylan DPC<dylan.dpc@gmail.com>|Hunar Roop Kahlon<hunar.roop@gmail.com>",
"repository": "https://github.com/uuid-rs/uuid",
"license": "Apache-2.0 OR MIT",
@ -3358,7 +3331,7 @@
},
{
"name": "wasm-bindgen",
"version": "0.2.87",
"version": "0.2.88",
"authors": "The wasm-bindgen Developers",
"repository": "https://github.com/rustwasm/wasm-bindgen",
"license": "Apache-2.0 OR MIT",
@ -3367,7 +3340,7 @@
},
{
"name": "wasm-bindgen-backend",
"version": "0.2.87",
"version": "0.2.88",
"authors": "The wasm-bindgen Developers",
"repository": "https://github.com/rustwasm/wasm-bindgen/tree/master/crates/backend",
"license": "Apache-2.0 OR MIT",
@ -3376,7 +3349,7 @@
},
{
"name": "wasm-bindgen-futures",
"version": "0.4.37",
"version": "0.4.38",
"authors": "The wasm-bindgen Developers",
"repository": "https://github.com/rustwasm/wasm-bindgen/tree/master/crates/futures",
"license": "Apache-2.0 OR MIT",
@ -3385,7 +3358,7 @@
},
{
"name": "wasm-bindgen-macro",
"version": "0.2.87",
"version": "0.2.88",
"authors": "The wasm-bindgen Developers",
"repository": "https://github.com/rustwasm/wasm-bindgen/tree/master/crates/macro",
"license": "Apache-2.0 OR MIT",
@ -3394,7 +3367,7 @@
},
{
"name": "wasm-bindgen-macro-support",
"version": "0.2.87",
"version": "0.2.88",
"authors": "The wasm-bindgen Developers",
"repository": "https://github.com/rustwasm/wasm-bindgen/tree/master/crates/macro-support",
"license": "Apache-2.0 OR MIT",
@ -3403,7 +3376,7 @@
},
{
"name": "wasm-bindgen-shared",
"version": "0.2.87",
"version": "0.2.88",
"authors": "The wasm-bindgen Developers",
"repository": "https://github.com/rustwasm/wasm-bindgen/tree/master/crates/shared",
"license": "Apache-2.0 OR MIT",
@ -3421,7 +3394,7 @@
},
{
"name": "web-sys",
"version": "0.3.64",
"version": "0.3.65",
"authors": "The wasm-bindgen Developers",
"repository": "https://github.com/rustwasm/wasm-bindgen/tree/master/crates/web-sys",
"license": "Apache-2.0 OR MIT",
@ -3430,7 +3403,7 @@
},
{
"name": "webpki-roots",
"version": "0.25.2",
"version": "0.25.3",
"authors": null,
"repository": "https://github.com/rustls/webpki-roots",
"license": "MPL-2.0",
@ -3484,7 +3457,7 @@
},
{
"name": "windows",
"version": "0.51.1",
"version": "0.52.0",
"authors": "Microsoft",
"repository": "https://github.com/microsoft/windows-rs",
"license": "Apache-2.0 OR MIT",
@ -3500,6 +3473,15 @@
"license_file": null,
"description": "Rust for Windows"
},
{
"name": "windows-core",
"version": "0.52.0",
"authors": "Microsoft",
"repository": "https://github.com/microsoft/windows-rs",
"license": "Apache-2.0 OR MIT",
"license_file": null,
"description": "Rust for Windows"
},
{
"name": "windows-sys",
"version": "0.48.0",
@ -3518,6 +3500,15 @@
"license_file": null,
"description": "Import libs for Windows"
},
{
"name": "windows-targets",
"version": "0.52.0",
"authors": "Microsoft",
"repository": "https://github.com/microsoft/windows-rs",
"license": "Apache-2.0 OR MIT",
"license_file": null,
"description": "Import libs for Windows"
},
{
"name": "windows_aarch64_gnullvm",
"version": "0.48.5",
@ -3527,6 +3518,15 @@
"license_file": null,
"description": "Import lib for Windows"
},
{
"name": "windows_aarch64_gnullvm",
"version": "0.52.0",
"authors": "Microsoft",
"repository": "https://github.com/microsoft/windows-rs",
"license": "Apache-2.0 OR MIT",
"license_file": null,
"description": "Import lib for Windows"
},
{
"name": "windows_aarch64_msvc",
"version": "0.48.5",
@ -3536,6 +3536,15 @@
"license_file": null,
"description": "Import lib for Windows"
},
{
"name": "windows_aarch64_msvc",
"version": "0.52.0",
"authors": "Microsoft",
"repository": "https://github.com/microsoft/windows-rs",
"license": "Apache-2.0 OR MIT",
"license_file": null,
"description": "Import lib for Windows"
},
{
"name": "windows_i686_gnu",
"version": "0.48.5",
@ -3545,6 +3554,15 @@
"license_file": null,
"description": "Import lib for Windows"
},
{
"name": "windows_i686_gnu",
"version": "0.52.0",
"authors": "Microsoft",
"repository": "https://github.com/microsoft/windows-rs",
"license": "Apache-2.0 OR MIT",
"license_file": null,
"description": "Import lib for Windows"
},
{
"name": "windows_i686_msvc",
"version": "0.48.5",
@ -3554,6 +3572,15 @@
"license_file": null,
"description": "Import lib for Windows"
},
{
"name": "windows_i686_msvc",
"version": "0.52.0",
"authors": "Microsoft",
"repository": "https://github.com/microsoft/windows-rs",
"license": "Apache-2.0 OR MIT",
"license_file": null,
"description": "Import lib for Windows"
},
{
"name": "windows_x86_64_gnu",
"version": "0.48.5",
@ -3563,6 +3590,15 @@
"license_file": null,
"description": "Import lib for Windows"
},
{
"name": "windows_x86_64_gnu",
"version": "0.52.0",
"authors": "Microsoft",
"repository": "https://github.com/microsoft/windows-rs",
"license": "Apache-2.0 OR MIT",
"license_file": null,
"description": "Import lib for Windows"
},
{
"name": "windows_x86_64_gnullvm",
"version": "0.48.5",
@ -3572,6 +3608,15 @@
"license_file": null,
"description": "Import lib for Windows"
},
{
"name": "windows_x86_64_gnullvm",
"version": "0.52.0",
"authors": "Microsoft",
"repository": "https://github.com/microsoft/windows-rs",
"license": "Apache-2.0 OR MIT",
"license_file": null,
"description": "Import lib for Windows"
},
{
"name": "windows_x86_64_msvc",
"version": "0.48.5",
@ -3581,9 +3626,18 @@
"license_file": null,
"description": "Import lib for Windows"
},
{
"name": "windows_x86_64_msvc",
"version": "0.52.0",
"authors": "Microsoft",
"repository": "https://github.com/microsoft/windows-rs",
"license": "Apache-2.0 OR MIT",
"license_file": null,
"description": "Import lib for Windows"
},
{
"name": "winnow",
"version": "0.5.17",
"version": "0.5.19",
"authors": null,
"repository": "https://github.com/winnow-rs/winnow",
"license": "MIT",
@ -3601,7 +3655,7 @@
},
{
"name": "wiremock",
"version": "0.5.19",
"version": "0.5.21",
"authors": "Luca Palmieri <rust@lpalmieri.com>",
"repository": "https://github.com/LukeMathWalker/wiremock-rs",
"license": "Apache-2.0 OR MIT",
@ -3610,19 +3664,19 @@
},
{
"name": "zerocopy",
"version": "0.7.13",
"version": "0.7.26",
"authors": "Joshua Liebow-Feeser <joshlf@google.com>",
"repository": "https://github.com/google/zerocopy",
"license": "BSD-2-Clause",
"license": "Apache-2.0 OR BSD-2-Clause OR MIT",
"license_file": null,
"description": "Utilities for zero-copy parsing and serialization"
},
{
"name": "zerocopy-derive",
"version": "0.7.13",
"version": "0.7.26",
"authors": "Joshua Liebow-Feeser <joshlf@google.com>",
"repository": "https://github.com/google/zerocopy",
"license": "BSD-2-Clause",
"license": "Apache-2.0 OR BSD-2-Clause OR MIT",
"license_file": null,
"description": "Custom derive for traits from the zerocopy crate"
},

2
ftl/src/string/transform.rs
View File

@ -50,7 +50,7 @@ pub fn transform(args: TransformArgs) -> Result<()> {
}
if let Some(template_dir) = super::additional_template_folder(&args.lang_folder) {
// Our templates are also stored in the source tree, and need to be updated too.
for ftl in paths_in_dir(&template_dir)? {
for ftl in paths_in_dir(template_dir)? {
transform_ftl(&ftl, &regex, &args)?;
}
}

2
rslib/Cargo.toml
View File

@ -106,5 +106,5 @@ zip.workspace = true
zstd.workspace = true
[target.'cfg(windows)'.dependencies.windows]
version = "0.51.1"
version = "0.52.0"
features = ["Media_SpeechSynthesis", "Foundation_Collections", "Storage_Streams"]

2
rslib/src/deckconfig/service.rs
View File

@ -51,7 +51,7 @@ impl crate::services::DeckConfigService for Collection {
) -> Result<generic::Json> {
let conf = Collection::get_deck_config(self, input.into(), true)?.unwrap();
let conf: DeckConfSchema11 = conf.into();
Ok(serde_json::to_vec(&conf)?).map(Into::into)
Ok(serde_json::to_vec(&conf)?.into())
}
fn new_deck_config_legacy(&mut self) -> Result<generic::Json> {

2
rslib/src/notetype/service.rs
View File

@ -111,7 +111,7 @@ impl crate::services::NotetypesService for Collection {
let schema11: NotetypeSchema11 =
self.storage.get_notetype(ntid)?.or_not_found(ntid)?.into();
Ok(serde_json::to_vec(&schema11)?).map(Into::into)
Ok(serde_json::to_vec(&schema11)?.into())
}
fn get_notetype_names(&mut self) -> error::Result<anki_proto::notetypes::NotetypeNames> {

2
rslib/src/search/service/mod.rs
View File

@ -122,7 +122,7 @@ impl crate::services::SearchService for Collection {
fn set_active_browser_columns(&mut self, input: generic::StringList) -> Result<()> {
self.state.active_browser_columns = Some(Arc::new(string_list_to_browser_columns(input)));
Ok(()).map(Into::into)
Ok(())
}
fn browser_row_for_id(

2
rust-toolchain.toml
View File

@ -1,3 +1,3 @@
[toolchain]
# older versions may fail to compile; newer versions may fail the clippy tests
channel = "1.73"
channel = "1.74"