From 057a91e498d4e4ec6427de7ed35bced8d202fe30 Mon Sep 17 00:00:00 2001 From: Syfaro Date: Sun, 12 Jan 2020 18:23:47 -0600 Subject: [PATCH] Update furaffinity-rs version. --- Cargo.lock | 63 ++++++++++++++++++++++++++--------------------------- Cargo.toml | 10 ++++----- src/main.rs | 3 ++- 3 files changed, 38 insertions(+), 38 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 20e093c..2726280 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -275,13 +275,13 @@ name = "fa-watcher" version = "0.1.0" dependencies = [ "chrono 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)", - "furaffinity-rs 0.1.0 (git+https://git.huefox.com/syfaro/furaffinity-rs?rev=75254a58385b3a8ea7fde0c86ff764fd1688bad9)", - "postgres 0.17.0-alpha.2 (registry+https://github.com/rust-lang/crates.io-index)", + "furaffinity-rs 0.1.0 (git+https://git.huefox.com/syfaro/furaffinity-rs?rev=1548d7f0132e65b360af8bef16f864a1c3b3df02)", + "postgres 0.17.0 (registry+https://github.com/rust-lang/crates.io-index)", "r2d2 0.8.7 (registry+https://github.com/rust-lang/crates.io-index)", - "r2d2_postgres 0.16.0-alpha.2 (registry+https://github.com/rust-lang/crates.io-index)", - "reqwest 0.10.0-alpha.2 (git+https://github.com/seanmonstar/reqwest)", + "r2d2_postgres 0.16.0 (registry+https://github.com/rust-lang/crates.io-index)", + "reqwest 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)", "tokio 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", - "tokio-postgres 0.5.0-alpha.2 (registry+https://github.com/rust-lang/crates.io-index)", + "tokio-postgres 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -334,14 +334,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "furaffinity-rs" version = "0.1.0" -source = "git+https://git.huefox.com/syfaro/furaffinity-rs?rev=75254a58385b3a8ea7fde0c86ff764fd1688bad9#75254a58385b3a8ea7fde0c86ff764fd1688bad9" +source = "git+https://git.huefox.com/syfaro/furaffinity-rs?rev=1548d7f0132e65b360af8bef16f864a1c3b3df02#1548d7f0132e65b360af8bef16f864a1c3b3df02" dependencies = [ "chrono 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)", "image 0.22.3 (registry+https://github.com/rust-lang/crates.io-index)", "img_hash 3.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "regex 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)", - "reqwest 0.10.0-alpha.2 (git+https://github.com/seanmonstar/reqwest)", + "reqwest 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)", "scraper 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -758,7 +758,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "md5" -version = "0.6.1" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] @@ -1096,30 +1096,29 @@ dependencies = [ [[package]] name = "postgres" -version = "0.17.0-alpha.2" +version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "bytes 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", "fallible-iterator 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "futures 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", - "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "tokio 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", - "tokio-postgres 0.5.0-alpha.2 (registry+https://github.com/rust-lang/crates.io-index)", + "tokio-postgres 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "postgres-protocol" -version = "0.5.0-alpha.2" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "base64 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)", + "base64 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "bytes 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", "fallible-iterator 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "generic-array 0.13.2 (registry+https://github.com/rust-lang/crates.io-index)", "hmac 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", - "md5 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", + "md5 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", "memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "rand 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", "sha2 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1128,13 +1127,13 @@ dependencies = [ [[package]] name = "postgres-types" -version = "0.1.0-alpha.2" +version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "bytes 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", "chrono 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)", "fallible-iterator 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", - "postgres-protocol 0.5.0-alpha.2 (registry+https://github.com/rust-lang/crates.io-index)", + "postgres-protocol 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1211,10 +1210,10 @@ dependencies = [ [[package]] name = "r2d2_postgres" -version = "0.16.0-alpha.2" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "postgres 0.17.0-alpha.2 (registry+https://github.com/rust-lang/crates.io-index)", + "postgres 0.17.0 (registry+https://github.com/rust-lang/crates.io-index)", "r2d2 0.8.7 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1412,8 +1411,8 @@ dependencies = [ [[package]] name = "reqwest" -version = "0.10.0-alpha.2" -source = "git+https://github.com/seanmonstar/reqwest#f78846b6f15e82e60c8a83e7b3a7137e19f94884" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "base64 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", "bytes 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1803,7 +1802,6 @@ dependencies = [ "memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "mio 0.6.21 (registry+https://github.com/rust-lang/crates.io-index)", "mio-uds 0.6.7 (registry+https://github.com/rust-lang/crates.io-index)", - "num_cpus 1.11.1 (registry+https://github.com/rust-lang/crates.io-index)", "pin-project-lite 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", "tokio-macros 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1820,9 +1818,10 @@ dependencies = [ [[package]] name = "tokio-postgres" -version = "0.5.0-alpha.2" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ + "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "bytes 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", "fallible-iterator 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "futures 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1831,8 +1830,8 @@ dependencies = [ "percent-encoding 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "phf 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", "pin-project-lite 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", - "postgres-protocol 0.5.0-alpha.2 (registry+https://github.com/rust-lang/crates.io-index)", - "postgres-types 0.1.0-alpha.2 (registry+https://github.com/rust-lang/crates.io-index)", + "postgres-protocol 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", + "postgres-types 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "tokio 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", "tokio-util 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -2155,7 +2154,7 @@ dependencies = [ "checksum fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba" "checksum fuchsia-zircon 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "2e9763c69ebaae630ba35f74888db465e49e259ba1bc0eda7d06f4a067615d82" "checksum fuchsia-zircon-sys 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7" -"checksum furaffinity-rs 0.1.0 (git+https://git.huefox.com/syfaro/furaffinity-rs?rev=75254a58385b3a8ea7fde0c86ff764fd1688bad9)" = "" +"checksum furaffinity-rs 0.1.0 (git+https://git.huefox.com/syfaro/furaffinity-rs?rev=1548d7f0132e65b360af8bef16f864a1c3b3df02)" = "" "checksum futf 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "7c9c1ce3fa9336301af935ab852c437817d14cd33690446569392e65170aac3b" "checksum futures 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "b6f16056ecbb57525ff698bb955162d0cd03bee84e6241c27ff75c08d8ca5987" "checksum futures-channel 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "fcae98ca17d102fd8a3603727b9259fcf7fa4239b603d2142926189bc8999b86" @@ -2201,7 +2200,7 @@ dependencies = [ "checksum markup5ever 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "65381d9d47506b8592b97c4efd936afcf673b09b059f2bef39c7211ee78b9d03" "checksum matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08" "checksum maybe-uninit 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "60302e4db3a61da70c0cb7991976248362f30319e88850c487b9b95bbf059e00" -"checksum md5 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7e6bcd6433cff03a4bfc3d9834d504467db1f1cf6d0ea765d37d330249ed629d" +"checksum md5 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "490cc448043f947bae3cbee9c203358d62dbee0db12107a74be5c30ccfd09771" "checksum memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "88579771288728879b57485cc7d6b07d648c9f0141eb955f8ab7f9d45394468e" "checksum memoffset 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)" = "75189eb85871ea5c2e2c15abbdd541185f63b408415e5051f5cac122d8c774b9" "checksum mime 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)" = "dd1d63acd1b78403cc0c325605908475dd9b9a3acbf65ed8bcab97e27014afcf" @@ -2240,9 +2239,9 @@ dependencies = [ "checksum pin-utils 0.1.0-alpha.4 (registry+https://github.com/rust-lang/crates.io-index)" = "5894c618ce612a3fa23881b152b608bafb8c56cfc22f434a3ba3120b40f7b587" "checksum pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)" = "05da548ad6865900e60eaba7f589cc0783590a92e940c26953ff81ddbab2d677" "checksum png 0.15.2 (registry+https://github.com/rust-lang/crates.io-index)" = "247cb804bd7fc86d0c2b153d1374265e67945875720136ca8fe451f11c6aed52" -"checksum postgres 0.17.0-alpha.2 (registry+https://github.com/rust-lang/crates.io-index)" = "64229998d4e09fe347044b70388fef5839783b9a1f5234baf5fca5c077de50a7" -"checksum postgres-protocol 0.5.0-alpha.2 (registry+https://github.com/rust-lang/crates.io-index)" = "03b400f720e2838de4d4b07c3b87c7934d9ed8b1d1656452209e888106a8f701" -"checksum postgres-types 0.1.0-alpha.2 (registry+https://github.com/rust-lang/crates.io-index)" = "e0547f59b9769e15ef18747600a0f8f109fddc08d848f7772218a125f5b9d5b4" +"checksum postgres 0.17.0 (registry+https://github.com/rust-lang/crates.io-index)" = "96dd5c8eddec65a5497798ebde2e5c74a93ef8b66782c1b09eeab9bb8538aebc" +"checksum postgres-protocol 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a30f0e172ae0fb0653dbf777ad10a74b8e58d6de95a892f2e1d3e94a9df9a844" +"checksum postgres-types 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "eab1dd99401779ab03bc3872f196fb02c420e76f416c850be494a6f2d67287ad" "checksum ppv-lite86 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)" = "74490b50b9fbe561ac330df47c08f3f33073d2d00c150f719147d7c54522fa1b" "checksum precomputed-hash 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c" "checksum proc-macro-hack 0.5.11 (registry+https://github.com/rust-lang/crates.io-index)" = "ecd45702f76d6d3c75a80564378ae228a85f0b59d2f3ed43c91b4a69eb2ebfc5" @@ -2253,7 +2252,7 @@ dependencies = [ "checksum quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)" = "6ce23b6b870e8f94f81fb0a363d65d86675884b34a09043c81e5562f11c1f8e1" "checksum quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "053a8c8bcc71fcce321828dc897a98ab9760bef03a4fc36693c231e5b3216cfe" "checksum r2d2 0.8.7 (registry+https://github.com/rust-lang/crates.io-index)" = "22b5c5fc5fba064373f03887337b412e0e1562d63023393db77251146cb75553" -"checksum r2d2_postgres 0.16.0-alpha.2 (registry+https://github.com/rust-lang/crates.io-index)" = "b8202e67b2386d612c773d864cc2e9a44b330b65e4c59f32ec2e48f4645e82a8" +"checksum r2d2_postgres 0.16.0 (registry+https://github.com/rust-lang/crates.io-index)" = "707d27f66f43bac1081141f6d9611fffcce7da2841ae97c7ac53619d098efe8f" "checksum rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)" = "6d71dacdc3c88c1fde3885a3be3fbab9f35724e6ce99467f7d9c5026132184ca" "checksum rand 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)" = "3ae1b169243eaf61759b8475a998f0a385e42042370f3a7dbaf35246eacc8412" "checksum rand_chacha 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "556d3a1ca6600bfcbab7c7c91ccb085ac7fbbcd70e008a98742e7847f4f7bcef" @@ -2275,7 +2274,7 @@ dependencies = [ "checksum regex 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "dc220bd33bdce8f093101afe22a037b8eb0e5af33592e6a9caafff0d4cb81cbd" "checksum regex-syntax 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)" = "11a7e20d1cce64ef2fed88b66d347f88bd9babb82845b2b858f3edbf59a4f716" "checksum remove_dir_all 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "4a83fa3702a688b9359eccba92d153ac33fd2e8462f9e0e3fdf155239ea7792e" -"checksum reqwest 0.10.0-alpha.2 (git+https://github.com/seanmonstar/reqwest)" = "" +"checksum reqwest 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)" = "c0e798e19e258bf6c30a304622e3e9ac820e483b06a1857a026e1f109b113fe4" "checksum rustc-serialize 0.3.24 (registry+https://github.com/rust-lang/crates.io-index)" = "dcf128d1287d2ea9d80910b5f1120d0b8eede3fbf1abe91c40d39ea7d51e6fda" "checksum rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a" "checksum rustdct 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e0f7856a89272b7bb9e8b1dee289efba95d7a5409a8b819a2257ce894b195708" @@ -2319,7 +2318,7 @@ dependencies = [ "checksum time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)" = "db8dcfca086c1143c9270ac42a2bbd8a7ee477b78ac8e45b19abfb0cbede4b6f" "checksum tokio 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)" = "bcced6bb623d4bff3739c176c415f13c418f426395c169c9c3cd9a492c715b16" "checksum tokio-macros 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d5795a71419535c6dcecc9b6ca95bdd3c2d6142f7e8343d7beb9923f129aa87e" -"checksum tokio-postgres 0.5.0-alpha.2 (registry+https://github.com/rust-lang/crates.io-index)" = "58704838bb0030fb3e3314f5e4ff62edc87472ff7bd00196457e9a8c2d428d93" +"checksum tokio-postgres 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "c03cb0c66092269a9b280e9e4956cb23ce00b8a6b1b393f7700f7732ac4bf133" "checksum tokio-tls 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7bde02a3a5291395f59b06ec6945a3077602fac2b07eeeaf0dee2122f3619828" "checksum tokio-util 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "571da51182ec208780505a32528fc5512a8fe1443ab960b3f2f3ef093cd16930" "checksum tower-service 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e987b6bf443f4b5b3b6f38704195592cca41c5bb7aedd3c3693c7081f8289860" diff --git a/Cargo.toml b/Cargo.toml index c3e0d6d..6f20bcb 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -5,14 +5,14 @@ authors = ["Syfaro "] edition = "2018" [dependencies] -reqwest = { git = "https://github.com/seanmonstar/reqwest" } -postgres = { version = "0.17.0-alpha.2", features = ["with-chrono-0_4"] } +reqwest = "0.10.1" +postgres = { version = "0.17.0", features = ["with-chrono-0_4"] } tokio = { version = "0.2", features = ["macros", "time"] } -tokio-postgres = { version = "0.5.0-alpha.2" } -r2d2_postgres = " 0.16.0-alpha.2" +tokio-postgres = { version = "0.5.0" } +r2d2_postgres = " 0.16.0" r2d2 = "0.8" chrono = "0.4" [dependencies.furaffinity-rs] git = "https://git.huefox.com/syfaro/furaffinity-rs" -rev = "75254a58385b3a8ea7fde0c86ff764fd1688bad9" +rev = "1548d7f0132e65b360af8bef16f864a1c3b3df02" diff --git a/src/main.rs b/src/main.rs index 6111b4c..f5e8886 100644 --- a/src/main.rs +++ b/src/main.rs @@ -125,7 +125,8 @@ async fn main() { Err(e) => { println!("got error: {:?}, retry {}", e.message, e.retry); if e.retry { - tokio::time::delay_for(std::time::Duration::from_secs(attempt + 1)).await; + tokio::time::delay_for(std::time::Duration::from_secs(attempt + 1)) + .await; continue 'attempt; } else { println!("unrecoverable, exiting");