diff --git a/src/db/pool.rs b/src/db/pool.rs index 9de3b7f2c..4bef9599a 100644 --- a/src/db/pool.rs +++ b/src/db/pool.rs @@ -61,7 +61,7 @@ impl Pool { ) -> R { #[cfg(test)] { - f(&self.pool.lock().unwrap().as_ref().unwrap()) + f(self.pool.lock().unwrap().as_ref().unwrap()) } #[cfg(not(test))] { diff --git a/src/test/mod.rs b/src/test/mod.rs index 0c65ada2a..b965e96e0 100644 --- a/src/test/mod.rs +++ b/src/test/mod.rs @@ -290,7 +290,7 @@ impl TestDatabase { // test to create a fresh instance of the database to run within. let schema = format!("docs_rs_test_schema_{}", rand::random::()); - let pool = Pool::new_with_schema(&config, metrics, &schema)?; + let pool = Pool::new_with_schema(config, metrics, &schema)?; let repository_stats_updater = RepositoryStatsUpdater::new(config, pool.clone()); let mut conn = Connection::connect(&config.database_url, postgres::NoTls)?; diff --git a/src/web/crate_details.rs b/src/web/crate_details.rs index e4ee4d349..9172904f2 100644 --- a/src/web/crate_details.rs +++ b/src/web/crate_details.rs @@ -323,7 +323,7 @@ mod tests { &mut db.conn(), package, version, - &db.repository_stats_updater(), + db.repository_stats_updater(), ) .ok_or_else(|| failure::err_msg("could not fetch crate details"))?; @@ -358,11 +358,11 @@ mod tests { .yanked(true) .create()?; - assert_last_successful_build_equals(&db, "foo", "0.0.1", None)?; - assert_last_successful_build_equals(&db, "foo", "0.0.2", None)?; - assert_last_successful_build_equals(&db, "foo", "0.0.3", Some("0.0.2"))?; - assert_last_successful_build_equals(&db, "foo", "0.0.4", None)?; - assert_last_successful_build_equals(&db, "foo", "0.0.5", Some("0.0.2"))?; + assert_last_successful_build_equals(db, "foo", "0.0.1", None)?; + assert_last_successful_build_equals(db, "foo", "0.0.2", None)?; + assert_last_successful_build_equals(db, "foo", "0.0.3", Some("0.0.2"))?; + assert_last_successful_build_equals(db, "foo", "0.0.4", None)?; + assert_last_successful_build_equals(db, "foo", "0.0.5", Some("0.0.2"))?; Ok(()) }); } @@ -388,9 +388,9 @@ mod tests { .yanked(true) .create()?; - assert_last_successful_build_equals(&db, "foo", "0.0.1", None)?; - assert_last_successful_build_equals(&db, "foo", "0.0.2", None)?; - assert_last_successful_build_equals(&db, "foo", "0.0.3", None)?; + assert_last_successful_build_equals(db, "foo", "0.0.1", None)?; + assert_last_successful_build_equals(db, "foo", "0.0.2", None)?; + assert_last_successful_build_equals(db, "foo", "0.0.3", None)?; Ok(()) }); } @@ -413,10 +413,10 @@ mod tests { .create()?; env.fake_release().name("foo").version("0.0.4").create()?; - assert_last_successful_build_equals(&db, "foo", "0.0.1", None)?; - assert_last_successful_build_equals(&db, "foo", "0.0.2", Some("0.0.4"))?; - assert_last_successful_build_equals(&db, "foo", "0.0.3", None)?; - assert_last_successful_build_equals(&db, "foo", "0.0.4", None)?; + assert_last_successful_build_equals(db, "foo", "0.0.1", None)?; + assert_last_successful_build_equals(db, "foo", "0.0.2", Some("0.0.4"))?; + assert_last_successful_build_equals(db, "foo", "0.0.3", None)?; + assert_last_successful_build_equals(db, "foo", "0.0.4", None)?; Ok(()) }); } @@ -456,7 +456,7 @@ mod tests { &mut db.conn(), "foo", "0.2.0", - &db.repository_stats_updater(), + db.repository_stats_updater(), ) .unwrap(); assert_eq!( @@ -531,7 +531,7 @@ mod tests { &mut db.conn(), "foo", version, - &db.repository_stats_updater(), + db.repository_stats_updater(), ) .unwrap(); assert_eq!( @@ -561,7 +561,7 @@ mod tests { &mut db.conn(), "foo", version, - &db.repository_stats_updater(), + db.repository_stats_updater(), ) .unwrap(); assert_eq!( @@ -592,7 +592,7 @@ mod tests { &mut db.conn(), "foo", version, - &db.repository_stats_updater(), + db.repository_stats_updater(), ) .unwrap(); assert_eq!( @@ -631,7 +631,7 @@ mod tests { &mut db.conn(), "foo", version, - &db.repository_stats_updater(), + db.repository_stats_updater(), ) .unwrap(); assert_eq!( @@ -693,7 +693,7 @@ mod tests { &mut db.conn(), "foo", "0.0.1", - &db.repository_stats_updater(), + db.repository_stats_updater(), ) .unwrap(); assert_eq!( @@ -723,7 +723,7 @@ mod tests { &mut db.conn(), "foo", "0.0.1", - &db.repository_stats_updater(), + db.repository_stats_updater(), ) .unwrap(); let mut owners = details.owners; @@ -752,7 +752,7 @@ mod tests { &mut db.conn(), "foo", "0.0.1", - &db.repository_stats_updater(), + db.repository_stats_updater(), ) .unwrap(); assert_eq!( @@ -776,7 +776,7 @@ mod tests { &mut db.conn(), "foo", "0.0.1", - &db.repository_stats_updater(), + db.repository_stats_updater(), ) .unwrap(); assert_eq!( diff --git a/src/web/rustdoc.rs b/src/web/rustdoc.rs index d953ff30f..bb32f6007 100644 --- a/src/web/rustdoc.rs +++ b/src/web/rustdoc.rs @@ -831,19 +831,19 @@ mod test { let web = env.frontend(); // check it works at all - let redirect = latest_version_redirect("/dummy/0.1.0/dummy/", &web)?; + let redirect = latest_version_redirect("/dummy/0.1.0/dummy/", web)?; assert_eq!( redirect, "/crate/dummy/0.2.0/target-redirect/x86_64-unknown-linux-gnu/dummy/index.html" ); // check it keeps the subpage - let redirect = latest_version_redirect("/dummy/0.1.0/dummy/blah/", &web)?; + let redirect = latest_version_redirect("/dummy/0.1.0/dummy/blah/", web)?; assert_eq!( redirect, "/crate/dummy/0.2.0/target-redirect/x86_64-unknown-linux-gnu/dummy/blah/index.html" ); - let redirect = latest_version_redirect("/dummy/0.1.0/dummy/blah/blah.html", &web)?; + let redirect = latest_version_redirect("/dummy/0.1.0/dummy/blah/blah.html", web)?; assert_eq!( redirect, "/crate/dummy/0.2.0/target-redirect/x86_64-unknown-linux-gnu/dummy/blah/blah.html" @@ -851,7 +851,7 @@ mod test { // check it also works for deleted pages let redirect = - latest_version_redirect("/dummy/0.1.0/dummy/struct.will-be-deleted.html", &web)?; + latest_version_redirect("/dummy/0.1.0/dummy/struct.will-be-deleted.html", web)?; assert_eq!(redirect, "/crate/dummy/0.2.0/target-redirect/x86_64-unknown-linux-gnu/dummy/struct.will-be-deleted.html"); Ok(()) @@ -891,7 +891,7 @@ mod test { let redirect = latest_version_redirect( "/dummy/0.1.0/x86_64-pc-windows-msvc/dummy/struct.Blah.html", - &web, + web, )?; assert_eq!( redirect, @@ -1049,7 +1049,7 @@ mod test { assert_redirect( "/zstd/badge.svg", "/zstd/badge.svg?version=0.5.1%2Bzstd.1.4.4", - &frontend, + frontend, )?; Ok(()) })