From 831ef884312ad09993561cf80002138bffa5ced5 Mon Sep 17 00:00:00 2001 From: Kitaiti Makoto Date: Thu, 27 Jan 2022 11:45:21 +0900 Subject: [PATCH 1/4] Update Rust --- rust-toolchain | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rust-toolchain b/rust-toolchain index a1da0415..63af764b 100644 --- a/rust-toolchain +++ b/rust-toolchain @@ -1 +1 @@ -nightly-2021-11-27 +nightly-2022-01-27 From 996b161c1e07459f5349e576d34c5ba0dafc15b3 Mon Sep 17 00:00:00 2001 From: Kitaiti Makoto Date: Thu, 27 Jan 2022 11:45:35 +0900 Subject: [PATCH 2/4] Satisfy clippy --- plume-models/src/comments.rs | 3 +-- plume-models/src/search/tokenizer.rs | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/plume-models/src/comments.rs b/plume-models/src/comments.rs index 0809aab5..09f26a35 100644 --- a/plume-models/src/comments.rs +++ b/plume-models/src/comments.rs @@ -304,14 +304,13 @@ impl FromId for Comment { .chain(bcc) .collect::>() // remove duplicates (don't do a query more than once) .into_iter() - .map(|v| { + .flat_map(|v| { if let Ok(user) = User::from_id(conn, &v, None, CONFIG.proxy()) { vec![user] } else { vec![] // TODO try to fetch collection } }) - .flatten() .filter(|u| u.get_instance(conn).map(|i| i.local).unwrap_or(false)) .collect::>(); //remove duplicates (prevent db error) diff --git a/plume-models/src/search/tokenizer.rs b/plume-models/src/search/tokenizer.rs index 52cd62b2..83228e67 100644 --- a/plume-models/src/search/tokenizer.rs +++ b/plume-models/src/search/tokenizer.rs @@ -57,7 +57,7 @@ impl<'a> WhitespaceTokenStream<'a> { .filter(|&(_, ref c)| c.is_whitespace()) .map(|(offset, _)| offset) .next() - .unwrap_or_else(|| self.text.len()) + .unwrap_or(self.text.len()) } } From 9e2c76c3bc209dc04ce93ea40863d9125e21038c Mon Sep 17 00:00:00 2001 From: Kitaiti Makoto Date: Thu, 27 Jan 2022 11:54:41 +0900 Subject: [PATCH 3/4] Satisfy clippy --- templates/partials/image_select.rs.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/partials/image_select.rs.html b/templates/partials/image_select.rs.html index 8a200bbd..53e7eee0 100644 --- a/templates/partials/image_select.rs.html +++ b/templates/partials/image_select.rs.html @@ -17,7 +17,7 @@ @if !media.alt_text.is_empty() { @media.alt_text } else { - @media.content_warning.unwrap_or(i18n!(ctx.1, "No description")) + @media.content_warning.unwrap_or_else(|| i18n!(ctx.1, "No description"))) } } From 325d8cde08fa0a927263e405e69c883c3efee716 Mon Sep 17 00:00:00 2001 From: Kitaiti Makoto Date: Thu, 27 Jan 2022 12:01:54 +0900 Subject: [PATCH 4/4] [skip ci]Add changelog about Rust bump --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index cdc91ce6..37eede76 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,10 @@ - Basque language +### Changed + +- Bump Rust to nightly 2022-01-26 + ### Fixed - Add explanation of sign-up step at sign-up page when email sign-up mode