From 27dcb4aab534741f747354c6a72ff29d0ccce329 Mon Sep 17 00:00:00 2001 From: Manish Goregaokar Date: Wed, 10 Jun 2020 00:33:10 -0700 Subject: Avoid collisions between traits and their derive macros --- src/test/rustdoc/auxiliary/intra-link-proc-macro-macro.rs | 5 +++++ src/test/rustdoc/intra-link-proc-macro.rs | 6 +++++- 2 files changed, 10 insertions(+), 1 deletion(-) (limited to 'src/test/rustdoc') diff --git a/src/test/rustdoc/auxiliary/intra-link-proc-macro-macro.rs b/src/test/rustdoc/auxiliary/intra-link-proc-macro-macro.rs index fee92ff2e0d..04a431d9902 100644 --- a/src/test/rustdoc/auxiliary/intra-link-proc-macro-macro.rs +++ b/src/test/rustdoc/auxiliary/intra-link-proc-macro-macro.rs @@ -19,6 +19,11 @@ pub fn b_derive(input: TokenStream) -> TokenStream { input } +#[proc_macro_derive(DeriveTrait)] +pub fn trait_derive(input: TokenStream) -> TokenStream { + input +} + #[proc_macro_attribute] pub fn attr_a(input: TokenStream, _args: TokenStream) -> TokenStream { input diff --git a/src/test/rustdoc/intra-link-proc-macro.rs b/src/test/rustdoc/intra-link-proc-macro.rs index 78ef91ab682..405e08d4c07 100644 --- a/src/test/rustdoc/intra-link-proc-macro.rs +++ b/src/test/rustdoc/intra-link-proc-macro.rs @@ -11,7 +11,11 @@ use intra_link_proc_macro_macro::{DeriveB, attr_b}; // @has - '//a/@href' '../intra_link_proc_macro/derive.DeriveA.html' // @has - '//a/@href' '../intra_link_proc_macro/attr.attr_a.html' +// @has - '//a/@href' '../intra_link_proc_macro/trait.DeriveTrait.html' // @has - '//a/@href' '../intra_link_proc_macro_macro/derive.DeriveB.html' // @has - '//a/@href' '../intra_link_proc_macro_macro/attr.attr_b.html' -/// Link to [DeriveA], [attr_a], [DeriveB], [attr_b] +/// Link to [DeriveA], [attr_a], [DeriveB], [attr_b], [DeriveTrait] pub struct Foo; + +// this should not cause ambiguity errors +pub trait DeriveTrait {} -- cgit 1.4.1-3-g733a5