Skip to content

Commit

Permalink
Address some clippy warnings (#5121)
Browse files Browse the repository at this point in the history
* Address `clippy::explicit_auto_deref` warnings

* Address `clippy::needless_borrow` warning
  • Loading branch information
jtgeibel authored Aug 25, 2022
1 parent 83c1d07 commit 3d71217
Show file tree
Hide file tree
Showing 8 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion src/controllers/crate_owner_invitation.rs
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ fn prepare_list(
ListFilter::CrateName(crate_name) => {
// Only allow crate owners to query pending invitations for their crate.
let krate: Crate = Crate::by_name(&crate_name).first(&*conn)?;
let owners = krate.owners(&*conn)?;
let owners = krate.owners(&conn)?;
if user.rights(req.app(), &owners)? != Rights::Full {
return Err(forbidden());
}
Expand Down
2 changes: 1 addition & 1 deletion src/controllers/keyword.rs
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ pub fn index(req: &mut dyn RequestExt) -> EndpointResult {

let query = query.pages_pagination(PaginationOptions::builder().gather(req)?);
let conn = req.db_read()?;
let data: Paginated<Keyword> = query.load(&*conn)?;
let data: Paginated<Keyword> = query.load(&conn)?;
let total = data.total();
let kws = data
.into_iter()
Expand Down
2 changes: 1 addition & 1 deletion src/controllers/krate/metadata.rs
Original file line number Diff line number Diff line change
Expand Up @@ -359,7 +359,7 @@ pub fn reverse_dependencies(req: &mut dyn RequestExt) -> EndpointResult {
let name = &req.params()["crate_id"];
let conn = req.db_read()?;
let krate: Crate = Crate::by_name(name).first(&*conn)?;
let (rev_deps, total) = krate.reverse_dependencies(&*conn, pagination_options)?;
let (rev_deps, total) = krate.reverse_dependencies(&conn, pagination_options)?;
let rev_deps: Vec<_> = rev_deps
.into_iter()
.map(|dep| EncodableDependency::from_reverse_dep(dep, &krate.name))
Expand Down
2 changes: 1 addition & 1 deletion src/controllers/krate/search.rs
Original file line number Diff line number Diff line change
Expand Up @@ -295,7 +295,7 @@ pub fn search(req: &mut dyn RequestExt) -> EndpointResult {
(total, next_page, None, results, conn)
} else {
let query = query.pages_pagination(pagination);
let data: Paginated<(Crate, bool, Option<i64>)> = query.load(&*conn)?;
let data: Paginated<(Crate, bool, Option<i64>)> = query.load(&conn)?;
(
data.total(),
data.next_page_params().map(|p| req.query_with_params(p)),
Expand Down
2 changes: 1 addition & 1 deletion src/controllers/token.rs
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ pub fn new(req: &mut dyn RequestExt) -> EndpointResult {
)));
}

let api_token = ApiToken::insert(&*conn, user.id, name)?;
let api_token = ApiToken::insert(&conn, user.id, name)?;
let api_token = EncodableApiTokenWithToken::from(api_token);

Ok(req.json(&json!({ "api_token": api_token })))
Expand Down
2 changes: 1 addition & 1 deletion src/controllers/user/me.rs
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ pub fn updates(req: &mut dyn RequestExt) -> EndpointResult {
))
.pages_pagination(PaginationOptions::builder().gather(req)?);
let conn = req.db_read_prefer_primary()?;
let data: Paginated<(Version, String, Option<User>)> = query.load(&*conn)?;
let data: Paginated<(Version, String, Option<User>)> = query.load(&conn)?;
let more = data.next_page_params().is_some();
let versions = data.iter().map(|(v, _, _)| v).cloned().collect::<Vec<_>>();
let data = data
Expand Down
2 changes: 1 addition & 1 deletion src/tests/owners.rs
Original file line number Diff line number Diff line change
Expand Up @@ -766,7 +766,7 @@ fn extract_token_from_invite_email(emails: &Emails) -> String {
let after_token = " ";
let body = message.body.as_str();
let before_pos = body.find(before_token).unwrap() + before_token.len();
let after_pos = before_pos + (&body[before_pos..]).find(after_token).unwrap();
let after_pos = before_pos + body[before_pos..].find(after_token).unwrap();
body[before_pos..after_pos].to_string()
}

Expand Down
2 changes: 1 addition & 1 deletion src/tests/util/response.rs
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ where
Ok(body.len())
);

match serde_json::from_slice(&*body) {
match serde_json::from_slice(&body) {
Ok(t) => t,
Err(e) => panic!("failed to decode: {:?}", e),
}
Expand Down

0 comments on commit 3d71217

Please sign in to comment.