mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Auto merge of #90635 - matthiaskrgr:rustdoc_compl, r=GuillaumeGomez

Browse Source 
rustdoc: clippy::complexity fixes
This commit is contained in:
bors 2021-11-07 02:17:35 +00:00
commit 88b4ea8fb6
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/librustdoc/clean/mod.rs
View File

@ -924,7 +924,7 @@ impl Clean<Item> 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<Item> for (&hir::ForeignItem<'_>, Option<Symbol>) {
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,

2
src/librustdoc/scrape_examples.rs
View File

@ -48,7 +48,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),