From 609bbde7bd3d69e057bb89e375dc864524bcdc68 Mon Sep 17 00:00:00 2001 From: realaravinth Date: Wed, 24 Mar 2021 17:12:09 +0530 Subject: [PATCH] slqx-actix runtime issues --- Cargo.lock | 172 ++++++++++++++++++------------------------- Cargo.toml | 5 +- src/tests-migrate.rs | 2 +- 3 files changed, 75 insertions(+), 104 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 168dbf36..8cc84766 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -98,12 +98,12 @@ dependencies = [ "pin-project 1.0.5", "rand 0.7.3", "regex", - "serde 1.0.124", + "serde 1.0.125", "serde_json", "serde_urlencoded", "sha-1", "slab", - "time 0.2.25", + "time 0.2.26", ] [[package]] @@ -115,9 +115,9 @@ dependencies = [ "actix-service", "actix-web", "futures-util", - "serde 1.0.124", + "serde 1.0.125", "serde_json", - "time 0.2.25", + "time 0.2.26", ] [[package]] @@ -150,7 +150,7 @@ dependencies = [ "http", "log", "regex", - "serde 1.0.124", + "serde 1.0.125", ] [[package]] @@ -300,11 +300,11 @@ dependencies = [ "mime", "pin-project 1.0.5", "regex", - "serde 1.0.124", + "serde 1.0.125", "serde_json", "serde_urlencoded", "socket2", - "time 0.2.25", + "time 0.2.26", "tinyvec", "url", ] @@ -434,8 +434,8 @@ dependencies = [ [[package]] name = "argon2-creds" -version = "0.2.0" -source = "git+https://github.com/realaravinth/argon2-creds#61f2d1d5a2660905939054f6be03e76584965b63" +version = "0.2.1" +source = "git+https://github.com/realaravinth/argon2-creds#99c1769430fbf6b420c063fc0de25a7e84086c6a" dependencies = [ "ammonia", "derive_builder", @@ -445,7 +445,7 @@ dependencies = [ "regex", "rust-argon2", "unicode-normalization", - "validator 0.12.0", + "validator", ] [[package]] @@ -516,7 +516,7 @@ dependencies = [ "mime", "percent-encoding", "rand 0.7.3", - "serde 1.0.124", + "serde 1.0.125", "serde_json", "serde_urlencoded", ] @@ -540,7 +540,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d175dfa69e619905c4c3cdb7c3c203fa3bdd5d51184e3afdb2742c0280493772" dependencies = [ "byteorder", - "serde 1.0.124", + "serde 1.0.125", ] [[package]] @@ -676,7 +676,7 @@ dependencies = [ "lazy_static", "nom 5.1.2", "rust-ini", - "serde 1.0.124", + "serde 1.0.125", "serde-hjson", "serde_json", "toml", @@ -695,6 +695,12 @@ version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc" +[[package]] +name = "convert_case" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e" + [[package]] name = "cookie" version = "0.14.4" @@ -708,7 +714,7 @@ dependencies = [ "percent-encoding", "rand 0.8.3", "sha2", - "time 0.2.25", + "time 0.2.26", "version_check", ] @@ -860,10 +866,11 @@ dependencies = [ [[package]] name = "derive_more" -version = "0.99.11" +version = "0.99.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41cb0e6161ad61ed084a36ba71fbba9e3ac5aee3606fb607fe08da6acbcf3d8c" +checksum = "f82b1b72f1263f214c0f823371768776c4f5841b942c9883aa8e5ec584fd0ba6" dependencies = [ + "convert_case", "proc-macro2", "quote", "syn", @@ -1151,11 +1158,11 @@ dependencies = [ "m_captcha", "pretty_env_logger", "rand 0.8.3", - "serde 1.0.124", + "serde 1.0.125", "serde_json", "sqlx", "url", - "validator 0.13.0", + "validator", ] [[package]] @@ -1362,9 +1369,9 @@ checksum = "dd25036021b0de88a0aff6b850051563c6516d0bf53f8638938edbb9de732736" [[package]] name = "js-sys" -version = "0.3.48" +version = "0.3.49" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc9f84f9b115ce7843d60706df1422a916680bfdfcbdb0447c5614ff9d7e4d78" +checksum = "dc15e39392125075f60c95ba416f5381ff6c3a948ff02ab12464715adf56c821" dependencies = [ "wasm-bindgen", ] @@ -1406,9 +1413,9 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.88" +version = "0.2.91" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03b07a082330a35e43f63177cc01689da34fbffa0105e1246cf0311472cac73a" +checksum = "8916b1f6ca17130ec6568feccee27c156ad12037880833a3b842a823236502e7" [[package]] name = "linked-hash-map" @@ -1453,7 +1460,7 @@ dependencies = [ "derive_more", "pow_sha256", "rand 0.8.3", - "serde 1.0.124", + "serde 1.0.125", "serde_json", ] @@ -1478,7 +1485,7 @@ dependencies = [ "log", "phf", "phf_codegen", - "serde 1.0.124", + "serde 1.0.125", "serde_derive", "serde_json", "string_cache", @@ -1842,7 +1849,7 @@ source = "git+https://github.com/mcaptcha/pow_sha256#1b65c603bdd527e3e1f3b8b565a dependencies = [ "bincode", "derive_builder", - "serde 1.0.124", + "serde 1.0.125", "sha2", ] @@ -2036,9 +2043,9 @@ dependencies = [ [[package]] name = "regex" -version = "1.4.4" +version = "1.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54fd1046a3107eb58f42de31d656fee6853e5d276c455fd943742dce89fc3dd3" +checksum = "957056ecddbeba1b26965114e191d2e8589ce74db242b6ea25fc4062427a5c19" dependencies = [ "aho-corasick", "memchr", @@ -2161,9 +2168,9 @@ checksum = "9dad3f759919b92c3068c696c15c3d17238234498bbdcc80f2c469606f948ac8" [[package]] name = "serde" -version = "1.0.124" +version = "1.0.125" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd761ff957cb2a45fbb9ab3da6512de9de55872866160b23c25f1a841e99d29f" +checksum = "558dc50e1a5a5fa7112ca2ce4effcb321b0300c0d4ccf0776a9f60cd89031171" dependencies = [ "serde_derive", ] @@ -2182,9 +2189,9 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.124" +version = "1.0.125" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1800f7693e94e186f5e25a28291ae1570da908aff7d97a095dec1e56ff99069b" +checksum = "b093b7a2bb58203b5da3056c05b4ec1fed827dcfdb37347a8841695263b3d06d" dependencies = [ "proc-macro2", "quote", @@ -2199,7 +2206,7 @@ checksum = "799e97dc9fdae36a5c8b8f2cae9ce2ee9fdce2058c57a93e6099d919fd982f79" dependencies = [ "itoa", "ryu", - "serde 1.0.124", + "serde 1.0.125", ] [[package]] @@ -2211,7 +2218,7 @@ dependencies = [ "form_urlencoded", "itoa", "ryu", - "serde 1.0.124", + "serde 1.0.125", ] [[package]] @@ -2257,9 +2264,9 @@ dependencies = [ [[package]] name = "siphasher" -version = "0.3.3" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa8f3741c7372e75519bd9346068370c9cdaabcc1f9599cbcf2a2719352286b7" +checksum = "cbce6d4507c7e4a3962091436e56e95290cb71fa302d0d270e32130b75fbff27" [[package]] name = "slab" @@ -2346,7 +2353,7 @@ dependencies = [ "percent-encoding", "rand 0.7.3", "rustls", - "serde 1.0.124", + "serde 1.0.125", "serde_json", "sha-1", "sha2", @@ -2395,9 +2402,9 @@ dependencies = [ [[package]] name = "standback" -version = "0.2.15" +version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2beb4d1860a61f571530b3f855a1b538d0200f7871c63331ecd6f17b1f014f8" +checksum = "e113fb6f3de07a243d434a56ec6f186dfd51cb08448239fe7bcae73f87ff28ff" dependencies = [ "version_check", ] @@ -2430,7 +2437,7 @@ checksum = "c87a60a40fccc84bef0652345bbbbbe20a605bf5d0ce81719fc476f5c03b50ef" dependencies = [ "proc-macro2", "quote", - "serde 1.0.124", + "serde 1.0.125", "serde_derive", "syn", ] @@ -2444,7 +2451,7 @@ dependencies = [ "base-x", "proc-macro2", "quote", - "serde 1.0.124", + "serde 1.0.125", "serde_derive", "serde_json", "sha1", @@ -2467,7 +2474,7 @@ dependencies = [ "new_debug_unreachable", "phf_shared", "precomputed-hash", - "serde 1.0.124", + "serde 1.0.125", ] [[package]] @@ -2506,9 +2513,9 @@ checksum = "1e81da0851ada1f3e9d4312c704aa4f8806f0f9d69faaf8df2f3464b4a9437c2" [[package]] name = "syn" -version = "1.0.63" +version = "1.0.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fd9bc7ccc2688b3344c2f48b9b546648b25ce0b20fc717ee7fa7981a8ca9717" +checksum = "3fd9d1e9976102a03c542daa2eff1b43f9d72306342f3f8b3ed5fb8908195d6f" dependencies = [ "proc-macro2", "quote", @@ -2582,9 +2589,9 @@ dependencies = [ [[package]] name = "time" -version = "0.2.25" +version = "0.2.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1195b046942c221454c2539395f85413b33383a067449d78aab2b7b052a142f7" +checksum = "08a8cbfbf47955132d0202d1662f49b2423ae35862aee471f3ba4b133358f372" dependencies = [ "const_fn", "libc", @@ -2728,7 +2735,7 @@ version = "0.5.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a31142970826733df8241ef35dc040ef98c679ab14d7c3e54d827099b3acecaa" dependencies = [ - "serde 1.0.124", + "serde 1.0.125", ] [[package]] @@ -2803,9 +2810,9 @@ dependencies = [ [[package]] name = "typenum" -version = "1.12.0" +version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "373c8a200f9e67a0c95e62a4f52fbf80c23b4381c05a17845531982fa99e6b33" +checksum = "879f6906492a7cd215bfa4cf595b600146ccfac0c79bcbd1f3000162af5e8b06" [[package]] name = "unicode-bidi" @@ -2877,23 +2884,6 @@ version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "05e42f7c18b8f902290b009cde6d651262f956c98bc51bca4cd1d511c9cd85c7" -[[package]] -name = "validator" -version = "0.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "841d6937c33ec6039d8071bcf72933146b5bbe378d645d8fa59bdadabfc2a249" -dependencies = [ - "idna", - "lazy_static", - "regex", - "serde 1.0.124", - "serde_derive", - "serde_json", - "url", - "validator_derive 0.12.0", - "validator_types", -] - [[package]] name = "validator" version = "0.13.0" @@ -2903,27 +2893,11 @@ dependencies = [ "idna", "lazy_static", "regex", - "serde 1.0.124", + "serde 1.0.125", "serde_derive", "serde_json", "url", - "validator_derive 0.13.0", - "validator_types", -] - -[[package]] -name = "validator_derive" -version = "0.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4286b4497f270f59276a89ae0ad109d5f8f18c69b613e3fb22b61201aadb0c4d" -dependencies = [ - "if_chain", - "lazy_static", - "proc-macro-error", - "proc-macro2", - "quote", - "regex", - "syn", + "validator_derive", "validator_types", ] @@ -2951,9 +2925,9 @@ checksum = "ad9680608df133af2c1ddd5eaf1ddce91d60d61b6bc51494ef326458365a470a" [[package]] name = "version_check" -version = "0.9.2" +version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5a972e5669d67ba988ce3dc826706fb0a8b01471c088cb0b6110b805cc36aed" +checksum = "5fecdca9a5291cc2b8dcf7dc02453fee791a280f3743cb0905f8822ae463b3fe" [[package]] name = "wasi" @@ -2969,9 +2943,9 @@ checksum = "fd6fbd9a79829dd1ad0cc20627bf1ed606756a7f77edff7b66b7064f9cb327c6" [[package]] name = "wasm-bindgen" -version = "0.2.71" +version = "0.2.72" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ee1280240b7c461d6a0071313e08f34a60b0365f14260362e5a2b17d1d31aa7" +checksum = "8fe8f61dba8e5d645a4d8132dc7a0a66861ed5e1045d2c0ed940fab33bac0fbe" dependencies = [ "cfg-if 1.0.0", "wasm-bindgen-macro", @@ -2979,9 +2953,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.71" +version = "0.2.72" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b7d8b6942b8bb3a9b0e73fc79b98095a27de6fa247615e59d096754a3bc2aa8" +checksum = "046ceba58ff062da072c7cb4ba5b22a37f00a302483f7e2a6cdc18fedbdc1fd3" dependencies = [ "bumpalo", "lazy_static", @@ -2994,9 +2968,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.71" +version = "0.2.72" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5ac38da8ef716661f0f36c0d8320b89028efe10c7c0afde65baffb496ce0d3b" +checksum = "0ef9aa01d36cda046f797c57959ff5f3c615c9cc63997a8d545831ec7976819b" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -3004,9 +2978,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.71" +version = "0.2.72" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc053ec74d454df287b9374ee8abb36ffd5acb95ba87da3ba5b7d3fe20eb401e" +checksum = "96eb45c1b2ee33545a813a92dbb53856418bf7eb54ab34f7f7ff1448a5b3735d" dependencies = [ "proc-macro2", "quote", @@ -3017,15 +2991,15 @@ dependencies = [ [[package]] name = "wasm-bindgen-shared" -version = "0.2.71" +version = "0.2.72" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d6f8ec44822dd71f5f221a5847fb34acd9060535c1211b70a05844c0f6383b1" +checksum = "b7148f4696fb4960a346eaa60bbfb42a1ac4ebba21f750f75fc1375b098d5ffa" [[package]] name = "web-sys" -version = "0.3.48" +version = "0.3.49" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec600b26223b2948cedfde2a0aa6756dcf1fef616f43d7b3097aaf53a6c4d92b" +checksum = "59fe19d70f5dacc03f6e46777213facae5ac3801575d56ca6cbd4c93dcd12310" dependencies = [ "js-sys", "wasm-bindgen", @@ -3052,9 +3026,9 @@ dependencies = [ [[package]] name = "whoami" -version = "1.1.0" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a921c0ad578a51c0b6c0bbb9b95f0ed11e90d61da506139e48a946edd11ee1e" +checksum = "1e296f550993cba2c5c3eba5da0fb335562b2fa3d97b7a8ac9dc91f40a3abc70" dependencies = [ "wasm-bindgen", "web-sys", diff --git a/Cargo.toml b/Cargo.toml index 7e85bf99..d6f3334a 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -28,6 +28,7 @@ actix-web = "3" actix = "0.11" actix-identity = "0.3" actix-http = "2.2" +actix-rt = "2" sqlx = { version = "0.5.0", features = [ "runtime-actix-rustls", "postgres" ] } argon2-creds = { version = "0.2", git = "https://github.com/realaravinth/argon2-creds", commit = "61f2d1d" } @@ -52,7 +53,3 @@ lazy_static = "1.4" m_captcha = { version = "0.1.2", git = "https://github.com/mCaptcha/mCaptcha" } rand = "0.8" - - -[dev-dependencies] -actix-rt = "2" diff --git a/src/tests-migrate.rs b/src/tests-migrate.rs index 9397b5c2..43e93282 100644 --- a/src/tests-migrate.rs +++ b/src/tests-migrate.rs @@ -30,7 +30,7 @@ lazy_static! { } #[cfg(not(tarpaulin_include))] -#[actix_web::main] +#[actix_rt::main] async fn main() { let data = Data::new().await; pretty_env_logger::init();