fix clippy #42

Merged
ben merged 4 commits from ben/Jobboerse:main into main 2023-01-28 20:40:42 +01:00
6 changed files with 11 additions and 11 deletions
Showing only changes of commit 9ee86480dd - Show all commits

fix clippy for rust 1.65

- still compatible with 1.64
Bennet Bleßmann 2023-01-28 20:22:49 +01:00 committed by Bennet Bleßmann
Signed by: ben
GPG key ID: 3BE1A1A3CBC3CF99

View file

@ -91,7 +91,7 @@ impl Attachment<PathBuf> {
req: &HttpRequest, req: &HttpRequest,
preview_token: Option<&str>, preview_token: Option<&str>,
) -> Result<Url, UrlGenerationError> { ) -> Result<Url, UrlGenerationError> {
let mut url = req.url_for(JOBOFFER_ATTACHMENT_ROUTE, &[id, self.file_name.as_str()])?; let mut url = req.url_for(JOBOFFER_ATTACHMENT_ROUTE, [id, self.file_name.as_str()])?;
if let Some(token) = preview_token { if let Some(token) = preview_token {
url.query_pairs_mut().append_pair("token", token); url.query_pairs_mut().append_pair("token", token);

View file

@ -65,19 +65,19 @@ impl JobOfferActions {
offer: &JobOffer<PathBuf>, offer: &JobOffer<PathBuf>,
) -> actix_web::Result<Self, UrlGenerationError> { ) -> actix_web::Result<Self, UrlGenerationError> {
let publish_url = req let publish_url = req
.url_for(JOBOFFER_PUBLISH_ROUTE, &[id]) .url_for(JOBOFFER_PUBLISH_ROUTE, [id])
.expect("generation of publish route urls should succeed"); .expect("generation of publish route urls should succeed");
let unpublish_url = req let unpublish_url = req
.url_for(JOBOFFER_UNPUBLISH_ROUTE, &[id]) .url_for(JOBOFFER_UNPUBLISH_ROUTE, [id])
.expect("generation of un-publish route urls should succeed"); .expect("generation of un-publish route urls should succeed");
let delete_url = req let delete_url = req
.url_for(JOBOFFER_DELETION_ROUTE, &[id]) .url_for(JOBOFFER_DELETION_ROUTE, [id])
.expect("generation of delete route urls should succeed"); .expect("generation of delete route urls should succeed");
let edit_url = req let edit_url = req
.url_for(JOBOFFER_EDIT_ROUTE, &[id]) .url_for(JOBOFFER_EDIT_ROUTE, [id])
.expect("generation of delete route urls should succeed"); .expect("generation of delete route urls should succeed");
let confirmation_url = match &offer.status { let confirmation_url = match &offer.status {

View file

@ -148,7 +148,7 @@ pub(crate) async fn job_offer_attachment(
.map_or(false, |token| offer.check_submitter_token(token)) .map_or(false, |token| offer.check_submitter_token(token))
{ {
let dest = req let dest = req
.url_for(JOBOFFER_ATTACHMENT_ROUTE, &[id, attachment_name]) .url_for(JOBOFFER_ATTACHMENT_ROUTE, [id, attachment_name])
.expect("generation of attachment route urls should succeed"); .expect("generation of attachment route urls should succeed");
// when not authenticated, redirect to login with return path set back to the attachment // when not authenticated, redirect to login with return path set back to the attachment
User::current(&session).map_err(|req_login| req_login.return_to(dest))?; User::current(&session).map_err(|req_login| req_login.return_to(dest))?;
@ -159,7 +159,7 @@ pub(crate) async fn job_offer_attachment(
Ok(NamedFile::open_async(path).await.map(|named_file| { Ok(NamedFile::open_async(path).await.map(|named_file| {
named_file named_file
.disable_content_disposition() .disable_content_disposition()
.set_content_type(mime_guess::from_path(&attachment_name).first_or_octet_stream()) .set_content_type(mime_guess::from_path(attachment_name).first_or_octet_stream())
})) }))
} }

View file

@ -50,10 +50,10 @@ pub(crate) async fn confirm_joboffer_get(
preview: job_offer.to_preview_data(id, &req, Some(req_token))?, preview: job_offer.to_preview_data(id, &req, Some(req_token))?,
actions: ConfirmActions { actions: ConfirmActions {
confirm_url: req confirm_url: req
.url_for(JOBOFFER_SUBMISSION_CONFIRM_ACTION_ROUTE, &[id, req_token])? .url_for(JOBOFFER_SUBMISSION_CONFIRM_ACTION_ROUTE, [id, req_token])?
.to_string(), .to_string(),
retract_url: req retract_url: req
.url_for(JOBOFFER_SUBMISSION_RETRACT_ACTION_ROUTE, &[id, req_token])? .url_for(JOBOFFER_SUBMISSION_RETRACT_ACTION_ROUTE, [id, req_token])?
.to_string(), .to_string(),
}, },
is_reviewed: !job_offer.status.requires_review(), is_reviewed: !job_offer.status.requires_review(),

View file

@ -262,7 +262,7 @@ pub(crate) async fn create_job_offer<'data, 'config>(
} }
if !skip_confirmation { if !skip_confirmation {
let confirm_url = req.url_for(JOBOFFER_CONFIRM_ROUTE, &[created_offer.id(), &token])?; let confirm_url = req.url_for(JOBOFFER_CONFIRM_ROUTE, [created_offer.id(), &token])?;
email::send_confirmation_email( email::send_confirmation_email(
hb, hb,

View file

@ -133,7 +133,7 @@ pub(crate) async fn tmpfile_from_field(
let buf = if let Some(buf) = file_buffer.as_mut() { let buf = if let Some(buf) = file_buffer.as_mut() {
buf buf
} else { } else {
let file = NamedTempFile::new_in(&tmp_dir)?; let file = NamedTempFile::new_in(tmp_dir)?;
file_buffer.insert(BufWriter::new(file)) file_buffer.insert(BufWriter::new(file))
}; };
remaining -= data.len(); remaining -= data.len();