Skip to content

Conversation

compiler-errors
Copy link
Member

Far simpler approach to #98876.

This only fixes the case where the parent is doc(hidden), not where the child is doc(hidden) since I don't know how to get the attrs on the import statement given a ModChild... I'll try to follow up with that, but this is a good first step.

@rustbot rustbot added the T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. label Jul 24, 2022
@rust-highfive
Copy link
Contributor

r? @cjgillot

(rust-highfive has picked a reviewer for you, use r? to override)

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jul 24, 2022
@cjgillot
Copy link
Contributor

The best way to access the attributes on a ModChild would probably to add a DefId to the ModChild.
In the mean time, this implementation looks good enough.
@bors r+

@bors
Copy link
Collaborator

bors commented Jul 25, 2022

📌 Commit 42a4419 has been approved by cjgillot

It is now in the queue for this repository.

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jul 25, 2022
@jyn514
Copy link
Member

jyn514 commented Jul 25, 2022

This only fixes the case where the parent is doc(hidden), not where the child is doc(hidden) since I don't know how to get the attrs on the import statement given a ModChild... I'll try to follow up with that, but this is a good first step.

not sure how hard this is in rustc_metadata, but rustdoc does it like so:

pub(crate) fn inherits_doc_hidden(tcx: TyCtxt<'_>, mut node: hir::HirId) -> bool {
while let Some(id) = tcx.hir().get_enclosing_scope(node) {
node = id;
if tcx.hir().attrs(node).lists(sym::doc).has_word(sym::hidden) {
return true;
}
}
false
}

matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Jul 26, 2022
…gillot

Prefer visibility map parents that are not `doc(hidden)` first

Far simpler approach to rust-lang#98876.

This only fixes the case where the parent is `doc(hidden)`, not where the child is `doc(hidden)` since I don't know how to get the attrs on the import statement given a `ModChild`... I'll try to follow up with that, but this is a good first step.
bors added a commit to rust-lang-ci/rust that referenced this pull request Jul 27, 2022
Rollup of 8 pull requests

Successful merges:

 - rust-lang#98583 (Stabilize Windows `FileTypeExt` with `is_symlink_dir` and `is_symlink_file`)
 - rust-lang#99698 (Prefer visibility map parents that are not `doc(hidden)` first)
 - rust-lang#99700 (Add a clickable link to the layout section)
 - rust-lang#99712 (passes: port more of `check_attr` module)
 - rust-lang#99759 (Remove dead code from cg_llvm)
 - rust-lang#99765 (Don't build std for *-uefi targets)
 - rust-lang#99771 (Update pulldown-cmark version to 0.9.2 (fixes url encoding for some chars))
 - rust-lang#99775 (rustdoc: do not allocate String when writing path full name)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 3ca1c31 into rust-lang:master Jul 27, 2022
@rustbot rustbot added this to the 1.64.0 milestone Jul 27, 2022
@pnkfelix
Copy link
Contributor

@compiler-errors any chance that this contributed to the regression reported in #99792 (comment) ?

@compiler-errors
Copy link
Member Author

Yes very likely.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants