Skip to content

Commit 88b4ea8

Browse files
committed
Auto merge of #90635 - matthiaskrgr:rustdoc_compl, r=GuillaumeGomez
rustdoc: clippy::complexity fixes
2 parents 089a016 + 952fea7 commit 88b4ea8

File tree

2 files changed

+4
-5
lines changed

2 files changed

+4
-5
lines changed

src/librustdoc/clean/mod.rs

+3-4
Original file line numberDiff line numberDiff line change
@@ -924,7 +924,7 @@ impl Clean<Item> for hir::TraitItem<'_> {
924924
}
925925
hir::TraitItemKind::Fn(ref sig, hir::TraitFn::Required(names)) => {
926926
let (generics, decl) = enter_impl_trait(cx, |cx| {
927-
(self.generics.clean(cx), (&*sig.decl, &names[..]).clean(cx))
927+
(self.generics.clean(cx), (sig.decl, names).clean(cx))
928928
});
929929
let mut t = Function { header: sig.header, decl, generics };
930930
if t.header.constness == hir::Constness::Const
@@ -2063,9 +2063,8 @@ impl Clean<Item> for (&hir::ForeignItem<'_>, Option<Symbol>) {
20632063
let kind = match item.kind {
20642064
hir::ForeignItemKind::Fn(decl, names, ref generics) => {
20652065
let abi = cx.tcx.hir().get_foreign_abi(item.hir_id());
2066-
let (generics, decl) = enter_impl_trait(cx, |cx| {
2067-
(generics.clean(cx), (&*decl, &names[..]).clean(cx))
2068-
});
2066+
let (generics, decl) =
2067+
enter_impl_trait(cx, |cx| (generics.clean(cx), (decl, names).clean(cx)));
20692068
ForeignFunctionItem(Function {
20702069
decl,
20712070
generics,

src/librustdoc/scrape_examples.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ impl ScrapeExamplesOptions {
4848
target_crates,
4949
})),
5050
(Some(_), false) | (None, true) => {
51-
diag.err(&format!("must use --scrape-examples-output-path and --scrape-examples-target-crate together"));
51+
diag.err("must use --scrape-examples-output-path and --scrape-examples-target-crate together");
5252
Err(1)
5353
}
5454
(None, false) => Ok(None),

0 commit comments

Comments
 (0)