Skip to content

Commit

Permalink
Merge pull request 'Run cargo fmt' (#839) from fmt into main
Browse files Browse the repository at this point in the history
  • Loading branch information
KitaitiMakoto committed Dec 6, 2020
2 parents 174ed73 + 5046220 commit 963e742
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 6 deletions.
3 changes: 1 addition & 2 deletions plume-common/src/utils.rs
Original file line number Diff line number Diff line change
Expand Up @@ -294,8 +294,7 @@ pub fn md_to_html<'a>(
}
let hashtag = text_acc;
let link = Tag::Link(
format!("{}tag/{}", base_url, &hashtag)
.into(),
format!("{}tag/{}", base_url, &hashtag).into(),
hashtag.to_owned().into(),
);

Expand Down
2 changes: 1 addition & 1 deletion src/routes/instance.rs
Original file line number Diff line number Diff line change
Expand Up @@ -215,7 +215,7 @@ pub fn add_email_blocklist(
if let Err(Error::Db(_)) = result {
Ok(Flash::error(
Redirect::to(uri!(admin_email_blocklist: page = None)),
i18n!(rockets.intl.catalog, "Email already blocked")
i18n!(rockets.intl.catalog, "Email already blocked"),
))
} else {
Ok(Flash::success(
Expand Down
4 changes: 1 addition & 3 deletions src/routes/posts.rs
Original file line number Diff line number Diff line change
Expand Up @@ -318,9 +318,7 @@ pub fn update(
.filter(|t| !t.is_empty())
.collect::<HashSet<_>>()
.into_iter()
.filter_map(|t| {
Tag::build_activity(t.to_string()).ok()
})
.filter_map(|t| Tag::build_activity(t.to_string()).ok())
.collect::<Vec<_>>();
post.update_tags(&conn, tags)
.expect("post::update: tags error");
Expand Down

0 comments on commit 963e742

Please sign in to comment.