From 54fcea8dd527d542fb3a4409db53b829ea37a8ff Mon Sep 17 00:00:00 2001 From: Luni-4 Date: Fri, 4 Dec 2020 11:40:30 +0100 Subject: [PATCH 1/3] Do not export macros --- src/macros.rs | 36 ++++++++++++------------------------ 1 file changed, 12 insertions(+), 24 deletions(-) diff --git a/src/macros.rs b/src/macros.rs index 6db8d2c06..3e4e34b52 100644 --- a/src/macros.rs +++ b/src/macros.rs @@ -1,5 +1,4 @@ -#[doc(hidden)] -#[macro_export] +#[macro_use] macro_rules! mk_checker { ( $name:ident, $( $type:ident ),* ) => { #[inline(always)] @@ -14,8 +13,7 @@ macro_rules! mk_checker { }; } -#[doc(hidden)] -#[macro_export] +#[macro_use] macro_rules! mk_else_if { ($if_type:ident) => { #[inline(always)] @@ -32,8 +30,7 @@ macro_rules! mk_else_if { }; } -#[doc(hidden)] -#[macro_export] +#[macro_use] macro_rules! mk_extern { ( $( $name:ident ),* ) => { $( @@ -42,8 +39,7 @@ macro_rules! mk_extern { }; } -#[doc(hidden)] -#[macro_export] +#[macro_use] macro_rules! mk_enum { ( $( $camel:ident, $description:expr ),* ) => { /// The list of supported languages. @@ -57,8 +53,7 @@ macro_rules! mk_enum { }; } -#[doc(hidden)] -#[macro_export] +#[macro_use] macro_rules! mk_impl_lang { ( $( ($camel:ident, $name:ident, $display: expr) ),* ) => { impl LANG { @@ -94,8 +89,7 @@ macro_rules! mk_impl_lang { }; } -#[doc(hidden)] -#[macro_export] +#[macro_use] macro_rules! mk_action { ( $( ($camel:ident, $parser:ident) ),* ) => { /// Runs a function, which implements the [`Callback`] trait, @@ -171,8 +165,7 @@ macro_rules! mk_action { }; } -#[doc(hidden)] -#[macro_export] +#[macro_use] macro_rules! mk_extensions { ( $( ($camel:ident, [ $( $ext:ident ),* ]) ),* ) => { /// Detects the language associated to the input file extension. @@ -199,8 +192,7 @@ macro_rules! mk_extensions { }; } -#[doc(hidden)] -#[macro_export] +#[macro_use] macro_rules! mk_emacs_mode { ( $( ($camel:ident, [ $( $emacs_mode:expr ),* ]) ),* ) => { /// Detects the language associated to the input `Emacs` mode. @@ -230,8 +222,7 @@ macro_rules! mk_emacs_mode { }; } -#[doc(hidden)] -#[macro_export] +#[macro_use] macro_rules! mk_code { ( $( ($camel:ident, $code:ident, $parser:ident, $name:ident, $docname:expr) ),* ) => { $( @@ -262,8 +253,7 @@ macro_rules! mk_code { }; } -#[doc(hidden)] -#[macro_export] +#[macro_use] macro_rules! mk_langs { ( $( ($camel:ident, $description: expr, $display: expr, $code:ident, $parser:ident, $name:ident, [ $( $ext:ident ),* ], [ $( $emacs_mode:expr ),* ]) ),* ) => { mk_extern!($( $name ),*); @@ -276,8 +266,7 @@ macro_rules! mk_langs { }; } -#[doc(hidden)] -#[macro_export] +#[macro_use] macro_rules! color { ( $stdout: ident, $color: ident) => { $stdout.set_color(ColorSpec::new().set_fg(Some(Color::$color)))?; @@ -291,8 +280,7 @@ macro_rules! color { }; } -#[doc(hidden)] -#[macro_export] +#[macro_use] macro_rules! check_metrics { ($source: expr, $file: expr, $parser: ident, $metric: ident, [ $( ( $func_int: ident, $true_int_value: expr $(,$type_int: ty)? )$(,)* )* ]$(,)* From e7300fea21e2033cc92be8dee37cf65a9e7c5d58 Mon Sep 17 00:00:00 2001 From: Luni-4 Date: Fri, 4 Dec 2020 11:41:13 +0100 Subject: [PATCH 2/3] Specify macros for tests --- src/macros.rs | 1 + 1 file changed, 1 insertion(+) diff --git a/src/macros.rs b/src/macros.rs index 3e4e34b52..a8b1702a8 100644 --- a/src/macros.rs +++ b/src/macros.rs @@ -280,6 +280,7 @@ macro_rules! color { }; } +#[cfg(test)] #[macro_use] macro_rules! check_metrics { ($source: expr, $file: expr, $parser: ident, $metric: ident, From f024c7b74ef7a1810c98fe5502ae58bd840bcdb3 Mon Sep 17 00:00:00 2001 From: Luni-4 Date: Fri, 4 Dec 2020 11:41:43 +0100 Subject: [PATCH 3/3] Remove useless attributes for macros --- src/asttools.rs | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/asttools.rs b/src/asttools.rs index 76538f06a..1b446c80d 100644 --- a/src/asttools.rs +++ b/src/asttools.rs @@ -16,7 +16,6 @@ pub fn get_parent<'a>(node: &'a Node<'a>, level: usize) -> Option> { Some(node) } -#[doc(hidden)] #[macro_use] macro_rules! has_ancestors { ($node:expr, $( $typs:pat )|*, $( $typ:pat ),+) => {{ @@ -55,7 +54,6 @@ macro_rules! has_ancestors { }}; } -#[doc(hidden)] #[macro_use] macro_rules! count_specific_ancestors { ($node:expr, $( $typs:pat )|*, $( $stops:pat )|*) => {{