From 952fea793e2daf58702dceb9f7aff9e429135fc1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20Kr=C3=BCger?= Date: Fri, 5 Nov 2021 22:06:17 +0100 Subject: [PATCH] rustdoc: clippy::complexity fixes --- src/librustdoc/clean/mod.rs | 7 +++---- src/librustdoc/scrape_examples.rs | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/librustdoc/clean/mod.rs b/src/librustdoc/clean/mod.rs index 9ea3112f178..62da44f0c98 100644 --- a/src/librustdoc/clean/mod.rs +++ b/src/librustdoc/clean/mod.rs @@ -924,7 +924,7 @@ impl Clean for hir::TraitItem<'_> { } hir::TraitItemKind::Fn(ref sig, hir::TraitFn::Required(names)) => { let (generics, decl) = enter_impl_trait(cx, |cx| { - (self.generics.clean(cx), (&*sig.decl, &names[..]).clean(cx)) + (self.generics.clean(cx), (sig.decl, names).clean(cx)) }); let mut t = Function { header: sig.header, decl, generics }; if t.header.constness == hir::Constness::Const @@ -2063,9 +2063,8 @@ impl Clean for (&hir::ForeignItem<'_>, Option) { let kind = match item.kind { hir::ForeignItemKind::Fn(decl, names, ref generics) => { let abi = cx.tcx.hir().get_foreign_abi(item.hir_id()); - let (generics, decl) = enter_impl_trait(cx, |cx| { - (generics.clean(cx), (&*decl, &names[..]).clean(cx)) - }); + let (generics, decl) = + enter_impl_trait(cx, |cx| (generics.clean(cx), (decl, names).clean(cx))); ForeignFunctionItem(Function { decl, generics, diff --git a/src/librustdoc/scrape_examples.rs b/src/librustdoc/scrape_examples.rs index 05e746573f4..eabc7133d96 100644 --- a/src/librustdoc/scrape_examples.rs +++ b/src/librustdoc/scrape_examples.rs @@ -49,7 +49,7 @@ impl ScrapeExamplesOptions { target_crates, })), (Some(_), false) | (None, true) => { - diag.err(&format!("must use --scrape-examples-output-path and --scrape-examples-target-crate together")); + diag.err("must use --scrape-examples-output-path and --scrape-examples-target-crate together"); Err(1) } (None, false) => Ok(None),