Skip to content

Commit

Permalink
Comment out test for generated docs until rustdoc changes its behavio…
Browse files Browse the repository at this point in the history
…r around documenting re-exports
  • Loading branch information
jyn514 committed Aug 30, 2020
1 parent 1b19354 commit e885f00
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 4 deletions.
7 changes: 6 additions & 1 deletion src/librustdoc/passes/collect_intra_doc_links.rs
Original file line number Diff line number Diff line change
Expand Up @@ -592,7 +592,12 @@ impl<'a, 'tcx> DocFolder for LinkCollector<'a, 'tcx> {
}
current = parent;
} else {
debug!("{:?} has no parent (kind={:?}, original was {:?})", current, self.cx.tcx.def_kind(current), item.def_id);
debug!(
"{:?} has no parent (kind={:?}, original was {:?})",
current,
self.cx.tcx.def_kind(current),
item.def_id
);
break None;
}
}
Expand Down
15 changes: 12 additions & 3 deletions src/test/rustdoc/intra-link-pub-use.rs
Original file line number Diff line number Diff line change
@@ -1,8 +1,17 @@
#![deny(intra_doc_link_resolution_failure)]
#![deny(broken_intra_doc_links)]

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

// @has intra_link_pub_use/index.html
// @ has - '//a[@href="https://doc.rust-lang.org/nightly/std/env/fn.var.html"]' "std::env"
// @ has - '//a[@href="../intra_link_pub_use/fn.f.html"]' "g"
pub use f as g;

/// [std::env]
extern crate self as _;

pub fn f() {}

0 comments on commit e885f00

Please sign in to comment.