diff options
| author | schvv31n <tim.kurdov@gmail.com> | 2024-08-08 17:13:15 +0100 |
|---|---|---|
| committer | schvv31n <tim.kurdov@gmail.com> | 2024-08-08 17:13:15 +0100 |
| commit | c2a0d9ca6eccbfaf1c6cd189dca0216a0ac66c75 (patch) | |
| tree | e3190494f5287933986d020e77c198cf8194cb01 | |
| parent | 8b3870784f69d8ed2ae4246d1b56f150e3131499 (diff) | |
| download | rust-c2a0d9ca6eccbfaf1c6cd189dca0216a0ac66c75.tar.gz rust-c2a0d9ca6eccbfaf1c6cd189dca0216a0ac66c75.zip | |
rustdoc: fixed #101105
modules are now stripped based on the same logic that's used to strip other item kinds
| -rw-r--r-- | src/librustdoc/passes/stripper.rs | 9 | ||||
| -rw-r--r-- | tests/rustdoc-json/pub_mod_in_private_mod.rs | 6 |
2 files changed, 14 insertions, 1 deletions
diff --git a/src/librustdoc/passes/stripper.rs b/src/librustdoc/passes/stripper.rs index d1e2b9978f7..f807c3362c4 100644 --- a/src/librustdoc/passes/stripper.rs +++ b/src/librustdoc/passes/stripper.rs @@ -95,7 +95,14 @@ impl<'a, 'tcx> DocFolder for Stripper<'a, 'tcx> { } clean::ModuleItem(..) => { - if i.item_id.is_local() && i.visibility(self.tcx) != Some(Visibility::Public) { + if i.item_id.is_local() + && !is_item_reachable( + self.tcx, + self.is_json_output, + self.effective_visibilities, + i.item_id, + ) + { debug!("Stripper: stripping module {:?}", i.name); let old = mem::replace(&mut self.update_retained, false); let ret = strip_item(self.fold_item_recur(i)); diff --git a/tests/rustdoc-json/pub_mod_in_private_mod.rs b/tests/rustdoc-json/pub_mod_in_private_mod.rs new file mode 100644 index 00000000000..112ab9c68f0 --- /dev/null +++ b/tests/rustdoc-json/pub_mod_in_private_mod.rs @@ -0,0 +1,6 @@ +// See https://github.com/rust-lang/rust/issues/101105 + +//@ !has "$.index[*][?(@.name=='nucleus')]" +mod corpus { + pub mod nucleus {} +} |
