about summary refs log tree commit diff
path: root/src/test/rustdoc
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2019-03-18 02:56:35 +0000
committerbors <bors@rust-lang.org>2019-03-18 02:56:35 +0000
commit03dafa7da38decbe74fcd8a23d7ec835e637c8e4 (patch)
treeeaa756de5943dff697eaa644d8edfcc93ca8061d /src/test/rustdoc
parent817d074e5459e5c7e44010520f0491b91213b7f2 (diff)
parent7c66ae2fc5eb15a5f9b3c7a0b2e18528c54e88a6 (diff)
downloadrust-03dafa7da38decbe74fcd8a23d7ec835e637c8e4.tar.gz
rust-03dafa7da38decbe74fcd8a23d7ec835e637c8e4.zip
Auto merge of #58824 - euclio:intra-link-ambiguity, r=petrochenkov
overhaul intra-doc-link ambiguity warning

Fixes #52784.

- Makes the warning part of the `intra_doc_link_resolution_failure`
lint.
- Tightens the span to just the ambiguous link.
- Reports ambiguities across all three namespaces.
- Uses structured suggestions for disambiguation.
- Adds a test for the warnings.

r? @QuietMisdreavus
Diffstat (limited to 'src/test/rustdoc')
-rw-r--r--src/test/rustdoc/intra-links.rs3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/test/rustdoc/intra-links.rs b/src/test/rustdoc/intra-links.rs
index 9139fc51b09..c356ab3a8ac 100644
--- a/src/test/rustdoc/intra-links.rs
+++ b/src/test/rustdoc/intra-links.rs
@@ -22,6 +22,7 @@
 //! * [`ThisType::this_method`](ThisType::this_method)
 //! * [`ThisEnum`](ThisEnum)
 //! * [`ThisEnum::ThisVariant`](ThisEnum::ThisVariant)
+//! * [`ThisEnum::ThisVariantCtor`](ThisEnum::ThisVariantCtor)
 //! * [`ThisTrait`](ThisTrait)
 //! * [`ThisTrait::this_associated_method`](ThisTrait::this_associated_method)
 //! * [`ThisTrait::ThisAssociatedType`](ThisTrait::ThisAssociatedType)
@@ -50,7 +51,7 @@ pub struct ThisType;
 impl ThisType {
     pub fn this_method() {}
 }
-pub enum ThisEnum { ThisVariant, }
+pub enum ThisEnum { ThisVariant, ThisVariantCtor(u32), }
 pub trait ThisTrait {
     type ThisAssociatedType;
     const THIS_ASSOCIATED_CONST: u8;