Skip to content

Commit e885f00

Browse files
committed
Comment out test for generated docs until rustdoc changes its behavior around documenting re-exports
1 parent 1b19354 commit e885f00

File tree

2 files changed

+18
-4
lines changed

2 files changed

+18
-4
lines changed

src/librustdoc/passes/collect_intra_doc_links.rs

+6-1
Original file line numberDiff line numberDiff line change
@@ -592,7 +592,12 @@ impl<'a, 'tcx> DocFolder for LinkCollector<'a, 'tcx> {
592592
}
593593
current = parent;
594594
} else {
595-
debug!("{:?} has no parent (kind={:?}, original was {:?})", current, self.cx.tcx.def_kind(current), item.def_id);
595+
debug!(
596+
"{:?} has no parent (kind={:?}, original was {:?})",
597+
current,
598+
self.cx.tcx.def_kind(current),
599+
item.def_id
600+
);
596601
break None;
597602
}
598603
}
+12-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,17 @@
1-
#![deny(intra_doc_link_resolution_failure)]
1+
#![deny(broken_intra_doc_links)]
22

33
/// [std::env] [g]
4-
// @has intra_link_pub_use/index.html '//a[@href="https://doc.rust-lang.org/nightly/std/env/fn.var.html"]' "std::env"
5-
// @has - '//a[@href="../intra_link_pub_use/fn.f.html"]' "g"
4+
// FIXME: This can't be tested because rustdoc doesn't show documentation on pub re-exports.
5+
// Until then, comment out the `htmldocck` test.
6+
// This test still does something; namely check that no incorrect errors are emitted when
7+
// documenting the re-export.
8+
9+
// @has intra_link_pub_use/index.html
10+
// @ has - '//a[@href="https://doc.rust-lang.org/nightly/std/env/fn.var.html"]' "std::env"
11+
// @ has - '//a[@href="../intra_link_pub_use/fn.f.html"]' "g"
612
pub use f as g;
713

14+
/// [std::env]
15+
extern crate self as _;
16+
817
pub fn f() {}

0 commit comments

Comments
 (0)