Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit 7531753

Browse files
committedMar 26, 2022
fix tidy so ci is useful again
1 parent f6419c7 commit 7531753

File tree

4 files changed

+23
-11
lines changed

4 files changed

+23
-11
lines changed
 

‎src/librustdoc/core.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ use std::mem;
2525
use std::rc::Rc;
2626

2727
use crate::clean::inline::build_external_trait;
28-
use crate::clean::{self, ItemId, TraitWithExtraInfo, Crate};
28+
use crate::clean::{self, Crate, ItemId, TraitWithExtraInfo};
2929
use crate::config::{Options as RustdocOptions, OutputFormat, RenderOptions};
3030
use crate::formats::cache::Cache;
3131
use crate::passes::{self, Condition::*, ConditionalPass};

‎src/librustdoc/formats/mod.rs

-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ crate enum RenderMode {
2525

2626
/// Metadata about implementations for a type or trait.
2727
#[derive(Clone, Debug)]
28-
// TODO: this should not exist
2928
crate struct Impl {
3029
crate impl_item: clean::Item,
3130
}

‎src/librustdoc/passes/collect_intra_doc_links.rs

+13-3
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,21 @@ use std::fmt::Write;
2626
use std::mem;
2727
use std::ops::Range;
2828

29-
use crate::{clean::{self, utils::find_nearest_parent_module}, html::{format::HrefError, markdown::{MarkdownLink, markdown_links}}, lint::{PRIVATE_INTRA_DOC_LINKS, BROKEN_INTRA_DOC_LINKS}, visit::DocVisitor};
3029
use crate::clean::{Crate, Item, ItemId, ItemLink, PrimitiveType};
3130
use crate::core::DocContext;
31+
use crate::{
32+
clean::{self, utils::find_nearest_parent_module},
33+
html::{
34+
format::HrefError,
35+
markdown::{markdown_links, MarkdownLink},
36+
},
37+
lint::{BROKEN_INTRA_DOC_LINKS, PRIVATE_INTRA_DOC_LINKS},
38+
visit::DocVisitor,
39+
};
3240

3341
mod early;
34-
crate use early::early_resolve_intra_doc_links;
3542
use super::Pass;
43+
crate use early::early_resolve_intra_doc_links;
3644

3745
crate const COLLECT_INTRA_DOC_LINKS: Pass = Pass {
3846
name: "collect-intra-doc-links",
@@ -1436,7 +1444,9 @@ impl LinkCollector<'_, '_> {
14361444
return Some(());
14371445
}
14381446
// `relative_to` is only used for the actual path of the link, not whether it's resolved or not.
1439-
if let Err(missing) = crate::html::format::href_inner(id, self.cx.tcx, &self.cx.cache, None, &[]) {
1447+
if let Err(missing) =
1448+
crate::html::format::href_inner(id, self.cx.tcx, &self.cx.cache, None, &[])
1449+
{
14401450
missing_docs_for_link(self.cx, &item, id, missing, &path_str, &diag_info);
14411451
}
14421452

‎src/librustdoc/passes/mod.rs

+9-6
Original file line numberDiff line numberDiff line change
@@ -110,15 +110,18 @@ crate const DEFAULT_PASSES: (&[ConditionalPass], &[ConditionalPass]) = (
110110
ConditionalPass::always(CHECK_INVALID_HTML_TAGS),
111111
ConditionalPass::always(PROPAGATE_DOC_CFG),
112112
ConditionalPass::always(CHECK_BARE_URLS),
113-
]
113+
],
114114
);
115115

116116
/// The list of default passes run when `--doc-coverage` is passed to rustdoc.
117-
crate const COVERAGE_PASSES: (&[ConditionalPass], &[ConditionalPass]) = (&[
118-
ConditionalPass::new(STRIP_HIDDEN, WhenNotDocumentHidden),
119-
ConditionalPass::new(STRIP_PRIVATE, WhenNotDocumentPrivate),
120-
ConditionalPass::always(CALCULATE_DOC_COVERAGE),
121-
], &[]);
117+
crate const COVERAGE_PASSES: (&[ConditionalPass], &[ConditionalPass]) = (
118+
&[
119+
ConditionalPass::new(STRIP_HIDDEN, WhenNotDocumentHidden),
120+
ConditionalPass::new(STRIP_PRIVATE, WhenNotDocumentPrivate),
121+
ConditionalPass::always(CALCULATE_DOC_COVERAGE),
122+
],
123+
&[],
124+
);
122125

123126
impl ConditionalPass {
124127
crate const fn always(pass: Pass) -> Self {

0 commit comments

Comments
 (0)
Please sign in to comment.