Update compiler (#725)
* update compiler to recent nightly * cargo fmt * fix clippy but ructe code is still complaining * update circleci and rocket_csrf * fix last clippy problems * cargo fmt * fix build issue was caused be improper handling of recursive template (comment) by old ructe, which is fixed on newer version
This commit is contained in:
+7
-9
@@ -298,7 +298,7 @@ pub fn update(
|
||||
post.license = form.license.clone();
|
||||
post.cover_id = form.cover;
|
||||
post.update(&*conn, &rockets.searcher)
|
||||
.expect("post::update: update error");;
|
||||
.expect("post::update: update error");
|
||||
|
||||
if post.published {
|
||||
post.update_mentions(
|
||||
@@ -308,7 +308,7 @@ pub fn update(
|
||||
.filter_map(|m| Mention::build_activity(&rockets, &m).ok())
|
||||
.collect(),
|
||||
)
|
||||
.expect("post::update: mentions error");;
|
||||
.expect("post::update: mentions error");
|
||||
}
|
||||
|
||||
let tags = form
|
||||
@@ -367,8 +367,8 @@ pub fn update(
|
||||
&*form,
|
||||
form.draft,
|
||||
Some(post),
|
||||
errors.clone(),
|
||||
medias.clone(),
|
||||
errors,
|
||||
medias,
|
||||
cl.0
|
||||
))
|
||||
.into()
|
||||
@@ -406,7 +406,7 @@ pub fn create(
|
||||
rockets: PlumeRocket,
|
||||
) -> Result<RespondOrRedirect, ErrorPage> {
|
||||
let conn = &*rockets.conn;
|
||||
let blog = Blog::find_by_fqn(&rockets, &blog_name).expect("post::create: blog error");;
|
||||
let blog = Blog::find_by_fqn(&rockets, &blog_name).expect("post::create: blog error");
|
||||
let slug = form.title.to_string().to_kebab_case();
|
||||
let user = rockets.user.clone().unwrap();
|
||||
|
||||
@@ -553,7 +553,7 @@ pub fn create(
|
||||
&*form,
|
||||
form.draft,
|
||||
None,
|
||||
errors.clone(),
|
||||
errors,
|
||||
medias,
|
||||
cl.0
|
||||
))
|
||||
@@ -579,9 +579,7 @@ pub fn delete(
|
||||
.any(|a| a.id == user.id)
|
||||
{
|
||||
return Ok(Flash::error(
|
||||
Redirect::to(
|
||||
uri!(details: blog = blog_name.clone(), slug = slug.clone(), responding_to = _),
|
||||
),
|
||||
Redirect::to(uri!(details: blog = blog_name, slug = slug, responding_to = _)),
|
||||
i18n!(intl.catalog, "You are not allowed to delete this article."),
|
||||
));
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user