diff --git a/Cargo.lock b/Cargo.lock index 7860f0d5..7189d96b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -150,7 +150,7 @@ dependencies = [ "encoding_rs", "flate2", "futures-core", - "h2 0.3.14", + "h2 0.3.15", "http", "httparse", "httpdate 1.0.2", @@ -195,17 +195,18 @@ dependencies = [ [[package]] name = "actix-identity" -version = "0.4.0" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "171fe3ed055b2dd50c61967911d253d47e76e1d4308acfbf99fc7affe5ec42aa" +checksum = "1224c9f9593dc27c9077b233ce04adedc1d7febcfc35ee9f53ea3c24df180bec" dependencies = [ "actix-service", + "actix-session", "actix-utils", "actix-web", - "futures-util", + "anyhow", + "futures-core", "serde", - "serde_json", - "time 0.3.15", + "tracing", ] [[package]] @@ -238,9 +239,9 @@ dependencies = [ [[package]] name = "actix-protobuf" -version = "0.8.0" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5395a86526d22c0e01ce119e473ad5b1b006c42ba2f11b2995ea858579f81ad2" +checksum = "d2e1151cdf1d5f30115da7c8e3e4cefadfb6d396973d75354647c4e8fae3a14f" dependencies = [ "actix-web", "derive_more", @@ -264,7 +265,7 @@ dependencies = [ "futures-core", "log", "redis-async", - "time 0.3.15", + "time 0.3.16", "tokio 1.21.2", "tokio-util 0.7.4", ] @@ -304,7 +305,7 @@ dependencies = [ "actix-utils", "futures-core", "futures-util", - "mio 0.8.4", + "mio 0.8.5", "num_cpus", "socket2 0.4.7", "tokio 1.21.2", @@ -389,9 +390,9 @@ dependencies = [ [[package]] name = "actix-utils" -version = "3.0.0" +version = "3.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e491cbaac2e7fc788dfff99ff48ef317e23b3cf63dbaf7aaab6418f40f92aa94" +checksum = "88a1dcdff1466e3c2488e1cb5c36a71822750ad43839937f85d2f4d9f8b705d8" dependencies = [ "local-waker", "pin-project-lite 0.2.9", @@ -435,7 +436,7 @@ dependencies = [ "serde_urlencoded", "smallvec", "socket2 0.4.7", - "time 0.3.15", + "time 0.3.16", "url", ] @@ -474,89 +475,11 @@ version = "1.0.0" dependencies = [ "actix-cors", "actix-web", - "env_logger 0.9.1", + "env_logger", "serde", "serde_json", ] -[[package]] -name = "actix-web-lab" -version = "0.16.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8e25a9040595caff3abdf449185bcb846bd5da0001d916212bf370e9f146009" -dependencies = [ - "actix-files", - "actix-http", - "actix-router", - "actix-service", - "actix-utils", - "actix-web", - "actix-web-lab-derive", - "ahash 0.7.6", - "arc-swap", - "async-trait", - "bytes 1.2.1", - "bytestring", - "csv", - "derive_more", - "digest 0.10.5", - "futures-core", - "futures-util", - "generic-array", - "hmac", - "http", - "local-channel", - "mime", - "once_cell", - "pin-project-lite 0.2.9", - "regex", - "serde", - "serde_html_form", - "serde_json", - "subtle", - "tokio 1.21.2", - "tracing", -] - -[[package]] -name = "actix-web-lab" -version = "0.17.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e685bb63b29ddb0d5fe646d799a7fc7661876d4fed91c0a07eb2b6e6dbed95ba" -dependencies = [ - "actix-files", - "actix-http", - "actix-router", - "actix-service", - "actix-utils", - "actix-web", - "actix-web-lab-derive", - "ahash 0.7.6", - "arc-swap", - "async-trait", - "bytes 1.2.1", - "bytestring", - "csv", - "derive_more", - "digest 0.10.5", - "futures-core", - "futures-util", - "generic-array", - "hmac", - "http", - "local-channel", - "mime", - "once_cell", - "pin-project-lite 0.2.9", - "regex", - "serde", - "serde_html_form", - "serde_json", - "subtle", - "tokio 1.21.2", - "tracing", -] - [[package]] name = "actix-web-lab" version = "0.18.5" @@ -577,7 +500,7 @@ dependencies = [ "bytestring", "csv", "derive_more", - "digest 0.10.5", + "digest", "futures-core", "futures-util", "generic-array", @@ -679,7 +602,7 @@ version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47" dependencies = [ - "getrandom 0.2.7", + "getrandom 0.2.8", "once_cell", "version_check", ] @@ -691,7 +614,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "57e6e951cfbb2db8de1828d49073a113a29fd7117b1596caa781a258c7e38d72" dependencies = [ "cfg-if 1.0.0", - "getrandom 0.2.7", + "getrandom 0.2.8", "once_cell", "version_check", ] @@ -739,20 +662,11 @@ dependencies = [ "yansi-term", ] -[[package]] -name = "ansi_term" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2" -dependencies = [ - "winapi 0.3.9", -] - [[package]] name = "anyhow" -version = "1.0.65" +version = "1.0.66" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98161a4e3e2184da77bb14f02184cdd111e83bbbcc9979dfee3c44b9a85f5602" +checksum = "216261ddc8289130e551ddcd5ce8a064710c0d064a4d2895c67151c92b5443f6" [[package]] name = "arc-swap" @@ -766,12 +680,6 @@ version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a4c527152e37cf757a3f78aae5a06fbeefdb07ccc535c980a3208ee3060dd544" -[[package]] -name = "arrayvec" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b" - [[package]] name = "arrayvec" version = "0.7.2" @@ -828,7 +736,7 @@ dependencies = [ "humansize", "mime", "mime_guess", - "nom 7.1.1", + "nom", "num-traits", "percent-encoding", "proc-macro2", @@ -854,21 +762,22 @@ name = "async-data" version = "1.0.0" dependencies = [ "actix-web", - "env_logger 0.9.1", + "env_logger", "log", ] [[package]] name = "async-graphql" -version = "4.0.1" +version = "4.0.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19bc50aa64e3bc176fe1530a270d5efccd79bde469d6957629c590fe47558689" +checksum = "d9ed522678d412d77effe47b3c82314ac36952a35e6e852093dd48287c421f80" dependencies = [ "async-graphql-derive", "async-graphql-parser", "async-graphql-value", "async-stream", "async-trait", + "base64", "bytes 1.2.1", "fast_chemail", "fnv", @@ -883,6 +792,7 @@ dependencies = [ "regex", "serde", "serde_json", + "serde_urlencoded", "static_assertions", "tempfile", "thiserror", @@ -890,9 +800,9 @@ dependencies = [ [[package]] name = "async-graphql-actix-web" -version = "4.0.1" +version = "4.0.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61249530b25e497aa9023f76afa13ecbdd0078be2504ea4f4748871ca789bd31" +checksum = "c23479439e8a3819a937b88f6e8ec8e2185abebdc46a9b6d726e92518bbf858f" dependencies = [ "actix", "actix-http", @@ -903,7 +813,6 @@ dependencies = [ "futures-channel", "futures-util", "serde_json", - "serde_urlencoded", "thiserror", ] @@ -914,23 +823,23 @@ dependencies = [ "actix", "actix-cors", "actix-web", - "actix-web-lab 0.17.0", + "actix-web-lab", "async-graphql", "async-graphql-actix-web", - "env_logger 0.9.1", + "env_logger", "log", "slab", ] [[package]] name = "async-graphql-derive" -version = "4.0.1" +version = "4.0.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77c3836e72f564e4d502f9ed70ef67d9ef29163901027774fec7970f2785ef27" +checksum = "c121a894495d7d3fc3d4e15e0a9843e422e4d1d9e3c514d8062a1c94b35b005d" dependencies = [ "Inflector", "async-graphql-parser", - "darling", + "darling 0.14.1", "proc-macro-crate", "proc-macro2", "quote", @@ -940,9 +849,9 @@ dependencies = [ [[package]] name = "async-graphql-parser" -version = "4.0.15" +version = "4.0.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b599d684b30ed8ede2600507ceb2ba60214ffb2cfc55088c4c0dd33f7656acfd" +checksum = "6b6c386f398145c6180206c1869c2279f5a3d45db5be4e0266148c6ac5c6ad68" dependencies = [ "async-graphql-value", "pest", @@ -952,9 +861,9 @@ dependencies = [ [[package]] name = "async-graphql-value" -version = "4.0.15" +version = "4.0.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a81662a313c523f2b55c3735e20a5162fe7f42c0d4b0b64f6d73568dfde316ee" +checksum = "7a941b499fead4a3fb5392cabf42446566d18c86313f69f2deab69560394d65f" dependencies = [ "bytes 1.2.1", "indexmap", @@ -985,9 +894,9 @@ dependencies = [ [[package]] name = "async-trait" -version = "0.1.53" +version = "0.1.58" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed6aa3524a2dfcf9fe180c51eae2b58738348d819517ceadf95789c51fff7600" +checksum = "1e805d94e6b5001b651426cf4cd446b1ab5f319d27bab5c644f61de0a804360c" dependencies = [ "proc-macro2", "quote", @@ -999,7 +908,7 @@ name = "async_db" version = "1.0.0" dependencies = [ "actix-web", - "env_logger 0.9.1", + "env_logger", "futures-util", "log", "r2d2", @@ -1024,15 +933,6 @@ dependencies = [ "tokio-postgres", ] -[[package]] -name = "atoi" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7c57d12312ff59c811c0643f4d80830505833c9ffaebd193d819392b265be8e" -dependencies = [ - "num-traits", -] - [[package]] name = "atty" version = "0.2.14" @@ -1070,7 +970,7 @@ dependencies = [ "derive_more", "futures-core", "futures-util", - "h2 0.3.14", + "h2 0.3.15", "http", "itoa 1.0.4", "log", @@ -1079,7 +979,7 @@ dependencies = [ "percent-encoding", "pin-project-lite 0.2.9", "rand 0.8.5", - "rustls 0.20.6", + "rustls 0.20.7", "serde", "serde_json", "serde_urlencoded", @@ -1092,18 +992,18 @@ version = "1.0.0" dependencies = [ "actix-web", "awc", - "env_logger 0.9.1", + "env_logger", "log", "mime", - "rustls 0.20.6", + "rustls 0.20.7", "webpki-roots 0.22.5", ] [[package]] name = "aws-config" -version = "0.46.0" +version = "0.49.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11a8c971b0cb0484fc9436a291a44503b95141edc36ce7a6af6b6d7a06a02ab0" +checksum = "b309b2154d224728d845a958c580834f24213037ed61b195da80c0b0fc7469fa" dependencies = [ "aws-http", "aws-sdk-sso", @@ -1120,6 +1020,7 @@ dependencies = [ "http", "hyper 0.14.20", "ring", + "time 0.3.16", "tokio 1.21.2", "tower", "tracing", @@ -1128,11 +1029,12 @@ dependencies = [ [[package]] name = "aws-endpoint" -version = "0.46.0" +version = "0.49.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bc956f415dda77215372e5bc751a2463d1f9a1ec34edf3edc6c0ff67e5c8e43" +checksum = "76f35c8f5877ad60db4f0d9dcdfbcb2233a8cc539f9e568df39ee0581ec62e89" dependencies = [ "aws-smithy-http", + "aws-smithy-types", "aws-types", "http", "regex", @@ -1141,9 +1043,9 @@ dependencies = [ [[package]] name = "aws-http" -version = "0.46.0" +version = "0.49.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a0d98a1d606aa24554e604f220878db4aa3b525b72f88798524497cc3867fc6" +checksum = "2f5422c9632d887968ccb66e2871a6d190d6104e276034912bee72ef58a5d890" dependencies = [ "aws-smithy-http", "aws-smithy-types", @@ -1159,15 +1061,16 @@ dependencies = [ [[package]] name = "aws-sdk-s3" -version = "0.16.0" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f6e22f5641db610235c0c5fb768b5925a6317b16b12e4ab5a625cfed176f8a2" +checksum = "a4d31765abb258c501d5572ebce43dee524b4b3b6256cb8b4c78534898dc205b" dependencies = [ "aws-endpoint", "aws-http", "aws-sig-auth", "aws-sigv4", "aws-smithy-async", + "aws-smithy-checksums", "aws-smithy-client", "aws-smithy-eventstream", "aws-smithy-http", @@ -1176,17 +1079,19 @@ dependencies = [ "aws-smithy-xml", "aws-types", "bytes 1.2.1", + "bytes-utils", "http", - "md-5", + "http-body 0.4.5", "tokio-stream", "tower", + "tracing", ] [[package]] name = "aws-sdk-sso" -version = "0.16.0" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "baa0c66fab12976065403cf4cafacffe76afa91d0da335d195af379d4223d235" +checksum = "e2cc8b50281e1350d0b5c7207c2ce53c6721186ad196472caff4f20fa4b42e96" dependencies = [ "aws-endpoint", "aws-http", @@ -1206,9 +1111,9 @@ dependencies = [ [[package]] name = "aws-sdk-sts" -version = "0.16.0" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "048037cdfd7f42fb29b5f969c7f639b4b7eac00e8f911e4eac4f89fb7b3a0500" +checksum = "d6179f13c9fbab3226860f377354dece860e34ff129b69c7c1b0fa828d1e9c76" dependencies = [ "aws-endpoint", "aws-http", @@ -1228,9 +1133,9 @@ dependencies = [ [[package]] name = "aws-sig-auth" -version = "0.46.0" +version = "0.49.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8386fc0d218dbf2011f65bd8300d21ba98603fd150b962f61239be8b02d1fc6" +checksum = "b16f4d70c9c865af392eb40cacfe2bec3fa18f651fbdf49919cfc1dda13b189e" dependencies = [ "aws-sigv4", "aws-smithy-eventstream", @@ -1242,9 +1147,9 @@ dependencies = [ [[package]] name = "aws-sigv4" -version = "0.46.0" +version = "0.49.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd866926c2c4978210bcb01d7d1b431c794f0c23ca9ee1e420204b018836b5fb" +checksum = "8d33790cecae42b999d197074c8a19e9b96b9e346284a6f93989e7489c9fa0f5" dependencies = [ "aws-smithy-eventstream", "aws-smithy-http", @@ -1256,15 +1161,15 @@ dependencies = [ "percent-encoding", "regex", "ring", - "time 0.3.15", + "time 0.3.16", "tracing", ] [[package]] name = "aws-smithy-async" -version = "0.46.0" +version = "0.49.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "deb59cfdd21143006c01b9ca4dc4a9190b8c50c2ef831f9eb36f54f69efa42f1" +checksum = "bc604f278bae64bbd15854baa9c46ed69a56dfb0669d04aab80974749f2d6599" dependencies = [ "futures-util", "pin-project-lite 0.2.9", @@ -1273,10 +1178,31 @@ dependencies = [ ] [[package]] -name = "aws-smithy-client" -version = "0.46.0" +name = "aws-smithy-checksums" +version = "0.49.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44243329ba8618474c3b7f396de281f175ae172dd515b3d35648671a3cf51871" +checksum = "4b402da39bc5aae618b70a9b8d828acad21fe4a3a73b82c0205b89db55d71ce8" +dependencies = [ + "aws-smithy-http", + "aws-smithy-types", + "bytes 1.2.1", + "crc32c", + "crc32fast", + "hex", + "http", + "http-body 0.4.5", + "md-5", + "pin-project-lite 0.2.9", + "sha1 0.10.5", + "sha2", + "tracing", +] + +[[package]] +name = "aws-smithy-client" +version = "0.49.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec39585f8274fa543ad5c63cc09cbd435666be16b2cf99e4e07be5cf798bc050" dependencies = [ "aws-smithy-async", "aws-smithy-http", @@ -1297,9 +1223,9 @@ dependencies = [ [[package]] name = "aws-smithy-eventstream" -version = "0.46.0" +version = "0.49.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e69ee49b9ed0ef080a6e18c08644521d3026029eb65dfc8c694315e1ae3118bc" +checksum = "98c2a7b9490fd2bc7af3a1c486ae921102d7234d1fa5e7d91039068e7af48a01" dependencies = [ "aws-smithy-types", "bytes 1.2.1", @@ -1308,9 +1234,9 @@ dependencies = [ [[package]] name = "aws-smithy-http" -version = "0.46.0" +version = "0.49.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fba78f69a5bbe7ac1826389304c67b789032d813574e78f9a2d450634277f833" +checksum = "014a0ef5c4508fc2f6a9d3925c214725af19f020ea388db48e20196cc4cc9d6d" dependencies = [ "aws-smithy-eventstream", "aws-smithy-types", @@ -1330,9 +1256,9 @@ dependencies = [ [[package]] name = "aws-smithy-http-tower" -version = "0.46.0" +version = "0.49.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff8a512d68350561e901626baa08af9491cfbd54596201b84b4da846a59e4da3" +checksum = "deecb478dc3cc40203e0e97ac0fb92947e0719754bbafd0026bdc49318e2fd03" dependencies = [ "aws-smithy-http", "bytes 1.2.1", @@ -1345,18 +1271,18 @@ dependencies = [ [[package]] name = "aws-smithy-json" -version = "0.46.0" +version = "0.49.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31b7633698853aae80bd8b26866531420138eca91ea4620735d20b0537c93c2e" +checksum = "6593456af93c4a39724f7dc9d239833102ab96c1d1e94c35ea79f0e55f9fd54c" dependencies = [ "aws-smithy-types", ] [[package]] name = "aws-smithy-query" -version = "0.46.0" +version = "0.49.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95a94b5a8cc94a85ccbff89eb7bc80dc135ede02847a73d68c04ac2a3e4cf6b7" +checksum = "b803460b71645dfa9f6be47c4f00f91632f01e5bb01f9dc43890cd6cba983f08" dependencies = [ "aws-smithy-types", "urlencoding", @@ -1364,30 +1290,30 @@ dependencies = [ [[package]] name = "aws-smithy-types" -version = "0.46.0" +version = "0.49.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d230d281653de22fb0e9c7c74d18d724a39d7148e2165b1e760060064c4967c0" +checksum = "e93b0c93a3b963da946a0b8ef3853a7252298eb75cdbfb21dad60f5ed0ded861" dependencies = [ "itoa 1.0.4", "num-integer", "ryu", - "time 0.3.15", + "time 0.3.16", ] [[package]] name = "aws-smithy-xml" -version = "0.46.0" +version = "0.49.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4aacaf6c0fa549ebe5d9daa96233b8635965721367ee7c69effc8d8078842df3" +checksum = "36b9efb4855b4acb29961a776d45680f3cbdd7c4783cbbae078da54c342575dd" dependencies = [ "xmlparser", ] [[package]] name = "aws-types" -version = "0.46.0" +version = "0.49.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb54f097516352475a0159c9355f8b4737c54044538a4d9aca4d376ef2361ccc" +checksum = "93f3f349b39781849261db1c727369923bb97007cf7bd0deb3a6e9e461c8d38f" dependencies = [ "aws-smithy-async", "aws-smithy-client", @@ -1405,7 +1331,7 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b62ddb9cb1ec0a098ad4bbf9344d0713fa193ae1a80af55febcff2627b6a00c1" dependencies = [ - "getrandom 0.2.7", + "getrandom 0.2.8", "instant", "rand 0.8.5", ] @@ -1418,9 +1344,9 @@ checksum = "4cbbc9d0964165b47557570cce6c952866c2678457aca742aafc9fb771d30270" [[package]] name = "base64" -version = "0.13.0" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd" +checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" [[package]] name = "basics" @@ -1430,43 +1356,38 @@ dependencies = [ "actix-session", "actix-web", "async-stream", - "env_logger 0.9.1", + "env_logger", "log", ] [[package]] name = "bigdecimal" -version = "0.2.2" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1e50562e37200edf7c6c43e54a08e64a5553bfb59d9c297d5572512aa517256" +checksum = "6aaf33151a6429fe9211d1b276eafdf70cdff28b071e76c0b0e1503221ea3744" dependencies = [ - "num-bigint 0.3.3", + "num-bigint", "num-integer", "num-traits", - "serde", ] [[package]] name = "bindgen" -version = "0.58.1" +version = "0.59.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f8523b410d7187a43085e7e064416ea32ded16bd0a4e6fc025e21616d01258f" +checksum = "2bd2a9a458e8f4304c52c43ebb0cfbd520289f8379a52e329a38afda99bf8eb8" dependencies = [ "bitflags", "cexpr", "clang-sys", - "clap 2.34.0", - "env_logger 0.8.4", "lazy_static", "lazycell", - "log", "peeking_take_while", "proc-macro2", "quote", "regex", "rustc-hash", "shlex", - "which", ] [[package]] @@ -1494,19 +1415,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "72936ee4afc7f8f736d1c38383b56480b5497b4617b4a77bdbf1d2ababc76127" dependencies = [ "arrayref", - "arrayvec 0.7.2", + "arrayvec", "constant_time_eq", ] -[[package]] -name = "block-buffer" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4152116fd6e9dadb291ae18fc1ec3575ed6d84c29642d97890f4b4a3417297e4" -dependencies = [ - "generic-array", -] - [[package]] name = "block-buffer" version = "0.10.3" @@ -1569,7 +1481,7 @@ dependencies = [ "serde", "serde_bytes", "serde_json", - "time 0.3.15", + "time 0.3.16", "uuid 1.2.1", ] @@ -1599,9 +1511,9 @@ checksum = "40e38929add23cdf8a366df9b0e088953150724bcbe5fc330b0d8eb3b328eec8" [[package]] name = "bumpalo" -version = "3.11.0" +version = "3.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1ad822118d20d2c234f427000d5acc36eabe1e29a348c89b63dd60b13f28e5d" +checksum = "572f695136211188308f16ad2ca5c851a712c464060ae6974944458eb83880ba" [[package]] name = "byteorder" @@ -1677,11 +1589,11 @@ dependencies = [ [[package]] name = "cexpr" -version = "0.4.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4aedb84272dbe89af497cf81375129abda4fc0a9e7c5d317498c15cc30c0d27" +checksum = "6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766" dependencies = [ - "nom 5.1.2", + "nom", ] [[package]] @@ -1763,41 +1675,24 @@ dependencies = [ [[package]] name = "clap" -version = "2.34.0" +version = "4.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c" -dependencies = [ - "ansi_term", - "atty", - "bitflags", - "strsim 0.8.0", - "textwrap 0.11.0", - "unicode-width", - "vec_map", -] - -[[package]] -name = "clap" -version = "3.2.22" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86447ad904c7fb335a790c9d7fe3d0d971dc523b8ccd1561a520de9a85302750" +checksum = "335867764ed2de42325fafe6d18b8af74ba97ee0c590fa016f157535b42ab04b" dependencies = [ "atty", "bitflags", "clap_derive", "clap_lex", - "indexmap", "once_cell", - "strsim 0.10.0", + "strsim", "termcolor", - "textwrap 0.15.1", ] [[package]] name = "clap_derive" -version = "3.2.18" +version = "4.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea0c8bce528c4be4da13ea6fead8965e95b6073585a2f05204bd8f4119f82a65" +checksum = "16a1b0f6422af32d5da0c58e2703320f379216ee70198241c84173a8c5ac28f3" dependencies = [ "heck", "proc-macro-error", @@ -1808,9 +1703,9 @@ dependencies = [ [[package]] name = "clap_lex" -version = "0.2.4" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2850f2f5a82cbf437dd5af4d49848fbdfc27c157c3d010345776f952765261c5" +checksum = "0d4198f73e42b4936b35b5bb248d81d2b595ecb170da0bac7655c54eedfa8da8" dependencies = [ "os_str_bytes", ] @@ -1890,7 +1785,7 @@ dependencies = [ "async-trait", "json5", "lazy_static", - "nom 7.1.1", + "nom", "pathdiff", "ron", "rust-ini", @@ -1941,9 +1836,9 @@ dependencies = [ "hmac", "percent-encoding", "rand 0.8.5", - "sha2 0.10.6", + "sha2", "subtle", - "time 0.3.15", + "time 0.3.16", "version_check", ] @@ -1952,8 +1847,9 @@ name = "cookie-auth" version = "1.0.0" dependencies = [ "actix-identity", + "actix-session", "actix-web", - "env_logger 0.9.1", + "env_logger", "rand 0.8.5", ] @@ -1963,7 +1859,7 @@ version = "1.0.0" dependencies = [ "actix-session", "actix-web", - "env_logger 0.9.1", + "env_logger", "log", ] @@ -2009,20 +1905,14 @@ dependencies = [ ] [[package]] -name = "crc" -version = "3.0.0" +name = "crc32c" +version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53757d12b596c16c78b83458d732a5d1a17ab3f53f2f7412f6fb57cc8a140ab3" +checksum = "3dfea2db42e9927a3845fb268a10a72faed6d416065f77873f05e411457c363e" dependencies = [ - "crc-catalog", + "rustc_version 0.4.0", ] -[[package]] -name = "crc-catalog" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d0165d2900ae6778e36e80bbc4da3b5eefccee9ba939761f9c2882a5d9af3ff" - [[package]] name = "crc32fast" version = "1.3.2" @@ -2032,6 +1922,20 @@ dependencies = [ "cfg-if 1.0.0", ] +[[package]] +name = "crossbeam" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2801af0d36612ae591caa9568261fddce32ce6e08a7275ea334a06a4ad021a2c" +dependencies = [ + "cfg-if 1.0.0", + "crossbeam-channel", + "crossbeam-deque", + "crossbeam-epoch", + "crossbeam-queue", + "crossbeam-utils", +] + [[package]] name = "crossbeam-channel" version = "0.5.6" @@ -2042,6 +1946,30 @@ dependencies = [ "crossbeam-utils", ] +[[package]] +name = "crossbeam-deque" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "715e8152b692bba2d374b53d4875445368fdf21a94751410af607a5ac677d1fc" +dependencies = [ + "cfg-if 1.0.0", + "crossbeam-epoch", + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-epoch" +version = "0.9.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f916dfc5d356b0ed9dae65f1db9fc9770aa2851d2662b988ccf4fe3516e86348" +dependencies = [ + "autocfg", + "cfg-if 1.0.0", + "crossbeam-utils", + "memoffset", + "scopeguard", +] + [[package]] name = "crossbeam-queue" version = "0.3.6" @@ -2114,9 +2042,9 @@ dependencies = [ [[package]] name = "cxx" -version = "1.0.68" +version = "1.0.80" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e599641dff337570f6aa9c304ecca92341d30bf72e1c50287869ed6a36615a6" +checksum = "6b7d4e43b25d3c994662706a1d4fcfc32aaa6afd287502c111b237093bb23f3a" dependencies = [ "cc", "cxxbridge-flags", @@ -2126,9 +2054,9 @@ dependencies = [ [[package]] name = "cxx-build" -version = "1.0.68" +version = "1.0.80" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60e2434bc22249c056e12d2e87db46380730da0f2648471edea3e8e11834a892" +checksum = "84f8829ddc213e2c1368e51a2564c552b65a8cb6a28f31e576270ac81d5e5827" dependencies = [ "cc", "codespan-reporting", @@ -2141,15 +2069,15 @@ dependencies = [ [[package]] name = "cxxbridge-flags" -version = "1.0.68" +version = "1.0.80" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3894ad0c6d517cb5a4ce8ec20b37cd0ea31b480fe582a104c5db67ae21270853" +checksum = "e72537424b474af1460806647c41d4b6d35d09ef7fe031c5c2fa5766047cc56a" [[package]] name = "cxxbridge-macro" -version = "1.0.68" +version = "1.0.80" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34fa7e395dc1c001083c7eed28c8f0f0b5a225610f3b6284675f444af6fab86b" +checksum = "309e4fb93eed90e1e14bea0da16b209f81813ba9fc7830c20ed151dd7bc0a4d7" dependencies = [ "proc-macro2", "quote", @@ -2162,8 +2090,18 @@ version = "0.13.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a01d95850c592940db9b8194bc39f4bc0e89dee5c4265e4b1807c34a9aba453c" dependencies = [ - "darling_core", - "darling_macro", + "darling_core 0.13.4", + "darling_macro 0.13.4", +] + +[[package]] +name = "darling" +version = "0.14.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4529658bdda7fd6769b8614be250cdcfc3aeb0ee72fe66f9e41e5e5eb73eac02" +dependencies = [ + "darling_core 0.14.1", + "darling_macro 0.14.1", ] [[package]] @@ -2176,7 +2114,21 @@ dependencies = [ "ident_case", "proc-macro2", "quote", - "strsim 0.10.0", + "strsim", + "syn", +] + +[[package]] +name = "darling_core" +version = "0.14.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "649c91bc01e8b1eac09fb91e8dbc7d517684ca6be8ebc75bb9cafc894f9fdb6f" +dependencies = [ + "fnv", + "ident_case", + "proc-macro2", + "quote", + "strsim", "syn", ] @@ -2186,7 +2138,18 @@ version = "0.13.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9c972679f83bdf9c42bd905396b6c3588a843a17f0f16dfcfa3e2c5d57441835" dependencies = [ - "darling_core", + "darling_core 0.13.4", + "quote", + "syn", +] + +[[package]] +name = "darling_macro" +version = "0.14.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ddfc69c5bfcbd2fc09a0f38451d2daf0e372e367986a83906d1b0dbc88134fb5" +dependencies = [ + "darling_core 0.14.1", "quote", "syn", ] @@ -2202,7 +2165,7 @@ name = "db-redis" version = "1.0.0" dependencies = [ "actix-web", - "env_logger 0.9.1", + "env_logger", "futures-util", "log", "redis", @@ -2225,9 +2188,9 @@ dependencies = [ [[package]] name = "deadpool-postgres" -version = "0.10.2" +version = "0.10.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c668a58063c6331e3437e3146970943ad82b1b36169fd979bb2645ac2088209a" +checksum = "e866e414e9e12fc988f0bfb89a0b86228e7ed196ca509fbc4dcbc738c56e753c" dependencies = [ "deadpool", "log", @@ -2310,7 +2273,7 @@ dependencies = [ "actix-web", "diesel", "dotenv", - "env_logger 0.9.1", + "env_logger", "log", "serde", "serde_json", @@ -2329,52 +2292,34 @@ dependencies = [ "syn", ] -[[package]] -name = "digest" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3dd60d1080a57a05ab032377049e0591415d2b31afd7028356dbf3cc6dcb066" -dependencies = [ - "generic-array", -] - [[package]] name = "digest" version = "0.10.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "adfbc57365a37acbd2ebf2b64d7e69bb766e2fea813521ed536f5d0520dcf86c" dependencies = [ - "block-buffer 0.10.3", + "block-buffer", "crypto-common", "subtle", ] -[[package]] -name = "dirs" -version = "4.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca3aa72a6f96ea37bbc5aa912f6788242832f75369bdfdadcb0e38423f100059" -dependencies = [ - "dirs-sys", -] - -[[package]] -name = "dirs-sys" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b1d1d91c932ef41c0f2663aa8b0ca0342d444d842c06914aa0a7e352d0bada6" -dependencies = [ - "libc", - "redox_users", - "winapi 0.3.9", -] - [[package]] name = "discard" version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "212d0f5754cb6769937f4501cc0e67f4f4483c8d2c3e1e922ee9edbe4ab4c7c0" +[[package]] +name = "displaydoc" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3bf95dc3f046b9da4f2d51833c0d3547d8564ef6910f5c1ed130306a75b92886" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "dlv-list" version = "0.3.0" @@ -2392,7 +2337,7 @@ name = "docker_sample" version = "1.0.0" dependencies = [ "actix-web", - "env_logger 0.9.1", + "env_logger", "log", ] @@ -2402,15 +2347,6 @@ version = "0.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "77c90badedccf4105eca100756a0b1289e191f6fcbdadd3cee1d2f614f97da8f" -[[package]] -name = "dotenvy" -version = "0.15.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed9155c8f4dc55c7470ae9da3f63c6785245093b3f6aeb0f5bf2e968efbba314" -dependencies = [ - "dirs", -] - [[package]] name = "dtoa" version = "1.0.4" @@ -2422,9 +2358,6 @@ name = "either" version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "90e5c1c8368803113bf0c9584fc495a58b86dc8a29edbf8fe877d21d9507e797" -dependencies = [ - "serde", -] [[package]] name = "encoding_rs" @@ -2447,19 +2380,6 @@ dependencies = [ "syn", ] -[[package]] -name = "env_logger" -version = "0.8.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a19187fea3ac7e84da7dacf48de0c45d63c6a76f9490dae389aead16c243fce3" -dependencies = [ - "atty", - "humantime", - "log", - "regex", - "termcolor", -] - [[package]] name = "env_logger" version = "0.9.1" @@ -2479,7 +2399,7 @@ version = "1.0.0" dependencies = [ "actix-web", "derive_more", - "env_logger 0.9.1", + "env_logger", "log", "rand 0.8.5", ] @@ -2522,14 +2442,14 @@ dependencies = [ [[package]] name = "filetime" -version = "0.2.17" +version = "0.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e94a7bbaa59354bc20dd75b67f23e2797b4490e9d6928203fb105c79e448c86c" +checksum = "4b9663d381d07ae25dc88dbdf27df458faa83a9b25336bcac83d5e452b5fc9d3" dependencies = [ "cfg-if 1.0.0", "libc", "redox_syscall", - "windows-sys", + "windows-sys 0.42.0", ] [[package]] @@ -2633,9 +2553,6 @@ version = "0.10.14" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1657b4441c3403d9f7b3409e47575237dac27b1b5726df654a6ecbf92f0f7577" dependencies = [ - "futures-core", - "futures-sink", - "pin-project", "spin 0.9.4", ] @@ -2784,9 +2701,9 @@ dependencies = [ [[package]] name = "futures" -version = "0.3.24" +version = "0.3.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f21eda599937fba36daeb58a22e8f5cee2d14c4a17b5b7739c7c8e5e3b8230c" +checksum = "38390104763dc37a5145a53c29c63c1290b5d316d6086ec32c293f6736051bb0" dependencies = [ "futures-channel", "futures-core", @@ -2799,9 +2716,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.24" +version = "0.3.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30bdd20c28fadd505d0fd6712cdfcb0d4b5648baf45faef7f852afb2399bb050" +checksum = "52ba265a92256105f45b719605a571ffe2d1f0fea3807304b522c1d778f79eed" dependencies = [ "futures-core", "futures-sink", @@ -2809,9 +2726,9 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.24" +version = "0.3.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e5aa3de05362c3fb88de6531e6296e85cde7739cccad4b9dfeeb7f6ebce56bf" +checksum = "04909a7a7e4633ae6c4a9ab280aeb86da1236243a77b694a49eacd659a4bd3ac" [[package]] name = "futures-enum" @@ -2826,37 +2743,26 @@ dependencies = [ [[package]] name = "futures-executor" -version = "0.3.24" +version = "0.3.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ff63c23854bee61b6e9cd331d523909f238fc7636290b96826e9cfa5faa00ab" +checksum = "7acc85df6714c176ab5edf386123fafe217be88c0840ec11f199441134a074e2" dependencies = [ "futures-core", "futures-task", "futures-util", ] -[[package]] -name = "futures-intrusive" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62007592ac46aa7c2b6416f7deb9a8a8f63a01e0f1d6e1787d5630170db2b63e" -dependencies = [ - "futures-core", - "lock_api", - "parking_lot 0.11.2", -] - [[package]] name = "futures-io" -version = "0.3.24" +version = "0.3.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbf4d2a7a308fd4578637c0b17c7e1c7ba127b8f6ba00b29f717e9655d85eb68" +checksum = "00f5fb52a06bdcadeb54e8d3671f8888a39697dcb0b81b23b55174030427f4eb" [[package]] name = "futures-macro" -version = "0.3.24" +version = "0.3.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42cd15d1c7456c04dbdf7e88bcd69760d74f3a798d6444e16974b505b0e62f17" +checksum = "bdfb8ce053d86b91919aad980c220b1fb8401a9394410e1c289ed7e66b61835d" dependencies = [ "proc-macro2", "quote", @@ -2865,21 +2771,21 @@ dependencies = [ [[package]] name = "futures-sink" -version = "0.3.24" +version = "0.3.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21b20ba5a92e727ba30e72834706623d94ac93a725410b6a6b6fbc1b07f7ba56" +checksum = "39c15cf1a4aa79df40f1bb462fb39676d0ad9e366c2a33b590d7c66f4f81fcf9" [[package]] name = "futures-task" -version = "0.3.24" +version = "0.3.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6508c467c73851293f390476d4491cf4d227dbabcd4170f3bb6044959b294f1" +checksum = "2ffb393ac5d9a6eaa9d3fdf37ae2776656b706e200c8e16b1bdb227f5198e6ea" [[package]] name = "futures-util" -version = "0.3.24" +version = "0.3.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44fb6cb1be61cc1d2e43b262516aafcf63b241cffdb1d3fa115f91d9c7b09c90" +checksum = "197676987abd2f9cadff84926f410af1c183608d36641465df73ae8211dc65d6" dependencies = [ "futures-channel", "futures-core", @@ -2916,9 +2822,9 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.7" +version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4eb1a864a501629691edf6c15a593b7a51eebaa1e8468e9ddc623de7c9b58ec6" +checksum = "c05aeb6a22b8f62540c194aac980f2115af067bfe15a0734d7277a768d396b31" dependencies = [ "cfg-if 1.0.0", "libc", @@ -3004,9 +2910,9 @@ dependencies = [ [[package]] name = "h2" -version = "0.3.14" +version = "0.3.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ca32592cf21ac7ccab1825cd87f6c9b3d9022c44d086172ed0966bec8af30be" +checksum = "5f9f29bc9dda355256b2916cf526ab02ce0aeaaaf2bad60d65ef3f12f11dd0f4" dependencies = [ "bytes 1.2.1", "fnv", @@ -3063,30 +2969,18 @@ dependencies = [ "hashbrown 0.11.2", ] -[[package]] -name = "hashlink" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69fe1fcf8b4278d860ad0548329f892a3631fb63f82574df68275f34cdbe0ffa" -dependencies = [ - "hashbrown 0.12.3", -] - [[package]] name = "heck" version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2540771e65fc8cb83cd6e8a237f70c319bd5c29f78ed1084ba5d50eeac86f7f9" -dependencies = [ - "unicode-segmentation", -] [[package]] name = "hello-world" version = "1.0.0" dependencies = [ "actix-web", - "env_logger 0.9.1", + "env_logger", ] [[package]] @@ -3119,7 +3013,7 @@ version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e" dependencies = [ - "digest 0.10.5", + "digest", ] [[package]] @@ -3180,8 +3074,8 @@ version = "1.0.0" dependencies = [ "actix-web", "awc", - "clap 3.2.22", - "env_logger 0.9.1", + "clap", + "env_logger", "log", "url", ] @@ -3256,7 +3150,7 @@ dependencies = [ "futures-channel", "futures-core", "futures-util", - "h2 0.3.14", + "h2 0.3.15", "http", "http-body 0.4.5", "httparse", @@ -3449,11 +3343,10 @@ dependencies = [ [[package]] name = "intl_pluralrules" -version = "7.0.1" +version = "7.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b18f988384267d7066cc2be425e6faf352900652c046b6971d2e228d3b1c5ecf" +checksum = "078ea7b7c29a2b4df841a7f6ac8775ff6074020c6776d48491ce2268e068f972" dependencies = [ - "tinystr", "unic-langid", ] @@ -3552,7 +3445,7 @@ name = "json-example" version = "1.0.0" dependencies = [ "actix-web", - "env_logger 0.9.1", + "env_logger", "futures-util", "json", "log", @@ -3566,7 +3459,7 @@ version = "1.0.0" dependencies = [ "actix-web", "awc", - "env_logger 0.9.1", + "env_logger", "futures-util", "log", "serde", @@ -3590,7 +3483,7 @@ name = "json_decode_error" version = "1.0.0" dependencies = [ "actix-web", - "env_logger 0.9.1", + "env_logger", "log", "serde", ] @@ -3600,7 +3493,7 @@ name = "json_error" version = "1.0.0" dependencies = [ "actix-web", - "env_logger 0.9.1", + "env_logger", "log", "serde", "serde_json", @@ -3612,7 +3505,7 @@ version = "1.0.0" dependencies = [ "actix-web", "bytes 1.2.1", - "env_logger 0.9.1", + "env_logger", "futures-util", "log", "serde", @@ -3647,9 +3540,9 @@ version = "1.0.0" dependencies = [ "actix-cors", "actix-web", - "actix-web-lab 0.17.0", + "actix-web-lab", "dotenv", - "env_logger 0.9.1", + "env_logger", "juniper", "log", "mysql", @@ -3666,8 +3559,8 @@ version = "1.0.0" dependencies = [ "actix-cors", "actix-web", - "actix-web-lab 0.17.0", - "env_logger 0.9.1", + "actix-web-lab", + "env_logger", "juniper", "log", "serde", @@ -3736,32 +3629,82 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" [[package]] name = "lexical" -version = "5.2.2" +version = "6.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f404a90a744e32e8be729034fc33b90cf2a56418fbf594d69aa3c0214ad414e5" +checksum = "c7aefb36fd43fef7003334742cbf77b243fcd36418a1d1bdd480d613a67968f6" dependencies = [ - "cfg-if 1.0.0", "lexical-core", ] [[package]] name = "lexical-core" -version = "0.7.6" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6607c62aa161d23d17a9072cc5da0be67cdfc89d3afb1e8d9c842bebc2525ffe" +checksum = "2cde5de06e8d4c2faabc400238f9ae1c74d5412d03a7bd067645ccbc47070e46" dependencies = [ - "arrayvec 0.5.2", - "bitflags", - "cfg-if 1.0.0", - "ryu", + "lexical-parse-float", + "lexical-parse-integer", + "lexical-util", + "lexical-write-float", + "lexical-write-integer", +] + +[[package]] +name = "lexical-parse-float" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "683b3a5ebd0130b8fb52ba0bdc718cc56815b6a097e28ae5a6997d0ad17dc05f" +dependencies = [ + "lexical-parse-integer", + "lexical-util", + "static_assertions", +] + +[[package]] +name = "lexical-parse-integer" +version = "0.8.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d0994485ed0c312f6d965766754ea177d07f9c00c9b82a5ee62ed5b47945ee9" +dependencies = [ + "lexical-util", + "static_assertions", +] + +[[package]] +name = "lexical-util" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5255b9ff16ff898710eb9eb63cb39248ea8a5bb036bea8085b1a767ff6c4e3fc" +dependencies = [ + "static_assertions", +] + +[[package]] +name = "lexical-write-float" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "accabaa1c4581f05a3923d1b4cfd124c329352288b7b9da09e766b0668116862" +dependencies = [ + "lexical-util", + "lexical-write-integer", + "static_assertions", +] + +[[package]] +name = "lexical-write-integer" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e1b6f3d1f4422866b68192d62f77bc5c700bee84f3069f2469d7bc8c77852446" +dependencies = [ + "lexical-util", "static_assertions", ] [[package]] name = "libc" -version = "0.2.135" +version = "0.2.137" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68783febc7782c6c5cb401fbda4de5a9898be1762314da0bb2c10ced61f18b0c" +checksum = "fc7fcc620a3bff7cdd7a365be3376c97191aeaccc2a603e600951e452615bf89" [[package]] name = "libloading" @@ -3779,7 +3722,6 @@ version = "0.24.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "898745e570c7d0453cc1fbc4a701eb6c662ed54e8fec8b7d14be137ebeeb9d14" dependencies = [ - "cc", "pkg-config", "vcpkg", ] @@ -3862,11 +3804,11 @@ dependencies = [ [[package]] name = "lru" -version = "0.6.6" +version = "0.7.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ea2d928b485416e8908cff2d97d621db22b27f7b3b6729e438bcf42c671ba91" +checksum = "e999beba7b6e8345721bd280141ed958096a2e4abdf74f67ff4ce49b4b54e47a" dependencies = [ - "hashbrown 0.11.2", + "hashbrown 0.12.3", ] [[package]] @@ -3916,7 +3858,7 @@ version = "0.10.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6365506850d44bff6e2fbcb5176cf63650e48bd45ef2fe2665ae1570e0f4b9ca" dependencies = [ - "digest 0.10.5", + "digest", ] [[package]] @@ -3945,7 +3887,7 @@ name = "middleware-example" version = "1.0.0" dependencies = [ "actix-web", - "env_logger 0.9.1", + "env_logger", "futures-util", "log", "pin-project", @@ -3956,7 +3898,7 @@ name = "middleware-ext-mut" version = "1.0.0" dependencies = [ "actix-web", - "env_logger 0.9.1", + "env_logger", "log", ] @@ -3965,11 +3907,11 @@ name = "middleware-http-to-https" version = "1.0.0" dependencies = [ "actix-web", - "actix-web-lab 0.17.0", - "env_logger 0.9.1", + "actix-web-lab", + "env_logger", "futures-util", "log", - "rustls 0.20.6", + "rustls 0.20.7", "rustls-pemfile 1.0.1", ] @@ -3991,9 +3933,9 @@ dependencies = [ [[package]] name = "minijinja" -version = "0.23.0" +version = "0.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9459b63f078d9b7bd7a9deee349f759b8afa3af49d8a8ed1d466ee117a2a3b58" +checksum = "36f65f01ba99f0dae44749515c1416d7875de7b06ae8b902466627b49553fc3f" dependencies = [ "memo-map", "self_cell", @@ -4002,9 +3944,9 @@ dependencies = [ [[package]] name = "minijinja-autoreload" -version = "0.23.0" +version = "0.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4caaefe206f2225f4da38d7f08aa7e1702920acc5505f01a7f33396766ae60a" +checksum = "13c13f1a720fa224764794f161ebbeeb1e8206a2ee29684ea00c3abe2f096d16" dependencies = [ "minijinja", "notify", @@ -4046,14 +3988,14 @@ dependencies = [ [[package]] name = "mio" -version = "0.8.4" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57ee1c23c7c63b0c9250c339ffdc69255f110b298b901b9f6c82547b7b87caaf" +checksum = "e5d732bc30207a6423068df043e3d02e0735b155ad7ce1a6f76fe2baa5b158de" dependencies = [ "libc", "log", "wasi 0.11.0+wasi-snapshot-preview1", - "windows-sys", + "windows-sys 0.42.0", ] [[package]] @@ -4101,16 +4043,16 @@ dependencies = [ "percent-encoding", "rand 0.8.5", "rustc_version_runtime", - "rustls 0.20.6", + "rustls 0.20.7", "rustls-pemfile 0.3.0", "serde", "serde_bytes", "serde_with", "sha-1", - "sha2 0.10.6", + "sha2", "socket2 0.4.7", "stringprep", - "strsim 0.10.0", + "strsim", "take_mut", "thiserror", "tokio 1.21.2", @@ -4158,11 +4100,11 @@ version = "1.0.0" dependencies = [ "actix-multipart", "actix-web", - "actix-web-lab 0.17.0", + "actix-web-lab", "aws-config", "aws-sdk-s3", "dotenv", - "env_logger 0.9.1", + "env_logger", "futures-util", "log", "sanitize-filename", @@ -4173,19 +4115,20 @@ dependencies = [ [[package]] name = "mysql" -version = "21.0.2" +version = "22.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06f5abe1c0f91831afd4d35298c08d958e80144869757b913891e5b0d00c2c96" +checksum = "b9d8136c78f78cda5c1a4eee4ce555281b71e3e6db715817bc50e186e623b36f" dependencies = [ "bufstream", "bytes 1.2.1", + "crossbeam", + "flate2", "io-enum", "libc", "lru", "mysql_common", "named_pipe", "native-tls", - "nix", "once_cell", "pem", "percent-encoding", @@ -4198,9 +4141,9 @@ dependencies = [ [[package]] name = "mysql_common" -version = "0.27.5" +version = "0.28.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02fa08ec695a40ed899b1239e81d0d74de5b40802d4fc8b513e2c541717c434e" +checksum = "4140827f2d12750de1e8755442577e4292a835f26ff2f659f0a380d1d71020b0" dependencies = [ "base64", "bigdecimal", @@ -4210,14 +4153,13 @@ dependencies = [ "byteorder", "bytes 1.2.1", "cc", - "chrono", "cmake", "crc32fast", "flate2", "frunk", "lazy_static", "lexical", - "num-bigint 0.4.3", + "num-bigint", "num-traits", "rand 0.8.5", "regex", @@ -4225,12 +4167,12 @@ dependencies = [ "saturating", "serde", "serde_json", - "sha1 0.6.1", - "sha2 0.9.9", + "sha-1", + "sha2", "smallvec", "subprocess", "thiserror", - "time 0.2.27", + "time 0.3.16", "uuid 0.8.2", ] @@ -4266,16 +4208,16 @@ name = "nested-routing" version = "1.0.0" dependencies = [ "actix-web", - "env_logger 0.9.1", + "env_logger", "serde", "serde_json", ] [[package]] name = "net2" -version = "0.2.37" +version = "0.2.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "391630d12b68002ae1e25e8f974306474966550ad82dac6886fb8910c19568ae" +checksum = "74d0df99cfcd2530b2e694f6e17e7f37b8e26bb23983ac530c0c97408837c631" dependencies = [ "cfg-if 0.1.10", "libc", @@ -4288,29 +4230,6 @@ version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e4a24736216ec316047a1fc4252e27dabb04218aa4a3f37c6e7ddbf1f9782b54" -[[package]] -name = "nix" -version = "0.23.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f866317acbd3a240710c63f065ffb1e4fd466259045ccb504130b7f668f35c6" -dependencies = [ - "bitflags", - "cc", - "cfg-if 1.0.0", - "libc", - "memoffset", -] - -[[package]] -name = "nom" -version = "5.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffb4262d26ed83a1c0a33a38fe2bb15797329c85770da05e6b828ddb782627af" -dependencies = [ - "memchr", - "version_check", -] - [[package]] name = "nom" version = "7.1.1" @@ -4333,22 +4252,11 @@ dependencies = [ "inotify", "kqueue", "libc", - "mio 0.8.4", + "mio 0.8.5", "walkdir", "winapi 0.3.9", ] -[[package]] -name = "num-bigint" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f6f7833f2cbf2360a6cfd58cd41a53aa7a90bd4c202f5b1c7dd2ed73c57b2c3" -dependencies = [ - "autocfg", - "num-integer", - "num-traits", -] - [[package]] name = "num-bigint" version = "0.4.3" @@ -4433,7 +4341,7 @@ dependencies = [ "actix-files", "actix-web", "anyhow", - "env_logger 0.9.1", + "env_logger", "log", "openssl", "reqwest 0.11.12", @@ -4444,7 +4352,7 @@ name = "openssl-example" version = "1.0.0" dependencies = [ "actix-web", - "env_logger 0.9.1", + "env_logger", "openssl", ] @@ -4467,9 +4375,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "openssl-sys" -version = "0.9.76" +version = "0.9.77" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5230151e44c0f05157effb743e8d517472843121cf9243e8b81393edb5acd9ce" +checksum = "b03b84c3b2d099b81f0953422b4d4ad58761589d0229b5506356afca05a3670a" dependencies = [ "autocfg", "cc", @@ -4522,7 +4430,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" dependencies = [ "lock_api", - "parking_lot_core 0.9.3", + "parking_lot_core 0.9.4", ] [[package]] @@ -4541,15 +4449,15 @@ dependencies = [ [[package]] name = "parking_lot_core" -version = "0.9.3" +version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09a279cbf25cb0757810394fbc1e359949b59e348145c643a939a525692e6929" +checksum = "4dc9e0dc2adc1c69d09143aff38d3d30c5c3f0df0dad82e6d25547af174ebec0" dependencies = [ "cfg-if 1.0.0", "libc", "redox_syscall", "smallvec", - "windows-sys", + "windows-sys 0.42.0", ] [[package]] @@ -4579,7 +4487,7 @@ version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "271779f35b581956db91a3e55737327a03aa051e90b1c47aeb189508533adfd7" dependencies = [ - "digest 0.10.5", + "digest", ] [[package]] @@ -4590,13 +4498,11 @@ checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099" [[package]] name = "pem" -version = "0.8.3" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd56cbd21fea48d0c440b41cd69c589faacade08c992d9a54e471b79d0fd13eb" +checksum = "03c64931a1a212348ec4f3b4362585eca7159d0d09cbdf4a7f74f02173596fd4" dependencies = [ "base64", - "once_cell", - "regex", ] [[package]] @@ -4766,9 +4672,9 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] name = "pkg-config" -version = "0.3.25" +version = "0.3.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1df8c4ec4b0627e53bdf214615ad287367e482558cf84b109250b37464dc03ae" +checksum = "6ac9a59f73473f1b8d852421e59e64809f025994837ef743615c6d0c5b305160" [[package]] name = "polyval" @@ -4796,7 +4702,7 @@ dependencies = [ "md-5", "memchr", "rand 0.8.5", - "sha2 0.10.6", + "sha2", "stringprep", ] @@ -4885,18 +4791,18 @@ checksum = "dbf0c48bc1d91375ae5c3cd81e3722dff1abcf81a30960240640d223f59fe0e5" [[package]] name = "proc-macro2" -version = "1.0.36" +version = "1.0.47" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7342d5883fbccae1cc37a2353b09c87c9b0f3afd73f5fb9bba687a1f733b029" +checksum = "5ea3d908b0e36316caf9e9e2c4625cdde190a7e6f440d794667ed17a1855e725" dependencies = [ - "unicode-xid", + "unicode-ident", ] [[package]] name = "prost" -version = "0.10.4" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71adf41db68aa0daaefc69bb30bcd68ded9b9abaad5d1fbb6304c4fb390e083e" +checksum = "399c3c31cdec40583bb68f0b18403400d01ec4289c383aa047560439952c4dd7" dependencies = [ "bytes 1.2.1", "prost-derive", @@ -4904,9 +4810,9 @@ dependencies = [ [[package]] name = "prost-derive" -version = "0.10.1" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b670f45da57fb8542ebdbb6105a925fe571b67f9e7ed9f47a06a84e72b4e7cc" +checksum = "7345d5f0e08c0536d7ac7229952590239e77abf0a0100a1b1d890add6ea96364" dependencies = [ "anyhow", "itertools", @@ -4921,7 +4827,7 @@ version = "1.0.0" dependencies = [ "actix-protobuf", "actix-web", - "env_logger 0.9.1", + "env_logger", "log", "prost", "prost-derive", @@ -4954,9 +4860,9 @@ checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" [[package]] name = "quote" -version = "1.0.19" +version = "1.0.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f53dc8cf16a769a6f677e09e7ff2cd4be1ea0f48754aac39520536962011de0d" +checksum = "bbe448f377a7d6961e30f5955f9b8d106c3f5e449d493ee1b125c1d43c2b5179" dependencies = [ "proc-macro2", ] @@ -4974,9 +4880,9 @@ dependencies = [ [[package]] name = "r2d2_mysql" -version = "21.0.0" +version = "22.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1d05145690b395f5515feff202b8f4b9429c500f423ef7129175155c3c3a9e2" +checksum = "ebe8da8e7ae0dc99dca0504a9d995ff2205c0268f0bbb994c9fec5a5abe6e73b" dependencies = [ "mysql", "r2d2", @@ -5057,7 +4963,7 @@ version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" dependencies = [ - "getrandom 0.2.7", + "getrandom 0.2.8", ] [[package]] @@ -5071,9 +4977,9 @@ dependencies = [ [[package]] name = "redis" -version = "0.22.0" +version = "0.22.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e5450e9add55de0ea728a964191669d3707fa20666c5f16753f3a6a51e96231" +checksum = "513b3649f1a111c17954296e4a3b9eecb108b766c803e2b99f179ebe27005985" dependencies = [ "arc-swap", "async-trait", @@ -5112,11 +5018,11 @@ dependencies = [ "actix-session", "actix-test", "actix-web", - "env_logger 0.9.1", + "env_logger", "log", "serde", "serde_json", - "time 0.3.15", + "time 0.3.16", ] [[package]] @@ -5128,17 +5034,6 @@ dependencies = [ "bitflags", ] -[[package]] -name = "redox_users" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b" -dependencies = [ - "getrandom 0.2.7", - "redox_syscall", - "thiserror", -] - [[package]] name = "regex" version = "1.6.0" @@ -5218,7 +5113,7 @@ dependencies = [ "encoding_rs", "futures-core", "futures-util", - "h2 0.3.14", + "h2 0.3.15", "http", "http-body 0.4.5", "hyper 0.14.20", @@ -5328,7 +5223,7 @@ name = "run-in-thread" version = "1.0.0" dependencies = [ "actix-web", - "env_logger 0.9.1", + "env_logger", "log", ] @@ -5341,7 +5236,7 @@ dependencies = [ "bitflags", "fallible-iterator", "fallible-streaming-iterator", - "hashlink 0.7.0", + "hashlink", "libsqlite3-sys", "memchr", "smallvec", @@ -5375,7 +5270,7 @@ version = "1.26.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ee9164faf726e4f3ece4978b25ca877ddc6802fa77f38cdccb32c7f805ecd70c" dependencies = [ - "arrayvec 0.7.2", + "arrayvec", "num-traits", "serde", ] @@ -5429,9 +5324,9 @@ dependencies = [ [[package]] name = "rustls" -version = "0.20.6" +version = "0.20.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5aab8ee6c7097ed6057f43c187a62418d0c05a4bd5f18b3571db50ee0f9ce033" +checksum = "539a2bfe908f471bfa933876bd1eb6a19cf2176d375f82ef7f99530a40e48c2c" dependencies = [ "log", "ring", @@ -5445,9 +5340,9 @@ version = "1.0.0" dependencies = [ "actix-tls", "actix-web", - "env_logger 0.9.1", + "env_logger", "log", - "rustls 0.20.6", + "rustls 0.20.7", "rustls-pemfile 1.0.1", ] @@ -5457,10 +5352,10 @@ version = "1.0.0" dependencies = [ "actix-files", "actix-web", - "actix-web-lab 0.17.0", - "env_logger 0.9.1", + "actix-web-lab", + "env_logger", "log", - "rustls 0.20.6", + "rustls 0.20.7", "rustls-pemfile 1.0.1", ] @@ -5502,9 +5397,9 @@ checksum = "4501abdff3ae82a1c1b477a17252eb69cee9e66eb915c1abaa4f44d873df9f09" [[package]] name = "sailfish" -version = "0.4.0" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "948a7edfc2f03d7c58a097dda25ed29440a72e8528894a6e182fe9171195fed1" +checksum = "79aef0b4612749106d372dfdeee715082f2f0fe24263be08e19db9b00b694bf9" dependencies = [ "itoap", "ryu", @@ -5514,9 +5409,9 @@ dependencies = [ [[package]] name = "sailfish-compiler" -version = "0.4.0" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f0a01133d6ce146020e6416ac6a823f813f1cbb30ff77548b4fa20749524947" +checksum = "787ef14715822299715d98d6eb6157f03a57a5258ffbd3321847f7450853dd64" dependencies = [ "filetime", "home", @@ -5530,9 +5425,9 @@ dependencies = [ [[package]] name = "sailfish-macros" -version = "0.4.0" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86326c1f1dce0b316e0a47071f683b185417dc64e1a704380b5c706b09e871b1" +checksum = "d0d39ce164c9e19147bcc4fa9ce9dcfc0a451e6cd0a996bb896fc7dee92887a4" dependencies = [ "proc-macro2", "sailfish-compiler", @@ -5570,7 +5465,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "88d6731146462ea25d9244b2ed5fd1d716d25c52e4d54aa4fb0f3c4e9854dbe2" dependencies = [ "lazy_static", - "windows-sys", + "windows-sys 0.36.1", ] [[package]] @@ -5666,9 +5561,9 @@ checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" [[package]] name = "serde" -version = "1.0.145" +version = "1.0.147" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "728eb6351430bccb993660dfffc5a72f91ccc1295abaa8ce19b27ebe4f75568b" +checksum = "d193d69bae983fc11a79df82342761dfbf28a99fc8d203dca4c3c1b590948965" dependencies = [ "serde_derive", ] @@ -5684,9 +5579,9 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.145" +version = "1.0.147" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81fa1584d3d1bcacd84c277a0dfe21f5b0f6accf4a23d04d4c6d61f1af522b4c" +checksum = "4f1d362ca8fc9c3e3a7484440752472d68a6caa98f1ab81d99b5dfe517cec852" dependencies = [ "proc-macro2", "quote", @@ -5708,9 +5603,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.86" +version = "1.0.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41feea4228a6f1cd09ec7a3593a682276702cd67b5273544757dae23c096f074" +checksum = "6ce777b7b150d76b9cf60d28b55f5847135a003f7d7350c6be7a773508ce7d45" dependencies = [ "indexmap", "itoa 1.0.4", @@ -5746,7 +5641,7 @@ version = "1.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e182d6ec6f05393cc0e5ed1bf81ad6db3a8feedf8ee515ecdd369809bcce8082" dependencies = [ - "darling", + "darling 0.13.4", "proc-macro2", "quote", "syn", @@ -5757,8 +5652,8 @@ name = "server-sent-events" version = "1.0.0" dependencies = [ "actix-web", - "actix-web-lab 0.16.9", - "env_logger 0.9.1", + "actix-web-lab", + "env_logger", "futures-util", "log", "parking_lot 0.12.1", @@ -5774,7 +5669,7 @@ checksum = "028f48d513f9678cda28f6e4064755b3fbb2af6acd672f2c209b62323f7aea0f" dependencies = [ "cfg-if 1.0.0", "cpufeatures", - "digest 0.10.5", + "digest", ] [[package]] @@ -5794,7 +5689,7 @@ checksum = "f04293dc80c3993519f2d7f6f511707ee7094fe0c6d3406feb330cdb3540eba3" dependencies = [ "cfg-if 1.0.0", "cpufeatures", - "digest 0.10.5", + "digest", ] [[package]] @@ -5803,19 +5698,6 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ae1a47186c03a32177042e55dbc5fd5aee900b8e0069a8d70fba96a9375cd012" -[[package]] -name = "sha2" -version = "0.9.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d58a1e1bf39749807d89cf2d98ac2dfa0ff1cb3faa38fbb64dd88ac8013d800" -dependencies = [ - "block-buffer 0.9.0", - "cfg-if 1.0.0", - "cpufeatures", - "digest 0.9.0", - "opaque-debug", -] - [[package]] name = "sha2" version = "0.10.6" @@ -5824,7 +5706,7 @@ checksum = "82e6b795fe2e3b1e845bafcb27aa35405c4d47cdfc92af5fc8d3002f76cebdc0" dependencies = [ "cfg-if 1.0.0", "cpufeatures", - "digest 0.10.5", + "digest", ] [[package]] @@ -5838,8 +5720,8 @@ name = "shutdown-server" version = "1.0.0" dependencies = [ "actix-web", - "actix-web-lab 0.17.0", - "env_logger 0.9.1", + "actix-web-lab", + "env_logger", "log", "parking_lot 0.12.1", "tokio 1.21.2", @@ -5859,19 +5741,20 @@ name = "simple-auth-server" version = "1.0.0" dependencies = [ "actix-identity", + "actix-session", "actix-web", "chrono", "derive_more", "diesel", "dotenv", - "env_logger 0.9.1", + "env_logger", "once_cell", "r2d2", "rust-argon2", "serde", "serde_json", "sparkpost", - "time 0.3.15", + "time 0.3.16", "uuid 1.2.1", ] @@ -5931,9 +5814,9 @@ dependencies = [ [[package]] name = "snafu" -version = "0.7.2" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd726aec4ebad65756394ff89a9b9598793d4e30121cd71690244c1e497b3aee" +checksum = "a152ba99b054b22972ee794cf04e5ef572da1229e33b65f3c57abbff0525a454" dependencies = [ "doc-comment", "snafu-derive", @@ -5941,9 +5824,9 @@ dependencies = [ [[package]] name = "snafu-derive" -version = "0.7.2" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "712529e9b0b014eabaa345b38e06032767e3dc393e8b017e853b1d7247094e74" +checksum = "d5e79cdebbabaebb06a9bdbaedc7f159b410461f63611d4d0e3fb0fab8fed850" dependencies = [ "heck", "proc-macro2", @@ -6000,107 +5883,6 @@ dependencies = [ "lock_api", ] -[[package]] -name = "sqlformat" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f87e292b4291f154971a43c3774364e2cbcaec599d3f5bf6fa9d122885dbc38a" -dependencies = [ - "itertools", - "nom 7.1.1", - "unicode_categories", -] - -[[package]] -name = "sqlx" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9249290c05928352f71c077cc44a464d880c63f26f7534728cca008e135c0428" -dependencies = [ - "sqlx-core", - "sqlx-macros", -] - -[[package]] -name = "sqlx-core" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcbc16ddba161afc99e14d1713a453747a2b07fc097d2009f4c300ec99286105" -dependencies = [ - "ahash 0.7.6", - "atoi", - "bitflags", - "byteorder", - "bytes 1.2.1", - "crc", - "crossbeam-queue", - "dotenvy", - "either", - "event-listener", - "flume", - "futures-channel", - "futures-core", - "futures-executor", - "futures-intrusive", - "futures-util", - "hashlink 0.8.1", - "hex", - "indexmap", - "itoa 1.0.4", - "libc", - "libsqlite3-sys", - "log", - "memchr", - "once_cell", - "paste", - "percent-encoding", - "rustls 0.20.6", - "rustls-pemfile 1.0.1", - "serde", - "sha2 0.10.6", - "smallvec", - "sqlformat", - "sqlx-rt", - "stringprep", - "thiserror", - "tokio-stream", - "url", - "webpki-roots 0.22.5", -] - -[[package]] -name = "sqlx-macros" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b850fa514dc11f2ee85be9d055c512aa866746adfacd1cb42d867d68e6a5b0d9" -dependencies = [ - "dotenvy", - "either", - "heck", - "hex", - "once_cell", - "proc-macro2", - "quote", - "serde", - "serde_json", - "sha2 0.10.6", - "sqlx-core", - "sqlx-rt", - "syn", - "url", -] - -[[package]] -name = "sqlx-rt" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24c5b2d25fa654cc5f841750b8e1cdedbe21189bf9a9382ee90bfa9dd3562396" -dependencies = [ - "once_cell", - "tokio 1.21.2", - "tokio-rustls 0.23.4", -] - [[package]] name = "standback" version = "0.2.17" @@ -6115,7 +5897,7 @@ name = "state" version = "1.0.0" dependencies = [ "actix-web", - "env_logger 0.9.1", + "env_logger", ] [[package]] @@ -6124,7 +5906,7 @@ version = "1.0.0" dependencies = [ "actix-files", "actix-web", - "env_logger 0.9.1", + "env_logger", "log", ] @@ -6219,12 +6001,6 @@ dependencies = [ "unicode-normalization", ] -[[package]] -name = "strsim" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" - [[package]] name = "strsim" version = "0.10.0" @@ -6249,13 +6025,13 @@ checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601" [[package]] name = "syn" -version = "1.0.94" +version = "1.0.103" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a07e33e919ebcd69113d5be0e4d70c5707004ff45188910106854f38b960df4a" +checksum = "a864042229133ada95abf3b54fdc62ef5ccabe9515b64717bcb9a1919e59445d" dependencies = [ "proc-macro2", "quote", - "unicode-xid", + "unicode-ident", ] [[package]] @@ -6290,7 +6066,7 @@ version = "1.0.0" dependencies = [ "actix-web", "askama", - "env_logger 0.9.1", + "env_logger", ] [[package]] @@ -6298,7 +6074,7 @@ name = "templating-fluent" version = "1.0.0" dependencies = [ "actix-web", - "actix-web-lab 0.17.0", + "actix-web-lab", "fluent-templates", "handlebars", "serde", @@ -6320,8 +6096,8 @@ version = "1.0.0" dependencies = [ "actix-utils", "actix-web", - "actix-web-lab 0.18.5", - "env_logger 0.9.1", + "actix-web-lab", + "env_logger", "log", "minijinja", "minijinja-autoreload", @@ -6332,8 +6108,8 @@ name = "templating-sailfish" version = "0.1.0" dependencies = [ "actix-web", - "actix-web-lab 0.17.0", - "env_logger 0.9.1", + "actix-web-lab", + "env_logger", "log", "sailfish", ] @@ -6343,8 +6119,8 @@ name = "templating-tera" version = "1.0.0" dependencies = [ "actix-web", - "actix-web-lab 0.18.5", - "env_logger 0.9.1", + "actix-web-lab", + "env_logger", "tera", ] @@ -6353,7 +6129,7 @@ name = "templating-tinytemplate" version = "1.0.0" dependencies = [ "actix-web", - "env_logger 0.9.1", + "env_logger", "serde_json", "tinytemplate", ] @@ -6364,7 +6140,7 @@ version = "1.0.0" dependencies = [ "actix-web", "derive_more", - "env_logger 0.9.1", + "env_logger", "yarte", "yarte_helpers", ] @@ -6411,21 +6187,6 @@ dependencies = [ "winapi-util", ] -[[package]] -name = "textwrap" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" -dependencies = [ - "unicode-width", -] - -[[package]] -name = "textwrap" -version = "0.15.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "949517c0cf1bf4ee812e2e07e08ab448e3ae0d23472aee8a06c985f0c8815b16" - [[package]] name = "thiserror" version = "1.0.37" @@ -6483,16 +6244,24 @@ dependencies = [ [[package]] name = "time" -version = "0.3.15" +version = "0.3.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d634a985c4d4238ec39cacaed2e7ae552fbd3c476b552c1deac3021b7d7eaf0c" +checksum = "0fab5c8b9980850e06d92ddbe3ab839c062c801f3927c0fb8abd6fc8e918fbca" dependencies = [ "itoa 1.0.4", "libc", "num_threads", - "time-macros 0.2.4", + "serde", + "time-core", + "time-macros 0.2.5", ] +[[package]] +name = "time-core" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2e153e1f1acaef8acc537e68b44906d2db6436e2b35ac2c6b42640fff91f00fd" + [[package]] name = "time-macros" version = "0.1.1" @@ -6505,9 +6274,12 @@ dependencies = [ [[package]] name = "time-macros" -version = "0.2.4" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42657b1a6f4d817cda8e7a0ace261fe0cc946cf3a80314390b22cc61ae080792" +checksum = "65bb801831d812c562ae7d2bfb531f26e66e4e1f6b17307ba4149c5064710e5b" +dependencies = [ + "time-core", +] [[package]] name = "time-macros-impl" @@ -6524,9 +6296,12 @@ dependencies = [ [[package]] name = "tinystr" -version = "0.3.4" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29738eedb4388d9ea620eeab9384884fc3f06f586a2eddb56bedc5885126c7c1" +checksum = "f8aeafdfd935e4a7fe16a91ab711fa52d54df84f9c8f7ca5837a9d1d902ef4c2" +dependencies = [ + "displaydoc", +] [[package]] name = "tinytemplate" @@ -6553,23 +6328,6 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" -[[package]] -name = "todo" -version = "1.0.0" -dependencies = [ - "actix-files", - "actix-session", - "actix-web", - "actix-web-lab 0.17.0", - "dotenv", - "env_logger 0.9.1", - "log", - "serde", - "serde_json", - "sqlx", - "tera", -] - [[package]] name = "tokio" version = "0.2.25" @@ -6598,7 +6356,7 @@ dependencies = [ "bytes 1.2.1", "libc", "memchr", - "mio 0.8.4", + "mio 0.8.5", "num_cpus", "parking_lot 0.12.1", "pin-project-lite 0.2.9", @@ -6702,7 +6460,7 @@ version = "0.23.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c43ee83903113e03984cb9e5cebe6c04a5116269e900e3ddba8f068a62adda59" dependencies = [ - "rustls 0.20.6", + "rustls 0.20.7", "tokio 1.21.2", "webpki 0.22.0", ] @@ -6795,9 +6553,9 @@ checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" [[package]] name = "tracing" -version = "0.1.36" +version = "0.1.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fce9567bd60a67d08a16488756721ba392f24f29006402881e43b19aac64307" +checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8" dependencies = [ "cfg-if 1.0.0", "log", @@ -6808,9 +6566,9 @@ dependencies = [ [[package]] name = "tracing-attributes" -version = "0.1.22" +version = "0.1.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11c75893af559bc8e10716548bdef5cb2b983f8e637db9d0e15126b61b484ee2" +checksum = "4017f8f45139870ca7e672686113917c71c7a6e02d4924eda67186083c03081a" dependencies = [ "proc-macro2", "quote", @@ -6978,9 +6736,9 @@ checksum = "80d7ff825a6a654ee85a63e80f92f054f904f21e7d12da4e22f9834a4aaa35bc" [[package]] name = "unic-langid" -version = "0.9.0" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73328fcd730a030bdb19ddf23e192187a6b01cd98be6d3140622a89129459ce5" +checksum = "398f9ad7239db44fd0f80fe068d12ff22d78354080332a5077dc6f52f14dcf2f" dependencies = [ "unic-langid-impl", "unic-langid-macros", @@ -6988,18 +6746,18 @@ dependencies = [ [[package]] name = "unic-langid-impl" -version = "0.9.0" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a4a8eeaf0494862c1404c95ec2f4c33a2acff5076f64314b465e3ddae1b934d" +checksum = "e35bfd2f2b8796545b55d7d3fd3e89a0613f68a0d1c8bc28cb7ff96b411a35ff" dependencies = [ "tinystr", ] [[package]] name = "unic-langid-macros" -version = "0.9.0" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18f980d6d87e8805f2836d64b4138cc95aa7986fa63b1f51f67d5fbff64dd6e5" +checksum = "055e618bf694161ffff0466d95cef3e1a5edc59f6ba1888e97801f2b4ebdc4fe" dependencies = [ "proc-macro-hack", "tinystr", @@ -7009,9 +6767,9 @@ dependencies = [ [[package]] name = "unic-langid-macros-impl" -version = "0.9.0" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29396ffd97e27574c3e01368b1a64267d3064969e4848e2e130ff668be9daa9f" +checksum = "1f5cdec05b907f4e2f6843f4354f4ce6a5bebe1a56df320a49134944477ce4d8" dependencies = [ "proc-macro-hack", "quote", @@ -7063,6 +6821,12 @@ version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "099b7128301d285f79ddd55b9a83d5e6b9e97c92e0ea0daebee7263e932de992" +[[package]] +name = "unicode-ident" +version = "1.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ceab39d59e4c9499d4e5a8ee0e2735b891bb7308ac83dfb4e80cad195c9f6f3" + [[package]] name = "unicode-normalization" version = "0.1.22" @@ -7072,12 +6836,6 @@ dependencies = [ "tinyvec", ] -[[package]] -name = "unicode-segmentation" -version = "1.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fdbf052a0783de01e944a6ce7a8cb939e295b1e7be835a1112c3b9a7f047a5a" - [[package]] name = "unicode-width" version = "0.1.10" @@ -7090,12 +6848,6 @@ version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c" -[[package]] -name = "unicode_categories" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39ec24b3121d976906ece63c9daad25b85969647682eee313cb5779fdd69e14e" - [[package]] name = "universal-hash" version = "0.5.0" @@ -7111,7 +6863,7 @@ name = "unix-socket" version = "1.0.0" dependencies = [ "actix-web", - "env_logger 0.9.1", + "env_logger", ] [[package]] @@ -7177,7 +6929,7 @@ version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bc5cf98d8186244414c848017f0e2676b3fcb46807f6668a97dfe67359a3c4b7" dependencies = [ - "getrandom 0.2.7", + "getrandom 0.2.8", ] [[package]] @@ -7186,7 +6938,7 @@ version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "feb41e78f93363bb2df8b0e86a2ca30eed7806ea16ea0c790d757cf93f79be83" dependencies = [ - "getrandom 0.2.7", + "getrandom 0.2.8", "serde", ] @@ -7211,9 +6963,9 @@ dependencies = [ [[package]] name = "validator" -version = "0.15.0" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f07b0a1390e01c0fc35ebb26b28ced33c9a3808f7f9fbe94d3cc01e233bfeed5" +checksum = "32ad5bf234c7d3ad1042e5252b7eddb2c4669ee23f32c7dd0e9b7705f07ef591" dependencies = [ "idna 0.2.3", "lazy_static", @@ -7227,9 +6979,9 @@ dependencies = [ [[package]] name = "validator_derive" -version = "0.15.0" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea7ed5e8cf2b6bdd64a6c4ce851da25388a89327b17b88424ceced6bd5017923" +checksum = "bc44ca3088bb3ba384d9aecf40c6a23a676ce23e09bdaca2073d99c207f864af" dependencies = [ "if_chain", "lazy_static", @@ -7243,9 +6995,9 @@ dependencies = [ [[package]] name = "validator_types" -version = "0.15.0" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2ddf34293296847abfc1493b15c6e2f5d3cd19f57ad7d22673bf4c6278da329" +checksum = "111abfe30072511849c5910134e8baf8dc05de4c0e5903d681cbd5c9c4d611e3" dependencies = [ "proc-macro2", "syn", @@ -7257,12 +7009,6 @@ version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" -[[package]] -name = "vec_map" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191" - [[package]] name = "version_check" version = "0.9.4" @@ -7441,7 +7187,7 @@ dependencies = [ "actix-web", "actix-web-actors", "awc", - "env_logger 0.9.1", + "env_logger", "futures-util", "log", "tokio 1.21.2", @@ -7455,7 +7201,7 @@ dependencies = [ "actix", "actix-web", "actix-web-actors", - "env_logger 0.9.1", + "env_logger", "log", ] @@ -7468,7 +7214,7 @@ dependencies = [ "actix-ws", "awc", "derive_more", - "env_logger 0.9.1", + "env_logger", "futures-util", "log", "rand 0.8.5", @@ -7484,7 +7230,7 @@ dependencies = [ "actix-files", "actix-web", "actix-web-actors", - "env_logger 0.9.1", + "env_logger", "log", "rand 0.8.5", ] @@ -7497,7 +7243,7 @@ dependencies = [ "actix-web", "actix-ws", "awc", - "env_logger 0.9.1", + "env_logger", "futures-util", "log", "tokio 1.21.2", @@ -7511,7 +7257,7 @@ dependencies = [ "actix-files", "actix-web", "actix-web-actors", - "env_logger 0.9.1", + "env_logger", "log", "rand 0.8.5", "serde", @@ -7529,7 +7275,7 @@ dependencies = [ "actix-web-actors", "byteorder", "bytes 1.2.1", - "env_logger 0.9.1", + "env_logger", "futures-util", "log", "rand 0.8.5", @@ -7540,15 +7286,6 @@ dependencies = [ "tokio-util 0.7.4", ] -[[package]] -name = "which" -version = "3.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d011071ae14a2f6671d0b74080ae0cd8ebf3a6f8c9589a2cd45f23126fe29724" -dependencies = [ - "libc", -] - [[package]] name = "widestring" version = "0.5.1" @@ -7604,43 +7341,100 @@ version = "0.36.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ea04155a16a59f9eab786fe12a4a450e75cdb175f9e0d80da1e17db09f55b8d2" dependencies = [ - "windows_aarch64_msvc", - "windows_i686_gnu", - "windows_i686_msvc", - "windows_x86_64_gnu", - "windows_x86_64_msvc", + "windows_aarch64_msvc 0.36.1", + "windows_i686_gnu 0.36.1", + "windows_i686_msvc 0.36.1", + "windows_x86_64_gnu 0.36.1", + "windows_x86_64_msvc 0.36.1", ] +[[package]] +name = "windows-sys" +version = "0.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" +dependencies = [ + "windows_aarch64_gnullvm", + "windows_aarch64_msvc 0.42.0", + "windows_i686_gnu 0.42.0", + "windows_i686_msvc 0.42.0", + "windows_x86_64_gnu 0.42.0", + "windows_x86_64_gnullvm", + "windows_x86_64_msvc 0.42.0", +] + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41d2aa71f6f0cbe00ae5167d90ef3cfe66527d6f613ca78ac8024c3ccab9a19e" + [[package]] name = "windows_aarch64_msvc" version = "0.36.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9bb8c3fd39ade2d67e9874ac4f3db21f0d710bee00fe7cab16949ec184eeaa47" +[[package]] +name = "windows_aarch64_msvc" +version = "0.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd0f252f5a35cac83d6311b2e795981f5ee6e67eb1f9a7f64eb4500fbc4dcdb4" + [[package]] name = "windows_i686_gnu" version = "0.36.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "180e6ccf01daf4c426b846dfc66db1fc518f074baa793aa7d9b9aaeffad6a3b6" +[[package]] +name = "windows_i686_gnu" +version = "0.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fbeae19f6716841636c28d695375df17562ca208b2b7d0dc47635a50ae6c5de7" + [[package]] name = "windows_i686_msvc" version = "0.36.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e2e7917148b2812d1eeafaeb22a97e4813dfa60a3f8f78ebe204bcc88f12f024" +[[package]] +name = "windows_i686_msvc" +version = "0.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "84c12f65daa39dd2babe6e442988fc329d6243fdce47d7d2d155b8d874862246" + [[package]] name = "windows_x86_64_gnu" version = "0.36.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4dcd171b8776c41b97521e5da127a2d86ad280114807d0b2ab1e462bc764d9e1" +[[package]] +name = "windows_x86_64_gnu" +version = "0.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bf7b1b21b5362cbc318f686150e5bcea75ecedc74dd157d874d754a2ca44b0ed" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09d525d2ba30eeb3297665bd434a54297e4170c7f1a44cad4ef58095b4cd2028" + [[package]] name = "windows_x86_64_msvc" version = "0.36.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c811ca4a8c853ef420abd8592ba53ddbbac90410fab6903b3e79972a631f7680" +[[package]] +name = "windows_x86_64_msvc" +version = "0.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f40009d85759725a34da6d89a94e63d7bdc50a862acf0dbc7c8e488f1edcb6f5" + [[package]] name = "winreg" version = "0.7.0" diff --git a/Cargo.toml b/Cargo.toml index 42339b2d..535e234c 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -11,7 +11,7 @@ members = [ "basics/nested-routing", "basics/state", "basics/static-files", - "basics/todo", + # "basics/todo", "cors/backend", "data-factory", "databases/diesel", diff --git a/auth/cookie-auth/Cargo.toml b/auth/cookie-auth/Cargo.toml index eee02d3a..180efd11 100644 --- a/auth/cookie-auth/Cargo.toml +++ b/auth/cookie-auth/Cargo.toml @@ -5,6 +5,8 @@ edition = "2021" [dependencies] actix-web = "4" -actix-identity = "0.4" +actix-identity = "0.5" +actix-session = { version = "0.7", features = ["cookie-session"] } + env_logger = "0.9" rand = "0.8" diff --git a/auth/cookie-auth/src/main.rs b/auth/cookie-auth/src/main.rs index 76aecdae..a432a9e7 100644 --- a/auth/cookie-auth/src/main.rs +++ b/auth/cookie-auth/src/main.rs @@ -1,23 +1,28 @@ -use actix_identity::{CookieIdentityPolicy, Identity, IdentityService}; -use actix_web::{middleware, web, App, HttpResponse, HttpServer}; +use actix_identity::{Identity, IdentityMiddleware}; +use actix_session::{storage::CookieSessionStore, SessionMiddleware}; +use actix_web::{ + cookie::Key, middleware, web, App, HttpMessage as _, HttpRequest, HttpResponse, HttpServer, +}; use rand::Rng; async fn index(id: Identity) -> String { format!( "Hello {}", - id.identity().unwrap_or_else(|| "Anonymous".to_owned()) + id.id().unwrap_or_else(|_| "Anonymous".to_owned()) ) } -async fn login(id: Identity) -> HttpResponse { - id.remember("user1".to_owned()); +async fn login(req: HttpRequest) -> HttpResponse { + Identity::login(&req.extensions(), "user1".to_owned()).unwrap(); + HttpResponse::Found() .insert_header(("location", "/")) .finish() } async fn logout(id: Identity) -> HttpResponse { - id.forget(); + id.logout(); + HttpResponse::Found() .insert_header(("location", "/")) .finish() @@ -32,13 +37,16 @@ async fn main() -> std::io::Result<()> { // private key for every project. Anyone with access to the key can generate // authentication cookies for any user! let private_key = rand::thread_rng().gen::<[u8; 32]>(); + HttpServer::new(move || { App::new() - .wrap(IdentityService::new( - CookieIdentityPolicy::new(&private_key) - .name("auth-example") - .secure(false), - )) + .wrap(IdentityMiddleware::default()) + .wrap( + SessionMiddleware::builder(CookieSessionStore::default(), Key::from(&private_key)) + .cookie_name("auth-example".to_owned()) + .cookie_secure(false) + .build(), + ) // enable logger - always register Actix Web Logger middleware last .wrap(middleware::Logger::default()) .service(web::resource("/login").route(web::post().to(login))) diff --git a/auth/simple-auth-server/Cargo.toml b/auth/simple-auth-server/Cargo.toml index 1251a80b..7b40d904 100644 --- a/auth/simple-auth-server/Cargo.toml +++ b/auth/simple-auth-server/Cargo.toml @@ -5,7 +5,8 @@ edition = "2021" [dependencies] actix-web = "4" -actix-identity = "0.4" +actix-identity = "0.5" +actix-session = { version = "0.7", features = ["cookie-session"] } chrono = { version = "0.4", features = ["serde"] } derive_more = "0.99.5" diff --git a/auth/simple-auth-server/src/auth_handler.rs b/auth/simple-auth-server/src/auth_handler.rs index 43149be5..573cb8ae 100644 --- a/auth/simple-auth-server/src/auth_handler.rs +++ b/auth/simple-auth-server/src/auth_handler.rs @@ -1,7 +1,9 @@ use std::future::{ready, Ready}; use actix_identity::Identity; -use actix_web::{dev::Payload, web, Error, FromRequest, HttpRequest, HttpResponse}; +use actix_web::{ + dev::Payload, web, Error, FromRequest, HttpMessage as _, HttpRequest, HttpResponse, +}; use diesel::prelude::*; use serde::Deserialize; @@ -27,7 +29,7 @@ impl FromRequest for LoggedUser { fn from_request(req: &HttpRequest, pl: &mut Payload) -> Self::Future { if let Ok(identity) = Identity::from_request(req, pl).into_inner() { - if let Some(user_json) = identity.identity() { + if let Ok(user_json) = identity.id() { if let Ok(user) = serde_json::from_str(&user_json) { return ready(Ok(user)); } @@ -39,21 +41,21 @@ impl FromRequest for LoggedUser { } pub async fn logout(id: Identity) -> HttpResponse { - id.forget(); - HttpResponse::Ok().finish() + id.logout(); + HttpResponse::NoContent().finish() } pub async fn login( + req: HttpRequest, auth_data: web::Json, - id: Identity, pool: web::Data, ) -> Result { let user = web::block(move || query(auth_data.into_inner(), pool)).await??; let user_string = serde_json::to_string(&user).unwrap(); - id.remember(user_string); + Identity::login(&req.extensions(), user_string).unwrap(); - Ok(HttpResponse::Ok().finish()) + Ok(HttpResponse::NoContent().finish()) } pub async fn get_me(logged_user: LoggedUser) -> HttpResponse { diff --git a/auth/simple-auth-server/src/main.rs b/auth/simple-auth-server/src/main.rs index 0016ee42..34ad0255 100644 --- a/auth/simple-auth-server/src/main.rs +++ b/auth/simple-auth-server/src/main.rs @@ -1,8 +1,9 @@ #[macro_use] extern crate diesel; -use actix_identity::{CookieIdentityPolicy, IdentityService}; -use actix_web::{middleware, web, App, HttpServer}; +use actix_identity::IdentityMiddleware; +use actix_session::{config::PersistentSession, storage::CookieSessionStore, SessionMiddleware}; +use actix_web::{cookie::Key, middleware, web, App, HttpServer}; use diesel::{ prelude::*, r2d2::{self, ConnectionManager}, @@ -39,17 +40,21 @@ async fn main() -> std::io::Result<()> { HttpServer::new(move || { App::new() .app_data(web::Data::new(pool.clone())) + .wrap(IdentityMiddleware::default()) + .wrap( + SessionMiddleware::builder( + CookieSessionStore::default(), + Key::from(utils::SECRET_KEY.as_bytes()), + ) + .session_lifecycle(PersistentSession::default().session_ttl(Duration::days(1))) + .cookie_name("auth-example".to_owned()) + .cookie_secure(false) + .cookie_domain(Some(domain.clone())) + .cookie_path("/".to_owned()) + .build(), + ) // enable logger .wrap(middleware::Logger::default()) - .wrap(IdentityService::new( - CookieIdentityPolicy::new(utils::SECRET_KEY.as_bytes()) - .name("auth") - .path("/") - .domain(domain.as_str()) - .max_age(Duration::days(1)) - .secure(false), // this can only be true if you have https - )) - .app_data(web::JsonConfig::default().limit(4096)) // everything under '/api/' route .service( web::scope("/api") diff --git a/basics/todo/Cargo.toml b/basics/todo/Cargo.toml index ecef9bad..009dd399 100644 --- a/basics/todo/Cargo.toml +++ b/basics/todo/Cargo.toml @@ -7,7 +7,7 @@ edition = "2021" actix-files = "0.6" actix-session = { version = "0.7", features = ["cookie-session"] } actix-web = "4" -actix-web-lab = "0.17" +actix-web-lab = "0.18" dotenv = "0.15" env_logger = "0.9" diff --git a/databases/sqlite/Cargo.toml b/databases/sqlite/Cargo.toml index 5e3aa204..faa85ad4 100644 --- a/databases/sqlite/Cargo.toml +++ b/databases/sqlite/Cargo.toml @@ -10,7 +10,7 @@ env_logger = "0.9" futures-util = { version = "0.3", default-features = false, features = ["std"] } log = "0.4" r2d2 = "0.8" -r2d2_sqlite = "0.20" -rusqlite = "0.27" +r2d2_sqlite = "0.20" # 0.21.0 blocked on sqlx sqlite update +rusqlite = "0.27" # 0.28.0 blocked on sqlx sqlite update serde = { version = "1", features = ["derive"] } serde_json = "1" diff --git a/forms/multipart-s3/Cargo.toml b/forms/multipart-s3/Cargo.toml index dd33e4a5..d4156015 100644 --- a/forms/multipart-s3/Cargo.toml +++ b/forms/multipart-s3/Cargo.toml @@ -6,10 +6,10 @@ edition = "2021" [dependencies] actix-multipart = "0.4" actix-web = "4" -actix-web-lab = "0.17" +actix-web-lab = "0.18" -aws-config = "0.46" -aws-sdk-s3 = "0.16" +aws-config = "0.49" +aws-sdk-s3 = "0.19" dotenv = "0.15" env_logger = "0.9" diff --git a/graphql/async-graphql/Cargo.toml b/graphql/async-graphql/Cargo.toml index 9038970a..cd37baec 100644 --- a/graphql/async-graphql/Cargo.toml +++ b/graphql/async-graphql/Cargo.toml @@ -6,7 +6,7 @@ edition = "2021" [dependencies] actix = "0.13" actix-web = "4" -actix-web-lab = "0.17" +actix-web-lab = "0.18" actix-cors = "0.6" async-graphql = "4" diff --git a/graphql/juniper-advanced/Cargo.toml b/graphql/juniper-advanced/Cargo.toml index 76d03086..f14ba5ce 100644 --- a/graphql/juniper-advanced/Cargo.toml +++ b/graphql/juniper-advanced/Cargo.toml @@ -5,14 +5,14 @@ edition = "2021" [dependencies] actix-web = "4" -actix-web-lab = "0.17" +actix-web-lab = "0.18" actix-cors = "0.6" juniper = "0.15" -mysql = "21" +mysql = "22" r2d2 = "0.8" -r2d2_mysql = "21" +r2d2_mysql = "22" dotenv = "0.15" env_logger = "0.9" diff --git a/graphql/juniper/Cargo.toml b/graphql/juniper/Cargo.toml index 26ab172c..0b98bba9 100644 --- a/graphql/juniper/Cargo.toml +++ b/graphql/juniper/Cargo.toml @@ -5,7 +5,7 @@ edition = "2021" [dependencies] actix-web = "4" -actix-web-lab = "0.17" +actix-web-lab = "0.18" actix-cors = "0.6" juniper = "0.15" diff --git a/http-proxy/Cargo.toml b/http-proxy/Cargo.toml index 4320d0e7..f013ce43 100644 --- a/http-proxy/Cargo.toml +++ b/http-proxy/Cargo.toml @@ -7,7 +7,7 @@ edition = "2021" actix-web = { version = "4", features = ["openssl"] } awc = "3" -clap = { version = "3", features = ["derive"] } +clap = { version = "4", features = ["derive"] } env_logger = "0.9" log = "0.4" url = "2.2" diff --git a/http-proxy/src/main.rs b/http-proxy/src/main.rs index 03c32a6a..83f874ff 100644 --- a/http-proxy/src/main.rs +++ b/http-proxy/src/main.rs @@ -2,7 +2,7 @@ use std::net::ToSocketAddrs; use actix_web::{error, middleware, web, App, Error, HttpRequest, HttpResponse, HttpServer}; use awc::Client; -use clap::StructOpt; +use clap::Parser; use url::Url; async fn forward( diff --git a/https-tls/rustls/Cargo.toml b/https-tls/rustls/Cargo.toml index 39c66bfc..7c705d44 100644 --- a/https-tls/rustls/Cargo.toml +++ b/https-tls/rustls/Cargo.toml @@ -9,7 +9,7 @@ path = "src/main.rs" [dependencies] actix-web = { version = "4", features = ["rustls"] } -actix-web-lab = "0.17" +actix-web-lab = "0.18" actix-files = "0.6" env_logger = "0.9" diff --git a/json/json-validation/Cargo.toml b/json/json-validation/Cargo.toml index 53f647ae..95bb2efb 100644 --- a/json/json-validation/Cargo.toml +++ b/json/json-validation/Cargo.toml @@ -12,4 +12,4 @@ futures-util = { version = "0.3.17", default-features = false, features = ["std" log = "0.4" serde = { version = "1", features = ["derive"] } serde_json = "1" -validator = { version = "0.15", features = ["derive"] } +validator = { version = "0.16", features = ["derive"] } diff --git a/middleware/middleware-http-to-https/Cargo.toml b/middleware/middleware-http-to-https/Cargo.toml index 19ecd075..4fa087a2 100644 --- a/middleware/middleware-http-to-https/Cargo.toml +++ b/middleware/middleware-http-to-https/Cargo.toml @@ -5,7 +5,7 @@ edition = "2021" [dependencies] actix-web = { version = "4", features = ["rustls"] } -actix-web-lab = "0.17" +actix-web-lab = "0.18" env_logger = "0.9" futures-util = { version = "0.3.17", default-features = false, features = ["std"] } diff --git a/protobuf/Cargo.toml b/protobuf/Cargo.toml index bf9c335b..0a2dcb29 100644 --- a/protobuf/Cargo.toml +++ b/protobuf/Cargo.toml @@ -4,10 +4,10 @@ version = "1.0.0" edition = "2021" [dependencies] -actix-protobuf = "0.8" +actix-protobuf = "0.9" actix-web = "4" env_logger = "0.9" log = "0.4" -prost = "0.10" -prost-derive = "0.10" +prost = "0.11" +prost-derive = "0.11" diff --git a/server-sent-events/Cargo.toml b/server-sent-events/Cargo.toml index 7ea2eeae..08f61b1e 100644 --- a/server-sent-events/Cargo.toml +++ b/server-sent-events/Cargo.toml @@ -5,7 +5,7 @@ edition = "2021" [dependencies] actix-web = "4" -actix-web-lab = "0.16.9" +actix-web-lab = "0.18" env_logger = "0.9" futures-util = { version = "0.3.17", default-features = false, features = ["std"] } log = "0.4" diff --git a/server-sent-events/src/broadcast.rs b/server-sent-events/src/broadcast.rs index 15dbfb81..89a3dd1a 100644 --- a/server-sent-events/src/broadcast.rs +++ b/server-sent-events/src/broadcast.rs @@ -1,7 +1,7 @@ use std::{sync::Arc, time::Duration}; use actix_web::rt::time::interval; -use actix_web_lab::sse::{sse, Sse, SseData, SseMessage, SseSender}; +use actix_web_lab::sse::{self, ChannelStream, Sse}; use futures_util::future; use parking_lot::Mutex; @@ -11,7 +11,7 @@ pub struct Broadcaster { #[derive(Debug, Clone, Default)] struct BroadcasterInner { - clients: Vec, + clients: Vec, } impl Broadcaster { @@ -47,7 +47,7 @@ impl Broadcaster { for client in clients { if client - .send(SseMessage::Comment("ping".into())) + .send(sse::Event::Comment("ping".into())) .await .is_ok() { @@ -59,10 +59,10 @@ impl Broadcaster { } /// Registers client with broadcaster, returning an SSE response body. - pub async fn new_client(&self) -> Sse { - let (tx, rx) = sse(10); + pub async fn new_client(&self) -> Sse { + let (tx, rx) = sse::channel(10); - tx.send(SseData::new("connected")).await.unwrap(); + tx.send(sse::Data::new("connected")).await.unwrap(); self.inner.lock().clients.push(tx); @@ -73,7 +73,9 @@ impl Broadcaster { pub async fn broadcast(&self, msg: &str) { let clients = self.inner.lock().clients.clone(); - let send_futures = clients.iter().map(|client| client.send(SseData::new(msg))); + let send_futures = clients + .iter() + .map(|client| client.send(sse::Data::new(msg))); // try to send to all clients, ignoring failures // disconnected clients will get swept up by `remove_stale_clients` diff --git a/shutdown-server/Cargo.toml b/shutdown-server/Cargo.toml index e74f276f..5c0dbae5 100644 --- a/shutdown-server/Cargo.toml +++ b/shutdown-server/Cargo.toml @@ -6,7 +6,7 @@ description = "Send a request to the server to shut it down" [dependencies] actix-web = "4" -actix-web-lab = "0.17" +actix-web-lab = "0.18" env_logger = "0.9" log = "0.4" diff --git a/templating/fluent/Cargo.toml b/templating/fluent/Cargo.toml index d344b7dc..d69ad9d1 100644 --- a/templating/fluent/Cargo.toml +++ b/templating/fluent/Cargo.toml @@ -5,7 +5,7 @@ edition = "2021" [dependencies] actix-web = "4" -actix-web-lab = "0.17" +actix-web-lab = "0.18" fluent-templates = { version = "0.8", features = ["handlebars"] } handlebars = { version = "4.3", features = ["dir_source"] } serde = { version = "1", features = ["derive"] } diff --git a/templating/minijinja/Cargo.toml b/templating/minijinja/Cargo.toml index 8a1ce6b1..73667d52 100644 --- a/templating/minijinja/Cargo.toml +++ b/templating/minijinja/Cargo.toml @@ -10,5 +10,5 @@ actix-utils = "3" env_logger = "0.9" log = "0.4" -minijinja = { version = "0.23", features = ["source"] } -minijinja-autoreload = "0.23" +minijinja = { version = "0.24", features = ["source"] } +minijinja-autoreload = "0.24" diff --git a/templating/sailfish/Cargo.toml b/templating/sailfish/Cargo.toml index 32eb93a4..c63dddca 100644 --- a/templating/sailfish/Cargo.toml +++ b/templating/sailfish/Cargo.toml @@ -5,8 +5,8 @@ edition = "2021" [dependencies] actix-web = "4" -actix-web-lab = "0.17" +actix-web-lab = "0.18" env_logger = "0.9" log = "0.4" -sailfish = "0.4" +sailfish = "0.5"