From: Dessalines Date: Mon, 21 Dec 2020 14:34:59 +0000 (-0500) Subject: Upgrading deps. X-Git-Url: http://these/git/%7B%60%24%7BwebArchiveUrl%7D/%22%7B%7D/%22https:/nerdica.net/%7Bthis.getImage%28%29%7D?a=commitdiff_plain;h=e5a65d580753656bdec1e367f68807c7bcf957a8;p=lemmy.git Upgrading deps. --- diff --git a/Cargo.lock b/Cargo.lock index 060fa891..a639b800 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -146,7 +146,7 @@ dependencies = [ "mime", "percent-encoding", "pin-project 1.0.2", - "rand", + "rand 0.7.3", "regex", "serde 1.0.118", "serde_json", @@ -399,9 +399,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.35" +version = "1.0.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c0df63cb2955042487fad3aefd2c6e3ae7389ac5dc1beb28921de0b69f779d4" +checksum = "68803225a7b13e47191bab76f2687382b60d259e8cf37f6e1893658b84bb9479" [[package]] name = "arrayvec" @@ -464,7 +464,7 @@ dependencies = [ "log", "mime", "percent-encoding", - "rand", + "rand 0.7.3", "rustls", "serde 1.0.118", "serde_json", @@ -495,7 +495,7 @@ dependencies = [ "chrono", "log", "num_cpus", - "rand", + "rand 0.7.3", "serde 1.0.118", "serde_json", "thiserror", @@ -708,7 +708,7 @@ dependencies = [ "hound", "image", "lodepng", - "rand", + "rand 0.7.3", "serde_json", ] @@ -1369,9 +1369,9 @@ checksum = "d7afe4a420e3fe79967a00898cc1f4db7c8a49a9333a29f8a4bd76a253d5cd04" [[package]] name = "heck" -version = "0.3.1" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20564e78d53d2bb135c343b3f47714a56af2061f1c928fdb541dc7b9fdd94205" +checksum = "87cbf45460356b7deeb5e3415b5563308c0a9b057c85e12b06ad551f98d0a6ac" dependencies = [ "unicode-segmentation", ] @@ -1725,7 +1725,7 @@ dependencies = [ "lemmy_websocket", "log", "openssl", - "rand", + "rand 0.8.0", "reqwest", "serde 1.0.118", "serde_json", @@ -1770,7 +1770,7 @@ dependencies = [ "log", "openssl", "percent-encoding", - "rand", + "rand 0.8.0", "reqwest", "serde 1.0.118", "serde_json", @@ -1899,7 +1899,7 @@ dependencies = [ "log", "openssl", "percent-encoding", - "rand", + "rand 0.8.0", "regex", "reqwest", "serde 1.0.118", @@ -1923,7 +1923,7 @@ dependencies = [ "lemmy_structs", "lemmy_utils", "log", - "rand", + "rand 0.8.0", "reqwest", "serde 1.0.118", "serde_json", @@ -1948,7 +1948,7 @@ dependencies = [ "once_cell", "quoted_printable", "r2d2", - "rand", + "rand 0.7.3", "regex", "serde 1.0.118", "serde_json", @@ -2569,9 +2569,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.7" +version = "1.0.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa563d17ecb180e500da1cfd2b028310ac758de548efdd203e18f283af693f37" +checksum = "991431c3519a3f36861882da93630ce66b52918dcf1b8e2fd66b397fc96f28df" dependencies = [ "proc-macro2", ] @@ -2607,9 +2607,21 @@ checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03" dependencies = [ "getrandom 0.1.15", "libc", - "rand_chacha", - "rand_core", - "rand_hc", + "rand_chacha 0.2.2", + "rand_core 0.5.1", + "rand_hc 0.2.0", +] + +[[package]] +name = "rand" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a76330fb486679b4ace3670f117bbc9e16204005c4bde9c4bd372f45bed34f12" +dependencies = [ + "libc", + "rand_chacha 0.3.0", + "rand_core 0.6.0", + "rand_hc 0.3.0", ] [[package]] @@ -2619,7 +2631,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402" dependencies = [ "ppv-lite86", - "rand_core", + "rand_core 0.5.1", +] + +[[package]] +name = "rand_chacha" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e12735cf05c9e10bf21534da50a147b924d555dc7a547c42e6bb2d5b6017ae0d" +dependencies = [ + "ppv-lite86", + "rand_core 0.6.0", ] [[package]] @@ -2631,13 +2653,31 @@ dependencies = [ "getrandom 0.1.15", ] +[[package]] +name = "rand_core" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8b34ba8cfb21243bd8df91854c830ff0d785fff2e82ebd4434c2644cb9ada18" +dependencies = [ + "getrandom 0.2.0", +] + [[package]] name = "rand_hc" version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c" dependencies = [ - "rand_core", + "rand_core 0.5.1", +] + +[[package]] +name = "rand_hc" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3190ef7066a446f2e7f42e239d161e905420ccab01eb967c9eb27d21b2322a73" +dependencies = [ + "rand_core 0.6.0", ] [[package]] @@ -3047,9 +3087,9 @@ checksum = "ae524f056d7d770e174287294f562e95044c68e88dec909a00d2094805db9d75" [[package]] name = "socket2" -version = "0.3.18" +version = "0.3.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97e0e9fd577458a4f61fb91fcb559ea2afecc54c934119421f9f5d3d5b1a1057" +checksum = "122e570113d28d773067fab24266b66753f6ea915758651696b6e35e49f88d6e" dependencies = [ "cfg-if 1.0.0", "libc", @@ -3152,9 +3192,9 @@ dependencies = [ [[package]] name = "syn" -version = "1.0.54" +version = "1.0.55" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a2af957a63d6bd42255c359c93d9bfdb97076bd3b820897ce55ffbfbf107f44" +checksum = "a571a711dddd09019ccc628e1b17fe87c59b09d513c06c026877aa708334f37a" dependencies = [ "proc-macro2", "quote", @@ -3175,7 +3215,7 @@ checksum = "7a6e24d9338a0a5be79593e2fa15a648add6138caa803e2d5bc782c371732ca9" dependencies = [ "cfg-if 0.1.10", "libc", - "rand", + "rand 0.7.3", "redox_syscall", "remove_dir_all", "winapi 0.3.9", @@ -3421,7 +3461,7 @@ dependencies = [ "idna", "lazy_static", "log", - "rand", + "rand 0.7.3", "smallvec", "thiserror", "tokio 0.2.24", @@ -3558,7 +3598,7 @@ version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9fde2f6a4bea1d6e007c4ad38c6839fa71cbb63b6dbf5b595aa38dc9b1093c11" dependencies = [ - "rand", + "rand 0.7.3", "serde 1.0.118", ] diff --git a/Cargo.toml b/Cargo.toml index 7bed59d1..e7714065 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -46,7 +46,7 @@ openssl = "0.10.31" http-signature-normalization-actix = { version = "0.4.1", default-features = false, features = ["sha-2"] } tokio = "0.3.6" sha2 = "0.9.2" -anyhow = "1.0.35" +anyhow = "1.0.36" reqwest = { version = "0.10.10", features = ["json"] } activitystreams = "0.7.0-alpha.8" actix-rt = { version = "1.1.1", default-features = false } diff --git a/lemmy_api/Cargo.toml b/lemmy_api/Cargo.toml index f4a10924..fc845c11 100644 --- a/lemmy_api/Cargo.toml +++ b/lemmy_api/Cargo.toml @@ -26,7 +26,7 @@ actix-web = { version = "3.3.2", default-features = false } actix-rt = { version = "1.1.1", default-features = false } awc = { version = "2.0.3", default-features = false } log = "0.4.11" -rand = "0.7.3" +rand = "0.8.0" strum = "0.20.0" strum_macros = "0.20.1" jsonwebtoken = "7.2.0" @@ -43,7 +43,7 @@ uuid = { version = "0.8.1", features = ["serde", "v4"] } sha2 = "0.9.2" async-trait = "0.1.42" captcha = "0.0.8" -anyhow = "1.0.35" +anyhow = "1.0.36" thiserror = "1.0.22" background-jobs = "0.8.0" reqwest = { version = "0.10.10", features = ["json"] } diff --git a/lemmy_apub/Cargo.toml b/lemmy_apub/Cargo.toml index e62ae9f0..09dd9be8 100644 --- a/lemmy_apub/Cargo.toml +++ b/lemmy_apub/Cargo.toml @@ -26,7 +26,7 @@ actix-web = { version = "3.3.2", default-features = false } actix-rt = { version = "1.1.1", default-features = false } awc = { version = "2.0.3", default-features = false } log = "0.4.11" -rand = "0.7.3" +rand = "0.8.0" strum = "0.20.0" strum_macros = "0.20.1" lazy_static = "1.4.0" @@ -43,7 +43,7 @@ itertools = "0.9.0" uuid = { version = "0.8.1", features = ["serde", "v4"] } sha2 = "0.9.2" async-trait = "0.1.42" -anyhow = "1.0.35" +anyhow = "1.0.36" thiserror = "1.0.22" background-jobs = "0.8.0" reqwest = { version = "0.10.10", features = ["json"] } diff --git a/lemmy_utils/Cargo.toml b/lemmy_utils/Cargo.toml index e90015f0..fe810a79 100644 --- a/lemmy_utils/Cargo.toml +++ b/lemmy_utils/Cargo.toml @@ -14,7 +14,7 @@ chrono = { version = "0.4.19", features = ["serde"] } lettre = "0.10.0-alpha.4" log = "0.4.11" itertools = "0.9.0" -rand = "0.7.3" +rand = "0.8.0" percent-encoding = "2.1.0" serde = { version = "1.0.118", features = ["derive"] } serde_json = { version = "1.0.60", features = ["preserve_order"] } @@ -25,5 +25,5 @@ openssl = "0.10.31" url = { version = "2.2.0", features = ["serde"] } actix-web = { version = "3.3.2", default-features = false, features = ["rustls"] } actix-rt = { version = "1.1.1", default-features = false } -anyhow = "1.0.35" +anyhow = "1.0.36" reqwest = { version = "0.10.10", features = ["json"] } diff --git a/lemmy_utils/src/utils.rs b/lemmy_utils/src/utils.rs index 2260cb65..2af010a8 100644 --- a/lemmy_utils/src/utils.rs +++ b/lemmy_utils/src/utils.rs @@ -65,7 +65,11 @@ pub(crate) fn slurs_vec_to_str(slurs: Vec<&str>) -> String { } pub fn generate_random_string() -> String { - thread_rng().sample_iter(&Alphanumeric).take(30).collect() + thread_rng() + .sample_iter(&Alphanumeric) + .map(char::from) + .take(30) + .collect() } pub fn markdown_to_html(text: &str) -> String { diff --git a/lemmy_websocket/Cargo.toml b/lemmy_websocket/Cargo.toml index 30dbe1fb..90cf0e17 100644 --- a/lemmy_websocket/Cargo.toml +++ b/lemmy_websocket/Cargo.toml @@ -16,11 +16,11 @@ lemmy_db_schema = { path = "../lemmy_db_schema" } lemmy_rate_limit = { path = "../lemmy_rate_limit" } reqwest = { version = "0.10.10", features = ["json"] } log = "0.4.11" -rand = "0.7.3" +rand = "0.8.0" serde = { version = "1.0.118", features = ["derive"] } serde_json = { version = "1.0.60", features = ["preserve_order"] } actix = "0.10.0" -anyhow = "1.0.35" +anyhow = "1.0.36" diesel = "1.4.5" background-jobs = "0.8.0" tokio = "0.3.6"