From d327e8800b245b6b976c14e63c72f46bbdc04bf9 Mon Sep 17 00:00:00 2001 From: Rob Ede Date: Thu, 27 Jan 2022 02:58:13 +0000 Subject: [PATCH] update docker sample --- Cargo.lock | 1908 ++++++++++++---------------- basics/docker_sample/.dockerignore | 1 + basics/docker_sample/Cargo.toml | 2 + basics/docker_sample/Dockerfile | 42 +- basics/docker_sample/src/main.rs | 24 +- 5 files changed, 887 insertions(+), 1090 deletions(-) create mode 100644 basics/docker_sample/.dockerignore diff --git a/Cargo.lock b/Cargo.lock index 2332fe72..572f13ad 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -29,7 +29,7 @@ dependencies = [ "log", "once_cell", "parking_lot", - "pin-project 0.4.28", + "pin-project 0.4.29", "smallvec", "tokio 0.2.25", "tokio-util 0.3.1", @@ -52,7 +52,7 @@ dependencies = [ name = "actix-casbin-example" version = "0.1.0" dependencies = [ - "actix-web 3.3.2", + "actix-web 3.3.3", "casbin", "loge", "rhai", @@ -71,25 +71,26 @@ dependencies = [ "futures-core", "futures-sink", "log", - "pin-project 0.4.28", + "pin-project 0.4.29", "tokio 0.2.25", "tokio-util 0.3.1", ] [[package]] name = "actix-codec" -version = "0.4.0" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d5dbeb2d9e51344cb83ca7cc170f1217f9fe25bfc50160e6e200b5c31c1019a" +checksum = "a36c014a3e811624313b51a227b775ecba55d36ef9462bbaac7d4f13e54c9271" dependencies = [ "bitflags", "bytes 1.1.0", "futures-core", "futures-sink", "log", - "pin-project-lite 0.2.7", - "tokio 1.12.0", - "tokio-util 0.6.8", + "memchr", + "pin-project-lite 0.2.8", + "tokio 1.15.0", + "tokio-util 0.6.9", ] [[package]] @@ -123,7 +124,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f3e5c769e4d332bfad27f11b8139b5818c4bbddb02c385b8f16344d93ff1a8eb" dependencies = [ "actix-service 1.0.6", - "actix-web 3.3.2", + "actix-web 3.3.3", "derive_more", "futures-util", ] @@ -134,7 +135,7 @@ version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "36b133d8026a9f209a9aeeeacd028e7451bcca975f592881b305d37983f303d7" dependencies = [ - "actix-web 3.3.2", + "actix-web 3.3.3", "derive_more", "futures-util", "log", @@ -148,9 +149,9 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8035f08f194893b199f4928b40425bd727c0257cf0fcf36f4ac214968d649ec7" dependencies = [ - "actix-http 2.2.1", + "actix-http 2.2.2", "actix-service 1.0.6", - "actix-web 3.3.2", + "actix-web 3.3.3", "bitflags", "bytes 0.5.6", "derive_more", @@ -170,7 +171,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d031468a7859f71674e5531bd05137e0ea5de05ec9a917314330b88c582e2e0a" dependencies = [ "actix-service 1.0.6", - "actix-web 3.3.2", + "actix-web 3.3.3", "bitflags", "bytes 0.5.6", "derive_more", @@ -185,9 +186,9 @@ dependencies = [ [[package]] name = "actix-http" -version = "2.2.1" +version = "2.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cb8958da437716f3f31b0e76f8daf36554128517d7df37ceba7df00f09622ee" +checksum = "2be6b66b62a794a8e6d366ac9415bb7d475ffd1e9f4671f38c1d8a8a5df950b3" dependencies = [ "actix", "actix-codec 0.3.0", @@ -195,11 +196,11 @@ dependencies = [ "actix-rt 1.1.1", "actix-service 1.0.6", "actix-threadpool", - "actix-tls 2.0.0", + "actix-tls", "actix-utils 2.0.0", "base64 0.13.0", "bitflags", - "brotli2", + "brotli", "bytes 0.5.6", "cookie 0.14.4", "copyless", @@ -215,16 +216,16 @@ dependencies = [ "http", "httparse", "indexmap", - "itoa", + "itoa 0.4.8", "language-tags 0.2.2", "lazy_static", "log", "mime", "percent-encoding", - "pin-project 1.0.8", + "pin-project 1.0.10", "rand 0.7.3", "regex", - "serde 1.0.130", + "serde 1.0.136", "serde_json", "serde_urlencoded", "sha-1 0.9.8", @@ -234,45 +235,38 @@ dependencies = [ [[package]] name = "actix-http" -version = "3.0.0-beta.10" +version = "3.0.0-beta.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd38a862fa7fead2b47ee55e550982aba583ebc7365ccf0155b49934ad6f16f9" +checksum = "ae58d21721388ea9b2cd0d4c11756b0f34424cdcd6e5cc74c3ce37b4641c8af0" dependencies = [ - "actix-codec 0.4.0", - "actix-rt 2.2.0", - "actix-service 2.0.0", - "actix-tls 3.0.0-beta.5", + "actix-codec 0.4.2", + "actix-rt 2.6.0", + "actix-service 2.0.2", "actix-utils 3.0.0", - "ahash 0.7.4", + "ahash 0.7.6", "base64 0.13.0", "bitflags", - "brotli2", + "brotli", "bytes 1.1.0", "bytestring", "derive_more", "encoding_rs", "flate2", "futures-core", - "futures-util", - "h2 0.3.6", + "h2 0.3.11", "http", "httparse", - "itoa", + "httpdate 1.0.2", + "itoa 1.0.1", "language-tags 0.3.2", "local-channel", "log", "mime", - "once_cell", "percent-encoding", - "pin-project 1.0.8", - "pin-project-lite 0.2.7", + "pin-project-lite 0.2.8", "rand 0.8.4", - "regex", - "serde 1.0.130", - "sha-1 0.9.8", + "sha-1 0.10.0", "smallvec", - "time 0.2.27", - "tokio 1.12.0", "zstd", ] @@ -283,9 +277,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3263fe74cf505c6f9e18209c89fbdba5569cfd3905a7e907b42aa1c85c18fae5" dependencies = [ "actix-service 1.0.6", - "actix-web 3.3.2", + "actix-web 3.3.3", "futures-util", - "serde 1.0.130", + "serde 1.0.136", "serde_json", "time 0.2.27", ] @@ -302,9 +296,9 @@ dependencies = [ [[package]] name = "actix-macros" -version = "0.2.1" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2f86cd6857c135e6e9fe57b1619a88d1f94a7df34c00e11fe13e64fd3438837" +checksum = "465a6172cf69b960917811022d8f29bc0b7fa1398bc4f78b3c466673db1213b6" dependencies = [ "quote", "syn", @@ -318,7 +312,7 @@ checksum = "774bfeb11b54bf9c857a005b8ab893293da4eaff79261a66a9200dab7f5ab6e3" dependencies = [ "actix-service 1.0.6", "actix-utils 2.0.0", - "actix-web 3.3.2", + "actix-web 3.3.3", "bytes 0.5.6", "derive_more", "futures-util", @@ -335,7 +329,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "af362615b2f93a278580d218b6485cb2afa4e7a22cbc9ab36e44ba3d79c66967" dependencies = [ "actix-rt 1.1.1", - "actix-web 3.3.2", + "actix-web 3.3.3", "bytes 0.5.6", "derive_more", "futures-util", @@ -349,19 +343,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ac08092eec10bd695a8bcd64d4dbc29fa4f3495cbd669be41d3355dd51213882" dependencies = [ "actix", - "actix-http 2.2.1", + "actix-http 2.2.2", "actix-rt 1.1.1", "actix-service 1.0.6", "actix-session", "actix-utils 2.0.0", - "actix-web 3.3.2", + "actix-web 3.3.3", "backoff", "derive_more", "futures-util", "log", "rand 0.7.3", "redis-async", - "serde 1.0.130", + "serde 1.0.136", "serde_json", "time 0.2.27", "tokio 0.2.25", @@ -378,21 +372,21 @@ dependencies = [ "http", "log", "regex", - "serde 1.0.130", + "serde 1.0.136", ] [[package]] name = "actix-router" -version = "0.5.0-beta.2" +version = "0.5.0-rc.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36b95ce0d76d1aa2f98b681702807475ade0f99bd4552546a6843a966d42ea3d" +checksum = "5e0b59ad08167ffbb686ddb495846707231e96908b829b1fc218198ec581e2ad" dependencies = [ "bytestring", "firestorm", "http", "log", "regex", - "serde 1.0.130", + "serde 1.0.136", ] [[package]] @@ -412,13 +406,13 @@ dependencies = [ [[package]] name = "actix-rt" -version = "2.2.0" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc7d7cd957c9ed92288a7c3c96af81fa5291f65247a76a34dac7b6af74e52ba0" +checksum = "cdf3f2183be1241ed4dd22611850b85d38de0b08a09f1f7bcccbd0809084b359" dependencies = [ - "actix-macros 0.2.1", + "actix-macros 0.2.3", "futures-core", - "tokio 1.12.0", + "tokio 1.15.0", ] [[package]] @@ -443,19 +437,20 @@ dependencies = [ [[package]] name = "actix-server" -version = "2.0.0-beta.5" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26369215fcc3b0176018b3b68756a8bcc275bb000e6212e454944913a1f9bf87" +checksum = "d9e7472ac180abb0a8e592b653744345983a7a14f44691c8394a799d0df4dbbf" dependencies = [ - "actix-rt 2.2.0", - "actix-service 2.0.0", + "actix-rt 2.6.0", + "actix-service 2.0.2", "actix-utils 3.0.0", "futures-core", + "futures-util", "log", - "mio 0.7.13", + "mio 0.8.0", "num_cpus", - "slab", - "tokio 1.12.0", + "socket2 0.4.3", + "tokio 1.15.0", ] [[package]] @@ -465,18 +460,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0052435d581b5be835d11f4eb3bce417c8af18d87ddf8ace99f8e67e595882bb" dependencies = [ "futures-util", - "pin-project 0.4.28", + "pin-project 0.4.29", ] [[package]] name = "actix-service" -version = "2.0.0" +version = "2.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77f5f9d66a8730d0fae62c26f3424f5751e5518086628a40b7ab6fca4a705034" +checksum = "3b894941f818cfdc7ccc4b9e60fa7e53b5042a2e8567270f9147d5591893373a" dependencies = [ "futures-core", "paste", - "pin-project-lite 0.2.7", + "pin-project-lite 0.2.8", ] [[package]] @@ -486,10 +481,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "559b815f2b3ad84f8a17256069d7df16c3ee8069635c86758729521d62ca891d" dependencies = [ "actix-service 1.0.6", - "actix-web 3.3.2", + "actix-web 3.3.3", "derive_more", "futures-util", - "serde 1.0.130", + "serde 1.0.136", "serde_json", "time 0.2.27", ] @@ -541,36 +536,19 @@ dependencies = [ "webpki-roots 0.20.0", ] -[[package]] -name = "actix-tls" -version = "3.0.0-beta.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "65b7bb60840962ef0332f7ea01a57d73a24d2cb663708511ff800250bbfef569" -dependencies = [ - "actix-codec 0.4.0", - "actix-rt 2.2.0", - "actix-service 2.0.0", - "actix-utils 3.0.0", - "derive_more", - "futures-core", - "http", - "log", - "tokio-util 0.6.8", -] - [[package]] name = "actix-todo" version = "2.0.0" dependencies = [ "actix-files 0.3.0", "actix-session", - "actix-web 3.3.2", + "actix-web 3.3.3", "diesel", "dotenv", "env_logger 0.8.4", "futures", "log", - "serde 1.0.130", + "serde 1.0.136", "serde_json", "tera", ] @@ -591,7 +569,7 @@ dependencies = [ "futures-sink", "futures-util", "log", - "pin-project 0.4.28", + "pin-project 0.4.29", "slab", ] @@ -602,17 +580,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e491cbaac2e7fc788dfff99ff48ef317e23b3cf63dbaf7aaab6418f40f92aa94" dependencies = [ "local-waker", - "pin-project-lite 0.2.7", + "pin-project-lite 0.2.8", ] [[package]] name = "actix-web" -version = "3.3.2" +version = "3.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e641d4a172e7faa0862241a20ff4f1f5ab0ab7c279f00c2d4587b77483477b86" +checksum = "b6534a126df581caf443ba2751cab42092c89b3f1d06a9d829b1e17edfe3e277" dependencies = [ "actix-codec 0.3.0", - "actix-http 2.2.1", + "actix-http 2.2.2", "actix-macros 0.1.3", "actix-router 0.2.7", "actix-rt 1.1.1", @@ -620,7 +598,7 @@ dependencies = [ "actix-service 1.0.6", "actix-testing", "actix-threadpool", - "actix-tls 2.0.0", + "actix-tls", "actix-utils 2.0.0", "actix-web-codegen 0.4.0", "awc", @@ -634,10 +612,10 @@ dependencies = [ "log", "mime", "openssl", - "pin-project 1.0.8", + "pin-project 1.0.10", "regex", "rustls 0.18.1", - "serde 1.0.130", + "serde 1.0.136", "serde_json", "serde_urlencoded", "socket2 0.3.19", @@ -648,42 +626,40 @@ dependencies = [ [[package]] name = "actix-web" -version = "4.0.0-beta.9" +version = "4.0.0-beta.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d34aa2b23ec9c7c9a799b3cf9258f67c91b18ac3f0f5f484e175c7ac46739bb5" +checksum = "606fc29a9bde2907243086ceb93ce56df7584276c2c46abc64a524f645c63c5e" dependencies = [ - "actix-codec 0.4.0", - "actix-http 3.0.0-beta.10", - "actix-macros 0.2.1", - "actix-router 0.5.0-beta.2", - "actix-rt 2.2.0", - "actix-server 2.0.0-beta.5", - "actix-service 2.0.0", + "actix-codec 0.4.2", + "actix-http 3.0.0-beta.19", + "actix-macros 0.2.3", + "actix-router 0.5.0-rc.2", + "actix-rt 2.6.0", + "actix-server 2.0.0", + "actix-service 2.0.2", "actix-utils 3.0.0", - "actix-web-codegen 0.5.0-beta.4", - "ahash 0.7.4", + "actix-web-codegen 0.5.0-rc.1", + "ahash 0.7.6", "bytes 1.1.0", "cfg-if 1.0.0", - "cookie 0.15.1", + "cookie 0.16.0", "derive_more", - "either", "encoding_rs", "futures-core", "futures-util", - "itoa", + "itoa 1.0.1", "language-tags 0.3.2", "log", "mime", "once_cell", - "paste", - "pin-project 1.0.8", + "pin-project-lite 0.2.8", "regex", - "serde 1.0.130", + "serde 1.0.136", "serde_json", "serde_urlencoded", "smallvec", - "socket2 0.4.2", - "time 0.2.27", + "socket2 0.4.3", + "time 0.3.7", "url", ] @@ -695,12 +671,12 @@ checksum = "7f6edf3c2693e2a8c422800c87ee89a6a4eac7dd01109bc172a1093ce1f4f001" dependencies = [ "actix", "actix-codec 0.3.0", - "actix-http 2.2.1", - "actix-web 3.3.2", + "actix-http 2.2.2", + "actix-web 3.3.3", "bytes 0.5.6", "futures-channel", "futures-core", - "pin-project 0.4.28", + "pin-project 0.4.29", ] [[package]] @@ -716,11 +692,11 @@ dependencies = [ [[package]] name = "actix-web-codegen" -version = "0.5.0-beta.4" +version = "0.5.0-rc.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a11fd6f322120a74b23327e778ef0a4950b1f44a2b76468a69316a150f5c6dd" +checksum = "98a793e4a7bd059e06e1bc1bd9943b57a47f806de3599d2437441682292c333e" dependencies = [ - "actix-router 0.5.0-beta.2", + "actix-router 0.5.0-rc.2", "proc-macro2", "quote", "syn", @@ -731,10 +707,10 @@ name = "actix-web-cors" version = "1.0.0" dependencies = [ "actix-cors 0.5.4", - "actix-web 3.3.2", + "actix-web 3.3.3", "env_logger 0.8.4", "futures", - "serde 1.0.130", + "serde 1.0.136", "serde_json", ] @@ -755,18 +731,18 @@ version = "1.0.0" dependencies = [ "actix", "actix-redis", - "actix-web 3.3.2", + "actix-web 3.3.3", "env_logger 0.8.4", "futures", "redis-async", - "serde 1.0.130", + "serde 1.0.136", ] [[package]] name = "addr2line" -version = "0.16.0" +version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e61f2b7f93d2c7d2b08263acaa4a363b3e276806c68af6134c44f523bf1aacd" +checksum = "b9ecd88a8c8378ca913a680cd98f0f13ac67383d35993f86c90a70e3f137816b" dependencies = [ "gimli", ] @@ -783,7 +759,7 @@ version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7fc95d1bdb8e6666b2b217308eeeb09f2d6728d104be3e31916cc74d15420331" dependencies = [ - "generic-array 0.14.4", + "generic-array 0.14.5", ] [[package]] @@ -837,20 +813,20 @@ version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "796540673305a66d127804eef19ad696f1f204b8c1025aaca4958c17eab32877" dependencies = [ - "getrandom 0.2.3", + "getrandom 0.2.4", "once_cell", - "version_check 0.9.3", + "version_check 0.9.4", ] [[package]] name = "ahash" -version = "0.7.4" +version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43bb833f0bf979d8475d38fbf09ed3b8a55e1885fe93ad3f93239fc6a4f17b98" +checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47" dependencies = [ - "getrandom 0.2.3", + "getrandom 0.2.4", "once_cell", - "version_check 0.9.3", + "version_check 0.9.4", ] [[package]] @@ -862,6 +838,21 @@ dependencies = [ "memchr", ] +[[package]] +name = "alloc-no-stdlib" +version = "2.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "35ef4730490ad1c4eae5c4325b2a95f521d023e5c885853ff7aca0a6a1631db3" + +[[package]] +name = "alloc-stdlib" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "697ed7edc0f1711de49ce108c541623a0af97c6c60b2f6e2b65229847ac843c2" +dependencies = [ + "alloc-no-stdlib", +] + [[package]] name = "annotate-snippets" version = "0.9.1" @@ -872,24 +863,6 @@ dependencies = [ "yansi-term", ] -[[package]] -name = "ansi_colours" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60e2fb6138a49ad9f1cb3c6d8f8ccbdd5e62b4dab317c1b435a47ecd7da1d28f" -dependencies = [ - "cc", -] - -[[package]] -name = "ansi_term" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b" -dependencies = [ - "winapi 0.3.9", -] - [[package]] name = "ansi_term" version = "0.12.1" @@ -901,9 +874,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.44" +version = "1.0.53" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61604a8f862e1d5c3229fdd78f8b02c68dcf73a4c4b05fd636d12240aaa242c1" +checksum = "94a45b455c14666b85fc40a019e8ab9eb75e3a124e05494f5397122bc9eb06e0" [[package]] name = "arrayref" @@ -926,6 +899,12 @@ version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b" +[[package]] +name = "arrayvec" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8da52d66c7071e2e3fa2a1e5c6d088fec47b593032b254f5e980de8ea54454d6" + [[package]] name = "ascii" version = "0.9.3" @@ -971,7 +950,7 @@ dependencies = [ "askama_escape", "humansize", "num-traits 0.2.14", - "serde 1.0.130", + "serde 1.0.136", "toml", ] @@ -1018,9 +997,9 @@ dependencies = [ [[package]] name = "async-graphql" -version = "2.10.2" +version = "2.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8a5bb9cdc45035df039132dd466621e6459f9ac378dc2874ded5254f539c616" +checksum = "8e6a9edeab4427f8162ac1ccd49152fa656affab3ccfaed7eeaf8e2f9ce12ee0" dependencies = [ "async-graphql-derive", "async-graphql-parser", @@ -1035,9 +1014,9 @@ dependencies = [ "mime", "multer", "once_cell", - "pin-project-lite 0.2.7", + "pin-project-lite 0.2.8", "regex", - "serde 1.0.130", + "serde 1.0.136", "serde_json", "static_assertions 1.1.0", "tempfile", @@ -1046,13 +1025,13 @@ dependencies = [ [[package]] name = "async-graphql-actix-web" -version = "2.10.2" +version = "2.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06b1ebf68ead38a82b84917cdaba13fb3b0282f642c4a3205bfe7737797de328" +checksum = "9e8a626bab0bda64c520a8133b8fda8ea6762bc58f25c4b550311362e4b4f950" dependencies = [ "actix", - "actix-http 2.2.1", - "actix-web 3.3.2", + "actix-http 2.2.2", + "actix-web 3.3.3", "actix-web-actors", "async-channel", "async-graphql", @@ -1065,7 +1044,7 @@ dependencies = [ name = "async-graphql-demo" version = "0.1.0" dependencies = [ - "actix-web 3.3.2", + "actix-web 3.3.3", "async-graphql", "async-graphql-actix-web", "slab", @@ -1073,9 +1052,9 @@ dependencies = [ [[package]] name = "async-graphql-derive" -version = "2.10.2" +version = "2.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99941fdd3b5745f4bd34a3e6b539f6604badd07c15a6a2e915e0e041a09c002e" +checksum = "d8be34933c1bca0b5aedb6d8b66ad3e27045eb8304f198cc1efaed6b6dd87835" dependencies = [ "Inflector", "async-graphql-parser", @@ -1089,25 +1068,26 @@ dependencies = [ [[package]] name = "async-graphql-parser" -version = "2.10.2" +version = "2.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aee8226c393b6c834665ebaae398fa9936f7c1af48055f55ce7138af6dfc66e3" +checksum = "99841c1f890fda6712054e7e37b207738f4aa97870cb1bffcab2f09f2df0957a" dependencies = [ "async-graphql-value", "pest", "pest_derive", - "serde 1.0.130", + "serde 1.0.136", "serde_json", ] [[package]] name = "async-graphql-value" -version = "2.10.2" +version = "2.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "568d658bca34d74d4bd3101ee44a0cfb343337534b1ce8de5e2776f74b999f27" +checksum = "6cecac7ab6737364cff7b16e9273dd51fac7cfbd14ab5d84127df5a56ca9d422" dependencies = [ "bytes 1.1.0", - "serde 1.0.130", + "indexmap", + "serde 1.0.136", "serde_json", ] @@ -1125,7 +1105,7 @@ dependencies = [ "parking", "polling", "slab", - "socket2 0.4.2", + "socket2 0.4.3", "waker-fn", "winapi 0.3.9", ] @@ -1162,9 +1142,9 @@ dependencies = [ [[package]] name = "async-process" -version = "1.2.0" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b21b63ab5a0db0369deb913540af2892750e42d949faacc7a61495ac418a1692" +checksum = "83137067e3a2a6a06d67168e49e68a0957d215410473a740cea95a2425c0b7c6" dependencies = [ "async-io", "blocking", @@ -1188,7 +1168,7 @@ dependencies = [ "async-io", "async-lock", "async-process", - "crossbeam-utils 0.8.5", + "crossbeam-utils 0.8.6", "futures-channel", "futures-core", "futures-io", @@ -1199,7 +1179,7 @@ dependencies = [ "memchr", "num_cpus", "once_cell", - "pin-project-lite 0.2.7", + "pin-project-lite 0.2.8", "pin-utils", "slab", "wasm-bindgen-futures", @@ -1249,15 +1229,15 @@ dependencies = [ [[package]] name = "async-task" -version = "4.0.3" +version = "4.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e91831deabf0d6d7ec49552e489aed63b7456a7a3c46cff62adad428110b0af0" +checksum = "677d306121baf53310a3fd342d88dc0824f6bbeace68347593658525565abee8" [[package]] name = "async-trait" -version = "0.1.51" +version = "0.1.52" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44318e776df68115a881de9a8fd1b9e53368d7a4a5ce4cc48517da3393233a5e" +checksum = "061a7acccaa286c011ddc30970520b98fa40e00c9d644633fb26b5fc63a265e3" dependencies = [ "proc-macro2", "quote", @@ -1268,7 +1248,7 @@ dependencies = [ name = "async_data_factory" version = "0.1.0" dependencies = [ - "actix-web 3.3.2", + "actix-web 3.3.3", "num_cpus", "redis", "redis_tang", @@ -1278,7 +1258,7 @@ dependencies = [ name = "async_db" version = "2.0.0" dependencies = [ - "actix-web 3.3.2", + "actix-web 3.3.3", "env_logger 0.8.4", "failure", "futures", @@ -1286,7 +1266,7 @@ dependencies = [ "r2d2", "r2d2_sqlite", "rusqlite", - "serde 1.0.130", + "serde 1.0.136", "serde_json", ] @@ -1296,11 +1276,11 @@ version = "0.1.0" dependencies = [ "actix-rt 1.1.1", "actix-service 1.0.6", - "actix-web 3.3.2", + "actix-web 3.3.3", "bytes 0.5.6", "env_logger 0.8.4", "futures", - "serde 1.0.130", + "serde 1.0.136", "serde_json", "time 0.1.44", ] @@ -1309,12 +1289,12 @@ dependencies = [ name = "async_pg" version = "0.1.0" dependencies = [ - "actix-web 3.3.2", + "actix-web 3.3.3", "config", "deadpool-postgres", "derive_more", "dotenv", - "serde 1.0.130", + "serde 1.0.136", "tokio-pg-mapper", "tokio-pg-mapper-derive", "tokio-postgres", @@ -1350,7 +1330,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b381e490e7b0cfc37ebc54079b0413d8093ef43d14a4e4747083f7fa47a9e691" dependencies = [ "actix-codec 0.3.0", - "actix-http 2.2.1", + "actix-http 2.2.2", "actix-rt 1.1.1", "actix-service 1.0.6", "base64 0.13.0", @@ -1364,7 +1344,7 @@ dependencies = [ "percent-encoding", "rand 0.7.3", "rustls 0.18.1", - "serde 1.0.130", + "serde 1.0.136", "serde_json", "serde_urlencoded", ] @@ -1373,10 +1353,10 @@ dependencies = [ name = "awc_examples" version = "2.0.0" dependencies = [ - "actix-web 3.3.2", + "actix-web 3.3.3", "env_logger 0.8.4", "futures", - "serde 1.0.130", + "serde 1.0.136", "serde_json", "validator", "validator_derive", @@ -1386,7 +1366,7 @@ dependencies = [ name = "awc_https" version = "0.1.0" dependencies = [ - "actix-web 3.3.2", + "actix-web 3.3.3", "openssl", ] @@ -1402,9 +1382,9 @@ dependencies = [ [[package]] name = "backtrace" -version = "0.3.61" +version = "0.3.63" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7a905d892734eea339e896738c14b9afce22b5318f64b951e70bf3844419b01" +checksum = "321629d8ba6513061f26707241fa9bc89524ff1cd7a915a97ef0c62c666ce1b6" dependencies = [ "addr2line", "cc", @@ -1446,35 +1426,10 @@ dependencies = [ "actix-files 0.3.0", "actix-session", "actix-utils 2.0.0", - "actix-web 3.3.2", + "actix-web 3.3.3", "env_logger 0.8.4", ] -[[package]] -name = "bat" -version = "0.18.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a069bad29696ecaa51ac79d3eb87abe3b65c7808ab2b3836afd9bd6c4009362" -dependencies = [ - "ansi_colours", - "ansi_term 0.12.1", - "bugreport", - "clircle", - "console", - "content_inspector", - "encoding", - "error-chain", - "globset", - "grep-cli", - "path_abs", - "semver 0.11.0", - "serde 1.0.130", - "serde_yaml", - "shell-words", - "syntect", - "unicode-width", -] - [[package]] name = "bigdecimal" version = "0.1.2" @@ -1484,33 +1439,9 @@ dependencies = [ "num-bigint", "num-integer", "num-traits 0.2.14", - "serde 1.0.130", + "serde 1.0.136", ] -[[package]] -name = "bincode" -version = "1.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1f45e9417d87227c7a56d22e471c6206462cba514c7590c09aff4cf6d1ddcad" -dependencies = [ - "serde 1.0.130", -] - -[[package]] -name = "bit-set" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e11e16035ea35e4e5997b393eacbf6f63983188f7a2ad25bfb13465f5ad59de" -dependencies = [ - "bit-vec", -] - -[[package]] -name = "bit-vec" -version = "0.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb" - [[package]] name = "bitflags" version = "1.3.2" @@ -1546,7 +1477,16 @@ version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4152116fd6e9dadb291ae18fc1ec3575ed6d84c29642d97890f4b4a3417297e4" dependencies = [ - "generic-array 0.14.4", + "generic-array 0.14.5", +] + +[[package]] +name = "block-buffer" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1d36a02058e76b040de25a4464ba1c80935655595b661505c8b39b664828b95" +dependencies = [ + "generic-array 0.14.5", ] [[package]] @@ -1560,9 +1500,9 @@ dependencies = [ [[package]] name = "blocking" -version = "1.0.2" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5e170dbede1f740736619b776d7251cb1b9095c435c34d8ca9f57fcd2f335e9" +checksum = "046e47d4b2d391b1f6f8b407b1deb8dee56c1852ccd868becf2710f601b5f427" dependencies = [ "async-channel", "async-task", @@ -1573,30 +1513,31 @@ dependencies = [ ] [[package]] -name = "brotli-sys" -version = "0.3.2" +name = "brotli" +version = "3.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4445dea95f4c2b41cde57cc9fee236ae4dbae88d8fcbdb4750fc1bb5d86aaecd" +checksum = "f838e47a451d5a8fa552371f80024dd6ace9b7acdf25c4c3d0f9bc6816fb1c39" dependencies = [ - "cc", - "libc", + "alloc-no-stdlib", + "alloc-stdlib", + "brotli-decompressor", ] [[package]] -name = "brotli2" -version = "0.3.2" +name = "brotli-decompressor" +version = "2.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0cb036c3eade309815c15ddbacec5b22c4d1f3983a774ab2eac2e3e9ea85568e" +checksum = "59ad2d4653bf5ca36ae797b1f4bb4dbddb60ce49ca4aed8a2ce4829f60425b80" dependencies = [ - "brotli-sys", - "libc", + "alloc-no-stdlib", + "alloc-stdlib", ] [[package]] name = "bson" -version = "1.2.3" +version = "1.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "903a4f4c7aa97921f1703acac1fd524e9e082b3228edd34dde07758c0c92c672" +checksum = "de0aa578035b938855a710ba58d43cfb4d435f3619f99236fb35922a574d6cb1" dependencies = [ "base64 0.13.0", "chrono", @@ -1604,25 +1545,25 @@ dependencies = [ "lazy_static", "linked-hash-map 0.5.4", "rand 0.7.3", - "serde 1.0.130", + "serde 1.0.136", "serde_json", "uuid", ] [[package]] name = "bson" -version = "2.0.0" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1dcc15cd0b9aff8e8326561dcf0bb6e56d0e559f3a4897f615b4a5075ab54c46" +checksum = "41539b5c502b7c4e7b8af8ef07e5c442fe79ceba62a2aad8e62bd589b9454745" dependencies = [ - "ahash 0.7.4", + "ahash 0.7.6", "base64 0.13.0", "chrono", "hex", "indexmap", "lazy_static", "rand 0.8.4", - "serde 1.0.130", + "serde 1.0.136", "serde_bytes", "serde_json", "uuid", @@ -1634,9 +1575,7 @@ version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ba3569f383e8f1598449f1a423e72e99569137b47740b1da11ef19af3d5c3223" dependencies = [ - "lazy_static", "memchr", - "regex-automata", ] [[package]] @@ -1663,7 +1602,6 @@ version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f4531c8a9fe2fb94e0d2afdf6bb4effd4797baf98dd26b6e20be71a92ac78e8d" dependencies = [ - "bytes 0.5.6", "bytes 1.1.0", ] @@ -1673,22 +1611,11 @@ version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "40e38929add23cdf8a366df9b0e088953150724bcbe5fc330b0d8eb3b328eec8" -[[package]] -name = "bugreport" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0014b4b2b4f63bfe69c3838470121290cc437fdc79785d408a761a21e8b2404c" -dependencies = [ - "git-version", - "shell-escape", - "sys-info", -] - [[package]] name = "bumpalo" -version = "3.7.1" +version = "3.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9df67f7bf9ef8498769f994239c45613ef0c5899415fb58e9add412d2c1a538" +checksum = "a4a45a46ab1f2412e53d3a0ade76ffad2025804294569aae387231a0cd6e0899" [[package]] name = "byte-tools" @@ -1718,7 +1645,7 @@ version = "0.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0e4cec68f03f32e44924783795810fa50a7035d8c8ebe78580ad7e6c703fba38" dependencies = [ - "serde 1.0.130", + "serde 1.0.136", ] [[package]] @@ -1733,7 +1660,7 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c4872d67bab6358e59559027aa3b9157c53d9358c51423c17554809a8858e0f8" dependencies = [ - "serde 1.0.130", + "serde 1.0.136", ] [[package]] @@ -1747,9 +1674,9 @@ dependencies = [ [[package]] name = "cache-padded" -version = "1.1.1" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "631ae5198c9be5e753e5cc215e1bd73c2b466a3565173db433f52bb9d3e66dba" +checksum = "c1db59621ec70f09c5e9b597b220c7a2b43611f4710dc03ceb8748637775692c" [[package]] name = "casbin" @@ -1763,15 +1690,15 @@ dependencies = [ "lazy_static", "regex", "rhai", - "serde 1.0.130", + "serde 1.0.136", "thiserror", ] [[package]] name = "cc" -version = "1.0.71" +version = "1.0.72" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79c2681d6594606957bbb8631c4b90a7fcaaa72cdb714743a437b156d6a7eedd" +checksum = "22a9137b95ea06864e018375b72adfb7db6e6f68cfc8df5a04d00288050485ee" dependencies = [ "jobserver", ] @@ -1797,19 +1724,31 @@ dependencies = [ "libc", "num-integer", "num-traits 0.2.14", - "serde 1.0.130", + "serde 1.0.136", "time 0.1.44", "winapi 0.3.9", ] [[package]] name = "chrono-tz" -version = "0.5.3" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2554a3155fec064362507487171dcc4edc3df60cb10f3a1fb10ed8094822b120" +checksum = "58549f1842da3080ce63002102d5bc954c7bc843d4f47818e642abdc36253552" dependencies = [ "chrono", + "chrono-tz-build", + "phf 0.10.1", +] + +[[package]] +name = "chrono-tz-build" +version = "0.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "db058d493fb2f65f41861bfed7e3fe6335264a9f0f92710cab5bdf01fef09069" +dependencies = [ "parse-zoneinfo", + "phf 0.10.1", + "phf_codegen 0.10.0", ] [[package]] @@ -1818,16 +1757,16 @@ version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "12f8e7987cbd042a63249497f41aed09f8e65add917ea6566effbc56578d6801" dependencies = [ - "generic-array 0.14.4", + "generic-array 0.14.5", ] [[package]] name = "clap" -version = "2.33.3" +version = "2.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37e58ac78573c40708d45522f0d80fa2f01cc4f9b4e2bf749807255454312002" +checksum = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c" dependencies = [ - "ansi_term 0.11.0", + "ansi_term", "atty", "bitflags", "strsim 0.8.0", @@ -1836,18 +1775,6 @@ dependencies = [ "vec_map", ] -[[package]] -name = "clircle" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e68bbd985a63de680ab4d1ad77b6306611a8f961b282c8b5ab513e6de934e396" -dependencies = [ - "cfg-if 1.0.0", - "libc", - "serde 1.0.130", - "winapi 0.3.9", -] - [[package]] name = "colored" version = "1.9.3" @@ -1874,15 +1801,15 @@ dependencies = [ [[package]] name = "combine" -version = "4.6.1" +version = "4.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a909e4d93292cd8e9c42e189f61681eff9d67b6541f96b8a1a737f23737bd001" +checksum = "50b727aacc797f9fc28e355d21f34709ac4fc9adecfe470ad07b8f4464f53062" dependencies = [ "bytes 0.5.6", "bytes 1.1.0", "futures-core", "memchr", - "pin-project-lite 0.2.7", + "pin-project-lite 0.2.8", "tokio 0.2.25", ] @@ -1904,33 +1831,18 @@ dependencies = [ "lazy_static", "nom 5.1.2", "rust-ini", - "serde 1.0.130", + "serde 1.0.136", "serde-hjson", "serde_json", "toml", "yaml-rust", ] -[[package]] -name = "console" -version = "0.14.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3993e6445baa160675931ec041a5e03ca84b9c6e32a056150d3aa2bdda0a1f45" -dependencies = [ - "encode_unicode", - "lazy_static", - "libc", - "regex", - "terminal_size", - "unicode-width", - "winapi 0.3.9", -] - [[package]] name = "const_fn" -version = "0.4.8" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f92cfa0fd5690b3cf8c1ef2cabbd9b7ef22fa53cf5e1f92b05103f6d5d1cf6e7" +checksum = "fbdcdcb6d86f71c5e97409ad45898af11cbc995b4ee8112d59095a28d376c935" [[package]] name = "constant_time_eq" @@ -1938,15 +1850,6 @@ version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc" -[[package]] -name = "content_inspector" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7bda66e858c683005a53a9a60c69a4aca7eeaa45d124526e389f7aec8e62f38" -dependencies = [ - "memchr", -] - [[package]] name = "convert_case" version = "0.4.0" @@ -1965,20 +1868,20 @@ dependencies = [ "hmac 0.10.1", "percent-encoding", "rand 0.8.4", - "sha2 0.9.8", + "sha2 0.9.9", "time 0.2.27", - "version_check 0.9.3", + "version_check 0.9.4", ] [[package]] name = "cookie" -version = "0.15.1" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5f1c7727e460397e56abc4bddc1d49e07a1ad78fc98eb2e1c8f032a58a2f80d" +checksum = "94d4706de1b0fa5b132270cddffa8585166037822e260a944fe161acd137ca05" dependencies = [ "percent-encoding", - "time 0.2.27", - "version_check 0.9.3", + "time 0.3.7", + "version_check 0.9.4", ] [[package]] @@ -1986,7 +1889,7 @@ name = "cookie-auth" version = "2.0.0" dependencies = [ "actix-identity", - "actix-web 3.3.2", + "actix-web 3.3.3", "env_logger 0.8.4", "rand 0.7.3", ] @@ -1996,7 +1899,7 @@ name = "cookie-session" version = "1.0.0" dependencies = [ "actix-session", - "actix-web 3.3.2", + "actix-web 3.3.3", "env_logger 0.8.4", ] @@ -2008,9 +1911,9 @@ checksum = "a2df960f5d869b2dd8532793fde43eb5427cceb126c929747a26823ab0eeb536" [[package]] name = "core-foundation" -version = "0.9.1" +version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a89e2ae426ea83155dccf10c0fa6b1463ef6d5fcb44cee0b224a408fa640a62" +checksum = "6888e10551bb93e424d8df1d07f1a8b4fceb0001a3a4b048bfc47554946f47b3" dependencies = [ "core-foundation-sys", "libc", @@ -2018,9 +1921,9 @@ dependencies = [ [[package]] name = "core-foundation-sys" -version = "0.8.2" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea221b5284a47e40033bf9b66f35f984ec0ea2931eb03505246cd27a963f981b" +checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc" [[package]] name = "cpufeatures" @@ -2039,9 +1942,9 @@ checksum = "dcb25d077389e53838a8158c8e99174c5a9d902dee4904320db714f3c653ffba" [[package]] name = "crc32fast" -version = "1.2.1" +version = "1.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81156fece84ab6a9f2afdb109ce3ae577e42b1228441eded99bd77f627953b1a" +checksum = "a2209c310e29876f7f0b2721e7e26b84aff178aa3da5d091f9bfbf47669e60e3" dependencies = [ "cfg-if 1.0.0", ] @@ -2080,14 +1983,23 @@ dependencies = [ [[package]] name = "crossbeam-utils" -version = "0.8.5" +version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d82cfc11ce7f2c3faef78d8a684447b40d503d9681acebed6cb728d45940c4db" +checksum = "cfcae03edb34f947e64acdb1c33ec169824e20657e9ecb61cef6c8c74dcb8120" dependencies = [ "cfg-if 1.0.0", "lazy_static", ] +[[package]] +name = "crypto-common" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "683d6b536309245c849479fba3da410962a43ed8e51c26b729208ec0ac2798d0" +dependencies = [ + "generic-array 0.14.5", +] + [[package]] name = "crypto-mac" version = "0.7.0" @@ -2104,7 +2016,7 @@ version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "58bcd97a54c7ca5ce2f6eb16f6bede5b0ab5f0055fedc17d2f0b4466e21671ca" dependencies = [ - "generic-array 0.14.4", + "generic-array 0.14.5", "subtle 2.4.1", ] @@ -2114,7 +2026,7 @@ version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bff07008ec701e8028e2ceb8f83f0e4274ee62bd2dbdc4fefff2e9a91824081a" dependencies = [ - "generic-array 0.14.4", + "generic-array 0.14.5", "subtle 2.4.1", ] @@ -2124,7 +2036,7 @@ version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b1d1a86f49236c215f271d40892d5fc950490551400b02ef360692c29815c714" dependencies = [ - "generic-array 0.14.4", + "generic-array 0.14.5", "subtle 2.4.1", ] @@ -2159,12 +2071,12 @@ dependencies = [ [[package]] name = "darling" -version = "0.13.0" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "757c0ded2af11d8e739c4daea1ac623dd1624b06c844cf3f5a39f1bdbd99bb12" +checksum = "d0d720b8683f8dd83c65155f0530560cba68cd2bf395f6513a483caee57ff7f4" dependencies = [ - "darling_core 0.13.0", - "darling_macro 0.13.0", + "darling_core 0.13.1", + "darling_macro 0.13.1", ] [[package]] @@ -2183,9 +2095,9 @@ dependencies = [ [[package]] name = "darling_core" -version = "0.13.0" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c34d8efb62d0c2d7f60ece80f75e5c63c1588ba68032740494b0b9a996466e3" +checksum = "7a340f241d2ceed1deb47ae36c4144b2707ec7dd0b649f894cb39bb595986324" dependencies = [ "fnv", "ident_case", @@ -2208,11 +2120,11 @@ dependencies = [ [[package]] name = "darling_macro" -version = "0.13.0" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ade7bff147130fe5e6d39f089c6bd49ec0250f35d70b2eebf72afdfc919f15cc" +checksum = "72c41b3b7352feb3211a0d743dc5700a4e3b60f51bd2b368892d1e0f9a95f44b" dependencies = [ - "darling_core 0.13.0", + "darling_core 0.13.1", "quote", "syn", ] @@ -2233,7 +2145,7 @@ dependencies = [ "config", "crossbeam-queue", "num_cpus", - "serde 1.0.130", + "serde 1.0.136", "tokio 0.2.25", ] @@ -2248,7 +2160,7 @@ dependencies = [ "deadpool", "futures", "log", - "serde 1.0.130", + "serde 1.0.136", "tokio 0.2.25", "tokio-postgres", ] @@ -2266,14 +2178,14 @@ dependencies = [ [[package]] name = "derive_more" -version = "0.99.16" +version = "0.99.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40eebddd2156ce1bb37b20bbe5151340a31828b1f2d22ba4141f3531710e38df" +checksum = "4fb810d30a7c1953f91334de7244731fc3f3c10d7fe163338a35b9f640960321" dependencies = [ "convert_case", "proc-macro2", "quote", - "rustc_version 0.3.3", + "rustc_version 0.4.0", "syn", ] @@ -2315,13 +2227,13 @@ name = "diesel-example" version = "1.0.0" dependencies = [ "actix-rt 1.1.1", - "actix-web 3.3.2", + "actix-web 3.3.3", "diesel", "dotenv", "env_logger 0.8.4", "failure", "futures", - "serde 1.0.130", + "serde 1.0.136", "serde_json", "uuid", ] @@ -2352,7 +2264,18 @@ version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d3dd60d1080a57a05ab032377049e0591415d2b31afd7028356dbf3cc6dcb066" dependencies = [ - "generic-array 0.14.4", + "generic-array 0.14.5", +] + +[[package]] +name = "digest" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b697d66081d42af4fba142d56918a3cb21dc8eb63372c6b85d14f44fb9c5979b" +dependencies = [ + "block-buffer 0.10.0", + "crypto-common", + "generic-array 0.14.5", ] [[package]] @@ -2386,7 +2309,9 @@ checksum = "212d0f5754cb6769937f4501cc0e67f4f4483c8d2c3e1e922ee9edbe4ab4c7c0" name = "docker_sample" version = "0.1.0" dependencies = [ - "actix-web 3.3.2", + "actix-web 3.3.3", + "env_logger 0.9.0", + "log", ] [[package]] @@ -2407,81 +2332,11 @@ version = "1.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457" -[[package]] -name = "encode_unicode" -version = "0.3.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f" - -[[package]] -name = "encoding" -version = "0.2.33" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b0d943856b990d12d3b55b359144ff341533e516d94098b1d3fc1ac666d36ec" -dependencies = [ - "encoding-index-japanese", - "encoding-index-korean", - "encoding-index-simpchinese", - "encoding-index-singlebyte", - "encoding-index-tradchinese", -] - -[[package]] -name = "encoding-index-japanese" -version = "1.20141219.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04e8b2ff42e9a05335dbf8b5c6f7567e5591d0d916ccef4e0b1710d32a0d0c91" -dependencies = [ - "encoding_index_tests", -] - -[[package]] -name = "encoding-index-korean" -version = "1.20141219.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dc33fb8e6bcba213fe2f14275f0963fd16f0a02c878e3095ecfdf5bee529d81" -dependencies = [ - "encoding_index_tests", -] - -[[package]] -name = "encoding-index-simpchinese" -version = "1.20141219.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d87a7194909b9118fc707194baa434a4e3b0fb6a5a757c73c3adb07aa25031f7" -dependencies = [ - "encoding_index_tests", -] - -[[package]] -name = "encoding-index-singlebyte" -version = "1.20141219.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3351d5acffb224af9ca265f435b859c7c01537c0849754d3db3fdf2bfe2ae84a" -dependencies = [ - "encoding_index_tests", -] - -[[package]] -name = "encoding-index-tradchinese" -version = "1.20141219.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd0e20d5688ce3cab59eb3ef3a2083a5c77bf496cb798dc6fcdb75f323890c18" -dependencies = [ - "encoding_index_tests", -] - -[[package]] -name = "encoding_index_tests" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a246d82be1c9d791c5dfde9a2bd045fc3cbba3fa2b11ad558f27d01712f00569" - [[package]] name = "encoding_rs" -version = "0.8.28" +version = "0.8.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80df024fbc5ac80f87dfef0d9f5209a252f2a497f7f42944cff24d8253cac065" +checksum = "7896dc8abb250ffdda33912550faa54c88ec8b998dec0b2c55ab224921ce11df" dependencies = [ "cfg-if 1.0.0", ] @@ -2537,20 +2392,11 @@ dependencies = [ "termcolor", ] -[[package]] -name = "error-chain" -version = "0.12.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d2f06b9cac1506ece98fe3231e3cc9c4410ec3d5b1f24ae1c8946f0742cdefc" -dependencies = [ - "version_check 0.9.3", -] - [[package]] name = "error_handling" version = "1.0.0" dependencies = [ - "actix-web 3.3.2", + "actix-web 3.3.3", "derive_more", "env_logger 0.8.4", "rand 0.7.3", @@ -2558,9 +2404,9 @@ dependencies = [ [[package]] name = "event-listener" -version = "2.5.1" +version = "2.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7531096570974c3a9dcf9e4b8e1cede1ec26cf5046219fb3b9d897503b9be59" +checksum = "77f3309417938f28bf8228fcff79a4a37103981e3e186d2ccd19c74b38f4eb71" [[package]] name = "failure" @@ -2602,30 +2448,20 @@ version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7360491ce676a36bf9bb3c56c1aa791658183a54d2744120f27285738d90465a" -[[package]] -name = "fancy-regex" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d6b8560a05112eb52f04b00e5d3790c0dd75d9d980eb8a122fb23b92a623ccf" -dependencies = [ - "bit-set", - "regex", -] - [[package]] name = "fastrand" -version = "1.5.0" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b394ed3d285a429378d3b384b9eb1285267e7df4b166df24b7a6939a04dc392e" +checksum = "c3fcf0cee53519c866c09b5de1f6c56ff9d647101f81c1964fa632e148896cdf" dependencies = [ "instant", ] [[package]] name = "firestorm" -version = "0.4.6" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31586bda1b136406162e381a3185a506cdfc1631708dd40cba2f6628d8634499" +checksum = "4d3d6188b8804df28032815ea256b6955c9625c24da7525f387a7af02fbb8f01" [[package]] name = "flate2" @@ -2666,8 +2502,8 @@ name = "form-example" version = "1.0.0" dependencies = [ "actix-rt 1.1.1", - "actix-web 3.3.2", - "serde 1.0.130", + "actix-web 3.3.3", + "serde 1.0.136", ] [[package]] @@ -2708,9 +2544,9 @@ dependencies = [ [[package]] name = "futures" -version = "0.3.17" +version = "0.3.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a12aa0eb539080d55c3f2d45a67c3b58b6b0773c1a3ca2dfec66d58c97fd66ca" +checksum = "28560757fe2bb34e79f907794bb6b22ae8b0e5c669b638a1132f2592b19035b4" dependencies = [ "futures-channel", "futures-core", @@ -2723,9 +2559,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.17" +version = "0.3.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5da6ba8c3bb3c165d3c7319fc1cc8304facf1fb8db99c5de877183c08a273888" +checksum = "ba3dda0b6588335f360afc675d0564c17a77a2bda81ca178a4b6081bd86c7f0b" dependencies = [ "futures-core", "futures-sink", @@ -2733,9 +2569,9 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.17" +version = "0.3.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88d1c26957f23603395cd326b0ffe64124b818f4449552f960d815cfba83a53d" +checksum = "d0c8ff0461b82559810cdccfde3215c3f373807f5e5232b71479bff7bb2583d7" [[package]] name = "futures-enum" @@ -2750,9 +2586,9 @@ dependencies = [ [[package]] name = "futures-executor" -version = "0.3.17" +version = "0.3.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45025be030969d763025784f7f355043dc6bc74093e4ecc5000ca4dc50d8745c" +checksum = "29d6d2ff5bb10fb95c85b8ce46538a2e5f5e7fdc755623a7d4529ab8a4ed9d2a" dependencies = [ "futures-core", "futures-task", @@ -2761,9 +2597,9 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.17" +version = "0.3.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "522de2a0fe3e380f1bc577ba0474108faf3f6b18321dbf60b3b9c39a75073377" +checksum = "b1f9d34af5a1aac6fb380f735fe510746c38067c5bf16c7fd250280503c971b2" [[package]] name = "futures-lite" @@ -2776,18 +2612,16 @@ dependencies = [ "futures-io", "memchr", "parking", - "pin-project-lite 0.2.7", + "pin-project-lite 0.2.8", "waker-fn", ] [[package]] name = "futures-macro" -version = "0.3.17" +version = "0.3.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18e4a4b95cea4b4ccbcf1c5675ca7c4ee4e9e75eb79944d07defde18068f79bb" +checksum = "6dbd947adfffb0efc70599b3ddcf7b5597bb5fa9e245eb99f62b3a5f7bb8bd3c" dependencies = [ - "autocfg", - "proc-macro-hack", "proc-macro2", "quote", "syn", @@ -2795,23 +2629,22 @@ dependencies = [ [[package]] name = "futures-sink" -version = "0.3.17" +version = "0.3.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36ea153c13024fe480590b3e3d4cad89a0cfacecc24577b68f86c6ced9c2bc11" +checksum = "e3055baccb68d74ff6480350f8d6eb8fcfa3aa11bdc1a1ae3afdd0514617d508" [[package]] name = "futures-task" -version = "0.3.17" +version = "0.3.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d3d00f4eddb73e498a54394f228cd55853bdf059259e8e7bc6e69d408892e99" +checksum = "6ee7c6485c30167ce4dfb83ac568a849fe53274c831081476ee13e0dce1aad72" [[package]] name = "futures-util" -version = "0.3.17" +version = "0.3.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36568465210a3a6ee45e1f165136d68671471a501e632e9a98d96872222b5481" +checksum = "d9b5cf40b47a271f77a8b1bec03ca09044d99d2372c0de244e66430761127164" dependencies = [ - "autocfg", "futures-channel", "futures-core", "futures-io", @@ -2819,10 +2652,8 @@ dependencies = [ "futures-sink", "futures-task", "memchr", - "pin-project-lite 0.2.7", + "pin-project-lite 0.2.8", "pin-utils", - "proc-macro-hack", - "proc-macro-nested", "slab", ] @@ -2846,12 +2677,12 @@ dependencies = [ [[package]] name = "generic-array" -version = "0.14.4" +version = "0.14.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "501466ecc8a30d1d3b7fc9229b122b2ce8ed6e9d9223f1138d4babb253e51817" +checksum = "fd48d33ec7f05fbfa152300fdad764757cbded343c1aa1cff2fbaf4134851803" dependencies = [ "typenum", - "version_check 0.9.3", + "version_check 0.9.4", ] [[package]] @@ -2867,9 +2698,9 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.3" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fcd999463524c52659517fe2cea98493cfe485d10565e7b0fb07dbba7ad2753" +checksum = "418d37c8b1d42553c93648be529cb70f920d3baf8ef469b74b9638df426e0b4c" dependencies = [ "cfg-if 1.0.0", "libc", @@ -2888,31 +2719,9 @@ dependencies = [ [[package]] name = "gimli" -version = "0.25.0" +version = "0.26.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0a01e0497841a3b2db4f8afa483cce65f7e96a3498bd6c541734792aeac8fe7" - -[[package]] -name = "git-version" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6b0decc02f4636b9ccad390dcbe77b722a77efedfa393caf8379a51d5c61899" -dependencies = [ - "git-version-macro", - "proc-macro-hack", -] - -[[package]] -name = "git-version-macro" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe69f1cbdb6e28af2bac214e943b99ce8a0a06b447d15d3e61161b0423139f3f" -dependencies = [ - "proc-macro-hack", - "proc-macro2", - "quote", - "syn", -] +checksum = "78cc372d058dcf6d5ecd98510e7fbc9e5aec4d21de70f65fea8fecebcd881bd4" [[package]] name = "globset" @@ -2940,9 +2749,9 @@ dependencies = [ [[package]] name = "gloo-timers" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "47204a46aaff920a1ea58b11d03dec6f704287d27561724a4631e450654a891f" +checksum = "6f16c88aa13d2656ef20d1c042086b8767bbe2bdb62526894275a1b062161b2e" dependencies = [ "futures-channel", "futures-core", @@ -2961,23 +2770,6 @@ dependencies = [ "thiserror", ] -[[package]] -name = "grep-cli" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dd110c34bb4460d0de5062413b773e385cbf8a85a63fc535590110a09e79e8a" -dependencies = [ - "atty", - "bstr", - "globset", - "lazy_static", - "log", - "regex", - "same-file", - "termcolor", - "winapi-util", -] - [[package]] name = "h2" version = "0.2.7" @@ -3000,9 +2792,9 @@ dependencies = [ [[package]] name = "h2" -version = "0.3.6" +version = "0.3.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c06815895acec637cd6ed6e9662c935b866d20a106f8361892893a7d9234964" +checksum = "d9f1f717ddc7b2ba36df7e871fd88db79326551d3d6f1fc406fbfd28b582ff8e" dependencies = [ "bytes 1.1.0", "fnv", @@ -3012,8 +2804,8 @@ dependencies = [ "http", "indexmap", "slab", - "tokio 1.12.0", - "tokio-util 0.6.8", + "tokio 1.15.0", + "tokio-util 0.6.9", "tracing", ] @@ -3027,7 +2819,7 @@ dependencies = [ "pest", "pest_derive", "quick-error 2.0.1", - "serde 1.0.130", + "serde 1.0.136", "serde_json", "walkdir", ] @@ -3052,7 +2844,7 @@ name = "hello-world" version = "2.0.0" dependencies = [ "actix-rt 1.1.1", - "actix-web 3.3.2", + "actix-web 3.3.3", "env_logger 0.8.4", ] @@ -3121,15 +2913,6 @@ dependencies = [ "digest 0.9.0", ] -[[package]] -name = "home" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2456aef2e6b6a9784192ae780c0f15bc57df0e918585282325e8c8ac27737654" -dependencies = [ - "winapi 0.3.9", -] - [[package]] name = "hostname" version = "0.3.1" @@ -3143,13 +2926,13 @@ dependencies = [ [[package]] name = "http" -version = "0.2.5" +version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1323096b05d41827dadeaee54c9981958c0f94e670bc94ed80037d1a7b8b186b" +checksum = "31f4c6746584866f0feabcc69893c5b51beef3831656a968ed7ae254cdc4fd03" dependencies = [ "bytes 1.1.0", "fnv", - "itoa", + "itoa 1.0.1", ] [[package]] @@ -3166,7 +2949,7 @@ dependencies = [ name = "http-proxy" version = "2.0.0" dependencies = [ - "actix-web 3.3.2", + "actix-web 3.3.3", "clap", "url", ] @@ -3183,6 +2966,12 @@ version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "494b4d60369511e7dea41cf646832512a94e542f68bb9c49e54518e0f468eb47" +[[package]] +name = "httpdate" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c4a1e36c821dbe04574f602848a19f742f4fb3c98d40449f11bcad18d6b17421" + [[package]] name = "humansize" version = "1.1.1" @@ -3218,9 +3007,9 @@ dependencies = [ "http", "http-body", "httparse", - "httpdate", - "itoa", - "pin-project 1.0.8", + "httpdate 0.3.2", + "itoa 0.4.8", + "pin-project 1.0.10", "socket2 0.3.19", "tokio 0.2.25", "tower-service", @@ -3270,7 +3059,7 @@ version = "0.4.18" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "713f1b139373f96a2e0ce3ac931cd01ee973c3c5dd7c40c0c2efe96ad2b6751d" dependencies = [ - "crossbeam-utils 0.8.5", + "crossbeam-utils 0.8.6", "globset", "lazy_static", "log", @@ -3284,20 +3073,20 @@ dependencies = [ [[package]] name = "indexmap" -version = "1.7.0" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc633605454125dec4b66843673f01c7df2b89479b32e0ed634e43a91cff62a5" +checksum = "282a6247722caba404c065016bbfa522806e51714c34f5dfc3e4a3a46fcb4223" dependencies = [ "autocfg", "hashbrown", - "serde 1.0.130", + "serde 1.0.136", ] [[package]] name = "instant" -version = "0.1.11" +version = "0.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "716d3d89f35ac6a34fd0eed635395f4c3b76fa889338a4632e5231a8684216bd" +checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" dependencies = [ "cfg-if 1.0.0", ] @@ -3352,9 +3141,9 @@ dependencies = [ [[package]] name = "itertools" -version = "0.10.1" +version = "0.10.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69ddb889f9d0d08a67338271fa9b62996bc788c7796a5c18cf057420aaed5eaf" +checksum = "a9a9d19fa1e79b6215ff29b9d6880b706147f16e9b1dbb1e4e5947b5b02bc5e3" dependencies = [ "either", ] @@ -3365,6 +3154,12 @@ version = "0.4.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b71991ff56294aa922b450139ee08b3bfc70982c6b2c7562771375cf73542dd4" +[[package]] +name = "itoa" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1aab8fc367588b89dcee83ab0fd66b72b50b72fa1904d7095045ace2b0c81c35" + [[package]] name = "jobserver" version = "0.1.24" @@ -3376,9 +3171,9 @@ dependencies = [ [[package]] name = "js-sys" -version = "0.3.55" +version = "0.3.56" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7cc9ffccd38c451a86bf13657df244e9c3f37493cce8e5e21e940963777acc84" +checksum = "a38fc24e30fd564ce974c02bf1d337caddff65be6cc4735a1f7eab22a7440f04" dependencies = [ "wasm-bindgen", ] @@ -3395,11 +3190,11 @@ version = "0.1.0" dependencies = [ "actix-rt 1.1.1", "actix-service 1.0.6", - "actix-web 3.3.2", + "actix-web 3.3.3", "env_logger 0.8.4", "futures", "json", - "serde 1.0.130", + "serde 1.0.136", "serde_json", ] @@ -3407,17 +3202,17 @@ dependencies = [ name = "json_decode_error" version = "0.1.0" dependencies = [ - "actix-web 3.3.2", - "serde 1.0.130", + "actix-web 3.3.3", + "serde 1.0.136", ] [[package]] name = "json_error" version = "1.0.0" dependencies = [ - "actix-web 3.3.2", + "actix-web 3.3.3", "failure", - "serde 1.0.130", + "serde 1.0.136", "serde_json", ] @@ -3425,12 +3220,12 @@ dependencies = [ name = "jsonrpc-example" version = "2.0.0" dependencies = [ - "actix-web 3.3.2", + "actix-web 3.3.3", "bytes 0.5.6", "env_logger 0.8.4", "futures-util", "log", - "serde 1.0.130", + "serde 1.0.136", "serde_json", ] @@ -3441,7 +3236,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "637ffa8a8d8a05aed3331449e311f145864adcd82442d82e54d0522decb7cecf" dependencies = [ "async-trait", - "bson 1.2.3", + "bson 1.2.4", "chrono", "fnv", "futures", @@ -3449,7 +3244,7 @@ dependencies = [ "graphql-parser", "indexmap", "juniper_codegen", - "serde 1.0.130", + "serde 1.0.136", "smartstring", "static_assertions 1.1.0", "url", @@ -3460,7 +3255,7 @@ dependencies = [ name = "juniper-advanced" version = "2.0.0" dependencies = [ - "actix-web 3.3.2", + "actix-web 3.3.3", "dotenv", "env_logger 0.8.4", "juniper", @@ -3468,7 +3263,7 @@ dependencies = [ "mysql", "r2d2", "r2d2_mysql", - "serde 1.0.130", + "serde 1.0.136", "serde_json", "uuid", ] @@ -3478,10 +3273,10 @@ name = "juniper-example" version = "0.2.0" dependencies = [ "actix-cors 0.4.1", - "actix-web 3.3.2", + "actix-web 3.3.3", "env_logger 0.8.4", "juniper", - "serde 1.0.130", + "serde 1.0.136", "serde_derive", "serde_json", ] @@ -3535,12 +3330,6 @@ version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" -[[package]] -name = "lazycell" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" - [[package]] name = "lexical" version = "4.2.1" @@ -3581,9 +3370,9 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.103" +version = "0.2.114" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd8f7255a17a627354f321ef0055d63b898c6fb27eff628af4d1b66b7331edf6" +checksum = "b0005d08a8f7b65fb8073cb697aa0b12b631ed251ce73d862ce50eeb52ce3b50" [[package]] name = "libsqlite3-sys" @@ -3607,15 +3396,6 @@ dependencies = [ "vcpkg", ] -[[package]] -name = "line-wrap" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f30344350a2a51da54c1d53be93fade8a237e545dbcc4bdbe635413f2117cab9" -dependencies = [ - "safemem", -] - [[package]] name = "linked-hash-map" version = "0.3.0" @@ -3646,9 +3426,9 @@ dependencies = [ [[package]] name = "local-waker" -version = "0.1.1" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84f9a2d3e27ce99ce2c3aad0b09b1a7b916293ea9b2bf624c13fe646fadd8da4" +checksum = "902eb695eb0591864543cbfbf6d742510642a605a61fc5e97fe6ceb5a30ac4fb" [[package]] name = "lock_api" @@ -3710,8 +3490,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a24f40fb03852d1cdd84330cddcaf98e9ec08a7b7768e952fad3b4cf048ec8fd" dependencies = [ "log", - "phf", - "phf_codegen", + "phf 0.8.0", + "phf_codegen 0.8.0", "string_cache", "string_cache_codegen", "tendril", @@ -3763,17 +3543,17 @@ name = "middleware-example" version = "2.0.0" dependencies = [ "actix-service 1.0.6", - "actix-web 3.3.2", + "actix-web 3.3.3", "env_logger 0.8.4", "futures", - "pin-project 0.4.28", + "pin-project 0.4.29", ] [[package]] name = "middleware-ext-mut" version = "0.1.0" dependencies = [ - "actix-web 3.3.2", + "actix-web 3.3.3", "env_logger 0.9.0", ] @@ -3781,7 +3561,7 @@ dependencies = [ name = "middleware-http-to-https" version = "0.1.0" dependencies = [ - "actix-web 3.3.2", + "actix-web 3.3.3", "futures", "rustls 0.18.1", ] @@ -3804,9 +3584,9 @@ dependencies = [ [[package]] name = "minimal-lexical" -version = "0.1.4" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c64630dcdd71f1a64c435f54885086a0de5d6a12d104d69b165fb7d5286d677" +checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" [[package]] name = "miniz_oxide" @@ -3839,9 +3619,22 @@ dependencies = [ [[package]] name = "mio" -version = "0.7.13" +version = "0.7.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c2bdb6314ec10835cd3293dd268473a835c02b7b352e788be788b3c6ca6bb16" +checksum = "8067b404fe97c70829f082dec8bcf4f71225d7eaea1d8645349cb76fa06205cc" +dependencies = [ + "libc", + "log", + "miow 0.3.7", + "ntapi", + "winapi 0.3.9", +] + +[[package]] +name = "mio" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba272f85fa0b41fc91872be579b3bbe0f56b792aa361a380eb669469f68dafb2" dependencies = [ "libc", "log", @@ -3898,23 +3691,23 @@ dependencies = [ name = "mongodb" version = "0.1.0" dependencies = [ - "actix-rt 2.2.0", - "actix-web 4.0.0-beta.9", + "actix-rt 2.6.0", + "actix-web 4.0.0-beta.21", "futures-util", - "mongodb 2.0.0", - "serde 1.0.130", + "mongodb 2.1.0", + "serde 1.0.136", ] [[package]] name = "mongodb" -version = "2.0.0" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b465d2f8add538efbaa3f22ae63be191b871ca511413405a59b8247cf2f6ef9" +checksum = "bacb6f8cee6bf010d7bc57550d859f6a4ffe255eb8c9a7014637fe988eaece64" dependencies = [ "async-trait", "base64 0.13.0", "bitflags", - "bson 2.0.0", + "bson 2.1.0", "chrono", "derivative", "futures-core", @@ -3930,33 +3723,34 @@ dependencies = [ "percent-encoding", "rand 0.8.4", "rustls 0.19.1", - "serde 1.0.130", + "rustls-pemfile", + "serde 1.0.136", "serde_bytes", "serde_with", "sha-1 0.9.8", - "sha2 0.9.8", - "socket2 0.4.2", + "sha2 0.9.9", + "socket2 0.4.3", "stringprep", "strsim 0.10.0", "take_mut", "thiserror", - "tokio 1.12.0", + "tokio 1.15.0", "tokio-rustls 0.22.0", - "tokio-util 0.6.8", + "tokio-util 0.6.9", "trust-dns-proto 0.20.3", "trust-dns-resolver 0.20.3", "typed-builder", "uuid", - "version_check 0.9.3", + "version_check 0.9.4", "webpki", "webpki-roots 0.21.1", ] [[package]] name = "multer" -version = "2.0.1" +version = "2.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "408327e2999b839cd1af003fc01b2019a6c10a1361769542203f6fedc5179680" +checksum = "5f8f35e687561d5c1667590911e6698a8cb714a134a7505718a182e7bc9d3836" dependencies = [ "bytes 1.1.0", "encoding_rs", @@ -3964,10 +3758,10 @@ dependencies = [ "http", "httparse", "log", + "memchr", "mime", "spin 0.9.2", - "twoway", - "version_check 0.9.3", + "version_check 0.9.4", ] [[package]] @@ -3975,7 +3769,7 @@ name = "multipart-example" version = "0.3.0" dependencies = [ "actix-multipart", - "actix-web 3.3.2", + "actix-web 3.3.3", "futures-util", "sanitize-filename", "uuid", @@ -3986,14 +3780,14 @@ name = "multipart-s3" version = "0.1.0" dependencies = [ "actix-multipart", - "actix-web 3.3.2", + "actix-web 3.3.3", "bytes 0.5.6", "dotenv", "futures", "rusoto_core", "rusoto_s3", "sanitize-filename", - "serde 1.0.130", + "serde 1.0.136", "serde_json", ] @@ -4013,7 +3807,7 @@ dependencies = [ "net2", "nix", "percent-encoding", - "serde 1.0.130", + "serde 1.0.136", "serde_json", "twox-hash", "url", @@ -4041,7 +3835,7 @@ dependencies = [ "rand 0.7.3", "regex", "rust_decimal", - "serde 1.0.130", + "serde 1.0.136", "serde_json", "sha1", "sha2 0.8.2", @@ -4131,18 +3925,18 @@ checksum = "ffb4262d26ed83a1c0a33a38fe2bb15797329c85770da05e6b828ddb782627af" dependencies = [ "lexical-core 0.7.6", "memchr", - "version_check 0.9.3", + "version_check 0.9.4", ] [[package]] name = "nom" -version = "7.0.0" +version = "7.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ffd9d26838a953b4af82cbeb9f1592c6798916983959be223a7124e992742c1" +checksum = "1b1d11e1ef389c76fe5b81bcaf2ea32cf88b62bc494e19f493d0b30e7a930109" dependencies = [ "memchr", "minimal-lexical", - "version_check 0.9.3", + "version_check 0.9.4", ] [[package]] @@ -4195,28 +3989,37 @@ dependencies = [ [[package]] name = "num_cpus" -version = "1.13.0" +version = "1.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05499f3756671c15885fee9034446956fff3f243d6077b91e5767df161f766b3" +checksum = "19e64526ebdee182341572e50e9ad03965aa510cd94427a4549448f285e957a1" dependencies = [ "hermit-abi", "libc", ] [[package]] -name = "object" -version = "0.26.2" +name = "num_threads" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39f37e50073ccad23b6d09bcb5b263f4e76d3bb6038e4a3c08e52162ffa8abc2" +checksum = "97ba99ba6393e2c3734791401b66902d981cb03bf190af674ca69949b6d5fb15" +dependencies = [ + "libc", +] + +[[package]] +name = "object" +version = "0.27.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67ac1d3f9a1d3616fd9a60c8d74296f22406a238b6a72f5cc1e6f314df4ffbf9" dependencies = [ "memchr", ] [[package]] name = "once_cell" -version = "1.8.0" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "692fcb63b64b1758029e0a96ee63e049ce8c5948587f2f7208df04625e5f6b56" +checksum = "da32515d9f6e6e489d7bc9d84c71b060db7247dc035bbe44eac88cf87486d8d5" [[package]] name = "opaque-debug" @@ -4232,9 +4035,9 @@ checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" [[package]] name = "openssl" -version = "0.10.36" +version = "0.10.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d9facdb76fec0b73c406f125d44d86fdad818d66fef0531eec9233ca425ff4a" +checksum = "0c7ae222234c30df141154f159066c5093ff73b63204dcda7121eb082fc56a95" dependencies = [ "bitflags", "cfg-if 1.0.0", @@ -4248,22 +4051,22 @@ dependencies = [ name = "openssl-example" version = "0.2.0" dependencies = [ - "actix-web 3.3.2", + "actix-web 3.3.3", "env_logger 0.8.4", "openssl", ] [[package]] name = "openssl-probe" -version = "0.1.4" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28988d872ab76095a6e6ac88d99b54fd267702734fd7ffe610ca27f533ddb95a" +checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "openssl-sys" -version = "0.9.67" +version = "0.9.72" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69df2d8dfc6ce3aaf44b40dec6f487d5a886516cf6879c49e98e0710f310a058" +checksum = "7e46109c383602735fa0a2e48dd2b7c892b048e1bf69e5c3b1d804b7d9c203cb" dependencies = [ "autocfg", "cc", @@ -4274,9 +4077,9 @@ dependencies = [ [[package]] name = "os_info" -version = "3.0.7" +version = "3.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ac91020bfed8cc3f8aa450d4c3b5fa1d3373fc091c8a92009f3b27749d5a227" +checksum = "198e392be7e882f0c2836f425e430f81d9a0e99651e4646311347417cddbfd43" dependencies = [ "log", "winapi 0.3.9", @@ -4324,18 +4127,9 @@ dependencies = [ [[package]] name = "paste" -version = "1.0.5" +version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acbf547ad0c65e31259204bd90935776d1c693cec2f4ff7abb7a1bbbd40dfe58" - -[[package]] -name = "path_abs" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05ef02f6342ac01d8a93b65f96db53fe68a92a15f41144f97fb00a9e669633c3" -dependencies = [ - "std_prelude", -] +checksum = "0744126afe1a6dd7f394cb50a716dbe086cb06e255e53d8d0185d82828358fb5" [[package]] name = "pbkdf2" @@ -4401,7 +4195,16 @@ version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3dfb61232e34fcb633f43d12c58f83c1df82962dcdfa565a4e866ffc17dafe12" dependencies = [ - "phf_shared", + "phf_shared 0.8.0", +] + +[[package]] +name = "phf" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fabbf1ead8a5bcbc20f5f8b939ee3f5b0f6f281b6ad3468b84656b658b455259" +dependencies = [ + "phf_shared 0.10.0", ] [[package]] @@ -4410,8 +4213,18 @@ version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cbffee61585b0411840d3ece935cce9cb6321f01c45477d30066498cd5e1a815" dependencies = [ - "phf_generator", - "phf_shared", + "phf_generator 0.8.0", + "phf_shared 0.8.0", +] + +[[package]] +name = "phf_codegen" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4fb1c3a8bc4dd4e5cfce29b44ffc14bedd2ee294559a294e2a4d4c9e9a6a13cd" +dependencies = [ + "phf_generator 0.10.0", + "phf_shared 0.10.0", ] [[package]] @@ -4420,10 +4233,20 @@ version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "17367f0cc86f2d25802b2c26ee58a7b23faeccf78a396094c13dced0d0182526" dependencies = [ - "phf_shared", + "phf_shared 0.8.0", "rand 0.7.3", ] +[[package]] +name = "phf_generator" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5d5285893bb5eb82e6aaf5d59ee909a06a16737a8970984dd7746ba9283498d6" +dependencies = [ + "phf_shared 0.10.0", + "rand 0.8.4", +] + [[package]] name = "phf_shared" version = "0.8.0" @@ -4434,28 +4257,38 @@ dependencies = [ ] [[package]] -name = "pin-project" -version = "0.4.28" +name = "phf_shared" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "918192b5c59119d51e0cd221f4d49dde9112824ba717369e903c97d076083d0f" +checksum = "b6796ad771acdc0123d2a88dc428b5e38ef24456743ddb1744ed628f9815c096" dependencies = [ - "pin-project-internal 0.4.28", + "siphasher", + "uncased", ] [[package]] name = "pin-project" -version = "1.0.8" +version = "0.4.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "576bc800220cc65dac09e99e97b08b358cfab6e17078de8dc5fee223bd2d0c08" +checksum = "9615c18d31137579e9ff063499264ddc1278e7b1982757ebc111028c4d1dc909" dependencies = [ - "pin-project-internal 1.0.8", + "pin-project-internal 0.4.29", +] + +[[package]] +name = "pin-project" +version = "1.0.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "58ad3879ad3baf4e44784bc6a718a8698867bb991f8ce24d1bcbe2cfb4c3a75e" +dependencies = [ + "pin-project-internal 1.0.10", ] [[package]] name = "pin-project-internal" -version = "0.4.28" +version = "0.4.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3be26700300be6d9d23264c73211d8190e755b6b5ca7a1b28230025511b52a5e" +checksum = "044964427019eed9d49d9d5bbce6047ef18f37100ea400912a9fa4a3523ab12a" dependencies = [ "proc-macro2", "quote", @@ -4464,9 +4297,9 @@ dependencies = [ [[package]] name = "pin-project-internal" -version = "1.0.8" +version = "1.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e8fe8163d14ce7f0cdac2e040116f22eac817edabff0be91e8aff7e9accf389" +checksum = "744b6f092ba29c3650faf274db506afd39944f48420f6c86b17cfe0ee1cb36bb" dependencies = [ "proc-macro2", "quote", @@ -4481,9 +4314,9 @@ checksum = "257b64915a082f7811703966789728173279bdebb956b143dbcd23f6f970a777" [[package]] name = "pin-project-lite" -version = "0.2.7" +version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d31d11c69a6b52a174b42bdc0c30e5e11670f90788b2c471c31c1d17d449443" +checksum = "e280fbe77cc62c91527259e9442153f4688736748d24660126286329742b4c6c" [[package]] name = "pin-utils" @@ -4493,29 +4326,15 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] name = "pkg-config" -version = "0.3.20" +version = "0.3.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c9b1041b4387893b91ee6746cddfc28516aff326a3519fb2adf820932c5e6cb" - -[[package]] -name = "plist" -version = "1.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a38d026d73eeaf2ade76309d0c65db5a35ecf649e3cec428db316243ea9d6711" -dependencies = [ - "base64 0.13.0", - "chrono", - "indexmap", - "line-wrap", - "serde 1.0.130", - "xml-rs", -] +checksum = "58893f751c9b0412871a09abd62ecd2a00298c6c83befa223ef98c52aef40cbe" [[package]] name = "polling" -version = "2.1.0" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92341d779fa34ea8437ef4d82d440d5e1ce3f3ff7f824aa64424cd481f9a1f25" +checksum = "685404d509889fade3e86fe3a5803bca2ec09b0c0778d5ada6ec8bf7a8de5259" dependencies = [ "cfg-if 1.0.0", "libc", @@ -4549,7 +4368,7 @@ dependencies = [ "md5", "memchr", "rand 0.7.3", - "sha2 0.9.8", + "sha2 0.9.9", "stringprep", ] @@ -4566,9 +4385,9 @@ dependencies = [ [[package]] name = "ppv-lite86" -version = "0.2.10" +version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac74c624d6b2d21f425f752262f42188365d7b8ff1aff74c82e45136510a4857" +checksum = "eb9f9e6e233e5c4a35559a617bf40a4ec447db2e84c20b55a6f83167b7e57872" [[package]] name = "pq-sys" @@ -4585,6 +4404,16 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c" +[[package]] +name = "prettyplease" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1942565ef999340d46b88ced7f8786befd95704ffaf5ac810bd1b358f321cbb1" +dependencies = [ + "proc-macro2", + "syn", +] + [[package]] name = "proc-macro-crate" version = "1.1.0" @@ -4605,7 +4434,7 @@ dependencies = [ "proc-macro2", "quote", "syn", - "version_check 0.9.3", + "version_check 0.9.4", ] [[package]] @@ -4616,7 +4445,7 @@ checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" dependencies = [ "proc-macro2", "quote", - "version_check 0.9.3", + "version_check 0.9.4", ] [[package]] @@ -4625,17 +4454,11 @@ version = "0.5.19" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dbf0c48bc1d91375ae5c3cd81e3722dff1abcf81a30960240640d223f59fe0e5" -[[package]] -name = "proc-macro-nested" -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc881b2c22681370c6a780e47af9840ef841837bc98118431d4e1868bd0c1086" - [[package]] name = "proc-macro2" -version = "1.0.29" +version = "1.0.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9f5105d4fdaab20335ca9565e106a5d9b82b6219b5ba735731124ac6711d23d" +checksum = "c7342d5883fbccae1cc37a2353b09c87c9b0f3afd73f5fb9bba687a1f733b029" dependencies = [ "unicode-xid", ] @@ -4669,7 +4492,7 @@ version = "0.2.0" dependencies = [ "actix", "actix-protobuf", - "actix-web 3.3.2", + "actix-web 3.3.3", "bytes 0.5.6", "env_logger 0.9.0", "prost", @@ -4690,9 +4513,9 @@ checksum = "a993555f31e5a609f617c12db6250dedcac1b0a85076912c436e6fc9b2c8e6a3" [[package]] name = "quote" -version = "1.0.10" +version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38bc8cc6a5f2e3655e0899c1b848643b2562f853f114bfec7be120678e3ace05" +checksum = "864d3e96a899863136fc6e99f3d7cae289dafe43bf2c5ac19b70df7210c0a145" dependencies = [ "proc-macro2", ] @@ -4712,7 +4535,7 @@ dependencies = [ name = "r2d2-example" version = "1.0.0" dependencies = [ - "actix-web 3.3.2", + "actix-web 3.3.3", "env_logger 0.8.4", "r2d2", "r2d2_sqlite", @@ -4801,7 +4624,7 @@ version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d34f1408f55294453790c48b2f1ebbb1c5b4b7563eb1f418bcfcfdbb06ebb4e7" dependencies = [ - "getrandom 0.2.3", + "getrandom 0.2.4", ] [[package]] @@ -4839,10 +4662,10 @@ checksum = "7b94c6247d45d78d24481a5b7aca146f414ec0f5e39e175f294d1876b943eeeb" dependencies = [ "async-trait", "bytes 0.5.6", - "combine 4.6.1", + "combine 4.6.3", "dtoa", "futures-util", - "itoa", + "itoa 0.4.8", "percent-encoding", "pin-project-lite 0.1.12", "tokio 0.2.25", @@ -4869,15 +4692,15 @@ dependencies = [ name = "redis_session" version = "2.0.0" dependencies = [ - "actix-http 2.2.1", + "actix-http 2.2.2", "actix-redis", "actix-rt 1.1.1", "actix-service 1.0.6", "actix-session", - "actix-web 3.3.2", + "actix-web 3.3.3", "env_logger 0.8.4", "rand 0.7.3", - "serde 1.0.130", + "serde 1.0.136", "serde_json", "time 0.2.27", ] @@ -4908,7 +4731,7 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "528532f3d801c87aec9def2add9ca802fe569e44a544afe633765267840abe64" dependencies = [ - "getrandom 0.2.3", + "getrandom 0.2.4", "redox_syscall", ] @@ -4923,12 +4746,6 @@ dependencies = [ "regex-syntax", ] -[[package]] -name = "regex-automata" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" - [[package]] name = "regex-syntax" version = "0.6.25" @@ -4967,8 +4784,8 @@ dependencies = [ "mime_guess", "native-tls", "percent-encoding", - "pin-project-lite 0.2.7", - "serde 1.0.130", + "pin-project-lite 0.2.8", + "serde 1.0.136", "serde_json", "serde_urlencoded", "tokio 0.2.25", @@ -5000,7 +4817,7 @@ dependencies = [ "instant", "num-traits 0.2.14", "rhai_codegen", - "serde 1.0.130", + "serde 1.0.136", "smallvec", ] @@ -5034,7 +4851,7 @@ dependencies = [ name = "run-in-thread" version = "2.0.0" dependencies = [ - "actix-web 3.3.2", + "actix-web 3.3.3", "env_logger 0.8.4", ] @@ -5056,11 +4873,11 @@ dependencies = [ "log", "md5", "percent-encoding", - "pin-project 0.4.28", + "pin-project 0.4.29", "rusoto_credential", "rusoto_signature", "rustc_version 0.2.3", - "serde 1.0.130", + "serde 1.0.136", "serde_json", "sha2 0.8.2", "tokio 0.2.25", @@ -5078,9 +4895,9 @@ dependencies = [ "dirs", "futures", "hyper", - "pin-project 0.4.28", + "pin-project 0.4.29", "regex", - "serde 1.0.130", + "serde 1.0.136", "serde_json", "shlex", "tokio 0.2.25", @@ -5116,10 +4933,10 @@ dependencies = [ "log", "md5", "percent-encoding", - "pin-project 0.4.28", + "pin-project 0.4.29", "rusoto_credential", "rustc_version 0.2.3", - "serde 1.0.130", + "serde 1.0.136", "sha2 0.8.2", "time 0.2.27", "tokio 0.2.25", @@ -5149,7 +4966,7 @@ dependencies = [ "base64 0.13.0", "blake2b_simd", "constant_time_eq", - "crossbeam-utils 0.8.5", + "crossbeam-utils 0.8.6", ] [[package]] @@ -5160,13 +4977,13 @@ checksum = "3e52c148ef37f8c375d49d5a73aa70713125b7f19095948a923f80afdeb22ec2" [[package]] name = "rust_decimal" -version = "1.16.0" +version = "1.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0f1028de22e436bb35fce070310ee57d57b5e59ae77b4e3f24ce4773312b813" +checksum = "e0593ce4677e3800ddafb3de917e8397b1348e06e688128ade722d88fbe11ebf" dependencies = [ - "arrayvec 0.5.2", + "arrayvec 0.7.2", "num-traits 0.2.14", - "serde 1.0.130", + "serde 1.0.136", ] [[package]] @@ -5186,11 +5003,11 @@ dependencies = [ [[package]] name = "rustc_version" -version = "0.3.3" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0dfe2087c51c460008730de8b57e6a320782fbfb312e1f4d520e6c6fae155ee" +checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" dependencies = [ - "semver 0.11.0", + "semver 1.0.4", ] [[package]] @@ -5223,8 +5040,8 @@ dependencies = [ name = "rustls-client-cert" version = "1.0.0" dependencies = [ - "actix-tls 2.0.0", - "actix-web 3.3.2", + "actix-tls", + "actix-web 3.3.3", "env_logger 0.8.4", "log", "rustls 0.18.1", @@ -5235,28 +5052,31 @@ name = "rustls-example" version = "1.0.0" dependencies = [ "actix-files 0.3.0", - "actix-web 3.3.2", + "actix-web 3.3.3", "env_logger 0.8.4", "rustls 0.18.1", ] [[package]] -name = "rustversion" -version = "1.0.5" +name = "rustls-pemfile" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61b3909d758bb75c79f23d4736fac9433868679d3ad2ea7a61e3c25cfda9a088" +checksum = "5eebeaeb360c87bfb72e84abdb3447159c0eaececf1bef2aecd65a8be949d1c9" +dependencies = [ + "base64 0.13.0", +] + +[[package]] +name = "rustversion" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f2cc38e8fa666e2de3c4aba7edeb5ffc5246c1c2ed0e3d17e560aeeba736b23f" [[package]] name = "ryu" -version = "1.0.5" +version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71d301d4193d031abdd79ff7e3dd721168a9572ef3fe51a1517aba235bd8f86e" - -[[package]] -name = "safemem" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef703b7cb59335eae2eb93ceb664c0eb7ea6bf567079d843e09420219668e072" +checksum = "73b4b750c782965c211b42f022f59af1fbceabdd026623714f104152f1ec149f" [[package]] name = "same-file" @@ -5314,9 +5134,9 @@ dependencies = [ [[package]] name = "security-framework" -version = "2.4.2" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "525bc1abfda2e1998d152c45cf13e696f76d0a4972310b22fac1658b05df7c87" +checksum = "d09d3c15d814eda1d6a836f2f2b56a6abc1446c8a34351cb3180d3db92ffe4ce" dependencies = [ "bitflags", "core-foundation", @@ -5327,9 +5147,9 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.4.2" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9dd14d83160b528b7bfd66439110573efcfbe281b17fc2ca9f39f550d619c7e" +checksum = "e90dd10c41c6bfc633da6e0c659bd25d31e0791e5974ac42970267d59eba87f7" dependencies = [ "core-foundation-sys", "libc", @@ -5341,17 +5161,14 @@ version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403" dependencies = [ - "semver-parser 0.7.0", + "semver-parser", ] [[package]] name = "semver" -version = "0.11.0" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f301af10236f6df4160f7c3f04eec6dbc70ace82d23326abad5edee88801c6b6" -dependencies = [ - "semver-parser 0.10.2", -] +checksum = "568a8e6258aa33c13358f81fd834adb854c6f7c9468520910a9b1e8fac068012" [[package]] name = "semver-parser" @@ -5359,15 +5176,6 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" -[[package]] -name = "semver-parser" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00b0bef5b7f9e0df16536d3961cfb6e84331c065b4066afb39768d0e319411f7" -dependencies = [ - "pest", -] - [[package]] name = "serde" version = "0.8.23" @@ -5376,9 +5184,9 @@ checksum = "9dad3f759919b92c3068c696c15c3d17238234498bbdcc80f2c469606f948ac8" [[package]] name = "serde" -version = "1.0.130" +version = "1.0.136" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f12d06de37cf59146fbdecab66aa99f9fe4f78722e3607577a5375d66bd0c913" +checksum = "ce31e24b01e1e524df96f1c2fdd054405f8d7376249a5110886fb4b658484789" dependencies = [ "serde_derive", ] @@ -5402,14 +5210,14 @@ version = "0.11.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "16ae07dd2f88a366f15bd0632ba725227018c69a1c8550a927324f8eb8368bb9" dependencies = [ - "serde 1.0.130", + "serde 1.0.136", ] [[package]] name = "serde_derive" -version = "1.0.130" +version = "1.0.136" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7bc1a1ab1961464eae040d96713baa5a724a8152c1222492465b54322ec508b" +checksum = "08597e7152fcd306f41838ed3e37be9eaeed2b61c42e2117266a554fab4662f9" dependencies = [ "proc-macro2", "quote", @@ -5418,14 +5226,14 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.68" +version = "1.0.78" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f690853975602e1bfe1ccbf50504d67174e3bcf340f23b5ea9992e0587a52d8" +checksum = "d23c1ba4cf0efd44be32017709280b32d1cea5c3f1275c3b6d9e8bc54f758085" dependencies = [ "indexmap", - "itoa", + "itoa 1.0.1", "ryu", - "serde 1.0.130", + "serde 1.0.136", ] [[package]] @@ -5439,56 +5247,44 @@ dependencies = [ [[package]] name = "serde_urlencoded" -version = "0.7.0" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "edfa57a7f8d9c1d260a549e7224100f6c43d43f9103e06dd8b4095a9b2b43ce9" +checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd" dependencies = [ "form_urlencoded", - "itoa", + "itoa 1.0.1", "ryu", - "serde 1.0.130", + "serde 1.0.136", ] [[package]] name = "serde_with" -version = "1.10.0" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "062b87e45d8f26714eacfaef0ed9a583e2bfd50ebd96bdd3c200733bd5758e2c" +checksum = "ad6056b4cb69b6e43e3a0f055def223380baecc99da683884f205bf347f7c4b3" dependencies = [ "rustversion", - "serde 1.0.130", + "serde 1.0.136", "serde_with_macros", ] [[package]] name = "serde_with_macros" -version = "1.5.0" +version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98c1fcca18d55d1763e1c16873c4bde0ac3ef75179a28c7b372917e0494625be" +checksum = "12e47be9471c72889ebafb5e14d5ff930d89ae7a67bbdb5f8abb564f845a927e" dependencies = [ - "darling 0.13.0", + "darling 0.13.1", "proc-macro2", "quote", "syn", ] -[[package]] -name = "serde_yaml" -version = "0.8.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8c608a35705a5d3cdc9fbe403147647ff34b921f8e833e49306df898f9b20af" -dependencies = [ - "dtoa", - "indexmap", - "serde 1.0.130", - "yaml-rust", -] - [[package]] name = "server-sent-events" version = "1.0.0" dependencies = [ - "actix-web 3.3.2", + "actix-web 3.3.3", "env_logger 0.8.4", "futures", "tokio 0.2.25", @@ -5520,10 +5316,30 @@ dependencies = [ ] [[package]] -name = "sha1" -version = "0.6.0" +name = "sha-1" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2579985fda508104f7587689507983eadd6a6e84dd35d6d115361f530916fa0d" +checksum = "028f48d513f9678cda28f6e4064755b3fbb2af6acd672f2c209b62323f7aea0f" +dependencies = [ + "cfg-if 1.0.0", + "cpufeatures", + "digest 0.10.1", +] + +[[package]] +name = "sha1" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c1da05c97445caa12d05e848c4a4fcbbea29e748ac28f7e80e9b010392063770" +dependencies = [ + "sha1_smol", +] + +[[package]] +name = "sha1_smol" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ae1a47186c03a32177042e55dbc5fd5aee900b8e0069a8d70fba96a9375cd012" [[package]] name = "sha2" @@ -5539,9 +5355,9 @@ dependencies = [ [[package]] name = "sha2" -version = "0.9.8" +version = "0.9.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b69f9a4c9740d74c5baa3fd2e547f9525fa8088a8a958e0ca2409a514e33f5fa" +checksum = "4d58a1e1bf39749807d89cf2d98ac2dfa0ff1cb3faa38fbb64dd88ac8013d800" dependencies = [ "block-buffer 0.9.0", "cfg-if 1.0.0", @@ -5550,18 +5366,6 @@ dependencies = [ "opaque-debug 0.3.0", ] -[[package]] -name = "shell-escape" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45bb67a18fa91266cc7807181f62f9178a6873bfad7dc788c42e6430db40184f" - -[[package]] -name = "shell-words" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6fa3938c99da4914afedd13bf3d79bcb6c277d1b2c398d23257a304d9e1b074" - [[package]] name = "shlex" version = "0.1.1" @@ -5572,7 +5376,7 @@ checksum = "7fdf1b9db47230893d76faad238fd6097fd6d6a9245cd7a4d90dbd639536bbd2" name = "shutdown-server" version = "2.0.0" dependencies = [ - "actix-web 3.3.2", + "actix-web 3.3.3", "env_logger 0.8.4", "futures", "tokio 0.2.25", @@ -5580,9 +5384,9 @@ dependencies = [ [[package]] name = "signal-hook" -version = "0.3.10" +version = "0.3.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c98891d737e271a2954825ef19e46bd16bdb98e2746f2eec4f7a4ef7946efd1" +checksum = "647c97df271007dcea485bb74ffdb57f2e683f1306c854f468a0c244badabf2d" dependencies = [ "libc", "signal-hook-registry", @@ -5602,7 +5406,7 @@ name = "simple-auth-server" version = "2.0.0" dependencies = [ "actix-identity", - "actix-web 3.3.2", + "actix-web 3.3.3", "chrono", "derive_more", "diesel", @@ -5612,7 +5416,7 @@ dependencies = [ "lazy_static", "r2d2", "rust-argon2", - "serde 1.0.130", + "serde 1.0.136", "serde_json", "sparkpost", "time 0.2.27", @@ -5621,15 +5425,15 @@ dependencies = [ [[package]] name = "siphasher" -version = "0.3.7" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "533494a8f9b724d33625ab53c6c4800f7cc445895924a8ef649222dcb76e938b" +checksum = "a86232ab60fa71287d7f2ddae4a7073f6b7aac33631c3015abb556f08c6d0a3e" [[package]] name = "slab" -version = "0.4.4" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c307a32c1c5c437f38c7fd45d753050587732ba8628319fbdf12a7e289ccc590" +checksum = "9def91fd1e018fe007022791f865d0ccc9b3a0d5001e01aabb8b40e46000afb5" [[package]] name = "slug" @@ -5642,9 +5446,9 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.7.0" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ecab6c735a6bb4139c0caafd0cc3635748bbb3acf4550e8138122099251f309" +checksum = "f2dd574626839106c320a323308629dcb1acfc96e32a8cba364ddc61ac23ee83" [[package]] name = "smartstring" @@ -5668,9 +5472,9 @@ dependencies = [ [[package]] name = "socket2" -version = "0.4.2" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5dc90fe6c7be1a323296982db1836d1ea9e47b6839496dde9a541bc496df3516" +checksum = "0f82496b90c36d70af5fcd482edaa2e0bd16fade569de1330405fecbbdac736b" dependencies = [ "libc", "winapi 0.3.9", @@ -5684,7 +5488,7 @@ checksum = "ba54017cf417e62d64260167de6b8d578f99a248225d3f9fd3396db1ab9e7fbc" dependencies = [ "chrono", "reqwest", - "serde 1.0.130", + "serde 1.0.136", "serde_derive", "serde_json", ] @@ -5707,8 +5511,8 @@ version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b4b7922be017ee70900be125523f38bdd644f4f06a1b16e8fa5a8ee8c34bffd4" dependencies = [ - "itertools 0.10.1", - "nom 7.0.0", + "itertools 0.10.3", + "nom 7.1.0", "unicode_categories", ] @@ -5769,13 +5573,13 @@ dependencies = [ name = "sqlx_todo" version = "0.1.0" dependencies = [ - "actix-web 3.3.2", + "actix-web 3.3.3", "anyhow", "dotenv", "env_logger 0.7.1", "futures", "log", - "serde 1.0.130", + "serde 1.0.136", "serde_json", "sqlx", ] @@ -5786,14 +5590,14 @@ version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e113fb6f3de07a243d434a56ec6f186dfd51cb08448239fe7bcae73f87ff28ff" dependencies = [ - "version_check 0.9.3", + "version_check 0.9.4", ] [[package]] name = "state" version = "2.0.0" dependencies = [ - "actix-web 3.3.2", + "actix-web 3.3.3", "env_logger 0.8.4", ] @@ -5814,16 +5618,10 @@ name = "static_index" version = "2.0.0" dependencies = [ "actix-files 0.3.0", - "actix-web 3.3.2", + "actix-web 3.3.3", "env_logger 0.8.4", ] -[[package]] -name = "std_prelude" -version = "0.2.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8207e78455ffdf55661170876f88daf85356e4edd54e0a3dbc79586ca1e50cbe" - [[package]] name = "stdweb" version = "0.4.20" @@ -5846,7 +5644,7 @@ checksum = "c87a60a40fccc84bef0652345bbbbbe20a605bf5d0ce81719fc476f5c03b50ef" dependencies = [ "proc-macro2", "quote", - "serde 1.0.130", + "serde 1.0.136", "serde_derive", "syn", ] @@ -5860,7 +5658,7 @@ dependencies = [ "base-x", "proc-macro2", "quote", - "serde 1.0.130", + "serde 1.0.136", "serde_derive", "serde_json", "sha1", @@ -5875,15 +5673,16 @@ checksum = "213701ba3370744dcd1a12960caa4843b3d68b4d1c0a5d575e0d65b2ee9d16c0" [[package]] name = "string_cache" -version = "0.8.1" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ddb1139b5353f96e429e1a5e19fbaf663bddedaa06d1dbd49f82e352601209a" +checksum = "923f0f39b6267d37d23ce71ae7235602134b250ace715dd2c90421998ddac0c6" dependencies = [ "lazy_static", "new_debug_unreachable", - "phf_shared", + "parking_lot", + "phf_shared 0.8.0", "precomputed-hash", - "serde 1.0.130", + "serde 1.0.136", ] [[package]] @@ -5892,8 +5691,8 @@ version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f24c8e5e19d22a726626f1a5e16fe15b132dcf21d10177fa5a45ce7962996b97" dependencies = [ - "phf_generator", - "phf_shared", + "phf_generator 0.8.0", + "phf_shared 0.8.0", "proc-macro2", "quote", ] @@ -5934,9 +5733,9 @@ checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601" [[package]] name = "syn" -version = "1.0.80" +version = "1.0.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d010a1623fbd906d51d650a9916aaefc05ffa0e4053ff7fe601167f3e715d194" +checksum = "8a65b3f4ffa0092e9887669db0eae07941f023991ab58ea44da8fe8e2d511c6b" dependencies = [ "proc-macro2", "quote", @@ -5945,9 +5744,9 @@ dependencies = [ [[package]] name = "synstructure" -version = "0.12.5" +version = "0.12.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "474aaa926faa1603c40b7885a9eaea29b444d1cb2850cb7c0e37bb1a4182f4fa" +checksum = "f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f" dependencies = [ "proc-macro2", "quote", @@ -5955,38 +5754,6 @@ dependencies = [ "unicode-xid", ] -[[package]] -name = "syntect" -version = "4.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b20815bbe80ee0be06e6957450a841185fcf690fe0178f14d77a05ce2caa031" -dependencies = [ - "bincode", - "bitflags", - "fancy-regex", - "flate2", - "fnv", - "lazy_static", - "lazycell", - "plist", - "regex-syntax", - "serde 1.0.130", - "serde_derive", - "serde_json", - "walkdir", - "yaml-rust", -] - -[[package]] -name = "sys-info" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33fcecee49339531cf6bd84ecf3ed94f9c8ef4a7e700f2a1cac9cc1ca485383a" -dependencies = [ - "cc", - "libc", -] - [[package]] name = "take_mut" version = "0.2.2" @@ -6001,13 +5768,13 @@ checksum = "b625cb7d76f7bb1887a11d2e7b97677539924010773844ed17252c6ec7877595" [[package]] name = "tempfile" -version = "3.2.0" +version = "3.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dac1c663cfc93810f88aed9b8941d48cabf856a1b111c29a40439018d870eb22" +checksum = "5cdb1ef4eaeeaddc8fbd371e5017057064af0911902ef36b39801f67cc6d79e4" dependencies = [ "cfg-if 1.0.0", + "fastrand", "libc", - "rand 0.8.4", "redox_syscall", "remove_dir_all", "winapi 0.3.9", @@ -6017,7 +5784,7 @@ dependencies = [ name = "template-askama" version = "2.0.0" dependencies = [ - "actix-web 3.3.2", + "actix-web 3.3.3", "askama", "env_logger 0.8.4", ] @@ -6026,8 +5793,8 @@ dependencies = [ name = "template-tera" version = "2.0.0" dependencies = [ - "actix-http 2.2.1", - "actix-web 3.3.2", + "actix-http 2.2.2", + "actix-web 3.3.3", "env_logger 0.8.4", "tera", ] @@ -6036,8 +5803,8 @@ dependencies = [ name = "template-tinytemplate" version = "2.0.0" dependencies = [ - "actix-http 2.2.1", - "actix-web 3.3.2", + "actix-http 2.2.2", + "actix-web 3.3.3", "env_logger 0.8.4", "serde_json", "tinytemplate", @@ -6047,8 +5814,8 @@ dependencies = [ name = "template_handlebars" version = "1.0.0" dependencies = [ - "actix-http 2.2.1", - "actix-web 3.3.2", + "actix-http 2.2.2", + "actix-web 3.3.3", "handlebars", "serde_json", ] @@ -6058,7 +5825,7 @@ name = "template_yarte" version = "0.0.1" dependencies = [ "actix-rt 1.1.1", - "actix-web 3.3.2", + "actix-web 3.3.3", "derive_more", "env_logger 0.8.4", "yarte", @@ -6078,9 +5845,9 @@ dependencies = [ [[package]] name = "tera" -version = "1.12.1" +version = "1.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf95b0d8a46da5fe3ea119394a6c7f1e745f9de359081641c99946e2bf55d4f2" +checksum = "d3cac831b615c25bcef632d1cabf864fa05813baad3d526829db18eb70e8b58d" dependencies = [ "chrono", "chrono-tz", @@ -6092,7 +5859,7 @@ dependencies = [ "pest_derive", "rand 0.8.4", "regex", - "serde 1.0.130", + "serde 1.0.136", "serde_json", "slug", "unic-segment", @@ -6107,16 +5874,6 @@ dependencies = [ "winapi-util", ] -[[package]] -name = "terminal_size" -version = "0.1.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "633c1a546cee861a1a6d0dc69ebeca693bf4296661ba7852b9d21d159e0506df" -dependencies = [ - "libc", - "winapi 0.3.9", -] - [[package]] name = "textwrap" version = "0.11.0" @@ -6128,18 +5885,18 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.29" +version = "1.0.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "602eca064b2d83369e2b2f34b09c70b605402801927c65c11071ac911d299b88" +checksum = "854babe52e4df1653706b98fcfc05843010039b406875930a70e4d9644e5c417" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.29" +version = "1.0.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bad553cc2c78e8de258400763a647e80e6d1b31ee237275d756f6836d204494c" +checksum = "aa32fd3f627f367fe16f893e2597ae3c05020f8bba2666a4e6ea73d377e5714b" dependencies = [ "proc-macro2", "quote", @@ -6148,9 +5905,9 @@ dependencies = [ [[package]] name = "thread_local" -version = "1.1.3" +version = "1.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8018d24e04c95ac8790716a5987d0fec4f8b27249ffa0f7d33f1369bdfb88cbd" +checksum = "5516c27b78311c50bf42c071425c560ac799b11c30b31f87e3081965fe5e0180" dependencies = [ "once_cell", ] @@ -6185,11 +5942,23 @@ dependencies = [ "libc", "standback", "stdweb", - "time-macros", - "version_check 0.9.3", + "time-macros 0.1.1", + "version_check 0.9.4", "winapi 0.3.9", ] +[[package]] +name = "time" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "004cbc98f30fa233c61a38bc77e96a9106e65c88f2d3bef182ae952027e5753d" +dependencies = [ + "itoa 1.0.1", + "libc", + "num_threads", + "time-macros 0.2.3", +] + [[package]] name = "time-macros" version = "0.1.1" @@ -6200,6 +5969,12 @@ dependencies = [ "time-macros-impl", ] +[[package]] +name = "time-macros" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "25eb0ca3468fc0acc11828786797f6ef9aa1555e4a211a60d64cc8e4d1be47d6" + [[package]] name = "time-macros-impl" version = "0.1.2" @@ -6219,15 +5994,15 @@ version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "be4d6b5f19ff7664e8c98d03e2139cb510db9b0a60b55f8e8709b689d939b6bc" dependencies = [ - "serde 1.0.130", + "serde 1.0.136", "serde_json", ] [[package]] name = "tinyvec" -version = "1.5.0" +version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f83b2a3d4d9091d0abd7eba4dc2710b1718583bd4d8992e2190720ea38f391f7" +checksum = "2c1c1d5a42b6245520c249549ec267180beaffcc0615401ac8e31853d4b6d8d2" dependencies = [ "tinyvec_macros", ] @@ -6264,21 +6039,20 @@ dependencies = [ [[package]] name = "tokio" -version = "1.12.0" +version = "1.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2c2416fdedca8443ae44b4527de1ea633af61d8f7169ffa6e72c5b53d24efcc" +checksum = "fbbf1c778ec206785635ce8ad57fe52b3009ae9e0c9f574a728f3049d3e55838" dependencies = [ - "autocfg", "bytes 1.1.0", "libc", "memchr", - "mio 0.7.13", + "mio 0.7.14", "num_cpus", "once_cell", "parking_lot", - "pin-project-lite 0.2.7", + "pin-project-lite 0.2.8", "signal-hook-registry", - "tokio-macros 1.4.1", + "tokio-macros 1.7.0", "winapi 0.3.9", ] @@ -6295,9 +6069,9 @@ dependencies = [ [[package]] name = "tokio-macros" -version = "1.4.1" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "154794c8f499c2619acd19e839294703e9e32e7630ef5f46ea80d4ef0fbee5eb" +checksum = "b557f72f448c511a979e2564e55d74e6c4432fc96ff4f6241bc6bded342643b7" dependencies = [ "proc-macro2", "quote", @@ -6348,7 +6122,7 @@ dependencies = [ "log", "parking_lot", "percent-encoding", - "phf", + "phf 0.8.0", "pin-project-lite 0.1.12", "postgres-protocol", "postgres-types", @@ -6375,7 +6149,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bc6844de72e57df1980054b38be3a9f4702aba4858be64dd700181a8a6d0e1b6" dependencies = [ "rustls 0.19.1", - "tokio 1.12.0", + "tokio 1.15.0", "webpki", ] @@ -6406,16 +6180,16 @@ dependencies = [ [[package]] name = "tokio-util" -version = "0.6.8" +version = "0.6.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08d3725d3efa29485e87311c5b699de63cde14b00ed4d256b8318aa30ca452cd" +checksum = "9e99e1983e5d376cd8eb4b66604d2e99e79f5bd988c3055891dcd8c9e2604cc0" dependencies = [ "bytes 1.1.0", "futures-core", "futures-sink", "log", - "pin-project-lite 0.2.7", - "tokio 1.12.0", + "pin-project-lite 0.2.8", + "tokio 1.15.0", ] [[package]] @@ -6424,20 +6198,7 @@ version = "0.5.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a31142970826733df8241ef35dc040ef98c679ab14d7c3e54d827099b3acecaa" dependencies = [ - "serde 1.0.130", -] - -[[package]] -name = "toolchain_find" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e85654a10e7a07a47c6f19d93818f3f343e22927f2fa280c84f7c8042743413" -dependencies = [ - "home", - "lazy_static", - "regex", - "semver 0.11.0", - "walkdir", + "serde 1.0.136", ] [[package]] @@ -6454,7 +6215,7 @@ checksum = "375a639232caf30edfc78e8d89b2d4c375515393e7af7e16f01cd96917fb2105" dependencies = [ "cfg-if 1.0.0", "log", - "pin-project-lite 0.2.7", + "pin-project-lite 0.2.8", "tracing-core", ] @@ -6473,7 +6234,7 @@ version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "97d095ae15e245a057c8e8451bab9b3ee1e1f68e9ba2b4fbc18d0ac5237835f2" dependencies = [ - "pin-project 1.0.8", + "pin-project 1.0.10", "tracing", ] @@ -6518,7 +6279,7 @@ dependencies = [ "smallvec", "thiserror", "tinyvec", - "tokio 1.12.0", + "tokio 1.15.0", "url", ] @@ -6557,7 +6318,7 @@ dependencies = [ "resolv-conf", "smallvec", "thiserror", - "tokio 1.12.0", + "tokio 1.15.0", "trust-dns-proto 0.20.3", ] @@ -6579,9 +6340,9 @@ dependencies = [ [[package]] name = "twox-hash" -version = "1.6.1" +version = "1.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f559b464de2e2bdabcac6a210d12e9b5a5973c251e102c44c585c71d51bd78e" +checksum = "4ee73e6e4924fe940354b8d4d98cad5231175d615cd855b758adc658c0aac6a0" dependencies = [ "cfg-if 1.0.0", "rand 0.8.4", @@ -6601,9 +6362,9 @@ dependencies = [ [[package]] name = "typenum" -version = "1.14.0" +version = "1.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b63708a265f51345575b27fe43f9500ad611579e764c79edbc2037b1121959ec" +checksum = "dcf81ac59edc17cc8697ff311e8f5ef2d99fcbd9817b34cec66f90b6c3dfd987" [[package]] name = "ucd-trie" @@ -6624,6 +6385,15 @@ dependencies = [ "tokio-util 0.3.1", ] +[[package]] +name = "uncased" +version = "0.9.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5baeed7327e25054889b9bd4f975f32e5f4c5d434042d59ab6cd4142c0a76ed0" +dependencies = [ + "version_check 0.9.4", +] + [[package]] name = "unchecked-index" version = "0.2.2" @@ -6686,14 +6456,14 @@ version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "50f37be617794602aabbeee0be4f259dc1778fabe05e2d67ee8f79326d5cb4f6" dependencies = [ - "version_check 0.9.3", + "version_check 0.9.4", ] [[package]] name = "unicode-bidi" -version = "0.3.6" +version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "246f4c42e67e7a4e3c6106ff716a5d067d4132a642840b242e357e468a2a0085" +checksum = "1a01404663e3db436ed2746d9fefef640d868edae3cceb81c3b8d5732fda678f" [[package]] name = "unicode-normalization" @@ -6734,7 +6504,7 @@ version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9f214e8f697e925001e66ec2c6e37a4ef93f0f78c2eed7814394e10c62025b05" dependencies = [ - "generic-array 0.14.4", + "generic-array 0.14.5", "subtle 2.4.1", ] @@ -6742,7 +6512,7 @@ dependencies = [ name = "unix-socket" version = "1.0.0" dependencies = [ - "actix-web 3.3.2", + "actix-web 3.3.3", "env_logger 0.8.4", ] @@ -6785,8 +6555,8 @@ version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bc5cf98d8186244414c848017f0e2676b3fcb46807f6668a97dfe67359a3c4b7" dependencies = [ - "getrandom 0.2.3", - "serde 1.0.130", + "getrandom 0.2.4", + "serde 1.0.136", ] [[package]] @@ -6796,7 +6566,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "039a44473286eb84e4e74f90165feff67c802dbeced7ee4c5b00d719b0d0475e" dependencies = [ "buf-min 0.1.1", - "v_escape_derive", + "v_escape_derive 0.8.5", ] [[package]] @@ -6806,24 +6576,24 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ccca9e73c678b882900cbaec16dae4d3662ace5a17774ac45af04e0f3988fafa" dependencies = [ "buf-min 0.2.0", - "v_escape_derive", + "v_escape_derive 0.8.5", ] [[package]] name = "v_escape" -version = "0.16.1" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b57701f09098e70ef300373fcfc1eda4e2961a88824f160894db534d8933a853" +checksum = "79d297315e8ca0b98255614f409699ea189e5929e820f07f69afcebf96c41f9b" dependencies = [ "buf-min 0.6.1", - "v_escape_derive", + "v_escape_derive 0.9.1", ] [[package]] name = "v_escape_derive" -version = "0.8.4" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c860ad1273f4eee7006cee05db20c9e60e5d24cba024a32e1094aa8e574f3668" +checksum = "f29769400af8b264944b851c961a4a6930e76604f59b1fcd51246bab6a296c8c" dependencies = [ "nom 4.2.3", "proc-macro2", @@ -6831,6 +6601,15 @@ dependencies = [ "syn", ] +[[package]] +name = "v_escape_derive" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8fe81cf194472e6ddd6545f8e91ee9780de636194c2e896b8ac201ac78389809" +dependencies = [ + "syn", +] + [[package]] name = "v_eval" version = "0.6.0" @@ -6863,12 +6642,12 @@ dependencies = [ [[package]] name = "v_htmlescape" -version = "0.13.1" +version = "0.14.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2609d928c084cd51b46a04b098bce48099278e0029a3489067b58673c720be59" +checksum = "04b32732bcd549ad15fcb01ee63ad03dd6a0289e9ba72b8164707d1f9fa80478" dependencies = [ "cfg-if 1.0.0", - "v_escape 0.16.1", + "v_escape 0.18.0", ] [[package]] @@ -6880,7 +6659,7 @@ dependencies = [ "idna", "lazy_static", "regex", - "serde 1.0.130", + "serde 1.0.136", "serde_derive", "serde_json", "url", @@ -6903,12 +6682,12 @@ dependencies = [ [[package]] name = "value-bag" -version = "1.0.0-alpha.7" +version = "1.0.0-alpha.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd320e1520f94261153e96f7534476ad869c14022aee1e59af7c778075d840ae" +checksum = "79923f7731dc61ebfba3633098bf3ac533bbd35ccd8c57e7088d9a5eebe0263f" dependencies = [ "ctor", - "version_check 0.9.3", + "version_check 0.9.4", ] [[package]] @@ -6931,9 +6710,9 @@ checksum = "914b1a6776c4c929a602fafd8bc742e06365d4bcbe48c30f9cca5824f70dc9dd" [[package]] name = "version_check" -version = "0.9.3" +version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fecdca9a5291cc2b8dcf7dc02453fee791a280f3743cb0905f8822ae463b3fe" +checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" [[package]] name = "void" @@ -6982,21 +6761,21 @@ checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f" [[package]] name = "wasm-bindgen" -version = "0.2.78" +version = "0.2.79" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "632f73e236b219150ea279196e54e610f5dbafa5d61786303d4da54f84e47fce" +checksum = "25f1af7423d8588a3d840681122e72e6a24ddbcb3f0ec385cac0d12d24256c06" dependencies = [ "cfg-if 1.0.0", - "serde 1.0.130", + "serde 1.0.136", "serde_json", "wasm-bindgen-macro", ] [[package]] name = "wasm-bindgen-backend" -version = "0.2.78" +version = "0.2.79" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a317bf8f9fba2476b4b2c85ef4c4af8ff39c3c7f0cdfeed4f82c34a880aa837b" +checksum = "8b21c0df030f5a177f3cba22e9bc4322695ec43e7257d865302900290bcdedca" dependencies = [ "bumpalo", "lazy_static", @@ -7009,9 +6788,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-futures" -version = "0.4.28" +version = "0.4.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e8d7523cb1f2a4c96c1317ca690031b714a51cc14e05f712446691f413f5d39" +checksum = "2eb6ec270a31b1d3c7e266b999739109abce8b6c87e4b31fcfcd788b65267395" dependencies = [ "cfg-if 1.0.0", "js-sys", @@ -7021,9 +6800,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.78" +version = "0.2.79" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d56146e7c495528bf6587663bea13a8eb588d39b36b679d83972e1a2dbbdacf9" +checksum = "2f4203d69e40a52ee523b2529a773d5ffc1dc0071801c87b3d270b471b80ed01" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -7031,9 +6810,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.78" +version = "0.2.79" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7803e0eea25835f8abdc585cd3021b3deb11543c6fe226dcd30b228857c5c5ab" +checksum = "bfa8a30d46208db204854cadbb5d4baf5fcf8071ba5bf48190c3e59937962ebc" dependencies = [ "proc-macro2", "quote", @@ -7044,15 +6823,15 @@ dependencies = [ [[package]] name = "wasm-bindgen-shared" -version = "0.2.78" +version = "0.2.79" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0237232789cf037d5480773fe568aac745bfe2afbc11a863e97901780a6b47cc" +checksum = "3d958d035c4438e28c70e4321a2911302f10135ce78a9c7834c0cab4123d06a2" [[package]] name = "web-sys" -version = "0.3.55" +version = "0.3.56" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38eb105f1c59d9eaa6b5cdc92b859d85b926e82cb2e0945cd0c9259faa6fe9fb" +checksum = "c060b319f29dd25724f09a2ba1418f142f539b2be99fbf4d2d5a8f7330afb8eb" dependencies = [ "js-sys", "wasm-bindgen", @@ -7093,7 +6872,7 @@ dependencies = [ "actix", "actix-codec 0.3.0", "actix-files 0.3.0", - "actix-web 3.3.2", + "actix-web 3.3.3", "actix-web-actors", "awc", "bytes 0.5.6", @@ -7106,7 +6885,7 @@ name = "websocket-autobahn" version = "2.0.0" dependencies = [ "actix", - "actix-web 3.3.2", + "actix-web 3.3.3", "actix-web-actors", "env_logger 0.8.4", ] @@ -7119,7 +6898,7 @@ dependencies = [ "actix-broker", "actix-files 0.4.1", "actix-rt 1.1.1", - "actix-web 3.3.2", + "actix-web 3.3.3", "actix-web-actors", "env_logger 0.8.4", "futures", @@ -7133,14 +6912,14 @@ version = "2.0.0" dependencies = [ "actix", "actix-files 0.3.0", - "actix-web 3.3.2", + "actix-web 3.3.3", "actix-web-actors", "byteorder", "bytes 0.5.6", "env_logger 0.8.4", "futures", "rand 0.7.3", - "serde 1.0.130", + "serde 1.0.136", "serde_json", ] @@ -7151,14 +6930,14 @@ dependencies = [ "actix", "actix-codec 0.3.0", "actix-files 0.3.0", - "actix-web 3.3.2", + "actix-web 3.3.3", "actix-web-actors", "byteorder", "bytes 0.5.6", "env_logger 0.8.4", "futures", "rand 0.7.3", - "serde 1.0.130", + "serde 1.0.136", "serde_json", "tokio 0.2.25", "tokio-util 0.3.1", @@ -7276,41 +7055,41 @@ dependencies = [ [[package]] name = "yarte" -version = "0.15.4" +version = "0.15.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1dc060d69c0bac4e38d159838c4dc23316b464b0c8f5bb6dff3271b599b0c629" +checksum = "c716c25f8cee3c289a749a10255f2b8eac52f8ac7279242f99eeb25acf2b51ce" dependencies = [ "buf-min 0.6.1", "yarte_derive", - "yarte_helpers 0.15.1", + "yarte_helpers 0.15.6", ] [[package]] name = "yarte_codegen" -version = "0.15.3" +version = "0.15.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8cc8d4bca39ee87a7db5a1016512ee59b063678d2e39bcf260a942a1e5fdad3b" +checksum = "ba620881dbdc7e340518f23dbea0a253dd1aa567bfbde9e39b2f8e01b1ab868c" dependencies = [ "proc-macro2", "quote", "syn", "yarte_dom", - "yarte_helpers 0.15.1", + "yarte_helpers 0.15.6", "yarte_hir", "yarte_html", ] [[package]] name = "yarte_derive" -version = "0.15.4" +version = "0.15.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "928aa038d1b77fc0332f0dfac3e97f11f8c6357f71cac3bfa02eada0f1bdfe75" +checksum = "2e4ad5cbe1874a6c8c6a0c59043a1abe02df60a441b098a9e8120b74be497bd0" dependencies = [ "proc-macro2", "quote", "syn", "yarte_codegen", - "yarte_helpers 0.15.1", + "yarte_helpers 0.15.6", "yarte_hir", "yarte_parser", ] @@ -7324,7 +7103,7 @@ dependencies = [ "markup5ever", "quote", "syn", - "yarte_helpers 0.15.1", + "yarte_helpers 0.15.6", "yarte_hir", "yarte_html", ] @@ -7335,49 +7114,48 @@ version = "0.12.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8f13cb211fffcfc9ac73726af6885f35a627d5662fe380a962529db071a3332d" dependencies = [ - "serde 1.0.130", + "serde 1.0.136", "toml", ] [[package]] name = "yarte_helpers" -version = "0.15.1" +version = "0.15.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02635dd70b0f67d67f8e693720a4204b72801a6f70ac0ac686e2b9e627eb488e" +checksum = "c752e264ef064fb624c5d85e5f174fe130d273e9221d47daaad091281067b212" dependencies = [ - "bat", "buf-min 0.6.1", "dtoa", - "itoa", + "itoa 0.4.8", + "prettyplease", "ryu", - "serde 1.0.130", - "tempfile", + "serde 1.0.136", + "syn", "toml", - "toolchain_find", - "v_htmlescape 0.13.1", + "v_htmlescape 0.14.1", ] [[package]] name = "yarte_hir" -version = "0.15.3" +version = "0.15.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fec7622b44b5f34ad22f5186e8c214f2d8b6251259797671b819e31e1c5d3954" +checksum = "c512fd587daa46e67fa758df5cf0ff3ec143210542ae291a42ac6cc133b3a653" dependencies = [ "derive_more", "proc-macro2", "quote", "syn", "v_eval", - "v_htmlescape 0.13.1", - "yarte_helpers 0.15.1", + "v_htmlescape 0.14.1", + "yarte_helpers 0.15.6", "yarte_parser", ] [[package]] name = "yarte_html" -version = "0.15.0" +version = "0.15.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23f49eb0409c4456c28b87fe06693722c4144f54aa5b40c5c7938a70275b58d7" +checksum = "d7a1ab7f1a0f5e7d7bd1c9ea0671985557b6d55b119ccb6ed88d34587430567c" dependencies = [ "log", "mac", @@ -7390,40 +7168,40 @@ dependencies = [ [[package]] name = "yarte_parser" -version = "0.15.0" +version = "0.15.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51dc059a5d3d5fcb182f8dbed76649a074f2c4f1b060744880ad97bbffb351ac" +checksum = "22462f6bb1d1b3ecaabe73ac51fc300f36868982f04f17d17eb8b90b1062efc7" dependencies = [ "annotate-snippets", "derive_more", "proc-macro2", "quote", - "serde 1.0.130", + "serde 1.0.136", "syn", "unicode-xid", - "yarte_helpers 0.15.1", + "yarte_helpers 0.15.6", ] [[package]] name = "zeroize" -version = "1.4.2" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf68b08513768deaa790264a7fac27a58cbf2705cfcdc9448362229217d7e970" +checksum = "cc222aec311c323c717f56060324f32b82da1ce1dd81d9a09aa6a9030bfe08db" [[package]] name = "zstd" -version = "0.7.0+zstd.1.4.9" +version = "0.9.2+zstd.1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9428752481d8372e15b1bf779ea518a179ad6c771cca2d2c60e4fbff3cc2cd52" +checksum = "2390ea1bf6c038c39674f22d95f0564725fc06034a47129179810b2fc58caa54" dependencies = [ "zstd-safe", ] [[package]] name = "zstd-safe" -version = "3.1.0+zstd.1.4.9" +version = "4.1.3+zstd.1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5aa1926623ad7fe406e090555387daf73db555b948134b4d73eac5eb08fb666d" +checksum = "e99d81b99fb3c2c2c794e3fe56c305c63d5173a16a46b5850b07c935ffc7db79" dependencies = [ "libc", "zstd-sys", @@ -7431,9 +7209,9 @@ dependencies = [ [[package]] name = "zstd-sys" -version = "1.5.0+zstd.1.4.9" +version = "1.6.2+zstd.1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e6c094340240369025fc6b731b054ee2a834328fa584310ac96aa4baebdc465" +checksum = "2daf2f248d9ea44454bfcb2516534e8b8ad2fc91bf818a1885495fc42bc8ac9f" dependencies = [ "cc", "libc", diff --git a/basics/docker_sample/.dockerignore b/basics/docker_sample/.dockerignore new file mode 100644 index 00000000..94143827 --- /dev/null +++ b/basics/docker_sample/.dockerignore @@ -0,0 +1 @@ +Dockerfile diff --git a/basics/docker_sample/Cargo.toml b/basics/docker_sample/Cargo.toml index 75606fb2..d5be97cc 100644 --- a/basics/docker_sample/Cargo.toml +++ b/basics/docker_sample/Cargo.toml @@ -6,3 +6,5 @@ edition = "2018" [dependencies] actix-web = "3" +env_logger = "0.9" +log = "0.4" diff --git a/basics/docker_sample/Dockerfile b/basics/docker_sample/Dockerfile index 83c87f08..54310f0f 100644 --- a/basics/docker_sample/Dockerfile +++ b/basics/docker_sample/Dockerfile @@ -1,24 +1,38 @@ -FROM rust:1-slim-buster AS base - -ENV USER=root +# NB: This is not a production-grade Dockerfile. +################# +## build stage ## +################# +FROM rust:1-slim-bullseye AS builder WORKDIR /code -RUN cargo init -COPY Cargo.toml /code/Cargo.toml + +# Download crates-io index and fetch dependency code. +# This step avoids needing to spend time on every build downloading the index +# which can take a long time within the docker context. Docker will cache it. +RUN USER=root cargo init +COPY Cargo.toml Cargo.toml RUN cargo fetch -COPY src /code/src +# copy app files +COPY src src -CMD [ "cargo", "test", "--offline" ] +# compile app +RUN cargo build --release -FROM base AS builder +############### +## run stage ## +############### +FROM debian:bullseye-slim +WORKDIR /app -RUN cargo build --release --offline +# copy server binary from build stage +COPY --from=builder /code/target/release/docker_sample docker_sample -FROM debian:buster-slim +# set user to non-root unless root is required for your app +USER 1001 -COPY --from=builder /code/target/release/docker_sample /usr/bin/docker_sample +# indicate what port the server is running on +EXPOSE 8080 -EXPOSE 5000 - -ENTRYPOINT [ "/usr/bin/docker_sample" ] +# run server +CMD [ "/app/docker_sample" ] diff --git a/basics/docker_sample/src/main.rs b/basics/docker_sample/src/main.rs index 1fc967b5..769dae68 100644 --- a/basics/docker_sample/src/main.rs +++ b/basics/docker_sample/src/main.rs @@ -1,26 +1,28 @@ -#[macro_use] -extern crate actix_web; - -use actix_web::{App, HttpResponse, HttpServer, Responder}; +use actix_web::{get, middleware::Logger, App, HttpResponse, HttpServer, Responder}; #[get("/")] async fn index() -> impl Responder { - println!("GET: /"); HttpResponse::Ok().body("Hello world!") } #[get("/again")] async fn again() -> impl Responder { - println!("GET: /again"); HttpResponse::Ok().body("Hello world again!") } #[actix_web::main] async fn main() -> std::io::Result<()> { - println!("Starting actix-web server"); + env_logger::init_from_env(env_logger::Env::new().default_filter_or("info")); - HttpServer::new(|| App::new().service(index).service(again)) - .bind("0.0.0.0:5000")? - .run() - .await + log::info!("Starting HTTP server: go to http://localhost:8080"); + + HttpServer::new(|| { + App::new() + .wrap(Logger::default()) + .service(index) + .service(again) + }) + .bind(("0.0.0.0", 8080))? + .run() + .await }