From 301aad3f73ab106ed778d3945d8219e18c83c5b7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 5 Jan 2023 19:06:39 +0000 Subject: [PATCH 1/5] Bump whatlang from 0.16.0 to 0.16.2 Bumps [whatlang](https://github.com/greyblake/whatlang-rs) from 0.16.0 to 0.16.2. - [Release notes](https://github.com/greyblake/whatlang-rs/releases) - [Changelog](https://github.com/greyblake/whatlang-rs/blob/master/CHANGELOG.md) - [Commits](https://github.com/greyblake/whatlang-rs/compare/v0.16.0...v0.16.2) --- updated-dependencies: - dependency-name: whatlang dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- Cargo.lock | 4 ++-- plume-models/Cargo.toml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 45ced755..75049a9a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -5550,9 +5550,9 @@ dependencies = [ [[package]] name = "whatlang" -version = "0.16.0" +version = "0.16.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2989d7e9d3cb96a76438e879144030b1be0931b944fbfed65e89e2ae536cd3b9" +checksum = "9c531a2dc4c462b833788be2c07eef4e621d0e9edbd55bf280cc164c1c1aa043" dependencies = [ "hashbrown 0.12.1", "once_cell", diff --git a/plume-models/Cargo.toml b/plume-models/Cargo.toml index 94ac6c0e..7c6e3bf8 100644 --- a/plume-models/Cargo.toml +++ b/plume-models/Cargo.toml @@ -24,7 +24,7 @@ tantivy = "0.13.3" url = "2.1" walkdir = "2.2" webfinger = "0.4.1" -whatlang = "0.16.0" +whatlang = "0.16.2" shrinkwraprs = "0.3.0" diesel-derive-newtype = "1.0.0" glob = "0.3.0" From 19766662f1f0497b58d5febee0cc91ab1614958e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 5 Jan 2023 19:06:52 +0000 Subject: [PATCH 2/5] Bump ldap3 from 0.10.6 to 0.11.1 Bumps [ldap3](https://github.com/inejge/ldap3) from 0.10.6 to 0.11.1. - [Release notes](https://github.com/inejge/ldap3/releases) - [Changelog](https://github.com/inejge/ldap3/blob/master/CHANGELOG.md) - [Commits](https://github.com/inejge/ldap3/compare/v0.10.6...v0.11.1) --- updated-dependencies: - dependency-name: ldap3 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- Cargo.lock | 170 ++++++++++++++++++++-------------------- plume-models/Cargo.toml | 2 +- 2 files changed, 87 insertions(+), 85 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 45ced755..4421d5b0 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -145,7 +145,7 @@ dependencies = [ "maplit", "once_cell", "tendril", - "url 2.3.0", + "url 2.3.1", ] [[package]] @@ -199,9 +199,9 @@ dependencies = [ [[package]] name = "async-trait" -version = "0.1.53" +version = "0.1.60" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed6aa3524a2dfcf9fe180c51eae2b58738348d819517ceadf95789c51fff7600" +checksum = "677d1d8ab452a3936018a687b20e6f7cf5363d713b732b8884001317b0e48aa3" dependencies = [ "proc-macro2 1.0.49", "quote 1.0.18", @@ -443,9 +443,9 @@ checksum = "0e4cec68f03f32e44924783795810fa50a7035d8c8ebe78580ad7e6c703fba38" [[package]] name = "bytes" -version = "1.1.0" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4872d67bab6358e59559027aa3b9157c53d9358c51423c17554809a8858e0f8" +checksum = "dfb24e866b15a1af2a1b663f10c6b6b8f397a84aadb828f12e5b289ec23a3a3c" [[package]] name = "cc" @@ -616,7 +616,7 @@ dependencies = [ "base64 0.13.1", "hkdf", "hmac", - "percent-encoding 2.1.0", + "percent-encoding 2.2.0", "rand 0.8.5", "sha2", "time 0.1.43", @@ -1316,12 +1316,11 @@ checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" [[package]] name = "form_urlencoded" -version = "1.0.1" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fc25a87fa4fd2094bffb06925852034d90a17f0d1e05197d4956d3555752191" +checksum = "a9c384f161156f5260c24a097c56119f9be8c798586aecc13afbcbe7b7e26bf8" dependencies = [ - "matches", - "percent-encoding 2.1.0", + "percent-encoding 2.2.0", ] [[package]] @@ -1393,9 +1392,9 @@ checksum = "3a471a38ef8ed83cd6e40aa59c1ffe17db6855c18e3604d9c4ed8c08ebc28678" [[package]] name = "futures" -version = "0.3.21" +version = "0.3.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f73fe65f54d1e12b726f517d3e2135ca3125a437b6d998caf1962961f7172d9e" +checksum = "38390104763dc37a5145a53c29c63c1290b5d316d6086ec32c293f6736051bb0" dependencies = [ "futures-channel", "futures-core", @@ -1408,9 +1407,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.21" +version = "0.3.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3083ce4b914124575708913bca19bfe887522d6e2e6d0952943f5eac4a74010" +checksum = "52ba265a92256105f45b719605a571ffe2d1f0fea3807304b522c1d778f79eed" dependencies = [ "futures-core", "futures-sink", @@ -1418,9 +1417,9 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.21" +version = "0.3.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c09fd04b7e4073ac7156a9539b57a484a8ea920f79c7c675d05d289ab6110d3" +checksum = "04909a7a7e4633ae6c4a9ab280aeb86da1236243a77b694a49eacd659a4bd3ac" [[package]] name = "futures-cpupool" @@ -1434,9 +1433,9 @@ dependencies = [ [[package]] name = "futures-executor" -version = "0.3.21" +version = "0.3.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9420b90cfa29e327d0429f19be13e7ddb68fa1cccb09d65e5706b8c7a749b8a6" +checksum = "7acc85df6714c176ab5edf386123fafe217be88c0840ec11f199441134a074e2" dependencies = [ "futures-core", "futures-task", @@ -1446,15 +1445,15 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.21" +version = "0.3.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc4045962a5a5e935ee2fdedaa4e08284547402885ab326734432bed5d12966b" +checksum = "00f5fb52a06bdcadeb54e8d3671f8888a39697dcb0b81b23b55174030427f4eb" [[package]] name = "futures-macro" -version = "0.3.21" +version = "0.3.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33c1e13800337f4d4d7a316bf45a567dbcb6ffe087f16424852d97e97a91f512" +checksum = "bdfb8ce053d86b91919aad980c220b1fb8401a9394410e1c289ed7e66b61835d" dependencies = [ "proc-macro2 1.0.49", "quote 1.0.18", @@ -1463,21 +1462,21 @@ dependencies = [ [[package]] name = "futures-sink" -version = "0.3.21" +version = "0.3.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21163e139fa306126e6eedaf49ecdb4588f939600f0b1e770f4205ee4b7fa868" +checksum = "39c15cf1a4aa79df40f1bb462fb39676d0ad9e366c2a33b590d7c66f4f81fcf9" [[package]] name = "futures-task" -version = "0.3.21" +version = "0.3.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57c66a976bf5909d801bbef33416c41372779507e7a6b3a5e25e4749c58f776a" +checksum = "2ffb393ac5d9a6eaa9d3fdf37ae2776656b706e200c8e16b1bdb227f5198e6ea" [[package]] name = "futures-util" -version = "0.3.21" +version = "0.3.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8b7abd5d659d9b90c8cba917f6ec750a74e2dc23902ef9cd4cc8c8b22e6036a" +checksum = "197676987abd2f9cadff84926f410af1c183608d36641465df73ae8211dc65d6" dependencies = [ "futures-channel", "futures-core", @@ -1672,7 +1671,7 @@ version = "0.3.13" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "37a82c6d637fc9515a4694bbf1cb2457b79d81ce52b3108bdeea58b07dd34a57" dependencies = [ - "bytes 1.1.0", + "bytes 1.3.0", "fnv", "futures-core", "futures-sink", @@ -1681,7 +1680,7 @@ dependencies = [ "indexmap", "slab", "tokio 1.23.1", - "tokio-util 0.7.1", + "tokio-util 0.7.4", "tracing", ] @@ -1785,7 +1784,7 @@ version = "0.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ff8670570af52249509a86f5e3e18a08c60b177071826898fde8997cf5f6bfbb" dependencies = [ - "bytes 1.1.0", + "bytes 1.3.0", "fnv", "itoa 1.0.1", ] @@ -1818,7 +1817,7 @@ version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1ff4f84919677303da5f147645dbea6b1881f368d03ac84e1dc09031ebd7b2c6" dependencies = [ - "bytes 1.1.0", + "bytes 1.3.0", "http 0.2.7", "pin-project-lite 0.2.9", ] @@ -1920,7 +1919,7 @@ version = "0.14.18" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b26ae0a80afebe130861d90abf98e3814a4f28a4c6ffeb5ab8ebb2be311e0ef2" dependencies = [ - "bytes 1.1.0", + "bytes 1.3.0", "futures-channel", "futures-core", "futures-util", @@ -1970,7 +1969,7 @@ version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905" dependencies = [ - "bytes 1.1.0", + "bytes 1.3.0", "hyper 0.14.18", "native-tls", "tokio 1.23.1", @@ -2005,6 +2004,16 @@ dependencies = [ "unicode-normalization", ] +[[package]] +name = "idna" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e14ddfc70884202db2244c223200c204c2bda1bc6e0998d11b5e024d657209e6" +dependencies = [ + "unicode-bidi", + "unicode-normalization", +] + [[package]] name = "if_chain" version = "1.0.2" @@ -2152,37 +2161,36 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" [[package]] name = "lber" -version = "0.3.0" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a99b520993b21a6faab32643cf4726573dc18ca4cf2d48cbeb24d248c86c930" +checksum = "b5d85f5e00e12cb50c70c3b1c1f0daff6546eb4c608b44d0a990e38a539e0446" dependencies = [ - "byteorder", - "bytes 1.1.0", - "nom 2.2.1", + "bytes 1.3.0", + "nom 7.1.1", ] [[package]] name = "ldap3" -version = "0.10.6" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce38dafca0608c64cc0146fb782b06abb8d946dae7a3af23c89a95da24f6b84d" +checksum = "c5cfbd3c59ca16d6671b002b8b3dd013cd825d9c77a1664a3135194d3270511e" dependencies = [ "async-trait", - "bytes 1.1.0", - "futures 0.3.21", + "bytes 1.3.0", + "futures 0.3.25", "futures-util", "lazy_static", "lber", "log 0.4.17", "native-tls", - "nom 2.2.1", - "percent-encoding 2.1.0", + "nom 7.1.1", + "percent-encoding 2.2.0", "thiserror", "tokio 1.23.1", "tokio-native-tls", "tokio-stream", - "tokio-util 0.7.1", - "url 2.3.0", + "tokio-util 0.7.4", + "url 2.3.1", ] [[package]] @@ -2670,9 +2678,9 @@ dependencies = [ [[package]] name = "native-tls" -version = "0.2.10" +version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd7e2f3618557f980e0b17e8856252eee3c97fa12c54dff0ca290fb6266ca4a9" +checksum = "07226173c32f2926027b63cce4bcd8076c3552846cbe7925f3aaffeac0a3b92e" dependencies = [ "lazy_static", "libc", @@ -2734,12 +2742,6 @@ dependencies = [ "static_assertions", ] -[[package]] -name = "nom" -version = "2.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf51a729ecf40266a2368ad335a5fdde43471f545a967109cd62146ecf8b66ff" - [[package]] name = "nom" version = "4.2.3" @@ -3079,9 +3081,9 @@ checksum = "31010dd2e1ac33d5b46a5b413495239882813e0369f8ed8a5e266f173602f831" [[package]] name = "percent-encoding" -version = "2.1.0" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e" +checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e" [[package]] name = "phf" @@ -3248,7 +3250,7 @@ dependencies = [ "base64 0.13.1", "chrono", "flume", - "futures 0.3.21", + "futures 0.3.25", "hex", "once_cell", "openssl", @@ -3263,7 +3265,7 @@ dependencies = [ "syntect", "tokio 1.23.1", "tracing", - "url 2.3.0", + "url 2.3.1", ] [[package]] @@ -3329,7 +3331,7 @@ dependencies = [ "shrinkwraprs", "tantivy 0.13.3", "tracing", - "url 2.3.0", + "url 2.3.1", "walkdir", "webfinger", "whatlang", @@ -3446,7 +3448,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "95b4ce31ff0a27d93c8de1849cf58162283752f065a90d508f1105fa6c9a213f" dependencies = [ "idna 0.2.3", - "url 2.3.0", + "url 2.3.1", ] [[package]] @@ -3839,13 +3841,13 @@ dependencies = [ "mime 0.3.16", "mime_guess", "native-tls", - "percent-encoding 2.1.0", + "percent-encoding 2.2.0", "pin-project-lite 0.2.9", "serde 1.0.152", "serde_urlencoded 0.7.1", "tokio 0.2.25", "tokio-tls", - "url 2.3.0", + "url 2.3.1", "wasm-bindgen", "wasm-bindgen-futures", "web-sys", @@ -3859,7 +3861,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "68cc60575865c7831548863cc02356512e3f1dc2f3f82cb837d7fc4cc8f3c97c" dependencies = [ "base64 0.13.1", - "bytes 1.1.0", + "bytes 1.3.0", "encoding_rs", "futures-core", "futures-util", @@ -3874,7 +3876,7 @@ dependencies = [ "mime 0.3.16", "native-tls", "once_cell", - "percent-encoding 2.1.0", + "percent-encoding 2.2.0", "pin-project-lite 0.2.9", "serde 1.0.152", "serde_json", @@ -3883,7 +3885,7 @@ dependencies = [ "tokio-native-tls", "tokio-socks", "tower-service", - "url 2.3.0", + "url 2.3.1", "wasm-bindgen", "wasm-bindgen-futures", "web-sys", @@ -3899,7 +3901,7 @@ dependencies = [ "chrono", "config", "dashmap", - "futures 0.3.21", + "futures 0.3.25", "num_cpus", "pin-utils", "rand 0.7.3", @@ -4574,7 +4576,7 @@ dependencies = [ "failure", "fnv", "fs2", - "futures 0.3.21", + "futures 0.3.25", "htmlescape", "levenshtein_automata", "log 0.4.17", @@ -4617,7 +4619,7 @@ dependencies = [ "fail", "fnv", "fs2", - "futures 0.3.21", + "futures 0.3.25", "htmlescape", "levenshtein_automata", "log 0.4.17", @@ -4728,18 +4730,18 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.31" +version = "1.0.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd829fe32373d27f76265620b5309d0340cb8550f523c1dda251d6298069069a" +checksum = "6a9cd18aa97d5c45c6603caea1da6628790b37f7a34b6ca89522331c5180fed0" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.31" +version = "1.0.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0396bc89e626244658bef819e22d0cc459e795a5ebe878e6ec336d1674a8d79a" +checksum = "1fb327af4685e4d03fa8cbcf1716380da910eeb2bb8be417e7f9fd3fb164f36f" dependencies = [ "proc-macro2 1.0.49", "quote 1.0.18", @@ -4850,7 +4852,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "38a54aca0c15d014013256222ba0ebed095673f89345dd79119d912eb561b7a8" dependencies = [ "autocfg 1.1.0", - "bytes 1.1.0", + "bytes 1.3.0", "libc", "memchr", "mio 0.8.5", @@ -4970,9 +4972,9 @@ dependencies = [ [[package]] name = "tokio-stream" -version = "0.1.8" +version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50145484efff8818b5ccd256697f36863f587da82cf8b409c53adf1e840798e3" +checksum = "d660770404473ccd7bc9f8b28494a811bc18542b915c0855c51e8f419d5223ce" dependencies = [ "futures-core", "pin-project-lite 0.2.9", @@ -5058,11 +5060,11 @@ dependencies = [ [[package]] name = "tokio-util" -version = "0.7.1" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0edfdeb067411dba2044da6d1cb2df793dd35add7888d73c16e3381ded401764" +checksum = "0bb2e075f03b3d66d8d8785356224ba688d2906a371015e225beeb65ca92c740" dependencies = [ - "bytes 1.1.0", + "bytes 1.3.0", "futures-core", "futures-sink", "pin-project-lite 0.2.9", @@ -5291,13 +5293,13 @@ dependencies = [ [[package]] name = "url" -version = "2.3.0" +version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22fe195a4f217c25b25cb5058ced57059824a678474874038dc88d211bf508d3" +checksum = "0d68c799ae75762b8c3fe375feb6600ef5602c883c5d21eb51c09f22b83c4643" dependencies = [ "form_urlencoded", - "idna 0.2.3", - "percent-encoding 2.1.0", + "idna 0.3.0", + "percent-encoding 2.2.0", ] [[package]] @@ -5343,7 +5345,7 @@ dependencies = [ "serde 1.0.152", "serde_derive", "serde_json", - "url 2.3.0", + "url 2.3.1", "validator_derive", ] diff --git a/plume-models/Cargo.toml b/plume-models/Cargo.toml index 94ac6c0e..b0f21a8c 100644 --- a/plume-models/Cargo.toml +++ b/plume-models/Cargo.toml @@ -10,7 +10,7 @@ bcrypt = "0.12.1" guid-create = "0.2" itertools = "0.10.3" lazy_static = "1.0" -ldap3 = "0.10.5" +ldap3 = "0.11.1" migrations_internals= "1.4.0" openssl = "0.10.40" rocket = "0.4.11" From 2f8d188d595c530f2df23585cb3e27b58779e821 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 5 Jan 2023 19:07:12 +0000 Subject: [PATCH 3/5] Bump futures from 0.3.21 to 0.3.25 Bumps [futures](https://github.com/rust-lang/futures-rs) from 0.3.21 to 0.3.25. - [Release notes](https://github.com/rust-lang/futures-rs/releases) - [Changelog](https://github.com/rust-lang/futures-rs/blob/master/CHANGELOG.md) - [Commits](https://github.com/rust-lang/futures-rs/compare/0.3.21...0.3.25) --- updated-dependencies: - dependency-name: futures dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- Cargo.lock | 46 ++++++++++++++++++++--------------------- plume-common/Cargo.toml | 2 +- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 45ced755..b15a48c0 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1393,9 +1393,9 @@ checksum = "3a471a38ef8ed83cd6e40aa59c1ffe17db6855c18e3604d9c4ed8c08ebc28678" [[package]] name = "futures" -version = "0.3.21" +version = "0.3.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f73fe65f54d1e12b726f517d3e2135ca3125a437b6d998caf1962961f7172d9e" +checksum = "38390104763dc37a5145a53c29c63c1290b5d316d6086ec32c293f6736051bb0" dependencies = [ "futures-channel", "futures-core", @@ -1408,9 +1408,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.21" +version = "0.3.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3083ce4b914124575708913bca19bfe887522d6e2e6d0952943f5eac4a74010" +checksum = "52ba265a92256105f45b719605a571ffe2d1f0fea3807304b522c1d778f79eed" dependencies = [ "futures-core", "futures-sink", @@ -1418,9 +1418,9 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.21" +version = "0.3.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c09fd04b7e4073ac7156a9539b57a484a8ea920f79c7c675d05d289ab6110d3" +checksum = "04909a7a7e4633ae6c4a9ab280aeb86da1236243a77b694a49eacd659a4bd3ac" [[package]] name = "futures-cpupool" @@ -1434,9 +1434,9 @@ dependencies = [ [[package]] name = "futures-executor" -version = "0.3.21" +version = "0.3.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9420b90cfa29e327d0429f19be13e7ddb68fa1cccb09d65e5706b8c7a749b8a6" +checksum = "7acc85df6714c176ab5edf386123fafe217be88c0840ec11f199441134a074e2" dependencies = [ "futures-core", "futures-task", @@ -1446,15 +1446,15 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.21" +version = "0.3.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc4045962a5a5e935ee2fdedaa4e08284547402885ab326734432bed5d12966b" +checksum = "00f5fb52a06bdcadeb54e8d3671f8888a39697dcb0b81b23b55174030427f4eb" [[package]] name = "futures-macro" -version = "0.3.21" +version = "0.3.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33c1e13800337f4d4d7a316bf45a567dbcb6ffe087f16424852d97e97a91f512" +checksum = "bdfb8ce053d86b91919aad980c220b1fb8401a9394410e1c289ed7e66b61835d" dependencies = [ "proc-macro2 1.0.49", "quote 1.0.18", @@ -1463,21 +1463,21 @@ dependencies = [ [[package]] name = "futures-sink" -version = "0.3.21" +version = "0.3.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21163e139fa306126e6eedaf49ecdb4588f939600f0b1e770f4205ee4b7fa868" +checksum = "39c15cf1a4aa79df40f1bb462fb39676d0ad9e366c2a33b590d7c66f4f81fcf9" [[package]] name = "futures-task" -version = "0.3.21" +version = "0.3.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57c66a976bf5909d801bbef33416c41372779507e7a6b3a5e25e4749c58f776a" +checksum = "2ffb393ac5d9a6eaa9d3fdf37ae2776656b706e200c8e16b1bdb227f5198e6ea" [[package]] name = "futures-util" -version = "0.3.21" +version = "0.3.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8b7abd5d659d9b90c8cba917f6ec750a74e2dc23902ef9cd4cc8c8b22e6036a" +checksum = "197676987abd2f9cadff84926f410af1c183608d36641465df73ae8211dc65d6" dependencies = [ "futures-channel", "futures-core", @@ -2169,7 +2169,7 @@ checksum = "ce38dafca0608c64cc0146fb782b06abb8d946dae7a3af23c89a95da24f6b84d" dependencies = [ "async-trait", "bytes 1.1.0", - "futures 0.3.21", + "futures 0.3.25", "futures-util", "lazy_static", "lber", @@ -3248,7 +3248,7 @@ dependencies = [ "base64 0.13.1", "chrono", "flume", - "futures 0.3.21", + "futures 0.3.25", "hex", "once_cell", "openssl", @@ -3899,7 +3899,7 @@ dependencies = [ "chrono", "config", "dashmap", - "futures 0.3.21", + "futures 0.3.25", "num_cpus", "pin-utils", "rand 0.7.3", @@ -4574,7 +4574,7 @@ dependencies = [ "failure", "fnv", "fs2", - "futures 0.3.21", + "futures 0.3.25", "htmlescape", "levenshtein_automata", "log 0.4.17", @@ -4617,7 +4617,7 @@ dependencies = [ "fail", "fnv", "fs2", - "futures 0.3.21", + "futures 0.3.25", "htmlescape", "levenshtein_automata", "log 0.4.17", diff --git a/plume-common/Cargo.toml b/plume-common/Cargo.toml index 924899f2..ac24594d 100644 --- a/plume-common/Cargo.toml +++ b/plume-common/Cargo.toml @@ -24,7 +24,7 @@ activitystreams-ext = "0.1.0-alpha.2" url = "2.2.2" flume = "0.10.13" tokio = { version = "1.19.2", features = ["full"] } -futures = "0.3.21" +futures = "0.3.25" [dependencies.chrono] features = ["serde"] From 4f796e788cd36e03c4e658097cf2ddcf27cbb2c7 Mon Sep 17 00:00:00 2001 From: Kitaiti Makoto Date: Fri, 6 Jan 2023 23:38:38 +0900 Subject: [PATCH 4/5] Clippy --- plume-models/src/posts.rs | 2 +- plume-models/src/search/query.rs | 10 +++++----- src/routes/search.rs | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/plume-models/src/posts.rs b/plume-models/src/posts.rs index 74ff21d8..b78690d9 100644 --- a/plume-models/src/posts.rs +++ b/plume-models/src/posts.rs @@ -756,7 +756,7 @@ impl FromId for Post { let timestamp_secs = published.unix_timestamp(); let timestamp_nanos = published.unix_timestamp_nanos() - (timestamp_secs as i128) * 1000i128 * 1000i128 * 1000i128; - NaiveDateTime::from_timestamp(timestamp_secs, timestamp_nanos as u32) + NaiveDateTime::from_timestamp_opt(timestamp_secs, timestamp_nanos as u32).unwrap() }), subtitle: article .summary() diff --git a/plume-models/src/search/query.rs b/plume-models/src/search/query.rs index a2c4f252..edab5711 100644 --- a/plume-models/src/search/query.rs +++ b/plume-models/src/search/query.rs @@ -94,7 +94,7 @@ macro_rules! gen_to_string { )* $( for val in &$self.$date { - $result.push_str(&format!("{}:{} ", stringify!($date), NaiveDate::from_num_days_from_ce(*val as i32).format("%Y-%m-%d"))); + $result.push_str(&format!("{}:{} ", stringify!($date), NaiveDate::from_num_days_from_ce_opt(*val as i32).unwrap().format("%Y-%m-%d"))); } )* } @@ -182,10 +182,10 @@ impl PlumeQuery { // if at least one range bound is provided let after = self .after - .unwrap_or_else(|| i64::from(NaiveDate::from_ymd(2000, 1, 1).num_days_from_ce())); + .unwrap_or_else(|| i64::from(NaiveDate::from_ymd_opt(2000, 1, 1).unwrap().num_days_from_ce())); let before = self .before - .unwrap_or_else(|| i64::from(Utc::today().num_days_from_ce())); + .unwrap_or_else(|| i64::from(Utc::now().date_naive().num_days_from_ce())); let field = Searcher::schema().get_field("creation_date").unwrap(); let range = RangeQuery::new_i64_bounds(field, Bound::Included(after), Bound::Included(before)); @@ -202,7 +202,7 @@ impl PlumeQuery { pub fn before(&mut self, date: &D) -> &mut Self { let before = self .before - .unwrap_or_else(|| i64::from(Utc::today().num_days_from_ce())); + .unwrap_or_else(|| i64::from(Utc::now().date_naive().num_days_from_ce())); self.before = Some(cmp::min(before, i64::from(date.num_days_from_ce()))); self } @@ -211,7 +211,7 @@ impl PlumeQuery { pub fn after(&mut self, date: &D) -> &mut Self { let after = self .after - .unwrap_or_else(|| i64::from(NaiveDate::from_ymd(2000, 1, 1).num_days_from_ce())); + .unwrap_or_else(|| i64::from(NaiveDate::from_ymd_opt(2000, 1, 1).unwrap().num_days_from_ce())); self.after = Some(cmp::max(after, i64::from(date.num_days_from_ce()))); self } diff --git a/src/routes/search.rs b/src/routes/search.rs index 33d8443f..0807b792 100644 --- a/src/routes/search.rs +++ b/src/routes/search.rs @@ -65,7 +65,7 @@ pub fn search(query: Option>, conn: DbConn, rockets: PlumeRock if str_query.is_empty() { render!(search::index( &(&conn, &rockets).to_context(), - &format!("{}", Utc::today().format("%Y-%m-d")) + &format!("{}", Utc::now().date_naive().format("%Y-%m-d")) )) } else { let res = rockets From 0020242571ff9208d647788934faa28b64c6a1d7 Mon Sep 17 00:00:00 2001 From: Kitaiti Makoto Date: Fri, 6 Jan 2023 23:40:05 +0900 Subject: [PATCH 5/5] Format --- plume-models/src/posts.rs | 6 +++++- plume-models/src/search/query.rs | 20 ++++++++++++++------ 2 files changed, 19 insertions(+), 7 deletions(-) diff --git a/plume-models/src/posts.rs b/plume-models/src/posts.rs index b78690d9..203e0d5e 100644 --- a/plume-models/src/posts.rs +++ b/plume-models/src/posts.rs @@ -756,7 +756,11 @@ impl FromId for Post { let timestamp_secs = published.unix_timestamp(); let timestamp_nanos = published.unix_timestamp_nanos() - (timestamp_secs as i128) * 1000i128 * 1000i128 * 1000i128; - NaiveDateTime::from_timestamp_opt(timestamp_secs, timestamp_nanos as u32).unwrap() + NaiveDateTime::from_timestamp_opt( + timestamp_secs, + timestamp_nanos as u32, + ) + .unwrap() }), subtitle: article .summary() diff --git a/plume-models/src/search/query.rs b/plume-models/src/search/query.rs index edab5711..5dcd605c 100644 --- a/plume-models/src/search/query.rs +++ b/plume-models/src/search/query.rs @@ -180,9 +180,13 @@ impl PlumeQuery { if self.before.is_some() || self.after.is_some() { // if at least one range bound is provided - let after = self - .after - .unwrap_or_else(|| i64::from(NaiveDate::from_ymd_opt(2000, 1, 1).unwrap().num_days_from_ce())); + let after = self.after.unwrap_or_else(|| { + i64::from( + NaiveDate::from_ymd_opt(2000, 1, 1) + .unwrap() + .num_days_from_ce(), + ) + }); let before = self .before .unwrap_or_else(|| i64::from(Utc::now().date_naive().num_days_from_ce())); @@ -209,9 +213,13 @@ impl PlumeQuery { // documents older than the provided date will be ignored pub fn after(&mut self, date: &D) -> &mut Self { - let after = self - .after - .unwrap_or_else(|| i64::from(NaiveDate::from_ymd_opt(2000, 1, 1).unwrap().num_days_from_ce())); + let after = self.after.unwrap_or_else(|| { + i64::from( + NaiveDate::from_ymd_opt(2000, 1, 1) + .unwrap() + .num_days_from_ce(), + ) + }); self.after = Some(cmp::max(after, i64::from(date.num_days_from_ce()))); self }