diff options
| author | Joshua Nelson <jyn514@gmail.com> | 2020-08-06 18:50:23 -0400 |
|---|---|---|
| committer | Joshua Nelson <jyn514@gmail.com> | 2020-08-06 18:53:12 -0400 |
| commit | d240490229b31e1ebd6871a08ee2cefeb580ba78 (patch) | |
| tree | ed6a34674eaea202d05c96dce81394405f2cca1e | |
| parent | ef54cde625966d4c103e067506ba31b3b79efec4 (diff) | |
| download | rust-d240490229b31e1ebd6871a08ee2cefeb580ba78.tar.gz rust-d240490229b31e1ebd6871a08ee2cefeb580ba78.zip | |
Fix outdated code
| -rw-r--r-- | src/librustdoc/passes/collect_intra_doc_links.rs | 4 | ||||
| -rw-r--r-- | src/test/rustdoc/intra-link-trait-item.rs | 6 |
2 files changed, 4 insertions, 6 deletions
diff --git a/src/librustdoc/passes/collect_intra_doc_links.rs b/src/librustdoc/passes/collect_intra_doc_links.rs index 7f3bb13edd7..00169530381 100644 --- a/src/librustdoc/passes/collect_intra_doc_links.rs +++ b/src/librustdoc/passes/collect_intra_doc_links.rs @@ -767,8 +767,6 @@ impl<'a, 'tcx> DocFolder for LinkCollector<'a, 'tcx> { // Disallow e.g. linking to enums with `struct@` if let Res::Def(kind, id) = res { debug!("saw kind {:?} with disambiguator {:?}", kind, disambiguator); - // NOTE: this relies on the fact that `''` is never parsed as a disambiguator - // NOTE: this needs to be kept in sync with the disambiguator parsing match (self.kind_side_channel.take().unwrap_or(kind), disambiguator) { | (DefKind::Const | DefKind::ConstParam | DefKind::AssocConst | DefKind::AnonConst, Some(Disambiguator::Kind(DefKind::Const))) // NOTE: this allows 'method' to mean both normal functions and associated functions @@ -780,7 +778,7 @@ impl<'a, 'tcx> DocFolder for LinkCollector<'a, 'tcx> { | (_, None) // All of these are valid, so do nothing => {} - (_, Some(Disambiguator::Kind(expected))) if kind == expected => {} + (actual, Some(Disambiguator::Kind(expected))) if actual == expected => {} (_, Some(expected)) => { // The resolved item did not match the disambiguator; give a better error than 'not found' let msg = format!("incompatible link kind for `{}`", path_str); diff --git a/src/test/rustdoc/intra-link-trait-item.rs b/src/test/rustdoc/intra-link-trait-item.rs index 80bafa1a270..54270414c9d 100644 --- a/src/test/rustdoc/intra-link-trait-item.rs +++ b/src/test/rustdoc/intra-link-trait-item.rs @@ -1,10 +1,10 @@ -// allow-tidy-line-length +// ignore-tidy-linelength #![deny(broken_intra_doc_links)] /// Link to [S::assoc_fn()] /// Link to [Default::default()] -// @has intra_link_trait_item/struct.S.html '//*[@href="https://doc.rust-lang.org/nightly/core/default/trait.Default.html#tymethod.default"]' 'Default::default()' -// @has - '//*[@href="../intra_link_trait_item/struct.S.html#method.assoc_fn"]' 'S::assoc_fn()' +// @has intra_link_trait_item/struct.S.html '//*[@href="../intra_link_trait_item/struct.S.html#method.assoc_fn"]' 'S::assoc_fn()' +// @has - '//*[@href="https://doc.rust-lang.org/nightly/core/default/trait.Default.html#tymethod.default"]' 'Default::default()' pub struct S; impl S { |