Skip to content

Commit b00749f

Browse files
sypharsyphar
committed
fix new clippy warnings
1 parent c53e527 commit b00749f

File tree

5 files changed

+32
-31
lines changed

5 files changed

+32
-31
lines changed

‎src/db/pool.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ impl Pool {
6161
) -> R {
6262
#[cfg(test)]
6363
{
64-
f(&self.pool.lock().unwrap().as_ref().unwrap())
64+
f(self.pool.lock().unwrap().as_ref().unwrap())
6565
}
6666
#[cfg(not(test))]
6767
{

‎src/docbuilder/rustwide_builder.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ use crate::utils::{copy_dir_all, parse_rustc_version, CargoMetadata};
1212
use crate::{db::blacklist::is_blacklisted, utils::MetadataPackage};
1313
use crate::{Config, Context, Index, Metrics, Storage};
1414
use docsrs_metadata::{Metadata, DEFAULT_TARGETS, HOST_TARGET};
15-
use failure::ResultExt;
1615
use log::{debug, info, warn, LevelFilter};
1716
use postgres::Client;
1817
use rustwide::cmd::{Command, CommandError, SandboxBuilder, SandboxImage};
@@ -271,6 +270,8 @@ impl RustwideBuilder {
271270
let limits = Limits::for_crate(&mut conn, name)?;
272271
#[cfg(target_os = "linux")]
273272
if !self.config.disable_memory_limit {
273+
use failure::ResultExt;
274+
274275
let mem_info = procfs::Meminfo::new().context("failed to read /proc/meminfo")?;
275276
let available = mem_info
276277
.mem_available

‎src/test/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -290,7 +290,7 @@ impl TestDatabase {
290290
// test to create a fresh instance of the database to run within.
291291
let schema = format!("docs_rs_test_schema_{}", rand::random::<u64>());
292292

293-
let pool = Pool::new_with_schema(&config, metrics, &schema)?;
293+
let pool = Pool::new_with_schema(config, metrics, &schema)?;
294294
let repository_stats_updater = RepositoryStatsUpdater::new(config, pool.clone());
295295

296296
let mut conn = Connection::connect(&config.database_url, postgres::NoTls)?;

‎src/web/crate_details.rs

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -323,7 +323,7 @@ mod tests {
323323
&mut db.conn(),
324324
package,
325325
version,
326-
&db.repository_stats_updater(),
326+
db.repository_stats_updater(),
327327
)
328328
.ok_or_else(|| failure::err_msg("could not fetch crate details"))?;
329329

@@ -358,11 +358,11 @@ mod tests {
358358
.yanked(true)
359359
.create()?;
360360

361-
assert_last_successful_build_equals(&db, "foo", "0.0.1", None)?;
362-
assert_last_successful_build_equals(&db, "foo", "0.0.2", None)?;
363-
assert_last_successful_build_equals(&db, "foo", "0.0.3", Some("0.0.2"))?;
364-
assert_last_successful_build_equals(&db, "foo", "0.0.4", None)?;
365-
assert_last_successful_build_equals(&db, "foo", "0.0.5", Some("0.0.2"))?;
361+
assert_last_successful_build_equals(db, "foo", "0.0.1", None)?;
362+
assert_last_successful_build_equals(db, "foo", "0.0.2", None)?;
363+
assert_last_successful_build_equals(db, "foo", "0.0.3", Some("0.0.2"))?;
364+
assert_last_successful_build_equals(db, "foo", "0.0.4", None)?;
365+
assert_last_successful_build_equals(db, "foo", "0.0.5", Some("0.0.2"))?;
366366
Ok(())
367367
});
368368
}
@@ -388,9 +388,9 @@ mod tests {
388388
.yanked(true)
389389
.create()?;
390390

391-
assert_last_successful_build_equals(&db, "foo", "0.0.1", None)?;
392-
assert_last_successful_build_equals(&db, "foo", "0.0.2", None)?;
393-
assert_last_successful_build_equals(&db, "foo", "0.0.3", None)?;
391+
assert_last_successful_build_equals(db, "foo", "0.0.1", None)?;
392+
assert_last_successful_build_equals(db, "foo", "0.0.2", None)?;
393+
assert_last_successful_build_equals(db, "foo", "0.0.3", None)?;
394394
Ok(())
395395
});
396396
}
@@ -413,10 +413,10 @@ mod tests {
413413
.create()?;
414414
env.fake_release().name("foo").version("0.0.4").create()?;
415415

416-
assert_last_successful_build_equals(&db, "foo", "0.0.1", None)?;
417-
assert_last_successful_build_equals(&db, "foo", "0.0.2", Some("0.0.4"))?;
418-
assert_last_successful_build_equals(&db, "foo", "0.0.3", None)?;
419-
assert_last_successful_build_equals(&db, "foo", "0.0.4", None)?;
416+
assert_last_successful_build_equals(db, "foo", "0.0.1", None)?;
417+
assert_last_successful_build_equals(db, "foo", "0.0.2", Some("0.0.4"))?;
418+
assert_last_successful_build_equals(db, "foo", "0.0.3", None)?;
419+
assert_last_successful_build_equals(db, "foo", "0.0.4", None)?;
420420
Ok(())
421421
});
422422
}
@@ -456,7 +456,7 @@ mod tests {
456456
&mut db.conn(),
457457
"foo",
458458
"0.2.0",
459-
&db.repository_stats_updater(),
459+
db.repository_stats_updater(),
460460
)
461461
.unwrap();
462462
assert_eq!(
@@ -531,7 +531,7 @@ mod tests {
531531
&mut db.conn(),
532532
"foo",
533533
version,
534-
&db.repository_stats_updater(),
534+
db.repository_stats_updater(),
535535
)
536536
.unwrap();
537537
assert_eq!(
@@ -561,7 +561,7 @@ mod tests {
561561
&mut db.conn(),
562562
"foo",
563563
version,
564-
&db.repository_stats_updater(),
564+
db.repository_stats_updater(),
565565
)
566566
.unwrap();
567567
assert_eq!(
@@ -592,7 +592,7 @@ mod tests {
592592
&mut db.conn(),
593593
"foo",
594594
version,
595-
&db.repository_stats_updater(),
595+
db.repository_stats_updater(),
596596
)
597597
.unwrap();
598598
assert_eq!(
@@ -631,7 +631,7 @@ mod tests {
631631
&mut db.conn(),
632632
"foo",
633633
version,
634-
&db.repository_stats_updater(),
634+
db.repository_stats_updater(),
635635
)
636636
.unwrap();
637637
assert_eq!(
@@ -693,7 +693,7 @@ mod tests {
693693
&mut db.conn(),
694694
"foo",
695695
"0.0.1",
696-
&db.repository_stats_updater(),
696+
db.repository_stats_updater(),
697697
)
698698
.unwrap();
699699
assert_eq!(
@@ -723,7 +723,7 @@ mod tests {
723723
&mut db.conn(),
724724
"foo",
725725
"0.0.1",
726-
&db.repository_stats_updater(),
726+
db.repository_stats_updater(),
727727
)
728728
.unwrap();
729729
let mut owners = details.owners;
@@ -752,7 +752,7 @@ mod tests {
752752
&mut db.conn(),
753753
"foo",
754754
"0.0.1",
755-
&db.repository_stats_updater(),
755+
db.repository_stats_updater(),
756756
)
757757
.unwrap();
758758
assert_eq!(
@@ -776,7 +776,7 @@ mod tests {
776776
&mut db.conn(),
777777
"foo",
778778
"0.0.1",
779-
&db.repository_stats_updater(),
779+
db.repository_stats_updater(),
780780
)
781781
.unwrap();
782782
assert_eq!(

‎src/web/rustdoc.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -831,27 +831,27 @@ mod test {
831831
let web = env.frontend();
832832

833833
// check it works at all
834-
let redirect = latest_version_redirect("/dummy/0.1.0/dummy/", &web)?;
834+
let redirect = latest_version_redirect("/dummy/0.1.0/dummy/", web)?;
835835
assert_eq!(
836836
redirect,
837837
"/crate/dummy/0.2.0/target-redirect/x86_64-unknown-linux-gnu/dummy/index.html"
838838
);
839839

840840
// check it keeps the subpage
841-
let redirect = latest_version_redirect("/dummy/0.1.0/dummy/blah/", &web)?;
841+
let redirect = latest_version_redirect("/dummy/0.1.0/dummy/blah/", web)?;
842842
assert_eq!(
843843
redirect,
844844
"/crate/dummy/0.2.0/target-redirect/x86_64-unknown-linux-gnu/dummy/blah/index.html"
845845
);
846-
let redirect = latest_version_redirect("/dummy/0.1.0/dummy/blah/blah.html", &web)?;
846+
let redirect = latest_version_redirect("/dummy/0.1.0/dummy/blah/blah.html", web)?;
847847
assert_eq!(
848848
redirect,
849849
"/crate/dummy/0.2.0/target-redirect/x86_64-unknown-linux-gnu/dummy/blah/blah.html"
850850
);
851851

852852
// check it also works for deleted pages
853853
let redirect =
854-
latest_version_redirect("/dummy/0.1.0/dummy/struct.will-be-deleted.html", &web)?;
854+
latest_version_redirect("/dummy/0.1.0/dummy/struct.will-be-deleted.html", web)?;
855855
assert_eq!(redirect, "/crate/dummy/0.2.0/target-redirect/x86_64-unknown-linux-gnu/dummy/struct.will-be-deleted.html");
856856

857857
Ok(())
@@ -891,7 +891,7 @@ mod test {
891891

892892
let redirect = latest_version_redirect(
893893
"/dummy/0.1.0/x86_64-pc-windows-msvc/dummy/struct.Blah.html",
894-
&web,
894+
web,
895895
)?;
896896
assert_eq!(
897897
redirect,
@@ -1049,7 +1049,7 @@ mod test {
10491049
assert_redirect(
10501050
"/zstd/badge.svg",
10511051
"/zstd/badge.svg?version=0.5.1%2Bzstd.1.4.4",
1052-
&frontend,
1052+
frontend,
10531053
)?;
10541054
Ok(())
10551055
})

0 commit comments

Comments
 (0)