Skip to content

Commit c0327a3

Browse files
borsbors
committed
Auto merge of #1615 - jtgeibel:clippy-nursery, r=sgrif
Temporarily deny clippy::nursery and fix warnings The warnings were ultimately from `clippy::needless_borrow` and `clippy::redundant_clone`.
2 parents 4670192 + a49c0c2 commit c0327a3

15 files changed

+63
-72
lines changed

‎src/bin/update-downloads.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ mod test {
137137
name: "foo",
138138
..Default::default()
139139
}
140-
.create_or_update(&conn, None, user_id)
140+
.create_or_update(conn, None, user_id)
141141
.unwrap();
142142
let version = NewVersion::new(
143143
krate.id,
@@ -148,7 +148,7 @@ mod test {
148148
0,
149149
)
150150
.unwrap();
151-
let version = version.save(&conn, &[]).unwrap();
151+
let version = version.save(conn, &[]).unwrap();
152152
(krate, version)
153153
}
154154

‎src/controllers/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ mod prelude {
3939

4040
fn redirect(&self, url: String) -> Response {
4141
let mut headers = HashMap::new();
42-
headers.insert("Location".to_string(), vec![url.to_string()]);
42+
headers.insert("Location".to_string(), vec![url]);
4343
Response {
4444
status: (302, "Found"),
4545
headers,

‎src/controllers/user/session.rs

+1-5
Original file line numberDiff line numberDiff line change
@@ -94,11 +94,7 @@ pub fn github_access_token(req: &mut dyn Request) -> CargoResult<Response> {
9494
}
9595

9696
// Fetch the access token from github using the code we just got
97-
let token = req
98-
.app()
99-
.github
100-
.exchange(code.clone())
101-
.map_err(|s| human(&s))?;
97+
let token = req.app().github.exchange(code).map_err(|s| human(&s))?;
10298

10399
let ghuser = github::github::<GithubUser>(req.app(), "/user", &token)?;
104100

‎src/models/category.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -93,8 +93,8 @@ impl Category {
9393
} = self;
9494
EncodableCategory {
9595
id: slug.clone(),
96-
slug: slug.clone(),
97-
description: description.clone(),
96+
slug,
97+
description,
9898
created_at,
9999
crates_cnt,
100100
category: category.rsplit("::").collect::<Vec<_>>()[0].to_string(),

‎src/render.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -381,7 +381,7 @@ mod tests {
381381
let readme_text =
382382
"[![Crates.io](https://img.shields.io/crates/v/clap.svg)](https://crates.io/crates/clap)";
383383
let repository = "https://github.com/kbknapp/clap-rs/";
384-
let result = markdown_to_html(readme_text, Some(&repository)).unwrap();
384+
let result = markdown_to_html(readme_text, Some(repository)).unwrap();
385385

386386
assert_eq!(
387387
result,

‎src/s3/lib.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ impl Bucket {
5050
} else {
5151
path
5252
};
53-
let date = Utc::now().to_rfc2822().to_string();
53+
let date = Utc::now().to_rfc2822();
5454
let auth = self.auth("PUT", &date, path, "", content_type);
5555
let url = self.url(path);
5656

@@ -74,7 +74,7 @@ impl Bucket {
7474
} else {
7575
path
7676
};
77-
let date = Utc::now().to_rfc2822().to_string();
77+
let date = Utc::now().to_rfc2822();
7878
let auth = self.auth("DELETE", &date, path, "", "");
7979
let url = self.url(path);
8080

‎src/tests/badge.rs

+1-4
Original file line numberDiff line numberDiff line change
@@ -317,10 +317,7 @@ fn update_attributes() {
317317
};
318318
let mut badge_attributes_travis_ci2 = HashMap::new();
319319
badge_attributes_travis_ci2.insert(String::from("repository"), String::from("rust-lang/rust"));
320-
badges.insert(
321-
String::from("travis-ci"),
322-
badge_attributes_travis_ci2.clone(),
323-
);
320+
badges.insert(String::from("travis-ci"), badge_attributes_travis_ci2);
324321
krate.update(&badges);
325322
let current_badges = krate.badges();
326323
assert_eq!(current_badges.len(), 1);

‎src/tests/category.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ fn show() {
5757
let url = "/api/v1/categories/foo-bar";
5858

5959
// Return not found if a category doesn't exist
60-
anon.get(&url).assert_not_found();
60+
anon.get(url).assert_not_found();
6161

6262
// Create a category and a subcategory
6363
app.db(|conn| {
@@ -66,7 +66,7 @@ fn show() {
6666
});
6767

6868
// The category and its subcategories should be in the json
69-
let json: CategoryWithSubcategories = anon.get(&url).good();
69+
let json: CategoryWithSubcategories = anon.get(url).good();
7070
assert_eq!(json.category.category, "Foo Bar");
7171
assert_eq!(json.category.slug, "foo-bar");
7272
assert_eq!(json.category.subcategories.len(), 1);
@@ -171,10 +171,10 @@ fn category_slugs_returns_all_slugs_in_alphabetical_order() {
171171
let (app, anon) = TestApp::init().empty();
172172
app.db(|conn| {
173173
new_category("Foo", "foo", "For crates that foo")
174-
.create_or_update(&conn)
174+
.create_or_update(conn)
175175
.unwrap();
176176
new_category("Bar", "bar", "For crates that bar")
177-
.create_or_update(&conn)
177+
.create_or_update(conn)
178178
.unwrap();
179179
});
180180

‎src/tests/keyword.rs

+7-7
Original file line numberDiff line numberDiff line change
@@ -71,41 +71,41 @@ fn update_crate() {
7171

7272
let krate = app.db(|conn| {
7373
Keyword::find_or_create_all(conn, &["kw1", "kw2"]).unwrap();
74-
CrateBuilder::new("fookey", user.id).expect_build(&conn)
74+
CrateBuilder::new("fookey", user.id).expect_build(conn)
7575
});
7676

7777
app.db(|conn| {
78-
Keyword::update_crate(&conn, &krate, &[]).unwrap();
78+
Keyword::update_crate(conn, &krate, &[]).unwrap();
7979
});
8080
assert_eq!(cnt("kw1"), 0);
8181
assert_eq!(cnt("kw2"), 0);
8282

8383
app.db(|conn| {
84-
Keyword::update_crate(&conn, &krate, &["kw1"]).unwrap();
84+
Keyword::update_crate(conn, &krate, &["kw1"]).unwrap();
8585
});
8686
assert_eq!(cnt("kw1"), 1);
8787
assert_eq!(cnt("kw2"), 0);
8888

8989
app.db(|conn| {
90-
Keyword::update_crate(&conn, &krate, &["kw2"]).unwrap();
90+
Keyword::update_crate(conn, &krate, &["kw2"]).unwrap();
9191
});
9292
assert_eq!(cnt("kw1"), 0);
9393
assert_eq!(cnt("kw2"), 1);
9494

9595
app.db(|conn| {
96-
Keyword::update_crate(&conn, &krate, &[]).unwrap();
96+
Keyword::update_crate(conn, &krate, &[]).unwrap();
9797
});
9898
assert_eq!(cnt("kw1"), 0);
9999
assert_eq!(cnt("kw2"), 0);
100100

101101
app.db(|conn| {
102-
Keyword::update_crate(&conn, &krate, &["kw1", "kw2"]).unwrap();
102+
Keyword::update_crate(conn, &krate, &["kw1", "kw2"]).unwrap();
103103
});
104104
assert_eq!(cnt("kw1"), 1);
105105
assert_eq!(cnt("kw2"), 1);
106106

107107
app.db(|conn| {
108-
Keyword::update_crate(&conn, &krate, &[]).unwrap();
108+
Keyword::update_crate(conn, &krate, &[]).unwrap();
109109
});
110110
assert_eq!(cnt("kw1"), 0);
111111
assert_eq!(cnt("kw2"), 0);

‎src/tests/krate.rs

+20-20
Original file line numberDiff line numberDiff line change
@@ -430,7 +430,7 @@ fn show() {
430430
.keyword("kw1")
431431
.downloads(20)
432432
.recent_downloads(10)
433-
.expect_build(&conn)
433+
.expect_build(conn)
434434
});
435435

436436
let json = anon.show_crate("foo_show");
@@ -627,7 +627,7 @@ fn new_with_renamed_dependency() {
627627

628628
app.db(|conn| {
629629
// Insert a crate directly into the database so that new-krate can depend on it
630-
CrateBuilder::new("package-name", user.as_model().id).expect_build(&conn);
630+
CrateBuilder::new("package-name", user.as_model().id).expect_build(conn);
631631
});
632632

633633
let dependency = DependencyBuilder::new("package-name").rename("my-name");
@@ -662,7 +662,7 @@ fn new_krate_with_dependency() {
662662
// The name choice of `foo-dep` is important! It has the property of
663663
// name != canon_crate_name(name) and is a regression test for
664664
// https://github.com/rust-lang/crates.io/issues/651
665-
CrateBuilder::new("foo-dep", user.as_model().id).expect_build(&conn);
665+
CrateBuilder::new("foo-dep", user.as_model().id).expect_build(conn);
666666
});
667667

668668
let dependency = DependencyBuilder::new("foo-dep");
@@ -678,7 +678,7 @@ fn reject_new_krate_with_non_exact_dependency() {
678678
let (app, _, user, token) = TestApp::init().with_token();
679679

680680
app.db(|conn| {
681-
CrateBuilder::new("foo-dep", user.as_model().id).expect_build(&conn);
681+
CrateBuilder::new("foo-dep", user.as_model().id).expect_build(conn);
682682
});
683683

684684
// Use non-exact name for the dependency
@@ -727,7 +727,7 @@ fn new_krate_with_wildcard_dependency() {
727727

728728
app.db(|conn| {
729729
// Insert a crate directly into the database so that new_wild can depend on it
730-
CrateBuilder::new("foo_wild", user.as_model().id).expect_build(&conn);
730+
CrateBuilder::new("foo_wild", user.as_model().id).expect_build(conn);
731731
});
732732

733733
let dependency = DependencyBuilder::new("foo_wild").version_req("*");
@@ -750,7 +750,7 @@ fn new_krate_twice() {
750750

751751
app.db(|conn| {
752752
// Insert a crate directly into the database and then we'll try to publish another version
753-
CrateBuilder::new("foo_twice", user.as_model().id).expect_build(&conn);
753+
CrateBuilder::new("foo_twice", user.as_model().id).expect_build(conn);
754754
});
755755

756756
let crate_to_publish = PublishBuilder::new("foo_twice")
@@ -768,7 +768,7 @@ fn new_krate_wrong_user() {
768768

769769
app.db(|conn| {
770770
// Create the foo_wrong crate with one user
771-
CrateBuilder::new("foo_wrong", user.as_model().id).expect_build(&conn);
771+
CrateBuilder::new("foo_wrong", user.as_model().id).expect_build(conn);
772772
});
773773

774774
// Then try to publish with a different user
@@ -819,7 +819,7 @@ fn new_krate_too_big_but_whitelisted() {
819819
app.db(|conn| {
820820
CrateBuilder::new("foo_whitelist", user.as_model().id)
821821
.max_upload_size(2_000_000)
822-
.expect_build(&conn);
822+
.expect_build(conn);
823823
});
824824

825825
let files = [("foo_whitelist-1.1.0/big", &[b'a'; 2000] as &[_])];
@@ -875,7 +875,7 @@ fn new_krate_duplicate_version() {
875875
// Insert a crate directly into the database and then we'll try to publish the same version
876876
CrateBuilder::new("foo_dupe", user.as_model().id)
877877
.version("1.0.0")
878-
.expect_build(&conn);
878+
.expect_build(conn);
879879
});
880880

881881
let crate_to_publish = PublishBuilder::new("foo_dupe").version("1.0.0");
@@ -895,7 +895,7 @@ fn new_crate_similar_name() {
895895
app.db(|conn| {
896896
CrateBuilder::new("Foo_similar", user.as_model().id)
897897
.version("1.0.0")
898-
.expect_build(&conn);
898+
.expect_build(conn);
899899
});
900900

901901
let crate_to_publish = PublishBuilder::new("foo_similar").version("1.1.0");
@@ -915,7 +915,7 @@ fn new_crate_similar_name_hyphen() {
915915
app.db(|conn| {
916916
CrateBuilder::new("foo_bar_hyphen", user.as_model().id)
917917
.version("1.0.0")
918-
.expect_build(&conn);
918+
.expect_build(conn);
919919
});
920920

921921
let crate_to_publish = PublishBuilder::new("foo-bar-hyphen").version("1.1.0");
@@ -935,7 +935,7 @@ fn new_crate_similar_name_underscore() {
935935
app.db(|conn| {
936936
CrateBuilder::new("foo-bar-underscore", user.as_model().id)
937937
.version("1.0.0")
938-
.expect_build(&conn);
938+
.expect_build(conn);
939939
});
940940

941941
let crate_to_publish = PublishBuilder::new("foo_bar_underscore").version("1.1.0");
@@ -1191,7 +1191,7 @@ fn download() {
11911191
app.db(|conn| {
11921192
CrateBuilder::new("foo_download", user.id)
11931193
.version(VersionBuilder::new("1.0.0"))
1194-
.expect_build(&conn);
1194+
.expect_build(conn);
11951195
});
11961196

11971197
let assert_dl_count = |name_and_version: &str, query: Option<&str>, count: i32| {
@@ -1241,7 +1241,7 @@ fn download_nonexistent_version_of_existing_crate_404s() {
12411241
let user = user.as_model();
12421242

12431243
app.db(|conn| {
1244-
CrateBuilder::new("foo_bad", user.id).expect_build(&conn);
1244+
CrateBuilder::new("foo_bad", user.id).expect_build(conn);
12451245
});
12461246

12471247
anon.get("/api/v1/crates/foo_bad/0.1.0/download")
@@ -1254,10 +1254,10 @@ fn dependencies() {
12541254
let user = user.as_model();
12551255

12561256
app.db(|conn| {
1257-
let c1 = CrateBuilder::new("foo_deps", user.id).expect_build(&conn);
1258-
let v = VersionBuilder::new("1.0.0").expect_build(c1.id, &conn);
1259-
let c2 = CrateBuilder::new("bar_deps", user.id).expect_build(&conn);
1260-
new_dependency(&conn, &v, &c2);
1257+
let c1 = CrateBuilder::new("foo_deps", user.id).expect_build(conn);
1258+
let v = VersionBuilder::new("1.0.0").expect_build(c1.id, conn);
1259+
let c2 = CrateBuilder::new("bar_deps", user.id).expect_build(conn);
1260+
new_dependency(conn, &v, &c2);
12611261
});
12621262

12631263
let deps: Deps = anon
@@ -1283,7 +1283,7 @@ fn following() {
12831283
let (app, _, user) = TestApp::init().with_user();
12841284

12851285
app.db(|conn| {
1286-
CrateBuilder::new("foo_following", user.as_model().id).expect_build(&conn);
1286+
CrateBuilder::new("foo_following", user.as_model().id).expect_build(conn);
12871287
});
12881288

12891289
let is_following = || -> bool {
@@ -1487,7 +1487,7 @@ fn publish_after_removing_documentation() {
14871487
app.db(|conn| {
14881488
CrateBuilder::new("docscrate", user.id)
14891489
.version("0.2.0")
1490-
.expect_build(&conn);
1490+
.expect_build(conn);
14911491
});
14921492

14931493
// Verify that crates start without any documentation so the next assertion can *prove*

‎src/tests/owners.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ fn check_ownership_two_crates() {
146146
let user2 = app.db_new_user("user_bar");
147147
let user2 = user2.as_model();
148148
let krate_not_owned_by_team =
149-
app.db(|conn| CrateBuilder::new("bar", user2.id).expect_build(&conn));
149+
app.db(|conn| CrateBuilder::new("bar", user2.id).expect_build(conn));
150150

151151
let json = anon.search_by_user_id(user2.id);
152152
assert_eq!(json.crates[0].name, krate_not_owned_by_team.name);
@@ -176,7 +176,7 @@ fn check_ownership_one_crate() {
176176
.create_or_update(conn)
177177
.unwrap();
178178
let krate = CrateBuilder::new("best_crate", user.id).expect_build(conn);
179-
add_team_to_crate(&t, &krate, &user, conn).unwrap();
179+
add_team_to_crate(&t, &krate, user, conn).unwrap();
180180
t
181181
});
182182

0 commit comments

Comments
 (0)