diff --git a/Cargo.lock b/Cargo.lock index adfee27b..908b96f0 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1,5 +1,7 @@ # This file is automatically @generated by Cargo. # It is not intended for manual editing. +version = 3 + [[package]] name = "actix" version = "0.9.0" @@ -10,14 +12,14 @@ dependencies = [ "actix-rt", "actix_derive", "bitflags", - "bytes", + "bytes 0.5.6", "crossbeam-channel", "derive_more", - "futures 0.3.8", + "futures 0.3.14", "lazy_static", "log", "parking_lot 0.10.2", - "pin-project 0.4.27", + "pin-project 0.4.28", "smallvec", "tokio", "tokio-util 0.2.0", @@ -34,7 +36,7 @@ dependencies = [ "actix-rt", "actix_derive", "bitflags", - "bytes", + "bytes 0.5.6", "crossbeam-channel", "derive_more", "futures-channel", @@ -42,12 +44,12 @@ dependencies = [ "log", "once_cell", "parking_lot 0.11.1", - "pin-project 0.4.27", + "pin-project 0.4.28", "smallvec", "tokio", "tokio-util 0.3.1", - "trust-dns-proto 0.19.6", - "trust-dns-resolver 0.19.6", + "trust-dns-proto 0.19.7", + "trust-dns-resolver 0.19.7", ] [[package]] @@ -57,7 +59,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "09e55f0a5c2ca15795035d90c46bd0e73a5123b72f68f12596d6ba5282051380" dependencies = [ "bitflags", - "bytes", + "bytes 0.5.6", "futures-core", "futures-sink", "log", @@ -72,11 +74,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "78d1833b3838dbe990df0f1f87baf640cf6146e898166afe401839d1b001e570" dependencies = [ "bitflags", - "bytes", + "bytes 0.5.6", "futures-core", "futures-sink", "log", - "pin-project 0.4.27", + "pin-project 0.4.28", "tokio", "tokio-util 0.3.1", ] @@ -93,7 +95,7 @@ dependencies = [ "actix-utils 1.0.6", "derive_more", "either", - "futures 0.3.8", + "futures 0.3.14", "http", "log", "trust-dns-proto 0.18.0-alpha.2", @@ -115,15 +117,15 @@ dependencies = [ "futures-util", "http", "log", - "trust-dns-proto 0.19.6", - "trust-dns-resolver 0.19.6", + "trust-dns-proto 0.19.7", + "trust-dns-resolver 0.19.7", ] [[package]] name = "actix-cors" -version = "0.5.3" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f3a3d5493dbc9b8769fe88c030d057ef8d2edc5728e5e26267780e8fc5db0be" +checksum = "36b133d8026a9f209a9aeeeacd028e7451bcca975f592881b305d37983f303d7" dependencies = [ "actix-web", "derive_more", @@ -142,7 +144,7 @@ dependencies = [ "actix-service", "actix-web", "bitflags", - "bytes", + "bytes 0.5.6", "derive_more", "futures-core", "futures-util", @@ -167,7 +169,7 @@ dependencies = [ "actix-utils 1.0.6", "base64 0.11.0", "bitflags", - "bytes", + "bytes 0.5.6", "chrono", "copyless", "derive_more", @@ -186,7 +188,7 @@ dependencies = [ "log", "mime", "percent-encoding", - "pin-project 0.4.27", + "pin-project 0.4.28", "rand 0.7.3", "regex", "serde", @@ -212,7 +214,7 @@ dependencies = [ "base64 0.13.0", "bitflags", "brotli2", - "bytes", + "bytes 0.5.6", "cookie", "copyless", "derive_more", @@ -233,15 +235,15 @@ dependencies = [ "log", "mime", "percent-encoding", - "pin-project 1.0.2", + "pin-project 1.0.6", "rand 0.7.3", "regex", "serde", "serde_json", "serde_urlencoded 0.7.0", - "sha-1 0.9.2", + "sha-1 0.9.4", "slab", - "time 0.2.23", + "time 0.2.26", ] [[package]] @@ -263,7 +265,7 @@ dependencies = [ "actix-service", "actix-utils 2.0.0", "actix-web", - "bytes", + "bytes 0.5.6", "derive_more", "futures-util", "httparse", @@ -274,9 +276,9 @@ dependencies = [ [[package]] name = "actix-router" -version = "0.2.5" +version = "0.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbd1f7dbda1645bf7da33554db60891755f6c01c1b2169e2f4c492098d30c235" +checksum = "2ad299af73649e1fc893e333ccf86f377751eb95ff875d095131574c6f43452c" dependencies = [ "bytestring", "http", @@ -327,7 +329,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0052435d581b5be835d11f4eb3bce417c8af18d87ddf8ace99f8e67e595882bb" dependencies = [ "futures-util", - "pin-project 0.4.27", + "pin-project 0.4.28", ] [[package]] @@ -381,11 +383,11 @@ dependencies = [ "actix-rt", "actix-service", "bitflags", - "bytes", + "bytes 0.5.6", "either", - "futures 0.3.8", + "futures 0.3.14", "log", - "pin-project 0.4.27", + "pin-project 0.4.28", "slab", ] @@ -399,13 +401,13 @@ dependencies = [ "actix-rt", "actix-service", "bitflags", - "bytes", + "bytes 0.5.6", "either", "futures-channel", "futures-sink", "futures-util", "log", - "pin-project 0.4.27", + "pin-project 0.4.28", "slab", ] @@ -428,7 +430,7 @@ dependencies = [ "actix-utils 2.0.0", "actix-web-codegen", "awc", - "bytes", + "bytes 0.5.6", "derive_more", "encoding_rs", "futures-channel", @@ -437,13 +439,13 @@ dependencies = [ "fxhash", "log", "mime", - "pin-project 1.0.2", + "pin-project 1.0.6", "regex", "serde", "serde_json", "serde_urlencoded 0.7.0", "socket2", - "time 0.2.23", + "time 0.2.26", "tinyvec", "url", ] @@ -458,10 +460,10 @@ dependencies = [ "actix-codec 0.3.0", "actix-http 2.2.0", "actix-web", - "bytes", + "bytes 0.5.6", "futures-channel", "futures-core", - "pin-project 0.4.27", + "pin-project 0.4.28", ] [[package]] @@ -497,9 +499,9 @@ dependencies = [ [[package]] name = "adler" -version = "0.2.3" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee2a4ec343196209d6594e19543ae87a39f96d5534d7174822a3ad825dd6ed7e" +checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" [[package]] name = "aho-corasick" @@ -518,9 +520,9 @@ dependencies = [ "actix-rt", "actix-service", "actix-web-actors", - "bytes", + "bytes 0.5.6", "env_logger", - "futures 0.3.8", + "futures 0.3.14", "jirs-config", "libc", "log", @@ -531,7 +533,7 @@ dependencies = [ "rusoto_signature", "serde", "tokio", - "uuid 0.8.1", + "uuid 0.8.2", ] [[package]] @@ -563,9 +565,9 @@ checksum = "71938f30533e4d95a6d17aa530939da3842c2ab6f4f84b9dae68447e4129f74a" [[package]] name = "async-trait" -version = "0.1.42" +version = "0.1.48" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d3a45e77e34375a7923b1e8febb049bb011f064714a8e17a1a616fef01da13d" +checksum = "36ea56748e10732c49404c153638a15ec3d6211ec5ff35d9bb20e13b93576adf" dependencies = [ "proc-macro2", "quote", @@ -606,7 +608,7 @@ dependencies = [ "actix-rt", "actix-service", "base64 0.13.0", - "bytes", + "bytes 0.5.6", "cfg-if 1.0.0", "derive_more", "futures-core", @@ -621,9 +623,9 @@ dependencies = [ [[package]] name = "backtrace" -version = "0.3.55" +version = "0.3.56" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef5140344c85b01f9bbb4d4b7288a8aa4b3287ccef913a14bcc78a1063623598" +checksum = "9d117600f438b1707d4e4ae15d3595657288f8235a0eb593e80ecc98ab34e1bc" dependencies = [ "addr2line", "cfg-if 1.0.0", @@ -689,11 +691,10 @@ dependencies = [ [[package]] name = "bincode" -version = "1.3.1" +version = "1.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f30d3a39baa26f9651f17b375061f3233dde33424a8b72b0dbe93a68a0bc896d" +checksum = "b1f45e9417d87227c7a56d22e471c6206462cba514c7590c09aff4cf6d1ddcad" dependencies = [ - "byteorder", "serde", ] @@ -723,7 +724,7 @@ dependencies = [ "block-padding", "byte-tools", "byteorder", - "generic-array 0.12.3", + "generic-array 0.12.4", ] [[package]] @@ -770,7 +771,7 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fa17aa1cf56bdd6bb30518767d00e58019d326f3f05d8c3e0730b549d332ea83" dependencies = [ - "bytes", + "bytes 0.5.6", ] [[package]] @@ -781,9 +782,9 @@ checksum = "40e38929add23cdf8a366df9b0e088953150724bcbe5fc330b0d8eb3b328eec8" [[package]] name = "bumpalo" -version = "3.4.0" +version = "3.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e8c087f005730276d1096a652e92a8bacee2e2472bcc9715a74d2bec38b5820" +checksum = "63396b8a4b9de3f4fdfb320ab6080762242f66a8ef174c49d8e19b674db4cdbe" [[package]] name = "byte-tools" @@ -793,9 +794,9 @@ checksum = "e3b5ca7a04898ad4bcd41c90c5285445ff5b791899bb1b0abdd2a2aa791211d7" [[package]] name = "byteorder" -version = "1.3.4" +version = "1.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08c48aae112d48ed9f069b33538ea9e3e90aa263cfa3d1c24309612b1f7472de" +checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" [[package]] name = "bytes" @@ -804,12 +805,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0e4cec68f03f32e44924783795810fa50a7035d8c8ebe78580ad7e6c703fba38" [[package]] -name = "bytestring" -version = "0.1.5" +name = "bytes" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc7c05fa5172da78a62d9949d662d2ac89d4cc7355d7b49adee5163f1fb3f363" +checksum = "b700ce4376041dcd0a327fd0097c41095743c4c8af8887265942faf1100bd040" + +[[package]] +name = "bytestring" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "90706ba19e97b90786e19dc0d5e2abd80008d99d4c0c5d1ad0b5e72cec7c494d" dependencies = [ - "bytes", + "bytes 1.0.1", ] [[package]] @@ -820,9 +827,9 @@ checksum = "df8670b8c7b9dae1793364eafadf7239c40d669904660c5960d74cfd80b46a53" [[package]] name = "cc" -version = "1.0.66" +version = "1.0.67" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c0496836a84f8d0495758516b8621a622beb77c0fed418570e50764093ced48" +checksum = "e3c69b077ad434294d3ce9f1f6143a2a4b89a8a2d54ef813d85003a4fd1137fd" [[package]] name = "cfg-if" @@ -878,9 +885,9 @@ dependencies = [ [[package]] name = "comrak" -version = "0.9.0" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bcfb8008d04126b176c76cbfdecf9a2ccb4bacc70af87c8da6136d63d7b7292a" +checksum = "ac96caba4b5b55c21c9efd51d498225ce9448d06d9d5c17bbd357522c71bacfd" dependencies = [ "clap", "entities", @@ -907,9 +914,9 @@ dependencies = [ [[package]] name = "const_fn" -version = "0.4.4" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd51eab21ab4fd6a3bf889e2d0958c0a6e3a61ad04260325e919e652a2a62826" +checksum = "076a6803b0dacd6a88cfe64deba628b01533ff5ef265687e6938280c1afd0a28" [[package]] name = "constant_time_eq" @@ -918,14 +925,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc" [[package]] -name = "cookie" -version = "0.14.3" +name = "convert_case" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "784ad0fbab4f3e9cef09f20e0aea6000ae08d2cb98ac4c0abc53df18803d702f" +checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e" + +[[package]] +name = "cookie" +version = "0.14.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "03a5d7b21829bc7b4bf4754a978a241ae54ea55a40f92bb20216e54096f4b951" dependencies = [ "percent-encoding", - "time 0.2.23", - "version_check 0.9.2", + "time 0.2.26", + "version_check 0.9.3", ] [[package]] @@ -988,9 +1001,9 @@ dependencies = [ [[package]] name = "crossbeam-utils" -version = "0.8.1" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02d96d1e189ef58269ebe5b97953da3274d83a93af647c2ddd6f9dab28cedb8d" +checksum = "e7e9d99fa91428effe99c5c6d4634cdeba32b8cf784fc428a2a687f61a952c49" dependencies = [ "autocfg 1.0.1", "cfg-if 1.0.0", @@ -1022,8 +1035,8 @@ dependencies = [ "diesel", "dotenv", "env_logger", - "futures 0.3.8", - "ipnetwork", + "futures 0.3.14", + "ipnetwork 0.16.0", "jirs-config", "jirs-data", "libc", @@ -1040,7 +1053,7 @@ dependencies = [ "time 0.1.44", "toml", "url", - "uuid 0.8.1", + "uuid 0.8.2", ] [[package]] @@ -1070,10 +1083,11 @@ version = "0.1.0" [[package]] name = "derive_more" -version = "0.99.11" +version = "0.99.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41cb0e6161ad61ed084a36ba71fbba9e3ac5aee3606fb607fe08da6acbcf3d8c" +checksum = "f82b1b72f1263f214c0f823371768776c4f5841b942c9883aa8e5ec584fd0ba6" dependencies = [ + "convert_case", "proc-macro2", "quote", "syn", @@ -1081,16 +1095,16 @@ dependencies = [ [[package]] name = "diesel" -version = "1.4.5" +version = "1.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e2de9deab977a153492a1468d1b1c0662c1cf39e5ea87d0c060ecd59ef18d8c" +checksum = "047bfc4d5c3bd2ef6ca6f981941046113524b9a9f9a7cbdfdd7ff40f58e6f542" dependencies = [ "bigdecimal", "bitflags", "byteorder", "chrono", "diesel_derives", - "ipnetwork", + "ipnetwork 0.17.0", "libc", "num-bigint", "num-integer", @@ -1100,7 +1114,7 @@ dependencies = [ "serde_json", "time 0.1.44", "uuid 0.6.5", - "uuid 0.8.1", + "uuid 0.8.2", ] [[package]] @@ -1120,7 +1134,7 @@ version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f3d0c8c8752312f9713efd397ff63acb9f85585afbf179282e720e7704954dd5" dependencies = [ - "generic-array 0.12.3", + "generic-array 0.12.4", ] [[package]] @@ -1167,9 +1181,9 @@ checksum = "77c90badedccf4105eca100756a0b1289e191f6fcbdadd3cee1d2f614f97da8f" [[package]] name = "dtoa" -version = "0.4.7" +version = "0.4.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88d7ed2934d741c6b37e33e3832298e8850b53fd2d2bea03873375596c7cea4e" +checksum = "56899898ce76aaf4a0f24d914c97ea6ed976d42fec6ad33fcbb0a1103e07b2b0" [[package]] name = "either" @@ -1264,9 +1278,9 @@ checksum = "a246d82be1c9d791c5dfde9a2bd045fc3cbba3fa2b11ad558f27d01712f00569" [[package]] name = "encoding_rs" -version = "0.8.26" +version = "0.8.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "801bbab217d7f79c0062f4f7205b5d4427c6d1a7bd7aafdd1475f7c59d62b283" +checksum = "80df024fbc5ac80f87dfef0d9f5209a252f2a497f7f42944cff24d8253cac065" dependencies = [ "cfg-if 1.0.0", ] @@ -1345,9 +1359,9 @@ version = "0.1.0" dependencies = [ "actix 0.10.0", "actix-files", - "bytes", + "bytes 0.5.6", "env_logger", - "futures 0.3.8", + "futures 0.3.14", "jirs-config", "log", "pretty_env_logger", @@ -1356,9 +1370,9 @@ dependencies = [ [[package]] name = "flate2" -version = "1.0.19" +version = "1.0.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7411863d55df97a419aa64cb4d2f167103ea9d767e2c54a1868b7ac3f6b47129" +checksum = "cd3aec53de10fe96d7d8c565eb17f2c687bb5518a2ec453b5b1252964526abe0" dependencies = [ "cfg-if 1.0.0", "crc32fast", @@ -1389,9 +1403,9 @@ checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" [[package]] name = "form_urlencoded" -version = "1.0.0" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ece68d15c92e84fa4f19d3780f1294e5ca82a78a6d515f1efaabcc144688be00" +checksum = "5fc25a87fa4fd2094bffb06925852034d90a17f0d1e05197d4956d3555752191" dependencies = [ "matches", "percent-encoding", @@ -1421,15 +1435,15 @@ checksum = "3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7" [[package]] name = "futures" -version = "0.1.30" +version = "0.1.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c7e4c2612746b0df8fed4ce0c69156021b704c9aefa360311c04e6e9e002eed" +checksum = "3a471a38ef8ed83cd6e40aa59c1ffe17db6855c18e3604d9c4ed8c08ebc28678" [[package]] name = "futures" -version = "0.3.8" +version = "0.3.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b3b0c040a1fe6529d30b3c5944b280c7f0dcb2930d2c3062bca967b602583d0" +checksum = "a9d5813545e459ad3ca1bff9915e9ad7f1a47dc6a91b627ce321d5863b7dd253" dependencies = [ "futures-channel", "futures-core", @@ -1442,9 +1456,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.8" +version = "0.3.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b7109687aa4e177ef6fe84553af6280ef2778bdb7783ba44c9dc3399110fe64" +checksum = "ce79c6a52a299137a6013061e0cf0e688fce5d7f1bc60125f520912fdb29ec25" dependencies = [ "futures-core", "futures-sink", @@ -1452,15 +1466,15 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.8" +version = "0.3.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "847ce131b72ffb13b6109a221da9ad97a64cbe48feb1028356b836b47b8f1748" +checksum = "098cd1c6dda6ca01650f1a37a794245eb73181d0d4d4e955e2f3c37db7af1815" [[package]] name = "futures-executor" -version = "0.3.8" +version = "0.3.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4caa2b2b68b880003057c1dd49f1ed937e38f22fcf6c212188a121f08cf40a65" +checksum = "10f6cb7042eda00f0049b1d2080aa4b93442997ee507eb3828e8bd7577f94c9d" dependencies = [ "futures-core", "futures-task", @@ -1469,15 +1483,15 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.8" +version = "0.3.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "611834ce18aaa1bd13c4b374f5d653e1027cf99b6b502584ff8c9a64413b30bb" +checksum = "365a1a1fb30ea1c03a830fdb2158f5236833ac81fa0ad12fe35b29cddc35cb04" [[package]] name = "futures-macro" -version = "0.3.8" +version = "0.3.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77408a692f1f97bcc61dc001d752e00643408fbc922e4d634c655df50d595556" +checksum = "668c6733a182cd7deb4f1de7ba3bf2120823835b3bcfbeacf7d2c4a773c1bb8b" dependencies = [ "proc-macro-hack", "proc-macro2", @@ -1487,24 +1501,21 @@ dependencies = [ [[package]] name = "futures-sink" -version = "0.3.8" +version = "0.3.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f878195a49cee50e006b02b93cf7e0a95a38ac7b776b4c4d9cc1207cd20fcb3d" +checksum = "5c5629433c555de3d82861a7a4e3794a4c40040390907cfbfd7143a92a426c23" [[package]] name = "futures-task" -version = "0.3.8" +version = "0.3.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c554eb5bf48b2426c4771ab68c6b14468b6e76cc90996f528c3338d761a4d0d" -dependencies = [ - "once_cell", -] +checksum = "ba7aa51095076f3ba6d9a1f702f74bd05ec65f555d70d2033d55ba8d69f581bc" [[package]] name = "futures-util" -version = "0.3.8" +version = "0.3.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d304cff4a7b99cfb7986f7d43fbe93d175e72e704a8860787cc95e9ffd85cbd2" +checksum = "3c144ad54d60f23927f0a6b6d816e4271278b64f005ad65e4e35291d2de9c025" dependencies = [ "futures-channel", "futures-core", @@ -1513,7 +1524,7 @@ dependencies = [ "futures-sink", "futures-task", "memchr", - "pin-project 1.0.2", + "pin-project-lite 0.2.6", "pin-utils", "proc-macro-hack", "proc-macro-nested", @@ -1531,9 +1542,9 @@ dependencies = [ [[package]] name = "generic-array" -version = "0.12.3" +version = "0.12.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c68f0274ae0e023facc3c97b2e00f076be70e254bc851d972503b328db79b2ec" +checksum = "ffdf9f34f1447443d37393cc6c2b8313aebddcd96906caf34e54c68d8e57d7bd" dependencies = [ "typenum", ] @@ -1545,7 +1556,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "501466ecc8a30d1d3b7fc9229b122b2ce8ed6e9d9223f1138d4babb253e51817" dependencies = [ "typenum", - "version_check 0.9.2", + "version_check 0.9.3", ] [[package]] @@ -1559,13 +1570,25 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.1.15" +version = "0.1.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc587bc0ec293155d5bfa6b9891ec18a1e330c234f896ea47fbada4cadbe47e6" +checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce" dependencies = [ - "cfg-if 0.1.10", + "cfg-if 1.0.0", "libc", "wasi 0.9.0+wasi-snapshot-preview1", +] + +[[package]] +name = "getrandom" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c9495705279e7140bf035dde1f6e750c162df8b625267cd52cc44e0b156732c8" +dependencies = [ + "cfg-if 1.0.0", + "js-sys", + "libc", + "wasi 0.10.0+wasi-snapshot-preview1", "wasm-bindgen", ] @@ -1617,7 +1640,7 @@ version = "0.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5e4728fd124914ad25e99e3d15a9361a879f6620f63cb56bbb08f95abb97a535" dependencies = [ - "bytes", + "bytes 0.5.6", "fnv", "futures-core", "futures-sink", @@ -1648,18 +1671,18 @@ dependencies = [ [[package]] name = "hermit-abi" -version = "0.1.17" +version = "0.1.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5aca5565f760fb5b220e499d72710ed156fdb74e631659e99377d9ebfbd13ae8" +checksum = "322f4de77956e22ed0e5032c359a0f1273f1f7f0d79bfa3b8ffbc730d7fbcc5c" dependencies = [ "libc", ] [[package]] name = "hex" -version = "0.4.2" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "644f9158b2f133fd50f5fb3242878846d9eb792e445c893805ff0e3824006e35" +checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" [[package]] name = "highlight-actor" @@ -1713,11 +1736,11 @@ dependencies = [ [[package]] name = "http" -version = "0.2.2" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84129d298a6d57d246960ff8eb831ca4af3f96d29e2e28848dae275408658e26" +checksum = "527e8c9ac747e28542699a951517aa9a6945af506cd1f2e1b53a576c17b6cc11" dependencies = [ - "bytes", + "bytes 1.0.1", "fnv", "itoa", ] @@ -1728,15 +1751,15 @@ version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "13d5ff830006f7646652e057693569bfe0d51760c0085a071769d142a205111b" dependencies = [ - "bytes", + "bytes 0.5.6", "http", ] [[package]] name = "httparse" -version = "1.3.4" +version = "1.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd179ae861f0c2e53da70d892f5f3029f9594be0c41dc5269cd371691b1dc2f9" +checksum = "bc35c995b9d93ec174cf9a27d425c7892722101e14993cd227fdb51d70cf9589" [[package]] name = "httpdate" @@ -1755,11 +1778,11 @@ dependencies = [ [[package]] name = "hyper" -version = "0.13.9" +version = "0.13.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6ad767baac13b44d4529fcf58ba2cd0995e36e7b435bc5b039de6f47e880dbf" +checksum = "8a6f157065790a3ed2f88679250419b5cdd96e714a0d65f7797fd337186e96bb" dependencies = [ - "bytes", + "bytes 0.5.6", "futures-channel", "futures-core", "futures-util", @@ -1769,7 +1792,7 @@ dependencies = [ "httparse", "httpdate", "itoa", - "pin-project 1.0.2", + "pin-project 1.0.6", "socket2", "tokio", "tower-service", @@ -1783,7 +1806,7 @@ version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d979acc56dcb5b8dddba3917601745e877576475aa046df3226eabdecef78eed" dependencies = [ - "bytes", + "bytes 0.5.6", "hyper", "native-tls", "tokio", @@ -1792,9 +1815,9 @@ dependencies = [ [[package]] name = "idna" -version = "0.2.0" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02e2673c30ee86b5b96a9cb52ad15718aa1f966f5ab9ad54a8b95d5ca33120a9" +checksum = "89829a5d69c23d348314a7ac337fe39173b61149a9864deabd260983aed48c21" dependencies = [ "matches", "unicode-bidi", @@ -1803,9 +1826,9 @@ dependencies = [ [[package]] name = "indexmap" -version = "1.6.1" +version = "1.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fb1fa934250de4de8aef298d81c729a7d33d8c239daa3a7575e6b92bfc7313b" +checksum = "824845a0bf897a9042383849b02c1bc219c2383772efcd5c6f9766fa4b81aef3" dependencies = [ "autocfg 1.0.1", "hashbrown", @@ -1850,6 +1873,15 @@ dependencies = [ "serde", ] +[[package]] +name = "ipnetwork" +version = "0.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "02c3eaab3ac0ede60ffa41add21970a7df7d91772c03383aac6c2c3d53cc716b" +dependencies = [ + "serde", +] + [[package]] name = "itertools" version = "0.9.0" @@ -1899,7 +1931,7 @@ dependencies = [ "diesel", "serde", "serde_json", - "uuid 0.8.1", + "uuid 0.8.2", ] [[package]] @@ -1923,9 +1955,9 @@ dependencies = [ "dotenv", "env_logger", "filesystem-actor", - "futures 0.3.8", + "futures 0.3.14", "highlight-actor", - "ipnetwork", + "ipnetwork 0.16.0", "jirs-config", "jirs-data", "libc", @@ -1943,7 +1975,7 @@ dependencies = [ "tokio", "toml", "url", - "uuid 0.8.1", + "uuid 0.8.2", "web-actor", "websocket-actor", ] @@ -1956,13 +1988,13 @@ dependencies = [ "chrono", "derive_enum_iter", "derive_enum_primitive", - "futures 0.1.30", + "futures 0.1.31", "jirs-data", "js-sys", "seed", "serde", "serde_json", - "uuid 0.8.1", + "uuid 0.8.2", "wasm-bindgen", "wasm-bindgen-test", "web-sys", @@ -1971,9 +2003,9 @@ dependencies = [ [[package]] name = "js-sys" -version = "0.3.46" +version = "0.3.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf3d7383929f7c9c7c2d0fa596f325832df98c3704f2c60553080f7127a58175" +checksum = "2d99f9e3e84b8f67f846ef5b4cbbc3b1c29f6c759fcbce6f01aa0e73d932a24c" dependencies = [ "wasm-bindgen", ] @@ -2040,9 +2072,9 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.81" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1482821306169ec4d07f6aca392a4681f66c75c9918aa49641a2595db64053cb" +checksum = "9385f66bf6105b241aa65a61cb923ef20efc665cb9f9bb50ac2f0c4b7f378d41" [[package]] name = "line-wrap" @@ -2055,9 +2087,9 @@ dependencies = [ [[package]] name = "linked-hash-map" -version = "0.5.3" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8dd5a6d5999d9907cda8ed67bbd137d3af8085216c2ac62de5be860bd41f304a" +checksum = "7fb9b38af92608140b86b693604b9ffcc5824240a484d1ecd4795bacb2fe88f3" [[package]] name = "lock_api" @@ -2070,20 +2102,20 @@ dependencies = [ [[package]] name = "lock_api" -version = "0.4.2" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd96ffd135b2fd7b973ac026d28085defbe8983df057ced3eb4f2130b0831312" +checksum = "5a3c91c24eae6777794bb1997ad98bbb87daf92890acab859f7eaa4320333176" dependencies = [ "scopeguard", ] [[package]] name = "log" -version = "0.4.11" +version = "0.4.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fabed175da42fed1fa0746b0ea71f412aa9d35e76e95e59b192c64b9dc2bf8b" +checksum = "51b9bbe6c47d51fc3e1a9b945965946b4c44142ab8792c50835a980d362c2710" dependencies = [ - "cfg-if 0.1.10", + "cfg-if 1.0.0", ] [[package]] @@ -2102,7 +2134,7 @@ dependencies = [ "actix 0.10.0", "dotenv", "env_logger", - "futures 0.3.8", + "futures 0.3.14", "jirs-config", "lettre", "lettre_email", @@ -2112,7 +2144,7 @@ dependencies = [ "pretty_env_logger", "serde", "toml", - "uuid 0.8.1", + "uuid 0.8.2", ] [[package]] @@ -2175,9 +2207,9 @@ dependencies = [ [[package]] name = "miniz_oxide" -version = "0.4.3" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f2d26ec3309788e423cfbf68ad1800f061638098d76a83681af979dc4eda19d" +checksum = "a92518e98c078586bc6c934028adcca4c92a53d6a958196de835170a01d84e4b" dependencies = [ "adler", "autocfg 1.0.1", @@ -2210,7 +2242,7 @@ checksum = "0840c1c50fd55e521b247f949c241c9997709f23bd7f023b9762cd561e935656" dependencies = [ "log", "mio", - "miow 0.3.6", + "miow 0.3.7", "winapi 0.3.9", ] @@ -2239,11 +2271,10 @@ dependencies = [ [[package]] name = "miow" -version = "0.3.6" +version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a33c1b55807fbed163481b5ba66db4b2fa6cde694a5027be10fb724206c5897" +checksum = "b9f1c5b025cda876f66ef43a113f91ebc9f4ccef34843000e0adf6ebbab84e21" dependencies = [ - "socket2", "winapi 0.3.9", ] @@ -2334,15 +2365,15 @@ checksum = "b8f8bdf33df195859076e54ab11ee78a1b208382d3a26ec40d142ffc1ecc49ef" [[package]] name = "object" -version = "0.22.0" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d3b63360ec3cb337817c2dbd47ab4a0f170d285d8e5a2064600f3def1402397" +checksum = "a9a7ab5d64814df0fe4a4b5ead45ed6c5f181ee3ff04ba344313a6c80446c5d4" [[package]] name = "once_cell" -version = "1.5.2" +version = "1.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13bd41f508810a131401606d54ac32a467c97172d74ba7662562ebba5ad07fa0" +checksum = "af8b08b04175473088b46763e51ee54da5f9a164bc162f615b91bc179dbf15a3" [[package]] name = "onig" @@ -2380,15 +2411,15 @@ checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" [[package]] name = "openssl" -version = "0.10.32" +version = "0.10.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "038d43985d1ddca7a9900630d8cd031b56e4794eecc2e9ea39dd17aa04399a70" +checksum = "a61075b62a23fef5a29815de7536d940aa35ce96d18ce0cc5076272db678a577" dependencies = [ "bitflags", "cfg-if 1.0.0", "foreign-types", - "lazy_static", "libc", + "once_cell", "openssl-sys", ] @@ -2400,18 +2431,18 @@ checksum = "77af24da69f9d9341038eba93a073b1fdaaa1b788221b00a69bce9e762cb32de" [[package]] name = "openssl-src" -version = "111.13.0+1.1.1i" +version = "111.15.0+1.1.1k" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "045e4dc48af57aad93d665885789b43222ae26f4886494da12d1ed58d309dcb6" +checksum = "b1a5f6ae2ac04393b217ea9f700cd04fa9bf3d93fae2872069f3d15d908af70a" dependencies = [ "cc", ] [[package]] name = "openssl-sys" -version = "0.9.60" +version = "0.9.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "921fc71883267538946025deffb622905ecad223c28efbfdef9bb59a0175f3e6" +checksum = "313752393519e876837e09e1fa183ddef0be7735868dced3196f4472d536277f" dependencies = [ "autocfg 1.0.1", "cc", @@ -2438,8 +2469,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6d7744ac029df22dca6284efe4e898991d28e3085c706c972bcd7da4a27a15eb" dependencies = [ "instant", - "lock_api 0.4.2", - "parking_lot_core 0.8.2", + "lock_api 0.4.3", + "parking_lot_core 0.8.3", ] [[package]] @@ -2451,21 +2482,21 @@ dependencies = [ "cfg-if 0.1.10", "cloudabi", "libc", - "redox_syscall", + "redox_syscall 0.1.57", "smallvec", "winapi 0.3.9", ] [[package]] name = "parking_lot_core" -version = "0.8.2" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ccb628cad4f84851442432c60ad8e1f607e29752d0bf072cbd0baf28aa34272" +checksum = "fa7a782938e745763fe6907fc6ba86946d72f49fe7e21de074e08128a99fb018" dependencies = [ "cfg-if 1.0.0", "instant", "libc", - "redox_syscall", + "redox_syscall 0.2.5", "smallvec", "winapi 0.3.9", ] @@ -2521,27 +2552,27 @@ dependencies = [ [[package]] name = "pin-project" -version = "0.4.27" +version = "0.4.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ffbc8e94b38ea3d2d8ba92aea2983b503cd75d0888d75b86bb37970b5698e15" +checksum = "918192b5c59119d51e0cd221f4d49dde9112824ba717369e903c97d076083d0f" dependencies = [ - "pin-project-internal 0.4.27", + "pin-project-internal 0.4.28", ] [[package]] name = "pin-project" -version = "1.0.2" +version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ccc2237c2c489783abd8c4c80e5450fc0e98644555b1364da68cc29aa151ca7" +checksum = "bc174859768806e91ae575187ada95c91a29e96a98dc5d2cd9a1fed039501ba6" dependencies = [ - "pin-project-internal 1.0.2", + "pin-project-internal 1.0.6", ] [[package]] name = "pin-project-internal" -version = "0.4.27" +version = "0.4.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "65ad2ae56b6abe3a1ee25f15ee605bacadb9a764edaba9c2bf4103800d4a1895" +checksum = "3be26700300be6d9d23264c73211d8190e755b6b5ca7a1b28230025511b52a5e" dependencies = [ "proc-macro2", "quote", @@ -2550,9 +2581,9 @@ dependencies = [ [[package]] name = "pin-project-internal" -version = "1.0.2" +version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8e8d2bf0b23038a4424865103a4df472855692821aab4e4f5c3312d461d9e5f" +checksum = "a490329918e856ed1b083f244e3bfe2d8c4f336407e4ea9e1a9f479ff09049e5" dependencies = [ "proc-macro2", "quote", @@ -2561,15 +2592,15 @@ dependencies = [ [[package]] name = "pin-project-lite" -version = "0.1.11" +version = "0.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c917123afa01924fc84bb20c4c03f004d9c38e5127e3c039bbf7f4b9c76a2f6b" +checksum = "257b64915a082f7811703966789728173279bdebb956b143dbcd23f6f970a777" [[package]] name = "pin-project-lite" -version = "0.2.0" +version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b063f57ec186e6140e2b8b6921e5f1bd89c7356dda5b33acc5401203ca6131c" +checksum = "dc0e1f259c92177c30a4c9d177246edd0a3568b25756a977d0632cf8fa37e905" [[package]] name = "pin-utils" @@ -2585,11 +2616,11 @@ checksum = "3831453b3449ceb48b6d9c7ad7c96d5ea673e9b470a1dc578c2ce6521230884c" [[package]] name = "plist" -version = "1.0.0" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b336d94e8e4ce29bf15bba393164629764744c567e8ad306cc1fdd0119967fd" +checksum = "679104537029ed2287c216bfb942bbf723f48ee98f0aef15611634173a74ef21" dependencies = [ - "base64 0.12.3", + "base64 0.13.0", "chrono", "indexmap", "line-wrap", @@ -2630,15 +2661,15 @@ checksum = "dbf0c48bc1d91375ae5c3cd81e3722dff1abcf81a30960240640d223f59fe0e5" [[package]] name = "proc-macro-nested" -version = "0.1.6" +version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eba180dafb9038b050a4c280019bbedf9f2467b61e5d892dcad585bb57aadc5a" +checksum = "bc881b2c22681370c6a780e47af9840ef841837bc98118431d4e1868bd0c1086" [[package]] name = "proc-macro2" -version = "1.0.24" +version = "1.0.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e0704ee1a7e00d7bb417d0770ea303c1bccbabf0ef1667dae92b5967f5f8a71" +checksum = "a152013215dca273577e18d2bf00fa862b89b24169fb78c4c95aeb07992c9cec" dependencies = [ "unicode-xid", ] @@ -2663,9 +2694,9 @@ checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" [[package]] name = "quote" -version = "1.0.8" +version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "991431c3519a3f36861882da93630ce66b52918dcf1b8e2fd66b397fc96f28df" +checksum = "c3d0b9745dc2debf507c8422de05d7226cc1f0644216dfdfead988f9b1ab32a7" dependencies = [ "proc-macro2", ] @@ -2708,7 +2739,7 @@ dependencies = [ "rand_isaac", "rand_jitter", "rand_os", - "rand_pcg 0.1.2", + "rand_pcg", "rand_xorshift", "winapi 0.3.9", ] @@ -2719,12 +2750,23 @@ version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03" dependencies = [ - "getrandom", + "getrandom 0.1.16", "libc", "rand_chacha 0.2.2", "rand_core 0.5.1", "rand_hc 0.2.0", - "rand_pcg 0.2.1", +] + +[[package]] +name = "rand" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ef9e7e66b4468674bfcb0c81af8b7fa0bb154fa9f28eb840da5c447baeb8d7e" +dependencies = [ + "libc", + "rand_chacha 0.3.0", + "rand_core 0.6.2", + "rand_hc 0.3.0", ] [[package]] @@ -2747,6 +2789,16 @@ dependencies = [ "rand_core 0.5.1", ] +[[package]] +name = "rand_chacha" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e12735cf05c9e10bf21534da50a147b924d555dc7a547c42e6bb2d5b6017ae0d" +dependencies = [ + "ppv-lite86", + "rand_core 0.6.2", +] + [[package]] name = "rand_core" version = "0.3.1" @@ -2768,7 +2820,16 @@ version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19" dependencies = [ - "getrandom", + "getrandom 0.1.16", +] + +[[package]] +name = "rand_core" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34cf66eb183df1c5876e2dcf6b13d57340741e8dc255b48e40a26de954d06ae7" +dependencies = [ + "getrandom 0.2.2", ] [[package]] @@ -2789,6 +2850,15 @@ dependencies = [ "rand_core 0.5.1", ] +[[package]] +name = "rand_hc" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3190ef7066a446f2e7f42e239d161e905420ccab01eb967c9eb27d21b2322a73" +dependencies = [ + "rand_core 0.6.2", +] + [[package]] name = "rand_isaac" version = "0.1.1" @@ -2833,15 +2903,6 @@ dependencies = [ "rand_core 0.4.2", ] -[[package]] -name = "rand_pcg" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16abd0c1b639e9eb4d7c50c0b8100b0d0f849be2349829c740fe8e6eb4816429" -dependencies = [ - "rand_core 0.5.1", -] - [[package]] name = "rand_xorshift" version = "0.1.1" @@ -2867,12 +2928,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "41cc0f7e4d5d4544e8861606a285bb08d3e70712ccc7d2b84d7c0ccfaf4b05ce" [[package]] -name = "redox_termios" -version = "0.1.1" +name = "redox_syscall" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e891cfe48e9100a70a3b6eb652fef28920c117d366339687bd5576160db0f76" +checksum = "94341e4e44e24f6b591b59e47a8a027df12e008d73fd5672dbea9cc22f4507d9" dependencies = [ - "redox_syscall", + "bitflags", +] + +[[package]] +name = "redox_termios" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8440d8acb4fd3d277125b4bd01a6f38aee8d814b3b5fc09b3f2b825d37d3fe8f" +dependencies = [ + "redox_syscall 0.2.5", ] [[package]] @@ -2881,28 +2951,27 @@ version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "de0737333e7a9502c789a36d7c7fa6092a49895d4faa31ca5df163857ded2e9d" dependencies = [ - "getrandom", - "redox_syscall", + "getrandom 0.1.16", + "redox_syscall 0.1.57", "rust-argon2", ] [[package]] name = "regex" -version = "1.4.2" +version = "1.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38cf2c13ed4745de91a5eb834e11c00bcc3709e773173b2ce4c56c9fbde04b9c" +checksum = "957056ecddbeba1b26965114e191d2e8589ce74db242b6ea25fc4062427a5c19" dependencies = [ "aho-corasick", "memchr", "regex-syntax", - "thread_local", ] [[package]] name = "regex-syntax" -version = "0.6.21" +version = "0.6.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b181ba2dcf07aaccad5448e8ead58db5b742cf85dfe035e2227f137a539a189" +checksum = "24d5f089152e60f62d28b835fbff2cd2e8dc0baf1ac13343bef92ab7eed84548" [[package]] name = "remove_dir_all" @@ -2941,9 +3010,9 @@ checksum = "e977941ee0658df96fca7291ecc6fc9a754600b21ad84b959eb1dbbc9d5abcc7" dependencies = [ "async-trait", "base64 0.12.3", - "bytes", + "bytes 0.5.6", "crc32fast", - "futures 0.3.8", + "futures 0.3.14", "http", "hyper", "hyper-tls", @@ -2951,7 +3020,7 @@ dependencies = [ "log", "md5", "percent-encoding", - "pin-project 0.4.27", + "pin-project 0.4.28", "rusoto_credential", "rusoto_signature", "rustc_version", @@ -2970,9 +3039,9 @@ dependencies = [ "async-trait", "chrono", "dirs", - "futures 0.3.8", + "futures 0.3.14", "hyper", - "pin-project 0.4.27", + "pin-project 0.4.28", "regex", "serde", "serde_json", @@ -2988,8 +3057,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1146e37a7c1df56471ea67825fe09bbbd37984b5f6e201d8b2e0be4ee15643d8" dependencies = [ "async-trait", - "bytes", - "futures 0.3.8", + "bytes 0.5.6", + "futures 0.3.14", "rusoto_core", "xml-rs", ] @@ -3001,8 +3070,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "97a740a88dde8ded81b6f2cff9cd5e054a5a2e38a38397260f7acdd2c85d17dd" dependencies = [ "base64 0.12.3", - "bytes", - "futures 0.3.8", + "bytes 0.5.6", + "futures 0.3.14", "hex", "hmac", "http", @@ -3010,12 +3079,12 @@ dependencies = [ "log", "md5", "percent-encoding", - "pin-project 0.4.27", + "pin-project 0.4.28", "rusoto_credential", "rustc_version", "serde", "sha2", - "time 0.2.23", + "time 0.2.26", "tokio", ] @@ -3028,7 +3097,7 @@ dependencies = [ "base64 0.13.0", "blake2b_simd", "constant_time_eq", - "crossbeam-utils 0.8.1", + "crossbeam-utils 0.8.3", ] [[package]] @@ -3100,9 +3169,9 @@ checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" [[package]] name = "security-framework" -version = "2.0.0" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1759c2e3c8580017a484a7ac56d3abc5a6c1feadf88db2f3633f12ae4268c69" +checksum = "3670b1d2fdf6084d192bc71ead7aabe6c06aa2ea3fbd9cc3ac111fa5c2b1bd84" dependencies = [ "bitflags", "core-foundation", @@ -3113,9 +3182,9 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.0.0" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f99b9d5e26d2a71633cc4f2ebae7cc9f874044e0c351a27e17892d76dce5678b" +checksum = "3676258fd3cfe2c9a0ec99ce3038798d847ce3e4bb17746373eb9f0f1ac16339" dependencies = [ "core-foundation-sys", "libc", @@ -3124,24 +3193,23 @@ dependencies = [ [[package]] name = "seed" version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b599be9cc57456f4b7fc99b8abfb154d4819f7b6c147e80be5580663dad4536" +source = "git+https://github.com/seed-rs/seed.git#e1d82f5012fb9e71b36be3a5457d61d34a1ee53d" dependencies = [ "console_error_panic_hook", "cookie", "dbg", "enclose", - "futures 0.3.8", + "futures 0.3.14", + "getrandom 0.2.2", "gloo-file", "gloo-timers", "indexmap", "js-sys", - "pulldown-cmark", - "rand 0.7.3", + "rand 0.8.3", "serde", "serde_json", - "uuid 0.8.1", - "version_check 0.9.2", + "uuid 0.8.2", + "version_check 0.9.3", "wasm-bindgen", "wasm-bindgen-futures", "web-sys", @@ -3164,18 +3232,18 @@ checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" [[package]] name = "serde" -version = "1.0.118" +version = "1.0.125" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06c64263859d87aa2eb554587e2d23183398d617427327cf2b3d0ed8c69e4800" +checksum = "558dc50e1a5a5fa7112ca2ce4effcb321b0300c0d4ccf0776a9f60cd89031171" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.118" +version = "1.0.125" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c84d3526699cd55261af4b941e4e725444df67aa4f9e6a3564f18030d12672df" +checksum = "b093b7a2bb58203b5da3056c05b4ec1fed827dcfdb37347a8841695263b3d06d" dependencies = [ "proc-macro2", "quote", @@ -3184,9 +3252,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.61" +version = "1.0.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fceb2595057b6891a4ee808f70054bd2d12f0e97f1cbb78689b59f676df325a" +checksum = "799e97dc9fdae36a5c8b8f2cae9ce2ee9fdce2058c57a93e6099d919fd982f79" dependencies = [ "itoa", "ryu", @@ -3231,9 +3299,9 @@ dependencies = [ [[package]] name = "sha-1" -version = "0.9.2" +version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce3cdf1b5e620a498ee6f2a171885ac7e22f0e12089ec4b3d22b84921792507c" +checksum = "dfebf75d25bd900fd1e7d11501efab59bc846dbc76196839663e6637bba9f25f" dependencies = [ "block-buffer 0.9.0", "cfg-if 1.0.0", @@ -3250,9 +3318,9 @@ checksum = "2579985fda508104f7587689507983eadd6a6e84dd35d6d115361f530916fa0d" [[package]] name = "sha2" -version = "0.9.2" +version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e7aab86fe2149bad8c507606bdb3f4ef5e7b2380eb92350f56122cca72a42a8" +checksum = "fa827a14b29ab7f44778d14a88d3cb76e949c45083f7dbfa507d0cb699dc12de" dependencies = [ "block-buffer 0.9.0", "cfg-if 1.0.0", @@ -3284,9 +3352,9 @@ dependencies = [ [[package]] name = "simsearch" -version = "0.2.2" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13b5ceaabc64e2d93a73aa29f8a7dd83dde9c02fdbee660c4551c7e659ce4185" +checksum = "ec7c616f4afa8be07117e344990cc90651fbaad06055655f3d8cc4a668675398" dependencies = [ "strsim 0.10.0", "triple_accel", @@ -3300,9 +3368,9 @@ checksum = "c111b5bd5695e56cffe5129854aa230b39c93a305372fdbb2668ca2394eea9f8" [[package]] name = "smallvec" -version = "1.5.1" +version = "1.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae524f056d7d770e174287294f562e95044c68e88dec909a00d2094805db9d75" +checksum = "fe0f37c9e8f3c5a4a66ad655a93c74daac4ad00c441533bf5c6e7990bb42604e" [[package]] name = "socket2" @@ -3323,11 +3391,11 @@ checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" [[package]] name = "standback" -version = "0.2.14" +version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c66a8cff4fa24853fdf6b51f75c6d7f8206d7c75cab4e467bcd7f25c2b1febe0" +checksum = "e113fb6f3de07a243d434a56ec6f186dfd51cb08448239fe7bcae73f87ff28ff" dependencies = [ - "version_check 0.9.2", + "version_check 0.9.3", ] [[package]] @@ -3399,9 +3467,9 @@ checksum = "1e81da0851ada1f3e9d4312c704aa4f8806f0f9d69faaf8df2f3464b4a9437c2" [[package]] name = "syn" -version = "1.0.56" +version = "1.0.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9802ddde94170d186eeee5005b798d9c159fa970403f1be19976d0cfb939b72" +checksum = "48fe99c6bd8b1cc636890bcc071842de909d902c81ac7dab53ba33c421ab8ffb" dependencies = [ "proc-macro2", "quote", @@ -3444,14 +3512,14 @@ dependencies = [ [[package]] name = "tempfile" -version = "3.1.0" +version = "3.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a6e24d9338a0a5be79593e2fa15a648add6138caa803e2d5bc782c371732ca9" +checksum = "dac1c663cfc93810f88aed9b8941d48cabf856a1b111c29a40439018d870eb22" dependencies = [ - "cfg-if 0.1.10", + "cfg-if 1.0.0", "libc", - "rand 0.7.3", - "redox_syscall", + "rand 0.8.3", + "redox_syscall 0.2.5", "remove_dir_all", "winapi 0.3.9", ] @@ -3467,13 +3535,13 @@ dependencies = [ [[package]] name = "termion" -version = "1.5.5" +version = "1.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c22cec9d8978d906be5ac94bceb5a010d885c626c4c8855721a4dbd20e3ac905" +checksum = "077185e2eac69c3f8379a4298e1e07cd36beb962290d4a51199acf0fdc10607e" dependencies = [ "libc", "numtoa", - "redox_syscall", + "redox_syscall 0.2.5", "redox_termios", ] @@ -3488,33 +3556,24 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.23" +version = "1.0.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76cc616c6abf8c8928e2fdcc0dbfab37175edd8fb49a4641066ad1364fdab146" +checksum = "e0f4a65597094d4483ddaed134f409b2cb7c1beccf25201a9f73c719254fa98e" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.23" +version = "1.0.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9be73a2caec27583d0046ef3796c3794f868a5bc813db689eed00c7631275cd1" +checksum = "7765189610d8241a44529806d6fd1f2e0a08734313a35d5b3a556f92b381f3c0" dependencies = [ "proc-macro2", "quote", "syn", ] -[[package]] -name = "thread_local" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d40c6d1b69745a6ec6fb1ca717914848da4b44ae29d9b3080cbee91d72a69b14" -dependencies = [ - "lazy_static", -] - [[package]] name = "threadpool" version = "1.8.1" @@ -3537,16 +3596,16 @@ dependencies = [ [[package]] name = "time" -version = "0.2.23" +version = "0.2.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bcdaeea317915d59b2b4cd3b5efcd156c309108664277793f5351700c02ce98b" +checksum = "08a8cbfbf47955132d0202d1662f49b2423ae35862aee471f3ba4b133358f372" dependencies = [ "const_fn", "libc", "standback", "stdweb", "time-macros", - "version_check 0.9.2", + "version_check 0.9.3", "winapi 0.3.9", ] @@ -3575,9 +3634,9 @@ dependencies = [ [[package]] name = "tinyvec" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ccf8dbc19eb42fba10e8feaaec282fb50e2c14b2726d6301dbfeed0f73306a6f" +checksum = "5b5220f05bb7de7f3f53c7c065e1199b3172696fe2db9f9c4d8ad9b4ee74c342" dependencies = [ "tinyvec_macros", ] @@ -3590,11 +3649,11 @@ checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" [[package]] name = "tokio" -version = "0.2.24" +version = "0.2.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "099837d3464c16a808060bb3f02263b412f6fafcb5d01c533d309985fbeebe48" +checksum = "6703a273949a90131b290be1fe7b039d0fc884aa1935860dfcbe056f28cd8092" dependencies = [ - "bytes", + "bytes 0.5.6", "fnv", "futures-core", "iovec", @@ -3604,7 +3663,7 @@ dependencies = [ "mio", "mio-named-pipes", "mio-uds", - "pin-project-lite 0.1.11", + "pin-project-lite 0.1.12", "signal-hook-registry", "slab", "tokio-macros", @@ -3638,11 +3697,11 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "571da51182ec208780505a32528fc5512a8fe1443ab960b3f2f3ef093cd16930" dependencies = [ - "bytes", + "bytes 0.5.6", "futures-core", "futures-sink", "log", - "pin-project-lite 0.1.11", + "pin-project-lite 0.1.12", "tokio", ] @@ -3652,12 +3711,12 @@ version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "be8242891f2b6cbef26a2d7e8605133c2c554cd35b3e4948ea892d6d68436499" dependencies = [ - "bytes", + "bytes 0.5.6", "futures-core", "futures-io", "futures-sink", "log", - "pin-project-lite 0.1.11", + "pin-project-lite 0.1.12", "tokio", ] @@ -3672,19 +3731,19 @@ dependencies = [ [[package]] name = "tower-service" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e987b6bf443f4b5b3b6f38704195592cca41c5bb7aedd3c3693c7081f8289860" +checksum = "360dfd1d6d30e05fda32ace2c8c70e9c0a9da713275777f5a4dbb8a1893930c6" [[package]] name = "tracing" -version = "0.1.22" +version = "0.1.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f47026cdc4080c07e49b37087de021820269d996f581aac150ef9e5583eefe3" +checksum = "01ebdc2bb4498ab1ab5f5b73c5803825e60199229ccba0698170e3be0e7f959f" dependencies = [ "cfg-if 1.0.0", "log", - "pin-project-lite 0.2.0", + "pin-project-lite 0.2.6", "tracing-core", ] @@ -3699,11 +3758,11 @@ dependencies = [ [[package]] name = "tracing-futures" -version = "0.2.4" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab7bb6f14721aa00656086e9335d363c5c8747bae02ebe32ea2c7dece5689b4c" +checksum = "97d095ae15e245a057c8e8451bab9b3ee1e1f68e9ba2b4fbc18d0ac5237835f2" dependencies = [ - "pin-project 0.4.27", + "pin-project 1.0.6", "tracing", ] @@ -3722,7 +3781,7 @@ dependencies = [ "async-trait", "enum-as-inner", "failure", - "futures 0.3.8", + "futures 0.3.14", "idna", "lazy_static", "log", @@ -3735,14 +3794,14 @@ dependencies = [ [[package]] name = "trust-dns-proto" -version = "0.19.6" +version = "0.19.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53861fcb288a166aae4c508ae558ed18b53838db728d4d310aad08270a7d4c2b" +checksum = "1cad71a0c0d68ab9941d2fb6e82f8fb2e86d9945b94e1661dd0aaea2b88215a9" dependencies = [ "async-trait", - "backtrace", + "cfg-if 1.0.0", "enum-as-inner", - "futures 0.3.8", + "futures 0.3.14", "idna", "lazy_static", "log", @@ -3761,7 +3820,7 @@ checksum = "6f90b1502b226f8b2514c6d5b37bafa8c200d7ca4102d57dc36ee0f3b7a04a2f" dependencies = [ "cfg-if 0.1.10", "failure", - "futures 0.3.8", + "futures 0.3.14", "ipconfig", "lazy_static", "log", @@ -3774,13 +3833,12 @@ dependencies = [ [[package]] name = "trust-dns-resolver" -version = "0.19.6" +version = "0.19.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6759e8efc40465547b0dfce9500d733c65f969a4cbbfbe3ccf68daaa46ef179e" +checksum = "710f593b371175db53a26d0b38ed2978fafb9e9e8d3868b1acd753ea18df0ceb" dependencies = [ - "backtrace", "cfg-if 0.1.10", - "futures 0.3.8", + "futures 0.3.14", "ipconfig", "lazy_static", "log", @@ -3789,7 +3847,7 @@ dependencies = [ "smallvec", "thiserror", "tokio", - "trust-dns-proto 0.19.6", + "trust-dns-proto 0.19.7", ] [[package]] @@ -3831,9 +3889,9 @@ checksum = "a9b2228007eba4120145f785df0f6c92ea538f5a3635a612ecf4e334c8c1446d" [[package]] name = "typenum" -version = "1.12.0" +version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "373c8a200f9e67a0c95e62a4f52fbf80c23b4381c05a17845531982fa99e6b33" +checksum = "879f6906492a7cd215bfa4cf595b600146ccfac0c79bcbd1f3000162af5e8b06" [[package]] name = "ucd-trie" @@ -3853,23 +3911,23 @@ version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "50f37be617794602aabbeee0be4f259dc1778fabe05e2d67ee8f79326d5cb4f6" dependencies = [ - "version_check 0.9.2", + "version_check 0.9.3", ] [[package]] name = "unicode-bidi" -version = "0.3.4" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49f2bd0c6468a8230e1db229cff8029217cf623c767ea5d60bfbd42729ea54d5" +checksum = "eeb8be209bb1c96b7c177c7420d26e04eccacb0eeae6b980e35fcb74678107e0" dependencies = [ "matches", ] [[package]] name = "unicode-normalization" -version = "0.1.16" +version = "0.1.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a13e63ab62dbe32aeee58d1c5408d35c36c392bba5d9d3142287219721afe606" +checksum = "07fbfce1c8a97d547e8b5334978438d9d6ec8c20e38f56d4a4374d181493eaef" dependencies = [ "tinyvec", ] @@ -3900,9 +3958,9 @@ checksum = "39ec24b3121d976906ece63c9daad25b85969647682eee313cb5779fdd69e14e" [[package]] name = "url" -version = "2.2.0" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5909f2b0817350449ed73e8bcd81c8c3c8d9a7a5d8acba4b27db277f1868976e" +checksum = "9ccd964113622c8e9322cfac19eb1004a07e636c545f325da085d5cdde6f1f8b" dependencies = [ "form_urlencoded", "idna", @@ -3930,11 +3988,11 @@ dependencies = [ [[package]] name = "uuid" -version = "0.8.1" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fde2f6a4bea1d6e007c4ad38c6839fa71cbb63b6dbf5b595aa38dc9b1093c11" +checksum = "bc5cf98d8186244414c848017f0e2676b3fcb46807f6668a97dfe67359a3c4b7" dependencies = [ - "rand 0.7.3", + "getrandom 0.2.2", "serde", "sha1", ] @@ -3991,15 +4049,15 @@ checksum = "914b1a6776c4c929a602fafd8bc742e06365d4bcbe48c30f9cca5824f70dc9dd" [[package]] name = "version_check" -version = "0.9.2" +version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5a972e5669d67ba988ce3dc826706fb0a8b01471c088cb0b6110b805cc36aed" +checksum = "5fecdca9a5291cc2b8dcf7dc02453fee791a280f3743cb0905f8822ae463b3fe" [[package]] name = "walkdir" -version = "2.3.1" +version = "2.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "777182bc735b6424e1a57516d35ed72cb8019d85c8c9bf536dccb3445c1a2f7d" +checksum = "808cf2735cd4b6866113f648b791c6adc5714537bc222d9347bb203386ffda56" dependencies = [ "same-file", "winapi 0.3.9", @@ -4030,9 +4088,9 @@ checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f" [[package]] name = "wasm-bindgen" -version = "0.2.69" +version = "0.2.73" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3cd364751395ca0f68cafb17666eee36b63077fb5ecd972bbcd74c90c4bf736e" +checksum = "83240549659d187488f91f33c0f8547cbfef0b2088bc470c116d1d260ef623d9" dependencies = [ "cfg-if 1.0.0", "serde", @@ -4042,9 +4100,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.69" +version = "0.2.73" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1114f89ab1f4106e5b55e688b828c0ab0ea593a1ea7c094b141b14cbaaec2d62" +checksum = "ae70622411ca953215ca6d06d3ebeb1e915f0f6613e3b495122878d7ebec7dae" dependencies = [ "bumpalo", "lazy_static", @@ -4057,9 +4115,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-futures" -version = "0.4.19" +version = "0.4.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fe9756085a84584ee9457a002b7cdfe0bfff169f45d2591d8be1345a6780e35" +checksum = "81b8b767af23de6ac18bf2168b690bed2902743ddf0fb39252e36f9e2bfc63ea" dependencies = [ "cfg-if 1.0.0", "js-sys", @@ -4069,9 +4127,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.69" +version = "0.2.73" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a6ac8995ead1f084a8dea1e65f194d0973800c7f571f6edd70adf06ecf77084" +checksum = "3e734d91443f177bfdb41969de821e15c516931c3c3db3d318fa1b68975d0f6f" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -4079,9 +4137,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.69" +version = "0.2.73" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5a48c72f299d80557c7c62e37e7225369ecc0c963964059509fbafe917c7549" +checksum = "d53739ff08c8a68b0fdbcd54c372b8ab800b1449ab3c9d706503bc7dd1621b2c" dependencies = [ "proc-macro2", "quote", @@ -4092,15 +4150,15 @@ dependencies = [ [[package]] name = "wasm-bindgen-shared" -version = "0.2.69" +version = "0.2.73" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e7811dd7f9398f14cc76efd356f98f03aa30419dea46aa810d71e819fc97158" +checksum = "d9a543ae66aa233d14bb765ed9af4a33e81b8b58d1584cf1b47ff8cd0b9e4489" [[package]] name = "wasm-bindgen-test" -version = "0.3.19" +version = "0.3.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0355fa0c1f9b792a09b6dcb6a8be24d51e71e6d74972f9eb4a44c4c004d24a25" +checksum = "e972e914de63aa53bd84865e54f5c761bd274d48e5be3a6329a662c0386aa67a" dependencies = [ "console_error_panic_hook", "js-sys", @@ -4112,9 +4170,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-test-macro" -version = "0.3.19" +version = "0.3.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "27e07b46b98024c2ba2f9e83a10c2ef0515f057f2da299c1762a2017de80438b" +checksum = "ea6153a8f9bf24588e9f25c87223414fff124049f68d3a442a0f0eab4768a8b6" dependencies = [ "proc-macro2", "quote", @@ -4133,11 +4191,11 @@ dependencies = [ "actix-web-actors", "amazon-actor", "bincode", - "bytes", + "bytes 0.5.6", "database-actor", "env_logger", "filesystem-actor", - "futures 0.3.8", + "futures 0.3.14", "jirs-config", "jirs-data", "libc", @@ -4148,15 +4206,15 @@ dependencies = [ "serde", "tokio", "toml", - "uuid 0.8.1", + "uuid 0.8.2", "websocket-actor", ] [[package]] name = "web-sys" -version = "0.3.46" +version = "0.3.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "222b1ef9334f92a21d3fb53dc3fd80f30836959a90f9274a626d7e06315ba3c3" +checksum = "a905d57e488fec8861446d3393670fb50d27a262344013181c2cdf9fff5481be" dependencies = [ "js-sys", "wasm-bindgen", @@ -4174,7 +4232,7 @@ dependencies = [ "database-actor", "env_logger", "flate2", - "futures 0.3.8", + "futures 0.3.14", "highlight-actor", "jirs-config", "jirs-data", @@ -4188,7 +4246,7 @@ dependencies = [ "serde", "syntect", "toml", - "uuid 0.8.1", + "uuid 0.8.2", ] [[package]] @@ -4295,9 +4353,9 @@ checksum = "b07db065a5cf61a7e4ba64f29e67db906fb1787316516c4e6e5ff0fea1efcd8a" [[package]] name = "yaml-rust" -version = "0.4.4" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39f0c922f1a334134dc2f7a8b67dc5d25f0735263feec974345ff706bcf20b0d" +checksum = "56c1936c4cc7a1c9ab21a1ebb602eb942ba868cbd44a99cb7cdc5892335e1c85" dependencies = [ "linked-hash-map", ] diff --git a/jirs-client/Cargo.toml b/jirs-client/Cargo.toml index 759237a1..da210f5d 100644 --- a/jirs-client/Cargo.toml +++ b/jirs-client/Cargo.toml @@ -20,7 +20,7 @@ default = [] [dependencies] jirs-data = { path = "../shared/jirs-data", features = ["frontend"] } -seed = { version = "0.8.0" } +seed = { git = "https://github.com/seed-rs/seed.git" } serde = { version = "*" } serde_json = { version = "*" } diff --git a/jirs-client/src/components/styled_button.rs b/jirs-client/src/components/styled_button.rs index 031867ca..4d2f91b2 100644 --- a/jirs-client/src/components/styled_button.rs +++ b/jirs-client/src/components/styled_button.rs @@ -162,6 +162,26 @@ pub struct StyledButton<'l> { button_id: Option, } +impl<'l> StyledButton<'l> { + pub fn secondary_with_text_and_icon(text: &'l str, icon: I) -> Self + where + I: ToNode, + { + Self { + variant: Variant::Secondary, + disabled: false, + active: false, + text: Some(text), + icon: Some(icon.into_node()), + on_click: None, + children: vec![], + class_list: vec![], + button_type: "", + button_id: None, + } + } +} + impl<'l> StyledButton<'l> { #[inline(always)] pub fn build() -> StyledButtonBuilder<'l> { diff --git a/jirs-client/src/components/styled_editor.rs b/jirs-client/src/components/styled_editor.rs index e5c0d7c9..f335cb51 100644 --- a/jirs-client/src/components/styled_editor.rs +++ b/jirs-client/src/components/styled_editor.rs @@ -169,7 +169,7 @@ pub fn render(values: StyledEditor) -> Node { C!["viewRadio"], attrs![ At::Type => "radio"; At::Name => name.as_str(); At::Checked => true], ], - Node::from_html(html.as_str()), + Node::from_html(None, html.as_str()), ), }; diff --git a/jirs-client/src/components/styled_field.rs b/jirs-client/src/components/styled_field.rs index 71c74136..fec010f9 100644 --- a/jirs-client/src/components/styled_field.rs +++ b/jirs-client/src/components/styled_field.rs @@ -56,7 +56,7 @@ impl<'l> StyledFieldBuilder<'l> { StyledField { label: self.label.unwrap_or_default(), tip: self.tip, - input: self.input.unwrap_or_else(|| empty![]), + input: self.input.unwrap_or(empty![]), class_list: self.class_list, } } @@ -69,10 +69,7 @@ pub fn render(values: StyledField) -> Node { input, class_list, } = values; - let tip_node = match tip { - Some(s) => div![attrs![At::Class => "styledTip"], s], - _ => empty![], - }; + let tip_node = tip.map(|s| div![C!["styledTip"], s]).unwrap_or(empty![]); div![ attrs![At::Class => class_list.join(" "), At::Class => "styledField"], diff --git a/jirs-client/src/components/styled_input.rs b/jirs-client/src/components/styled_input.rs index d6aa5780..e0ad4ff2 100644 --- a/jirs-client/src/components/styled_input.rs +++ b/jirs-client/src/components/styled_input.rs @@ -113,6 +113,22 @@ pub struct StyledInput<'l, 'm: 'l> { } impl<'l, 'm: 'l> StyledInput<'l, 'm> { + #[inline] + pub fn new_with_id_and_value_and_valid(id: FieldId, value: &'m str, valid: bool) -> Self { + Self { + id, + icon: None, + valid, + value: Some(value), + input_type: None, + input_class_list: vec![], + wrapper_class_list: vec![], + variant: Variant::Normal, + auto_focus: false, + input_handlers: vec![], + } + } + #[inline] pub fn build() -> StyledInputBuilder<'l, 'm> { StyledInputBuilder { diff --git a/jirs-client/src/components/styled_modal.rs b/jirs-client/src/components/styled_modal.rs index 24e9dfac..62613e05 100644 --- a/jirs-client/src/components/styled_modal.rs +++ b/jirs-client/src/components/styled_modal.rs @@ -39,6 +39,18 @@ pub struct StyledModal<'l> { class_list: Vec<&'l str>, } +impl<'l> StyledModal<'l> { + pub fn centered_with_width_and_body(width: usize, children: Vec>) -> Self { + Self { + variant: Variant::Center, + width: Some(width), + with_icon: false, + children, + class_list: vec![], + } + } +} + impl<'l> ToNode for StyledModal<'l> { fn into_node(self) -> Node { render(self) diff --git a/jirs-client/src/lib.rs b/jirs-client/src/lib.rs index 2023523b..ad52b9a4 100644 --- a/jirs-client/src/lib.rs +++ b/jirs-client/src/lib.rs @@ -1,4 +1,4 @@ -#![feature(or_patterns, type_ascription, trait_alias, drain_filter)] +#![feature(type_ascription, trait_alias, drain_filter)] use { crate::{ diff --git a/jirs-client/src/modals/comments_delete/mod.rs b/jirs-client/src/modals/comments_delete/mod.rs index 6bd17a77..1ee19316 100644 --- a/jirs-client/src/modals/comments_delete/mod.rs +++ b/jirs-client/src/modals/comments_delete/mod.rs @@ -1,4 +1,4 @@ -pub use {view::*, model::*}; +pub use {model::*, view::*}; -mod view; mod model; +mod view; diff --git a/jirs-client/src/modals/debug/model.rs b/jirs-client/src/modals/debug/model.rs index e69de29b..8b137891 100644 --- a/jirs-client/src/modals/debug/model.rs +++ b/jirs-client/src/modals/debug/model.rs @@ -0,0 +1 @@ + diff --git a/jirs-client/src/modals/debug/update.rs b/jirs-client/src/modals/debug/update.rs index e69de29b..8b137891 100644 --- a/jirs-client/src/modals/debug/update.rs +++ b/jirs-client/src/modals/debug/update.rs @@ -0,0 +1 @@ + diff --git a/jirs-client/src/modals/issues_edit/view.rs b/jirs-client/src/modals/issues_edit/view.rs index 77c8c98d..2e0dc861 100644 --- a/jirs-client/src/modals/issues_edit/view.rs +++ b/jirs-client/src/modals/issues_edit/view.rs @@ -20,18 +20,13 @@ use { mod comments; pub fn view(model: &Model, modal: &EditIssueModal) -> Node { - let issue_id = modal.id; - if let Some(_issue) = model.issues_by_id.get(&issue_id) { - let details = details(model, modal); - StyledModal::build() - .variant(crate::components::styled_modal::Variant::Center) - .width(1040) - .child(details) - .build() - .into_node() - } else { - Node::Empty - } + model + .issues_by_id + .get(&modal.id) + .map(|_issue| { + StyledModal::centered_with_width_and_body(1040, vec![details(model, modal)]).into_node() + }) + .unwrap_or(Node::Empty) } pub fn details(model: &Model, modal: &EditIssueModal) -> Node { diff --git a/jirs-client/src/modals/time_tracking/update.rs b/jirs-client/src/modals/time_tracking/update.rs index e69de29b..8b137891 100644 --- a/jirs-client/src/modals/time_tracking/update.rs +++ b/jirs-client/src/modals/time_tracking/update.rs @@ -0,0 +1 @@ + diff --git a/jirs-client/src/modals/view.rs b/jirs-client/src/modals/view.rs index 7fe2aad8..02db71a7 100644 --- a/jirs-client/src/modals/view.rs +++ b/jirs-client/src/modals/view.rs @@ -4,66 +4,56 @@ use { }; pub fn view(model: &Model) -> Node { - let mut nodes = Vec::with_capacity(model.modal_stack().len()); - - for modal_type in model.modal_stack() { - match modal_type { - ModalType::AddIssue(_) => { - if let Some(modal) = &model.modals().add_issue { - let node = crate::modals::issues_create::view(model, modal); - nodes.push(node); - } - } - ModalType::EditIssue(_) => { - if let Some(modal) = &model.modals().edit_issue { - let node = crate::modals::issues_edit::view(model, modal); - nodes.push(node); - } - } - ModalType::DeleteEpic(_) => { - if let Some(modal) = &model.modals().delete_epic { - let node = crate::modals::epics_delete::view(model, modal); - nodes.push(node); - } - } - ModalType::EditEpic(_) => { - if let Some(modal) = &model.modals().edit_epic { - let node = crate::modals::epics_edit::view(model, modal); - nodes.push(node); - } - } - ModalType::DeleteIssueConfirm(_) => { - if let Some(_issue_id) = &model.modals().delete_issue_confirm { - let node = crate::modals::issues_delete::view(model); - nodes.push(node); - } - } - ModalType::DeleteCommentConfirm(_) => { - if let Some(modal) = &model.modals().delete_comment_confirm { - let node = crate::modals::comments_delete::view(model, modal); - nodes.push(node); - } - } - ModalType::TimeTracking(_) => { - if let Some(modal) = &model.modals().time_tracking { - let node = crate::modals::time_tracking::view(model, modal); - nodes.push(node); - } - } - ModalType::DeleteIssueStatusModal(_) => { - if let Some(modal) = &model.modals().delete_issue_status_modal { - let node = crate::modals::issue_statuses_delete::view(model, modal.delete_id); - nodes.push(node); - } - } + let nodes = model + .modal_stack() + .iter() + .filter_map(|modal_type| match modal_type { + ModalType::AddIssue(_) => model + .modals() + .add_issue + .as_ref() + .map(|modal| crate::modals::issues_create::view(model, modal)), + ModalType::EditIssue(_) => model + .modals() + .edit_issue + .as_ref() + .map(|modal| crate::modals::issues_edit::view(model, modal)), + ModalType::DeleteEpic(_) => model + .modals() + .delete_epic + .as_ref() + .map(|modal| crate::modals::epics_delete::view(model, modal)), + ModalType::EditEpic(_) => model + .modals() + .edit_epic + .as_ref() + .map(|modal| crate::modals::epics_edit::view(model, modal)), + ModalType::DeleteIssueConfirm(_) => model + .modals() + .delete_issue_confirm + .as_ref() + .map(|_id| crate::modals::issues_delete::view(model)), + ModalType::DeleteCommentConfirm(_) => model + .modals() + .delete_comment_confirm + .as_ref() + .map(|modal| crate::modals::comments_delete::view(model, modal)), + ModalType::TimeTracking(_) => model + .modals() + .time_tracking + .as_ref() + .map(|modal| crate::modals::time_tracking::view(model, modal)), + ModalType::DeleteIssueStatusModal(_) => model + .modals() + .delete_issue_status_modal + .as_ref() + .map(|modal| crate::modals::issue_statuses_delete::view(model, modal.delete_id)), #[cfg(debug_assertions)] - ModalType::DebugModal(_) => { - if let Some(true) = &model.modals().debug_modal { - let node = crate::modals::debug::view(model); - nodes.push(node) - } - } - }; - } + ModalType::DebugModal(_) => model + .modals() + .debug_modal + .as_ref() + .map(|_| crate::modals::debug::view(model)), + }); section![id!["modals"], nodes] } diff --git a/jirs-client/src/pages/project_page/model.rs b/jirs-client/src/pages/project_page/model.rs index ea039903..1792786f 100644 --- a/jirs-client/src/pages/project_page/model.rs +++ b/jirs-client/src/pages/project_page/model.rs @@ -1,10 +1,11 @@ +use chrono::NaiveDateTime; use {crate::shared::drag::DragState, jirs_data::*, std::collections::HashMap}; #[derive(Default, Debug)] pub struct StatusIssueIds { pub status_id: IssueStatusId, pub status_name: IssueStatusName, - pub issue_ids: Vec, + pub issue_ids: Vec, } #[derive(Default, Debug)] @@ -31,57 +32,67 @@ impl ProjectPage { issues: &[Issue], user: &Option, ) -> Vec { - let mut map = vec![]; let epics = vec![None] .into_iter() .chain(epics.iter().map(|s| Some((s.id, s.name.as_str())))); let statuses = statuses.iter().map(|s| (s.id, s.name.as_str())); - - let mut issues: Vec<&Issue> = issues.iter().collect(); - if page.recently_updated_filter { + let issues = issues.iter().filter(|issue| { + issue_filter_with_avatars(issue, &page.active_avatar_filters) + && issue_filter_with_text(issue, page.text_filter.as_str()) + && issue_filter_with_only_my(issue, page.only_my_filter, user) + }); + let issues = if page.recently_updated_filter { let mut m = HashMap::new(); - let mut sorted = vec![]; - for issue in issues.into_iter() { - sorted.push((issue.id, issue.updated_at)); - m.insert(issue.id, issue); - } + let mut sorted: Vec<(IssueId, NaiveDateTime)> = issues + .map(|issue| { + m.insert(issue.id, issue); + (issue.id, issue.updated_at) + }) + .collect(); sorted.sort_by(|(_, a_time), (_, b_time)| a_time.cmp(b_time)); - issues = sorted + let mut issues: Vec<&Issue> = sorted .into_iter() .take(10) .flat_map(|(id, _)| m.remove(&id)) .collect(); issues.sort_by(|a, b| a.list_position.cmp(&b.list_position)); - } + issues + } else { + issues.collect() + }; - for epic in epics { - let mut per_epic_map = EpicIssuePerStatus { - epic_ref: epic.map(|(id, name)| (id, name.to_string())), - ..Default::default() - }; + let issues_per_epic_id = issues.into_iter().fold(HashMap::new(), |mut m, issue| { + m.entry(issue.epic_id).or_insert_with(Vec::new).push(issue); + m + }); - for (current_status_id, issue_status_name) in statuses.to_owned() { - let mut per_status_map = StatusIssueIds { - status_id: current_status_id, - status_name: issue_status_name.to_string(), + epics + .map(|epic| { + let mut per_epic_map = EpicIssuePerStatus { + epic_ref: epic.map(|(id, name)| (id, name.to_string())), ..Default::default() }; - for issue in issues.iter() { - if issue.epic_id == epic.map(|(id, _)| id) - && issue_filter_status(issue, current_status_id) - && issue_filter_with_avatars(issue, &page.active_avatar_filters) - && issue_filter_with_text(issue, page.text_filter.as_str()) - && issue_filter_with_only_my(issue, page.only_my_filter, user) - { - per_status_map.issue_ids.push(issue.id); - } + + for (current_status_id, issue_status_name) in statuses.to_owned() { + let per_status_map = StatusIssueIds { + status_id: current_status_id, + status_name: issue_status_name.to_string(), + issue_ids: issues_per_epic_id + .get(&epic.map(|(id, _)| id)) + .map(|v| { + v.iter() + .filter(|issue| issue_filter_status(issue, current_status_id)) + .map(|issue| issue.id) + .collect() + }) + .unwrap_or_default(), + }; + per_epic_map.per_status_issues.push(per_status_map); } - per_epic_map.per_status_issues.push(per_status_map); - } - map.push(per_epic_map); - } - map + per_epic_map + }) + .collect() } } diff --git a/jirs-client/src/pages/project_page/view.rs b/jirs-client/src/pages/project_page/view.rs index 870448c6..b8140ea3 100644 --- a/jirs-client/src/pages/project_page/view.rs +++ b/jirs-client/src/pages/project_page/view.rs @@ -42,12 +42,7 @@ fn header(model: &Model) -> Node { if !model.show_extras { return Node::Empty; } - let button = StyledButton::build() - .secondary() - .text("Repository") - .icon(Icon::Github) - .build() - .into_node(); + let button = StyledButton::secondary_with_text_and_icon("Repository", Icon::Github).into_node(); div![ id!["projectBoardHeader"], div![id!["boardName"], C!["headerChild"], "Kanban board"], diff --git a/jirs-client/src/pages/reports_page/view.rs b/jirs-client/src/pages/reports_page/view.rs index 6da7557a..73428113 100644 --- a/jirs-client/src/pages/reports_page/view.rs +++ b/jirs-client/src/pages/reports_page/view.rs @@ -206,7 +206,7 @@ fn issue_list(page: &ReportsPage, project_name: &str, this_month_updated: &[&Iss let priority_icon = StyledIcon::build(priority.clone().into()) .build() .into_node(); - let desc = Node::from_html( + let desc = Node::from_html(None, description .as_deref() .unwrap_or_default() diff --git a/jirs-client/src/pages/sign_in_page/view.rs b/jirs-client/src/pages/sign_in_page/view.rs index 87429b79..81a4cc6c 100644 --- a/jirs-client/src/pages/sign_in_page/view.rs +++ b/jirs-client/src/pages/sign_in_page/view.rs @@ -24,7 +24,7 @@ pub fn view(model: &model::Model) -> Node { let username = StyledInput::build() .value(page.username.as_str()) - .valid(!page.username_touched || page.username.len() > 1) + .valid(is_valid_username(page.username_touched, &page.username)) .build(FieldId::SignIn(SignInFieldId::Username)) .into_node(); let username_field = StyledField::build() @@ -35,7 +35,7 @@ pub fn view(model: &model::Model) -> Node { let email = StyledInput::build() .value(page.email.as_str()) - .valid(!page.email_touched || is_email(page.email.as_str())) + .valid(is_valid_email(page.email_touched, page.email.as_str())) .build(FieldId::SignIn(SignInFieldId::Email)) .into_node(); let email_field = StyledField::build() @@ -94,11 +94,12 @@ pub fn view(model: &model::Model) -> Node { .build() .into_node(); - let token = StyledInput::build() - .value(page.token.as_str()) - .valid(!page.token_touched || is_token(page.token.as_str())) - .build(FieldId::SignIn(SignInFieldId::Token)) - .into_node(); + let token = StyledInput::new_with_id_and_value_and_valid( + FieldId::SignIn(SignInFieldId::Token), + &page.token, + is_valid_token(page.token_touched, page.token.as_str()), + ) + .into_node(); let token_field = StyledField::build() .label("Single use token") .input(token) @@ -126,3 +127,15 @@ pub fn view(model: &model::Model) -> Node { let children = vec![sign_in_form, bind_token_form]; outer_layout(model, "login", children) } + +fn is_valid_username(touched: bool, s: &str) -> bool { + !touched || (s.len() > 1 && s.len() < 20) +} + +fn is_valid_email(touched: bool, s: &str) -> bool { + !touched || (is_email(s) && s.len() < 20) +} + +fn is_valid_token(touched: bool, s: &str) -> bool { + !touched || is_token(s) +} diff --git a/jirs-server/src/main.rs b/jirs-server/src/main.rs index a9106c14..e68b79e5 100644 --- a/jirs-server/src/main.rs +++ b/jirs-server/src/main.rs @@ -1,5 +1,4 @@ #![feature(async_closure)] -#![feature(vec_remove_item)] #![recursion_limit = "256"] use { diff --git a/shared/jirs-config/src/utils.rs b/shared/jirs-config/src/utils.rs index a72948da..9120e3a9 100644 --- a/shared/jirs-config/src/utils.rs +++ b/shared/jirs-config/src/utils.rs @@ -1,6 +1,9 @@ use { - serde::{de::DeserializeOwned, export::PhantomData, Serialize}, - std::fs::{read_to_string, write}, + serde::{de::DeserializeOwned, Serialize}, + std::{ + fs::{read_to_string, write}, + marker::PhantomData, + }, }; pub struct Reader {