diff --git a/.circleci/config.yml b/.circleci/config.yml index 7f14d8ee0..94fb21bab 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,7 +1,7 @@ # These environment variables must be set in CircleCI UI # -# DOCKERHUB_REPO - docker hub repo, format: / -# DOCKERHUB_ENDPOINT_REPO - same as DOCKERHUB_REPO, but for autoendpoint +# DOCKERHUB_CONNECT_REPO - autoconnect docker hub repo, format: / +# DOCKERHUB_ENDPOINT_REPO - autoendpoint docker hub repo, format: / # DOCKER_EMAIL - login info for docker hub # DOCKER_USER # DOCKER_PASS @@ -326,14 +326,6 @@ workflows: filters: tags: only: /.*/ - - build: - name: build-autopush - image: autopush:build - crate: autopush - binary: autopush_rs - filters: - tags: - only: /.*/ - build: name: build-autoconnect @@ -359,19 +351,6 @@ workflows: only: /.*/ # Comment out the following two sections for local CircleCI testing. - - deploy: - name: deploy-autopush - image: autopush:build - repo: ${DOCKERHUB_REPO} - requires: - - build-autopush - - test - filters: - tags: - only: /.*/ - branches: - only: master - - deploy: name: deploy-autoconnect image: autoconnect:build diff --git a/Cargo.lock b/Cargo.lock index b8add1900..f2106de0a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -10,7 +10,7 @@ dependencies = [ "base64 0.20.0", "erased-serde", "http 0.2.11", - "hyper 0.14.28", + "hyper", "hyper-alpn", "openssl", "serde", @@ -95,7 +95,7 @@ dependencies = [ "encoding_rs", "flate2", "futures-core", - "h2 0.3.24", + "h2", "http 0.2.11", "httparse", "httpdate", @@ -103,7 +103,7 @@ dependencies = [ "language-tags", "local-channel", "mime", - "percent-encoding 2.3.1", + "percent-encoding", "pin-project-lite 0.2.13", "rand 0.8.5", "sha1", @@ -133,7 +133,7 @@ dependencies = [ "log", "serde", "serde_json", - "serde_urlencoded 0.7.1", + "serde_urlencoded", "slab", "socket2 0.4.10", "tokio 1.35.1", @@ -145,7 +145,7 @@ version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e01ed3140b2f8d422c68afa1ed2e85d996ea619c988ac834d255db32138655cb" dependencies = [ - "quote 1.0.33", + "quote", "syn 2.0.41", ] @@ -220,7 +220,7 @@ dependencies = [ "log", "serde", "serde_json", - "serde_urlencoded 0.7.1", + "serde_urlencoded", "tokio 1.35.1", ] @@ -273,7 +273,7 @@ dependencies = [ "bytes 1.5.0", "bytestring", "cfg-if 1.0.0", - "cookie 0.16.2", + "cookie", "derive_more", "encoding_rs", "futures-core", @@ -287,11 +287,11 @@ dependencies = [ "regex", "serde", "serde_json", - "serde_urlencoded 0.7.1", + "serde_urlencoded", "smallvec 1.11.2", "socket2 0.5.5", - "time 0.3.31", - "url 2.5.0", + "time", + "url", ] [[package]] @@ -301,8 +301,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eb1f50ebbb30eca122b188319a4398b3f7bb4a8cdf50ecfb73bfc6a3c3ce54f5" dependencies = [ "actix-router", - "proc-macro2 1.0.70", - "quote 1.0.33", + "proc-macro2", + "quote", "syn 2.0.41", ] @@ -325,8 +325,8 @@ version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7c7db3d5a9718568e4cf4a537cfd7070e6e6ff7481510d0237fb529ac850f6d3" dependencies = [ - "proc-macro2 1.0.70", - "quote 1.0.33", + "proc-macro2", + "quote", "syn 2.0.41", ] @@ -440,18 +440,6 @@ version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bddcadddf5e9015d310179a59bb28c4d4b9920ad0f11e8e14dbadf654890c9a6" -[[package]] -name = "arrayref" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b4930d2cb77ce62f89ee5d5289b4ac049559b1c45539271f5ed4fdc7db34545" - -[[package]] -name = "arrayvec" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b" - [[package]] name = "assert-json-diff" version = "2.0.2" @@ -479,8 +467,8 @@ version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193" dependencies = [ - "proc-macro2 1.0.70", - "quote 1.0.33", + "proc-macro2", + "quote", "syn 2.0.41", ] @@ -490,8 +478,8 @@ version = "0.1.74" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a66537f1bb974b254c98ed142ff995236e81b9d0fe4db0575f46612cb15eb0f9" dependencies = [ - "proc-macro2 1.0.70", - "quote 1.0.33", + "proc-macro2", + "quote", "syn 2.0.41", ] @@ -506,15 +494,6 @@ dependencies = [ "winapi 0.3.9", ] -[[package]] -name = "autocfg" -version = "0.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0dde43e75fd43e8a1bf86103336bc699aa8d17ad1be60c76c0bdfd4828e19b78" -dependencies = [ - "autocfg 1.1.0", -] - [[package]] name = "autocfg" version = "1.1.0" @@ -546,13 +525,13 @@ dependencies = [ "env_logger 0.10.1", "fernet", "futures 0.3.29", - "futures-locks 0.7.1", + "futures-locks", "futures-util", "hex", "lazy_static", "log", "mozsvc-common", - "reqwest 0.11.23", + "reqwest", "sentry", "sentry-actix", "sentry-core", @@ -565,7 +544,7 @@ dependencies = [ "slog-scope", "slog-stdlog", "slog-term", - "uuid 1.6.1", + "uuid", ] [[package]] @@ -576,9 +555,9 @@ dependencies = [ "autopush_common", "cadence", "futures 0.3.29", - "futures-locks 0.7.1", - "hyper 0.14.28", - "reqwest 0.11.23", + "futures-locks", + "hyper", + "reqwest", "sentry", "serde", "serde_derive", @@ -586,7 +565,7 @@ dependencies = [ "slog", "slog-scope", "tokio 1.35.1", - "uuid 1.6.1", + "uuid", ] [[package]] @@ -600,7 +579,7 @@ dependencies = [ "fernet", "lazy_static", "mozsvc-common", - "reqwest 0.11.23", + "reqwest", "serde", "serde_derive", "serde_json", @@ -629,12 +608,12 @@ dependencies = [ "cadence", "ctor", "futures-util", - "reqwest 0.11.23", + "reqwest", "serde_json", "slog-scope", "thiserror", "tokio 1.35.1", - "uuid 1.6.1", + "uuid", ] [[package]] @@ -678,12 +657,12 @@ dependencies = [ "ctor", "futures 0.3.29", "mockall", - "reqwest 0.11.23", + "reqwest", "sentry", "slog-scope", "thiserror", "tokio 1.35.1", - "uuid 1.6.1", + "uuid", ] [[package]] @@ -716,15 +695,15 @@ dependencies = [ "openssl", "rand 0.8.5", "regex", - "reqwest 0.11.23", - "rusoto_core 0.47.0", - "rusoto_dynamodb 0.47.0", + "reqwest", + "rusoto_core", + "rusoto_dynamodb", "sentry", "sentry-actix", "sentry-core", "serde", "serde_derive", - "serde_dynamodb 0.9.0", + "serde_dynamodb", "serde_json", "slog", "slog-async", @@ -735,66 +714,13 @@ dependencies = [ "tempfile", "thiserror", "tokio 1.35.1", - "url 2.5.0", - "uuid 1.6.1", + "url", + "uuid", "validator", "validator_derive", "yup-oauth2", ] -[[package]] -name = "autopush" -version = "1.69.7" -dependencies = [ - "autopush_common", - "base64 0.21.5", - "bytes 0.4.12", - "cadence", - "chrono", - "config", - "crossbeam-channel", - "docopt", - "env_logger 0.9.3", - "fernet", - "futures 0.1.31", - "futures-backoff", - "futures-locks 0.5.0", - "hex", - "httparse", - "hyper 0.12.36", - "lazy_static", - "log", - "mozsvc-common", - "openssl", - "rand 0.8.5", - "regex", - "reqwest 0.9.24", - "rusoto_core 0.42.0", - "rusoto_credential 0.42.0", - "rusoto_dynamodb 0.42.0", - "sentry", - "serde", - "serde_derive", - "serde_dynamodb 0.4.1", - "serde_json", - "signal-hook", - "slog", - "slog-async", - "slog-mozlog-json", - "slog-scope", - "slog-stdlog", - "slog-term", - "state_machine_future", - "thiserror", - "tokio-core", - "tokio-io", - "tokio-openssl", - "tokio-tungstenite", - "tungstenite", - "uuid 1.6.1", - "woothee", -] - [[package]] name = "autopush_common" version = "1.69.7" @@ -819,7 +745,7 @@ dependencies = [ "grpcio", "hex", "httparse", - "hyper 0.14.28", + "hyper", "lazy_static", "log", "mockall", @@ -828,16 +754,16 @@ dependencies = [ "protobuf", "rand 0.8.5", "regex", - "reqwest 0.11.23", - "rusoto_core 0.47.0", - "rusoto_credential 0.47.0", - "rusoto_dynamodb 0.47.0", + "reqwest", + "rusoto_core", + "rusoto_credential", + "rusoto_dynamodb", "sentry", "sentry-backtrace", "sentry-core", "serde", "serde_derive", - "serde_dynamodb 0.9.0", + "serde_dynamodb", "serde_json", "slog", "slog-async", @@ -852,8 +778,8 @@ dependencies = [ "tokio 1.35.1", "tokio-core", "tungstenite", - "url 2.5.0", - "uuid 1.6.1", + "url", + "uuid", "woothee", ] @@ -872,21 +798,21 @@ dependencies = [ "base64 0.21.5", "bytes 1.5.0", "cfg-if 1.0.0", - "cookie 0.16.2", + "cookie", "derive_more", "futures-core", "futures-util", - "h2 0.3.24", + "h2", "http 0.2.11", "itoa 1.0.10", "log", "mime", - "percent-encoding 2.3.1", + "percent-encoding", "pin-project-lite 0.2.13", "rand 0.8.5", "serde", "serde_json", - "serde_urlencoded 0.7.1", + "serde_urlencoded", "tokio 1.35.1", ] @@ -905,15 +831,6 @@ dependencies = [ "rustc-demangle", ] -[[package]] -name = "base64" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b25d992356d2eb0ed82172f5248873db5560c4721f564b13cb5193bda5e668e" -dependencies = [ - "byteorder", -] - [[package]] name = "base64" version = "0.11.0" @@ -953,11 +870,11 @@ dependencies = [ "lazycell", "log", "peeking_take_while", - "proc-macro2 1.0.70", - "quote 1.0.33", + "proc-macro2", + "quote", "regex", "rustc-hash", - "shlex 1.3.0", + "shlex", "which", ] @@ -973,17 +890,6 @@ version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" -[[package]] -name = "blake2b_simd" -version = "0.5.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "afa748e348ad3be8263be728124b24a24f268266f6f5d58af9d75f6a40b5c587" -dependencies = [ - "arrayref", - "arrayvec", - "constant_time_eq", -] - [[package]] name = "block-buffer" version = "0.7.3" @@ -1087,7 +993,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "206fdffcfa2df7cbe15601ef46c813fce0965eb3286db6b56c583b814b51c81c" dependencies = [ "byteorder", - "either", "iovec", ] @@ -1240,57 +1145,23 @@ dependencies = [ "yaml-rust", ] -[[package]] -name = "constant_time_eq" -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.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "888604f00b3db336d2af898ec3c1d5d0ddf5e6d462220f2ededc33a87ac4bbd5" -dependencies = [ - "time 0.1.45", - "url 1.7.2", -] - [[package]] name = "cookie" version = "0.16.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e859cd57d0710d9e06c381b550c06e76992472a8c6d527aecd2fc673dcc231fb" dependencies = [ - "percent-encoding 2.3.1", - "time 0.3.31", + "percent-encoding", + "time", "version_check", ] -[[package]] -name = "cookie_store" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46750b3f362965f197996c4448e4a0935e791bf7d6631bfce9ee0af3d24c919c" -dependencies = [ - "cookie 0.12.0", - "failure", - "idna 0.1.5", - "log", - "publicsuffix", - "serde", - "serde_json", - "time 0.1.45", - "try_from", - "url 1.7.2", -] - [[package]] name = "core-foundation" version = "0.9.4" @@ -1352,7 +1223,7 @@ version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "058ed274caafc1f60c4997b5fc07bf7dc7cca454af7c6e81edffe5f33f70dace" dependencies = [ - "autocfg 1.1.0", + "autocfg", "cfg-if 0.1.10", "crossbeam-utils 0.7.2", "lazy_static", @@ -1361,15 +1232,6 @@ dependencies = [ "scopeguard", ] -[[package]] -name = "crossbeam-queue" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c979cd6cfe72335896575c6b5688da489e420d36a27a0b9eb0c73db574b4a4b" -dependencies = [ - "crossbeam-utils 0.6.6", -] - [[package]] name = "crossbeam-queue" version = "0.2.3" @@ -1381,23 +1243,13 @@ dependencies = [ "maybe-uninit", ] -[[package]] -name = "crossbeam-utils" -version = "0.6.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04973fa96e96579258a5091af6003abde64af786b860f18622b82e026cca60e6" -dependencies = [ - "cfg-if 0.1.10", - "lazy_static", -] - [[package]] name = "crossbeam-utils" version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c3c7c73a2d1e9fc0886a08b93e98eb643461230d5f1925e4036204d5f2e261a8" dependencies = [ - "autocfg 1.1.0", + "autocfg", "cfg-if 0.1.10", "lazy_static", ] @@ -1421,16 +1273,6 @@ dependencies = [ "typenum", ] -[[package]] -name = "crypto-mac" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4434400df11d95d556bac068ddfedd482915eb18fe8bea89bc80b6e4b1c179e5" -dependencies = [ - "generic-array 0.12.4", - "subtle 1.0.0", -] - [[package]] name = "crypto-mac" version = "0.11.1" @@ -1438,7 +1280,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b1d1a86f49236c215f271d40892d5fc950490551400b02ef360692c29815c714" dependencies = [ "generic-array 0.14.7", - "subtle 2.4.1", + "subtle", ] [[package]] @@ -1456,44 +1298,10 @@ version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "30d2b3721e861707777e3195b0158f950ae6dc4a27e4d02ff9f67e3eb3de199e" dependencies = [ - "quote 1.0.33", + "quote", "syn 2.0.41", ] -[[package]] -name = "darling" -version = "0.8.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9158d690bc62a3a57c3e45b85e4d50de2008b39345592c64efd79345c7e24be0" -dependencies = [ - "darling_core", - "darling_macro", -] - -[[package]] -name = "darling_core" -version = "0.8.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2a368589465391e127e10c9e3a08efc8df66fd49b87dc8524c764bbe7f2ef82" -dependencies = [ - "fnv", - "ident_case", - "proc-macro2 0.4.30", - "quote 0.6.13", - "syn 0.15.44", -] - -[[package]] -name = "darling_macro" -version = "0.8.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "244e8987bd4e174385240cde20a3657f607fb0797563c28255c353b5819a07b1" -dependencies = [ - "darling_core", - "quote 0.6.13", - "syn 0.15.44", -] - [[package]] name = "deadpool" version = "0.10.0" @@ -1519,7 +1327,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bef552e6f588e446098f6ba40d89ac146c8c7b64aade83c051ee00bb5d2bc18d" dependencies = [ "serde", - "uuid 1.6.1", + "uuid", ] [[package]] @@ -1539,26 +1347,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4fb810d30a7c1953f91334de7244731fc3f3c10d7fe163338a35b9f640960321" dependencies = [ "convert_case", - "proc-macro2 1.0.70", - "quote 1.0.33", + "proc-macro2", + "quote", "rustc_version 0.4.0", "syn 1.0.109", ] -[[package]] -name = "derive_state_machine_future" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1220ad071cb8996454c20adf547a34ba3ac793759dab793d9dc04996a373ac83" -dependencies = [ - "darling", - "heck 0.3.3", - "petgraph", - "proc-macro2 0.4.30", - "quote 0.6.13", - "syn 0.15.44", -] - [[package]] name = "difflib" version = "0.4.0" @@ -1593,17 +1387,6 @@ dependencies = [ "crypto-common", ] -[[package]] -name = "dirs" -version = "1.0.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fd78930633bd1c6e35c4b42b1df7b0cbc6bc191146e512bb3bedf243fcc3901" -dependencies = [ - "libc", - "redox_users 0.3.5", - "winapi 0.3.9", -] - [[package]] name = "dirs-next" version = "2.0.0" @@ -1621,7 +1404,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4ebda144c4fe02d1f7ea1a7d9641b6fc6b580adcfa024ae48797ecdeb6825b4d" dependencies = [ "libc", - "redox_users 0.4.4", + "redox_users", "winapi 0.3.9", ] @@ -1649,12 +1432,6 @@ version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1435fa1053d8b2fbbe9be7e97eca7f33d37b28409959813daefc1446a14247f1" -[[package]] -name = "dtoa" -version = "0.4.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56899898ce76aaf4a0f24d914c97ea6ed976d42fec6ad33fcbb0a1103e07b2b0" - [[package]] name = "either" version = "1.9.0" @@ -1721,28 +1498,6 @@ dependencies = [ "windows-sys 0.52.0", ] -[[package]] -name = "failure" -version = "0.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d32e9bd16cc02eae7db7ef620b392808b89f6a5e16bb3497d159c6b92a0f4f86" -dependencies = [ - "backtrace", - "failure_derive", -] - -[[package]] -name = "failure_derive" -version = "0.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa4da3c766cd7a0db8242e326e9e4e081edd567072893ed320008189715366a4" -dependencies = [ - "proc-macro2 1.0.70", - "quote 1.0.33", - "syn 1.0.109", - "synstructure", -] - [[package]] name = "fake-simd" version = "0.1.2" @@ -1780,12 +1535,6 @@ dependencies = [ "winapi 0.3.9", ] -[[package]] -name = "fixedbitset" -version = "0.1.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86d4de0081402f5e88cdac65c8dcdcc73118c1a7a465e2a05f0da05843a8ea33" - [[package]] name = "flate2" version = "1.0.28" @@ -1832,7 +1581,7 @@ version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456" dependencies = [ - "percent-encoding 2.3.1", + "percent-encoding", ] [[package]] @@ -1911,16 +1660,6 @@ version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eb1d22c66e66d9d72e1758f0bd7d4fd0bee04cad842ee34587d68c07e45d088c" -[[package]] -name = "futures-cpupool" -version = "0.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab90cde24b3319636588d0c35fe03b1333857621051837ed769faefb4c2162e4" -dependencies = [ - "futures 0.1.31", - "num_cpus", -] - [[package]] name = "futures-executor" version = "0.3.29" @@ -1938,17 +1677,6 @@ version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8bf34a163b5c4c52d0478a4d757da8fb65cabef42ba90515efee0f6f9fa45aaa" -[[package]] -name = "futures-locks" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4297dd1d9d6268237e4f93aeb9c90fc1bf0d8cec7e1cef22798939e4c43a251" -dependencies = [ - "futures 0.1.31", - "tokio-current-thread", - "tokio-executor", -] - [[package]] name = "futures-locks" version = "0.7.1" @@ -1966,8 +1694,8 @@ version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "53b153fd91e4b0147f4aced87be237c98248656bb01050b96bf3ee89220a8ddb" dependencies = [ - "proc-macro2 1.0.70", - "quote 1.0.33", + "proc-macro2", + "quote", "syn 2.0.41", ] @@ -2116,24 +1844,6 @@ dependencies = [ "walkdir", ] -[[package]] -name = "h2" -version = "0.1.26" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5b34c246847f938a410a03c5458c7fee2274436675e76d8b903c08efc29c462" -dependencies = [ - "byteorder", - "bytes 0.4.12", - "fnv", - "futures 0.1.31", - "http 0.1.21", - "indexmap 1.9.3", - "log", - "slab", - "string", - "tokio-io", -] - [[package]] name = "h2" version = "0.3.24" @@ -2146,7 +1856,7 @@ dependencies = [ "futures-sink", "futures-util", "http 0.2.11", - "indexmap 2.1.0", + "indexmap", "slab", "tokio 1.35.1", "tokio-util", @@ -2168,15 +1878,6 @@ version = "0.14.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" -[[package]] -name = "heck" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d621efb26863f0e9924c6ac577e8275e5e6b77455db64ffa6c65c904e9e132c" -dependencies = [ - "unicode-segmentation", -] - [[package]] name = "heck" version = "0.4.1" @@ -2204,23 +1905,13 @@ version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" -[[package]] -name = "hmac" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5dcb5e64cda4c23119ab41ba960d1e170a774c8e4b9d9e6a9bc18aabf5e59695" -dependencies = [ - "crypto-mac 0.7.0", - "digest 0.8.1", -] - [[package]] name = "hmac" version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2a2a2320eb7ec0ebe8da8f744d7812d9fc4cb4d09344ac01898dbcb6a20ae69b" dependencies = [ - "crypto-mac 0.11.1", + "crypto-mac", "digest 0.9.0", ] @@ -2266,18 +1957,6 @@ dependencies = [ "itoa 1.0.10", ] -[[package]] -name = "http-body" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6741c859c1b2463a423a1dbce98d418e6c3c3fc720fb0d45528657320920292d" -dependencies = [ - "bytes 0.4.12", - "futures 0.1.31", - "http 0.1.21", - "tokio-buf", -] - [[package]] name = "http-body" version = "0.4.6" @@ -2307,36 +1986,6 @@ version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" -[[package]] -name = "hyper" -version = "0.12.36" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c843caf6296fc1f93444735205af9ed4e109a539005abb2564ae1d6fad34c52" -dependencies = [ - "bytes 0.4.12", - "futures 0.1.31", - "futures-cpupool", - "h2 0.1.26", - "http 0.1.21", - "http-body 0.1.0", - "httparse", - "iovec", - "itoa 0.4.8", - "log", - "net2", - "rustc_version 0.2.3", - "time 0.1.45", - "tokio 0.1.22", - "tokio-buf", - "tokio-executor", - "tokio-io", - "tokio-reactor", - "tokio-tcp", - "tokio-threadpool", - "tokio-timer", - "want 0.2.0", -] - [[package]] name = "hyper" version = "0.14.28" @@ -2347,9 +1996,9 @@ dependencies = [ "futures-channel", "futures-core", "futures-util", - "h2 0.3.24", + "h2", "http 0.2.11", - "http-body 0.4.6", + "http-body", "httparse", "httpdate", "itoa 1.0.10", @@ -2358,7 +2007,7 @@ dependencies = [ "tokio 1.35.1", "tower-service", "tracing", - "want 0.3.1", + "want", ] [[package]] @@ -2366,7 +2015,7 @@ name = "hyper-alpn" version = "0.4.1" source = "git+https://github.com/WalletConnect/hyper-alpn#9761c744b8ba274dfaea04613bb4c39c1a97c141" dependencies = [ - "hyper 0.14.28", + "hyper", "log", "rustls 0.20.9", "rustls-pemfile", @@ -2383,7 +2032,7 @@ checksum = "5f9f7a97316d44c0af9b0301e65010573a853a9fc97046d7331d7f6bc0fd5a64" dependencies = [ "ct-logs", "futures-util", - "hyper 0.14.28", + "hyper", "log", "rustls 0.19.1", "rustls-native-certs 0.5.0", @@ -2400,7 +2049,7 @@ checksum = "ec3efd23720e2049821a693cbc7e65ea87c72f1c58ff2f9522ff332b1491e590" dependencies = [ "futures-util", "http 0.2.11", - "hyper 0.14.28", + "hyper", "log", "rustls 0.21.10", "rustls-native-certs 0.6.3", @@ -2408,19 +2057,6 @@ dependencies = [ "tokio-rustls 0.24.1", ] -[[package]] -name = "hyper-tls" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a800d6aa50af4b5850b2b0f659625ce9504df908e9733b635720483be26174f" -dependencies = [ - "bytes 0.4.12", - "futures 0.1.31", - "hyper 0.12.36", - "native-tls", - "tokio-io", -] - [[package]] name = "hyper-tls" version = "0.5.0" @@ -2428,7 +2064,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905" dependencies = [ "bytes 1.5.0", - "hyper 0.14.28", + "hyper", "native-tls", "tokio 1.35.1", "tokio-native-tls", @@ -2457,34 +2093,6 @@ dependencies = [ "cc", ] -[[package]] -name = "ident_case" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" - -[[package]] -name = "idna" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38f09e0f0b1fb55fdee1f17470ad800da77af5186a1a76c026b679358b7e844e" -dependencies = [ - "matches", - "unicode-bidi", - "unicode-normalization", -] - -[[package]] -name = "idna" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "418a0a6fab821475f634efe3ccc45c013f742efe03d853e8d3355d5cb850ecf8" -dependencies = [ - "matches", - "unicode-bidi", - "unicode-normalization", -] - [[package]] name = "idna" version = "0.4.0" @@ -2517,16 +2125,6 @@ version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "206ca75c9c03ba3d4ace2460e57b189f39f43de612c2f85836e65c929701bb2d" -[[package]] -name = "indexmap" -version = "1.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" -dependencies = [ - "autocfg 1.1.0", - "hashbrown 0.12.3", -] - [[package]] name = "indexmap" version = "2.1.0" @@ -2756,7 +2354,7 @@ version = "0.4.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45" dependencies = [ - "autocfg 1.1.0", + "autocfg", "scopeguard", ] @@ -2772,12 +2370,6 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ffbee8634e0d45d258acb448e7eaab3fce7a0a467395d4d9f228e3c1f01fb2e4" -[[package]] -name = "matches" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2532096657941c2fea9c289d370a250971c689d4f143798ff67113ec042024a5" - [[package]] name = "maybe-uninit" version = "2.0.0" @@ -2795,12 +2387,6 @@ dependencies = [ "opaque-debug 0.3.0", ] -[[package]] -name = "md5" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "490cc448043f947bae3cbee9c203358d62dbee0db12107a74be5c30ccfd09771" - [[package]] name = "memchr" version = "2.6.4" @@ -2813,7 +2399,7 @@ version = "0.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "043175f069eda7b85febe4a74abbaeff828d9f8b448515d3151a14a3542811aa" dependencies = [ - "autocfg 1.1.0", + "autocfg", ] [[package]] @@ -2822,16 +2408,6 @@ version = "0.3.17" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" -[[package]] -name = "mime_guess" -version = "2.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4192263c238a5f0d0c6bfd21f336a313a4ce1c450542449ca191bb657b4642ef" -dependencies = [ - "mime", - "unicase", -] - [[package]] name = "minimal-lexical" version = "0.2.1" @@ -2860,7 +2436,7 @@ dependencies = [ "kernel32-sys", "libc", "log", - "miow 0.2.2", + "miow", "net2", "slab", "winapi 0.2.8", @@ -2878,18 +2454,6 @@ dependencies = [ "windows-sys 0.48.0", ] -[[package]] -name = "mio-named-pipes" -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0840c1c50fd55e521b247f949c241c9997709f23bd7f023b9762cd561e935656" -dependencies = [ - "log", - "mio 0.6.23", - "miow 0.3.7", - "winapi 0.3.9", -] - [[package]] name = "mio-uds" version = "0.6.8" @@ -2913,15 +2477,6 @@ dependencies = [ "ws2_32-sys", ] -[[package]] -name = "miow" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9f1c5b025cda876f66ef43a113f91ebc9f4ccef34843000e0adf6ebbab84e21" -dependencies = [ - "winapi 0.3.9", -] - [[package]] name = "mockall" version = "0.11.4" @@ -2944,8 +2499,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "22ce75669015c4f47b289fd4d4f56e894e4c96003ffdf3ac51313126f94c6cbb" dependencies = [ "cfg-if 1.0.0", - "proc-macro2 1.0.70", - "quote 1.0.33", + "proc-macro2", + "quote", "syn 1.0.109", ] @@ -2963,7 +2518,7 @@ dependencies = [ "rand 0.8.5", "regex", "serde_json", - "serde_urlencoded 0.7.1", + "serde_urlencoded", "similar", ] @@ -2975,7 +2530,7 @@ checksum = "51fba38c7ded23ca88a409f72277d177170b3eadb5e283741182fd3cae60ecdf" dependencies = [ "hostname", "lazy_static", - "reqwest 0.11.23", + "reqwest", ] [[package]] @@ -3029,7 +2584,7 @@ version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "608e7659b5c3d7cba262d894801b9ec9d00de989e8a82bd4bef91d08da45cdc0" dependencies = [ - "autocfg 1.1.0", + "autocfg", "num-integer", "num-traits", ] @@ -3040,7 +2595,7 @@ version = "0.1.45" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9" dependencies = [ - "autocfg 1.1.0", + "autocfg", "num-traits", ] @@ -3050,7 +2605,7 @@ version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c" dependencies = [ - "autocfg 1.1.0", + "autocfg", ] [[package]] @@ -3120,8 +2675,8 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ - "proc-macro2 1.0.70", - "quote 1.0.33", + "proc-macro2", + "quote", "syn 2.0.41", ] @@ -3153,12 +2708,6 @@ dependencies = [ "hashbrown 0.12.3", ] -[[package]] -name = "ordermap" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a86ed3f5f244b372d6b1a00b72ef7f8876d0bc6a78a4c9985c53614041512063" - [[package]] name = "os_info" version = "3.7.0" @@ -3271,12 +2820,6 @@ dependencies = [ "base64 0.13.1", ] -[[package]] -name = "percent-encoding" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31010dd2e1ac33d5b46a5b413495239882813e0369f8ed8a5e266f173602f831" - [[package]] name = "percent-encoding" version = "2.3.1" @@ -3312,8 +2855,8 @@ checksum = "68bd1206e71118b5356dae5ddc61c8b11e28b09ef6a31acbd15ea48a28e0c227" dependencies = [ "pest", "pest_meta", - "proc-macro2 1.0.70", - "quote 1.0.33", + "proc-macro2", + "quote", "syn 2.0.41", ] @@ -3328,16 +2871,6 @@ dependencies = [ "sha2 0.10.8", ] -[[package]] -name = "petgraph" -version = "0.4.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c3659d1ee90221741f65dd128d9998311b0e40c5d3c23a62445938214abce4f" -dependencies = [ - "fixedbitset", - "ordermap", -] - [[package]] name = "pin-project-lite" version = "0.1.12" @@ -3411,8 +2944,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" dependencies = [ "proc-macro-error-attr", - "proc-macro2 1.0.70", - "quote 1.0.33", + "proc-macro2", + "quote", "syn 1.0.109", "version_check", ] @@ -3423,20 +2956,11 @@ version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" dependencies = [ - "proc-macro2 1.0.70", - "quote 1.0.33", + "proc-macro2", + "quote", "version_check", ] -[[package]] -name = "proc-macro2" -version = "0.4.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf3d2011ab5c909338f7887f4fc896d35932e29146c12c8d01da6b22a80ba759" -dependencies = [ - "unicode-xid 0.1.0", -] - [[package]] name = "proc-macro2" version = "1.0.70" @@ -3452,32 +2976,13 @@ version = "2.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "106dd99e98437432fed6519dedecfade6a06a73bb7b2a1e019fdd2bee5778d94" -[[package]] -name = "publicsuffix" -version = "1.5.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95b4ce31ff0a27d93c8de1849cf58162283752f065a90d508f1105fa6c9a213f" -dependencies = [ - "idna 0.2.3", - "url 2.5.0", -] - -[[package]] -name = "quote" -version = "0.6.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ce23b6b870e8f94f81fb0a363d65d86675884b34a09043c81e5562f11c1f8e1" -dependencies = [ - "proc-macro2 0.4.30", -] - [[package]] name = "quote" version = "1.0.33" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" dependencies = [ - "proc-macro2 1.0.70", + "proc-macro2", ] [[package]] @@ -3493,25 +2998,6 @@ dependencies = [ "winapi 0.3.9", ] -[[package]] -name = "rand" -version = "0.6.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d71dacdc3c88c1fde3885a3be3fbab9f35724e6ce99467f7d9c5026132184ca" -dependencies = [ - "autocfg 0.1.8", - "libc", - "rand_chacha 0.1.1", - "rand_core 0.4.2", - "rand_hc 0.1.0", - "rand_isaac", - "rand_jitter", - "rand_os", - "rand_pcg", - "rand_xorshift", - "winapi 0.3.9", -] - [[package]] name = "rand" version = "0.7.3" @@ -3522,7 +3008,7 @@ dependencies = [ "libc", "rand_chacha 0.2.2", "rand_core 0.5.1", - "rand_hc 0.2.0", + "rand_hc", ] [[package]] @@ -3536,16 +3022,6 @@ dependencies = [ "rand_core 0.6.4", ] -[[package]] -name = "rand_chacha" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "556d3a1ca6600bfcbab7c7c91ccb085ac7fbbcd70e008a98742e7847f4f7bcef" -dependencies = [ - "autocfg 0.1.8", - "rand_core 0.3.1", -] - [[package]] name = "rand_chacha" version = "0.2.2" @@ -3599,15 +3075,6 @@ dependencies = [ "getrandom 0.2.11", ] -[[package]] -name = "rand_hc" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b40677c7be09ae76218dc623efbf7b18e34bced3f38883af07bb75630a21bc4" -dependencies = [ - "rand_core 0.3.1", -] - [[package]] name = "rand_hc" version = "0.2.0" @@ -3617,59 +3084,6 @@ dependencies = [ "rand_core 0.5.1", ] -[[package]] -name = "rand_isaac" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ded997c9d5f13925be2a6fd7e66bf1872597f759fd9dd93513dd7e92e5a5ee08" -dependencies = [ - "rand_core 0.3.1", -] - -[[package]] -name = "rand_jitter" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1166d5c91dc97b88d1decc3285bb0a99ed84b05cfd0bc2341bdf2d43fc41e39b" -dependencies = [ - "libc", - "rand_core 0.4.2", - "winapi 0.3.9", -] - -[[package]] -name = "rand_os" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b75f676a1e053fc562eafbb47838d67c84801e38fc1ba459e8f180deabd5071" -dependencies = [ - "cloudabi", - "fuchsia-cprng", - "libc", - "rand_core 0.4.2", - "rdrand", - "winapi 0.3.9", -] - -[[package]] -name = "rand_pcg" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "abf9b09b01790cfe0364f52bf32995ea3c39f4d2dd011eac241d2914146d0b44" -dependencies = [ - "autocfg 0.1.8", - "rand_core 0.4.2", -] - -[[package]] -name = "rand_xorshift" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cbf7e9e623549b0e21f6e97cf8ecf247c1a8fd2e8a992ae265314300b2455d5c" -dependencies = [ - "rand_core 0.3.1", -] - [[package]] name = "rdrand" version = "0.4.0" @@ -3703,17 +3117,6 @@ dependencies = [ "bitflags 1.3.2", ] -[[package]] -name = "redox_users" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de0737333e7a9502c789a36d7c7fa6092a49895d4faa31ca5df163857ded2e9d" -dependencies = [ - "getrandom 0.1.16", - "redox_syscall 0.1.57", - "rust-argon2", -] - [[package]] name = "redox_users" version = "0.4.4" @@ -3754,46 +3157,6 @@ version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" -[[package]] -name = "rent_to_own" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05a51ad2b1c5c710fa89e6b1631068dab84ed687bc6a5fe061ad65da3d0c25b2" - -[[package]] -name = "reqwest" -version = "0.9.24" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f88643aea3c1343c804950d7bf983bd2067f5ab59db6d613a08e05572f2714ab" -dependencies = [ - "base64 0.10.1", - "bytes 0.4.12", - "cookie 0.12.0", - "cookie_store", - "encoding_rs", - "flate2", - "futures 0.1.31", - "http 0.1.21", - "hyper 0.12.36", - "hyper-tls 0.3.2", - "log", - "mime", - "mime_guess", - "native-tls", - "serde", - "serde_json", - "serde_urlencoded 0.5.5", - "time 0.1.45", - "tokio 0.1.22", - "tokio-executor", - "tokio-io", - "tokio-threadpool", - "tokio-timer", - "url 1.7.2", - "uuid 0.7.4", - "winreg 0.6.2", -] - [[package]] name = "reqwest" version = "0.11.23" @@ -3805,31 +3168,31 @@ dependencies = [ "encoding_rs", "futures-core", "futures-util", - "h2 0.3.24", + "h2", "http 0.2.11", - "http-body 0.4.6", - "hyper 0.14.28", - "hyper-tls 0.5.0", + "http-body", + "hyper", + "hyper-tls", "ipnet", "js-sys", "log", "mime", "native-tls", "once_cell", - "percent-encoding 2.3.1", + "percent-encoding", "pin-project-lite 0.2.13", "serde", "serde_json", - "serde_urlencoded 0.7.1", + "serde_urlencoded", "system-configuration", "tokio 1.35.1", "tokio-native-tls", "tower-service", - "url 2.5.0", + "url", "wasm-bindgen", "wasm-bindgen-futures", "web-sys", - "winreg 0.50.0", + "winreg", ] [[package]] @@ -3861,41 +3224,15 @@ dependencies = [ "windows-sys 0.48.0", ] -[[package]] -name = "ron" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88073939a61e5b7680558e6be56b419e208420c2adb92be54921fa6b72283f1a" -dependencies = [ - "base64 0.13.1", - "bitflags 1.3.2", - "serde", -] - -[[package]] -name = "rusoto_core" -version = "0.42.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1d1ecfe8dac29878a713fbc4c36b0a84a48f7a6883541841cdff9fdd2ba7dfb" -dependencies = [ - "base64 0.11.0", - "bytes 0.4.12", - "futures 0.1.31", - "http 0.1.21", - "hyper 0.12.36", - "hyper-tls 0.3.2", - "lazy_static", - "log", - "rusoto_credential 0.42.0", - "rusoto_signature 0.42.0", - "rustc_version 0.2.3", +[[package]] +name = "ron" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "88073939a61e5b7680558e6be56b419e208420c2adb92be54921fa6b72283f1a" +dependencies = [ + "base64 0.13.1", + "bitflags 1.3.2", "serde", - "serde_derive", - "serde_json", - "time 0.1.45", - "tokio 0.1.22", - "tokio-timer", - "xml-rs", ] [[package]] @@ -3910,12 +3247,12 @@ dependencies = [ "crc32fast", "futures 0.3.29", "http 0.2.11", - "hyper 0.14.28", + "hyper", "hyper-rustls 0.22.1", "lazy_static", "log", - "rusoto_credential 0.47.0", - "rusoto_signature 0.47.0", + "rusoto_credential", + "rusoto_signature", "rustc_version 0.4.0", "serde", "serde_json", @@ -3923,26 +3260,6 @@ dependencies = [ "xml-rs", ] -[[package]] -name = "rusoto_credential" -version = "0.42.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8632e41d289db90dd40d0389c71a23c5489e3afd448424226529113102e2a002" -dependencies = [ - "chrono", - "dirs", - "futures 0.1.31", - "hyper 0.12.36", - "lazy_static", - "regex", - "serde", - "serde_derive", - "serde_json", - "shlex 0.1.1", - "tokio-process", - "tokio-timer", -] - [[package]] name = "rusoto_credential" version = "0.47.0" @@ -3953,28 +3270,14 @@ dependencies = [ "chrono", "dirs-next", "futures 0.3.29", - "hyper 0.14.28", + "hyper", "serde", "serde_json", - "shlex 1.3.0", + "shlex", "tokio 1.35.1", "zeroize", ] -[[package]] -name = "rusoto_dynamodb" -version = "0.42.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f6cfb692b9300c14d0d7c2607b2dcb9da8afca4239f3ca4e9ec48f47696ac9d" -dependencies = [ - "bytes 0.4.12", - "futures 0.1.31", - "rusoto_core 0.42.0", - "serde", - "serde_derive", - "serde_json", -] - [[package]] name = "rusoto_dynamodb" version = "0.47.0" @@ -3984,35 +3287,11 @@ dependencies = [ "async-trait", "bytes 1.5.0", "futures 0.3.29", - "rusoto_core 0.47.0", + "rusoto_core", "serde", "serde_json", ] -[[package]] -name = "rusoto_signature" -version = "0.42.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7063a70614eb4b36f49bcf4f6f6bb30cc765e3072b317d6afdfe51e7a9f482d1" -dependencies = [ - "base64 0.11.0", - "bytes 0.4.12", - "futures 0.1.31", - "hex", - "hmac 0.7.1", - "http 0.1.21", - "hyper 0.12.36", - "log", - "md5", - "percent-encoding 2.3.1", - "rusoto_credential 0.42.0", - "rustc_version 0.2.3", - "serde", - "sha2 0.8.2", - "time 0.1.45", - "tokio 0.1.22", -] - [[package]] name = "rusoto_signature" version = "0.47.0" @@ -4025,32 +3304,20 @@ dependencies = [ "digest 0.9.0", "futures 0.3.29", "hex", - "hmac 0.11.0", + "hmac", "http 0.2.11", - "hyper 0.14.28", + "hyper", "log", "md-5", - "percent-encoding 2.3.1", + "percent-encoding", "pin-project-lite 0.2.13", - "rusoto_credential 0.47.0", + "rusoto_credential", "rustc_version 0.4.0", "serde", "sha2 0.9.9", "tokio 1.35.1", ] -[[package]] -name = "rust-argon2" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b18820d944b33caa75a71378964ac46f58517c92b6ae5f762636247c09e78fb" -dependencies = [ - "base64 0.13.1", - "blake2b_simd", - "constant_time_eq", - "crossbeam-utils 0.8.17", -] - [[package]] name = "rust-ini" version = "0.18.0" @@ -4305,7 +3572,7 @@ dependencies = [ "httpdate", "log", "native-tls", - "reqwest 0.11.23", + "reqwest", "sentry-backtrace", "sentry-contexts", "sentry-core", @@ -4412,9 +3679,9 @@ dependencies = [ "serde", "serde_json", "thiserror", - "time 0.3.31", - "url 2.5.0", - "uuid 1.6.1", + "time", + "url", + "uuid", ] [[package]] @@ -4432,21 +3699,11 @@ version = "1.0.193" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "43576ca501357b9b071ac53cdc7da8ef0cbd9493d8df094cd821777ea6e894d3" dependencies = [ - "proc-macro2 1.0.70", - "quote 1.0.33", + "proc-macro2", + "quote", "syn 2.0.41", ] -[[package]] -name = "serde_dynamodb" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a2f694b5265a3612a5f51ce734e71b1865850a13b9390fea3da60a65dba6218" -dependencies = [ - "rusoto_dynamodb 0.42.0", - "serde", -] - [[package]] name = "serde_dynamodb" version = "0.9.0" @@ -4454,7 +3711,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b0a485bf5e371e28d4978444686ffa91830d4719b92fb31960fbd8f494816239" dependencies = [ "bytes 1.5.0", - "rusoto_dynamodb 0.47.0", + "rusoto_dynamodb", "serde", ] @@ -4469,18 +3726,6 @@ dependencies = [ "serde", ] -[[package]] -name = "serde_urlencoded" -version = "0.5.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "642dd69105886af2efd227f75a520ec9b44a820d65bc133a9131f7d229fd165a" -dependencies = [ - "dtoa", - "itoa 0.4.8", - "serde", - "url 1.7.2", -] - [[package]] name = "serde_urlencoded" version = "0.7.1" @@ -4516,18 +3761,6 @@ dependencies = [ "digest 0.10.7", ] -[[package]] -name = "sha2" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a256f46ea78a0c0d9ff00077504903ac881a1dafdc20da66545699e7776b3e69" -dependencies = [ - "block-buffer 0.7.3", - "digest 0.8.1", - "fake-simd", - "opaque-debug 0.2.3", -] - [[package]] name = "sha2" version = "0.9.9" @@ -4552,28 +3785,12 @@ dependencies = [ "digest 0.10.7", ] -[[package]] -name = "shlex" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fdf1b9db47230893d76faad238fd6097fd6d6a9245cd7a4d90dbd639536bbd2" - [[package]] name = "shlex" version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" -[[package]] -name = "signal-hook" -version = "0.3.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8621587d4798caf8eb44879d42e56b9a93ea5dcd315a6487c357130095b62801" -dependencies = [ - "libc", - "signal-hook-registry", -] - [[package]] name = "signal-hook-registry" version = "1.4.1" @@ -4598,7 +3815,7 @@ dependencies = [ "num-bigint", "num-traits", "thiserror", - "time 0.3.31", + "time", ] [[package]] @@ -4607,7 +3824,7 @@ version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67" dependencies = [ - "autocfg 1.1.0", + "autocfg", ] [[package]] @@ -4690,7 +3907,7 @@ dependencies = [ "slog", "term", "thread_local", - "time 0.3.31", + "time", ] [[package]] @@ -4740,26 +3957,6 @@ version = "0.9.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" -[[package]] -name = "state_machine_future" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "530e1d624baae485bce12e6647acb76aafa253346ee8a16751974eed5a24b13d" -dependencies = [ - "derive_state_machine_future", - "futures 0.1.31", - "rent_to_own", -] - -[[package]] -name = "string" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d24114bfcceb867ca7f71a0d3fe45d45619ec47a6fbfa98cb14e14250bfa5d6d" -dependencies = [ - "bytes 0.4.12", -] - [[package]] name = "strsim" version = "0.8.0" @@ -4787,44 +3984,27 @@ version = "0.24.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1e385be0d24f186b4ce2f9982191e7101bb737312ad61c1f2f984f34bcf85d59" dependencies = [ - "heck 0.4.1", - "proc-macro2 1.0.70", - "quote 1.0.33", + "heck", + "proc-macro2", + "quote", "rustversion", "syn 1.0.109", ] -[[package]] -name = "subtle" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d67a5a62ba6e01cb2192ff309324cb4875d0c451d55fe2319433abe7a05a8ee" - [[package]] name = "subtle" version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601" -[[package]] -name = "syn" -version = "0.15.44" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ca4b3b69a77cbe1ffc9e198781b7acb0c7365a883670e8f1c1bc66fba79a5c5" -dependencies = [ - "proc-macro2 0.4.30", - "quote 0.6.13", - "unicode-xid 0.1.0", -] - [[package]] name = "syn" version = "1.0.109" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" dependencies = [ - "proc-macro2 1.0.70", - "quote 1.0.33", + "proc-macro2", + "quote", "unicode-ident", ] @@ -4834,23 +4014,11 @@ version = "2.0.41" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "44c8b28c477cc3bf0e7966561e3460130e1255f7a1cf71931075f1c5e7a7e269" dependencies = [ - "proc-macro2 1.0.70", - "quote 1.0.33", + "proc-macro2", + "quote", "unicode-ident", ] -[[package]] -name = "synstructure" -version = "0.12.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f" -dependencies = [ - "proc-macro2 1.0.70", - "quote 1.0.33", - "syn 1.0.109", - "unicode-xid 0.2.4", -] - [[package]] name = "system-configuration" version = "0.5.1" @@ -4941,8 +4109,8 @@ version = "1.0.51" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "01742297787513b79cf8e29d1056ede1313e2420b7b3b15d0a768b4921f549df" dependencies = [ - "proc-macro2 1.0.70", - "quote 1.0.33", + "proc-macro2", + "quote", "syn 2.0.41", ] @@ -4956,17 +4124,6 @@ dependencies = [ "once_cell", ] -[[package]] -name = "time" -version = "0.1.45" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b797afad3f312d1c66a56d11d0316f916356d11bd158fbc6ca6389ff6bf805a" -dependencies = [ - "libc", - "wasi 0.10.0+wasi-snapshot-preview1", - "winapi 0.3.9", -] - [[package]] name = "time" version = "0.3.31" @@ -5067,17 +4224,6 @@ dependencies = [ "windows-sys 0.48.0", ] -[[package]] -name = "tokio-buf" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fb220f46c53859a4b7ec083e41dec9778ff0b1851c0942b211edb89e0ccdc46" -dependencies = [ - "bytes 0.4.12", - "either", - "futures 0.1.31", -] - [[package]] name = "tokio-codec" version = "0.1.2" @@ -5156,8 +4302,8 @@ version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e44da00bfc73a25f814cd8d7e57a68a5c31b74b3152a0a1d1f590c97ed06265a" dependencies = [ - "proc-macro2 1.0.70", - "quote 1.0.33", + "proc-macro2", + "quote", "syn 1.0.109", ] @@ -5167,8 +4313,8 @@ version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" dependencies = [ - "proc-macro2 1.0.70", - "quote 1.0.33", + "proc-macro2", + "quote", "syn 2.0.41", ] @@ -5182,36 +4328,6 @@ dependencies = [ "tokio 1.35.1", ] -[[package]] -name = "tokio-openssl" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "771d6246b170ae108d67d9963c23f31a579016c016d73bd4bd7d6ef0252afda7" -dependencies = [ - "futures 0.1.31", - "openssl", - "tokio-io", -] - -[[package]] -name = "tokio-process" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "382d90f43fa31caebe5d3bc6cfd854963394fff3b8cb59d5146607aaae7e7e43" -dependencies = [ - "crossbeam-queue 0.1.2", - "futures 0.1.31", - "lazy_static", - "libc", - "log", - "mio 0.6.23", - "mio-named-pipes", - "tokio-io", - "tokio-reactor", - "tokio-signal", - "winapi 0.3.9", -] - [[package]] name = "tokio-reactor" version = "0.1.12" @@ -5263,23 +4379,6 @@ dependencies = [ "tokio 1.35.1", ] -[[package]] -name = "tokio-signal" -version = "0.2.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0c34c6e548f101053321cba3da7cbb87a610b85555884c41b07da2eb91aff12" -dependencies = [ - "futures 0.1.31", - "libc", - "mio 0.6.23", - "mio-uds", - "signal-hook-registry", - "tokio-executor", - "tokio-io", - "tokio-reactor", - "winapi 0.3.9", -] - [[package]] name = "tokio-sync" version = "0.1.8" @@ -5311,7 +4410,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "df720b6581784c118f0eb4310796b12b1d242a7eb95f716a8367855325c25f89" dependencies = [ "crossbeam-deque", - "crossbeam-queue 0.2.3", + "crossbeam-queue", "crossbeam-utils 0.7.2", "futures 0.1.31", "lazy_static", @@ -5333,17 +4432,6 @@ dependencies = [ "tokio-executor", ] -[[package]] -name = "tokio-tungstenite" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38f95da5281a1a52e72fa3657e571279bcc2b163ba2897ed8eaa34ef97f24fda" -dependencies = [ - "futures 0.1.31", - "tokio-io", - "tungstenite", -] - [[package]] name = "tokio-udp" version = "0.1.6" @@ -5442,15 +4530,6 @@ version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" -[[package]] -name = "try_from" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "283d3b89e1368717881a9d51dad843cc435380d8109c9e47d38780a324698d8b" -dependencies = [ - "cfg-if 0.1.10", -] - [[package]] name = "tungstenite" version = "0.9.2" @@ -5466,7 +4545,7 @@ dependencies = [ "log", "rand 0.7.3", "sha-1", - "url 2.5.0", + "url", "utf-8", ] @@ -5491,15 +4570,6 @@ dependencies = [ "libc", ] -[[package]] -name = "unicase" -version = "2.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7d2d4dafb69621809a81864c9c1b864479e1235c0dd4e199924b9742439ed89" -dependencies = [ - "version_check", -] - [[package]] name = "unicode-bidi" version = "0.3.14" @@ -5521,30 +4591,12 @@ dependencies = [ "tinyvec", ] -[[package]] -name = "unicode-segmentation" -version = "1.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36" - [[package]] name = "unicode-width" version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85" -[[package]] -name = "unicode-xid" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc" - -[[package]] -name = "unicode-xid" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c" - [[package]] name = "untrusted" version = "0.7.1" @@ -5567,18 +4619,7 @@ dependencies = [ "log", "native-tls", "once_cell", - "url 2.5.0", -] - -[[package]] -name = "url" -version = "1.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd4e7c0d531266369519a4aa4f399d748bd37043b00bde1e4ff1f60a120b355a" -dependencies = [ - "idna 0.1.5", - "matches", - "percent-encoding 1.0.1", + "url", ] [[package]] @@ -5589,7 +4630,7 @@ checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633" dependencies = [ "form_urlencoded", "idna 0.5.0", - "percent-encoding 2.3.1", + "percent-encoding", "serde", ] @@ -5599,15 +4640,6 @@ version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9" -[[package]] -name = "uuid" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90dbc611eb48397705a6b0f6e917da23ae517e4d127123d2cf7674206627d32a" -dependencies = [ - "rand 0.6.5", -] - [[package]] name = "uuid" version = "1.6.1" @@ -5630,7 +4662,7 @@ dependencies = [ "serde", "serde_derive", "serde_json", - "url 2.5.0", + "url", ] [[package]] @@ -5642,8 +4674,8 @@ dependencies = [ "if_chain", "lazy_static", "proc-macro-error", - "proc-macro2 1.0.70", - "quote 1.0.33", + "proc-macro2", + "quote", "regex", "syn 1.0.109", "validator_types", @@ -5655,7 +4687,7 @@ version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "111abfe30072511849c5910134e8baf8dc05de4c0e5903d681cbd5c9c4d611e3" dependencies = [ - "proc-macro2 1.0.70", + "proc-macro2", "syn 1.0.109", ] @@ -5693,17 +4725,6 @@ dependencies = [ "winapi-util", ] -[[package]] -name = "want" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6395efa4784b027708f7451087e647ec73cc74f5d9bc2e418404248d679a230" -dependencies = [ - "futures 0.1.31", - "log", - "try-lock", -] - [[package]] name = "want" version = "0.3.1" @@ -5719,12 +4740,6 @@ version = "0.9.0+wasi-snapshot-preview1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" -[[package]] -name = "wasi" -version = "0.10.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f" - [[package]] name = "wasi" version = "0.11.0+wasi-snapshot-preview1" @@ -5750,8 +4765,8 @@ dependencies = [ "bumpalo", "log", "once_cell", - "proc-macro2 1.0.70", - "quote 1.0.33", + "proc-macro2", + "quote", "syn 2.0.41", "wasm-bindgen-shared", ] @@ -5774,7 +4789,7 @@ version = "0.2.89" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0162dbf37223cd2afce98f3d0785506dcb8d266223983e4b5b525859e6e182b2" dependencies = [ - "quote 1.0.33", + "quote", "wasm-bindgen-macro-support", ] @@ -5784,8 +4799,8 @@ version = "0.2.89" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f0eb82fcb7930ae6219a7ecfd55b217f5f0893484b7a13022ebb2b2bf20b5283" dependencies = [ - "proc-macro2 1.0.70", - "quote 1.0.33", + "proc-macro2", + "quote", "syn 2.0.41", "wasm-bindgen-backend", "wasm-bindgen-shared", @@ -6047,15 +5062,6 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04" -[[package]] -name = "winreg" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2986deb581c4fe11b621998a5e53361efe6b48a151178d0cd9eeffa4dc6acc9" -dependencies = [ - "winapi 0.3.9", -] - [[package]] name = "winreg" version = "0.50.0" @@ -6112,20 +5118,20 @@ dependencies = [ "base64 0.13.1", "futures 0.3.29", "http 0.2.11", - "hyper 0.14.28", + "hyper", "hyper-rustls 0.24.2", "itertools", "log", - "percent-encoding 2.3.1", + "percent-encoding", "rustls 0.21.10", "rustls-pemfile", "seahash", "serde", "serde_json", - "time 0.3.31", + "time", "tokio 1.35.1", "tower-service", - "url 2.5.0", + "url", ] [[package]] @@ -6143,8 +5149,8 @@ version = "0.7.31" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b3c129550b3e6de3fd0ba67ba5c81818f9805e58b8d7fee80a3a59d2c9fc601a" dependencies = [ - "proc-macro2 1.0.70", - "quote 1.0.33", + "proc-macro2", + "quote", "syn 2.0.41", ] @@ -6163,8 +5169,8 @@ version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ - "proc-macro2 1.0.70", - "quote 1.0.33", + "proc-macro2", + "quote", "syn 2.0.41", ] diff --git a/Cargo.toml b/Cargo.toml index eb81fed4f..6c079e377 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,7 +1,8 @@ [workspace] members = [ "autopush-common", - "autopush", + # Pending removal: https://github.com/mozilla-services/autopush-rs/issues/524 + #"autopush", "autoendpoint", "autoconnect", "autoconnect/autoconnect-common",