From 2408bc656489397cfe18e94de4ae30440586d356 Mon Sep 17 00:00:00 2001 From: Georg Semmler Date: Fri, 26 May 2023 13:52:02 +0200 Subject: [PATCH] Fix a merge conflict --- src/librustdoc/passes/collect_intra_doc_links.rs | 2 +- src/tools/tidy/src/ui_tests.rs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/librustdoc/passes/collect_intra_doc_links.rs b/src/librustdoc/passes/collect_intra_doc_links.rs index 2b0fef267e9a2..ef2e3da97725b 100644 --- a/src/librustdoc/passes/collect_intra_doc_links.rs +++ b/src/librustdoc/passes/collect_intra_doc_links.rs @@ -149,7 +149,7 @@ impl TryFrom for Res { Def(kind, id) => Ok(Res::Def(kind, id)), PrimTy(prim) => Ok(Res::Primitive(PrimitiveType::from_hir(prim))), // e.g. `#[derive]` - ToolMod | NonMacroAttr(..) | Err => Result::Err(()), + ToolMod { .. } | NonMacroAttr(..) | Err => Result::Err(()), other => bug!("unrecognized res {:?}", other), } } diff --git a/src/tools/tidy/src/ui_tests.rs b/src/tools/tidy/src/ui_tests.rs index 01ef4abd3dca3..1d1588b964679 100644 --- a/src/tools/tidy/src/ui_tests.rs +++ b/src/tools/tidy/src/ui_tests.rs @@ -11,7 +11,7 @@ use std::path::{Path, PathBuf}; const ENTRY_LIMIT: usize = 900; // FIXME: The following limits should be reduced eventually. const ISSUES_ENTRY_LIMIT: usize = 1898; -const ROOT_ENTRY_LIMIT: usize = 891; +const ROOT_ENTRY_LIMIT: usize = 892; const EXPECTED_TEST_FILE_EXTENSIONS: &[&str] = &[ "rs", // test source files