Skip to content

Commit 7fc9166

Browse files
committed
rustdoc: clean up retain conditon in link ambiguity handling
1 parent 11e738b commit 7fc9166

File tree

2 files changed

+1
-10
lines changed

2 files changed

+1
-10
lines changed

src/librustdoc/lib.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
#![feature(test)]
1818
#![feature(type_alias_impl_trait)]
1919
#![feature(type_ascription)]
20-
#![feature(iterator_try_reduce)]
2120
#![recursion_limit = "256"]
2221
#![warn(rustc::internal)]
2322
#![allow(clippy::collapsible_if, clippy::collapsible_else_if)]

src/librustdoc/passes/collect_intra_doc_links.rs

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2256,15 +2256,7 @@ fn ambiguity_error(
22562256
// As an optimization, we only deduplicate if we're in a proc-macro crate,
22572257
// and only if we already found something that looks like a proc macro.
22582258
if is_proc_macro_crate && let Some(macro_id) = possible_proc_macro_id {
2259-
kinds.retain(|res| {
2260-
if let Res::Def(DefKind::Fn, fn_id) = res
2261-
&& macro_id == *fn_id
2262-
{
2263-
false
2264-
} else {
2265-
true
2266-
}
2267-
});
2259+
kinds.retain(|res| !matches!(res, Res::Def(DefKind::Fn, fn_id) if macro_id == *fn_id));
22682260
}
22692261

22702262
kinds.retain(|res| descrs.insert(res.descr()));

0 commit comments

Comments
 (0)