Fixed some lint issues

This commit is contained in:
Daniel García
2018-09-13 21:55:23 +02:00
parent 948554a20f
commit 8651df8c2a
11 changed files with 25 additions and 27 deletions

View File

@ -41,12 +41,10 @@ fn register(data: JsonUpcase<RegisterData>, conn: DbConn) -> EmptyResult {
user_org.save(&conn);
};
user
} else if CONFIG.signups_allowed {
err!("Account with this email already exists")
} else {
if CONFIG.signups_allowed {
err!("Account with this email already exists")
} else {
err!("Registration not allowed")
}
err!("Registration not allowed")
}
},
None => {
@ -305,7 +303,7 @@ fn password_hint(data: JsonUpcase<PasswordHintData>, conn: DbConn) -> EmptyResul
if let Some(hint) = user.password_hint {
err!(format!("Your password hint is: {}", &hint));
} else {
err!(format!("Sorry, you have no password hint..."));
err!("Sorry, you have no password hint...");
}
}

View File

@ -376,11 +376,11 @@ fn put_cipher_share_seleted(data: JsonUpcase<ShareSelectedCipherData>, headers:
let mut data: ShareSelectedCipherData = data.into_inner().data;
let mut cipher_ids: Vec<String> = Vec::new();
if data.Ciphers.len() == 0 {
if data.Ciphers.is_empty() {
err!("You must select at least one cipher.")
}
if data.CollectionIds.len() == 0 {
if data.CollectionIds.is_empty() {
err!("You must select at least one collection.")
}
@ -393,7 +393,7 @@ fn put_cipher_share_seleted(data: JsonUpcase<ShareSelectedCipherData>, headers:
let attachments = Attachment::find_by_ciphers(cipher_ids, &conn);
if attachments.len() > 0 {
if !attachments.is_empty() {
err!("Ciphers should not have any attachments.")
}

View File

@ -289,7 +289,7 @@ fn get_collection_users(org_id: String, coll_id: String, _headers: AdminHeaders,
.iter().map(|col_user| {
UserOrganization::find_by_user_and_org(&col_user.user_uuid, &org_id, &conn)
.unwrap()
.to_json_collection_user_details(&col_user.read_only, &conn)
.to_json_collection_user_details(col_user.read_only, &conn)
}).collect();
Ok(Json(json!({

View File

@ -293,7 +293,7 @@ impl RegisterResponseCopy {
RegisterResponse {
registration_data: self.registration_data,
version: self.version,
challenge: challenge,
challenge,
client_data: self.client_data,
}
}