From 9ef0e0c890f8fb1d3a6e2d6bc369e67862a49494 Mon Sep 17 00:00:00 2001 From: Felix Ableitner Date: Fri, 4 Sep 2020 17:14:58 +0200 Subject: [PATCH] Update dependencies --- server/Cargo.lock | 26 ++++++++++++++++++++------ server/Cargo.toml | 8 ++++---- server/lemmy_api_structs/Cargo.toml | 2 +- server/lemmy_db/Cargo.toml | 6 +++--- server/lemmy_rate_limit/Cargo.toml | 4 ++-- server/lemmy_utils/Cargo.toml | 6 +++--- 6 files changed, 33 insertions(+), 19 deletions(-) diff --git a/server/Cargo.lock b/server/Cargo.lock index 5f3ac4bdb..388f8d0b4 100644 --- a/server/Cargo.lock +++ b/server/Cargo.lock @@ -859,9 +859,9 @@ checksum = "0dbbb57365263e881e805dc77d94697c9118fd94d8da011240555aa7b23445bd" [[package]] name = "comrak" -version = "0.7.0" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e17058cc536cf290563e88787d7b9e6030ce4742943017cc2ffb71f88034021c" +checksum = "0d325e4f2ffff52ca77d995bb675494d5364aa332499d5f7c7fbb28c25e671f6" dependencies = [ "clap", "entities", @@ -869,9 +869,11 @@ dependencies = [ "pest", "pest_derive", "regex", + "shell-words", "twoway", "typed-arena", "unicode_categories", + "xdg", ] [[package]] @@ -3104,6 +3106,12 @@ dependencies = [ "opaque-debug 0.3.0", ] +[[package]] +name = "shell-words" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6fa3938c99da4914afedd13bf3d79bcb6c277d1b2c398d23257a304d9e1b074" + [[package]] name = "signal-hook-registry" version = "1.2.1" @@ -3233,15 +3241,15 @@ checksum = "6446ced80d6c486436db5c078dde11a9f73d42b57fb273121e160b84f63d894c" [[package]] name = "strum" -version = "0.18.0" +version = "0.19.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57bd81eb48f4c437cadc685403cad539345bf703d78e63707418431cecd4522b" +checksum = "3924a58d165da3b7b2922c667ab0673c7b5fd52b5c19ea3442747bcb3cd15abe" [[package]] name = "strum_macros" -version = "0.18.0" +version = "0.19.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87c85aa3f8ea653bfd3ddf25f7ee357ee4d204731f6aa9ad04002306f6e2774c" +checksum = "2d2ab682ecdcae7f5f45ae85cd7c1e6c8e68ea42c8a612d47fedf831c037146a" dependencies = [ "heck", "proc-macro2", @@ -3911,3 +3919,9 @@ dependencies = [ "winapi 0.2.8", "winapi-build", ] + +[[package]] +name = "xdg" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d089681aa106a86fade1b0128fb5daf07d5867a509ab036d99988dec80429a57" diff --git a/server/Cargo.toml b/server/Cargo.toml index ec8a29d00..721ce51e7 100644 --- a/server/Cargo.toml +++ b/server/Cargo.toml @@ -22,7 +22,7 @@ lemmy_rate_limit = { path = "./lemmy_rate_limit" } diesel = "1.4.4" diesel_migrations = "1.4.0" dotenv = "0.15.0" -activitystreams = "0.7.0-alpha.3" +activitystreams = "0.7.0-alpha.4" activitystreams-ext = "0.1.0-alpha.2" bcrypt = "0.8.0" chrono = { version = "0.4.7", features = ["serde"] } @@ -37,8 +37,8 @@ awc = { version = "2.0.0", default-features = false } log = "0.4.0" env_logger = "0.7.1" rand = "0.7.3" -strum = "0.18.0" -strum_macros = "0.18.0" +strum = "0.19.2" +strum_macros = "0.19.2" jsonwebtoken = "7.0.1" lazy_static = "1.3.0" rss = "1.9.0" @@ -53,7 +53,7 @@ futures = "0.3.5" itertools = "0.9.0" uuid = { version = "0.8", features = ["serde", "v4"] } sha2 = "0.9" -async-trait = "0.1.36" +async-trait = "0.1.40" captcha = "0.0.7" anyhow = "1.0.32" thiserror = "1.0.20" diff --git a/server/lemmy_api_structs/Cargo.toml b/server/lemmy_api_structs/Cargo.toml index 64627edff..b442f697d 100644 --- a/server/lemmy_api_structs/Cargo.toml +++ b/server/lemmy_api_structs/Cargo.toml @@ -14,4 +14,4 @@ lemmy_utils = { path = "../lemmy_utils" } serde = { version = "1.0.105", features = ["derive"] } log = "0.4.0" diesel = "1.4.4" -actix-web = { version = "3.0.0-alpha.3", features = ["rustls"] } +actix-web = { version = "3.0.0-beta.3", features = ["rustls"] } diff --git a/server/lemmy_db/Cargo.toml b/server/lemmy_db/Cargo.toml index 36d9d9a77..1ae42a8bd 100644 --- a/server/lemmy_db/Cargo.toml +++ b/server/lemmy_db/Cargo.toml @@ -12,11 +12,11 @@ diesel = { version = "1.4.4", features = ["postgres","chrono","r2d2","64-column- chrono = { version = "0.4.7", features = ["serde"] } serde = { version = "1.0.105", features = ["derive"] } serde_json = { version = "1.0.52", features = ["preserve_order"]} -strum = "0.18.0" -strum_macros = "0.18.0" +strum = "0.19.2" +strum_macros = "0.19.2" log = "0.4.0" sha2 = "0.9" -bcrypt = "0.8.0" +bcrypt = "0.8.2" url = { version = "2.1.1", features = ["serde"] } lazy_static = "1.3.0" regex = "1.3.5" diff --git a/server/lemmy_rate_limit/Cargo.toml b/server/lemmy_rate_limit/Cargo.toml index dc86523ff..c5daaf7cd 100644 --- a/server/lemmy_rate_limit/Cargo.toml +++ b/server/lemmy_rate_limit/Cargo.toml @@ -11,8 +11,8 @@ path = "src/lib.rs" [dependencies] lemmy_utils = { path = "../lemmy_utils" } tokio = "0.2.21" -strum = "0.18.0" -strum_macros = "0.18.0" +strum = "0.19.2" +strum_macros = "0.19.2" futures = "0.3.5" actix-web = { version = "3.0.0", default-features = false, features = ["rustls"] } log = "0.4.0" diff --git a/server/lemmy_utils/Cargo.toml b/server/lemmy_utils/Cargo.toml index be6cb6535..58d0893e0 100644 --- a/server/lemmy_utils/Cargo.toml +++ b/server/lemmy_utils/Cargo.toml @@ -12,16 +12,16 @@ path = "src/lib.rs" [dependencies] regex = "1.3.5" config = { version = "0.10.1", default-features = false, features = ["hjson"] } -chrono = { version = "0.4.7", features = ["serde"] } +chrono = { version = "0.4.15", features = ["serde"] } lettre = "0.9.3" lettre_email = "0.9.4" log = "0.4.0" itertools = "0.9.0" rand = "0.7.3" -serde = { version = "1.0.105", features = ["derive"] } +serde = { version = "1.0.115", features = ["derive"] } serde_json = { version = "1.0.52", features = ["preserve_order"]} thiserror = "1.0.20" -comrak = "0.7" +comrak = "0.8.2" lazy_static = "1.3.0" openssl = "0.10" url = { version = "2.1.1", features = ["serde"] }