Skip to content

Commit 68d442d

Browse files
committed
Use $vis in declare_lint
1 parent dc6b8ed commit 68d442d

File tree

9 files changed

+11
-12
lines changed

9 files changed

+11
-12
lines changed

src/librustc/lib.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
#![feature(discriminant_value)]
3131
#![feature(i128_type)]
3232
#![feature(libc)]
33+
#![feature(macro_vis_matcher)]
3334
#![feature(never_type)]
3435
#![feature(nonzero)]
3536
#![feature(quote)]

src/librustc/lint/mod.rs

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -92,18 +92,9 @@ macro_rules! lint_initializer {
9292
/// Declare a static item of type `&'static Lint`.
9393
#[macro_export]
9494
macro_rules! declare_lint {
95-
(pub(crate) $name:ident, $level:ident, $desc:expr) => (
96-
pub(crate) static $name: &'static ::rustc::lint::Lint
97-
= &lint_initializer!($name, $level, $desc);
98-
);
99-
(pub $name:ident, $level:ident, $desc:expr) => (
100-
pub static $name: &'static ::rustc::lint::Lint
101-
= &lint_initializer!($name, $level, $desc);
102-
);
103-
($name:ident, $level:ident, $desc:expr) => (
104-
static $name: &'static ::rustc::lint::Lint
105-
= &lint_initializer!($name, $level, $desc);
106-
);
95+
($vis: vis $name: ident, $level: ident, $desc: expr) => {
96+
$vis static $name: &$crate::lint::Lint = &lint_initializer!($name, $level, $desc);
97+
}
10798
}
10899

109100
/// Declare a static `LintArray` and return it as an expression.

src/test/compile-fail-fulldeps/auxiliary/lint_for_crate.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212

1313
#![feature(plugin_registrar, rustc_private)]
1414
#![feature(box_syntax)]
15+
#![feature(macro_vis_matcher)]
1516

1617
#[macro_use] extern crate rustc;
1718
extern crate rustc_plugin;

src/test/compile-fail-fulldeps/auxiliary/lint_group_plugin_test.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212

1313
#![feature(plugin_registrar)]
1414
#![feature(box_syntax, rustc_private)]
15+
#![feature(macro_vis_matcher)]
1516

1617
// Load rustc as a plugin to get macros
1718
#[macro_use]

src/test/compile-fail-fulldeps/auxiliary/lint_plugin_test.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212

1313
#![feature(plugin_registrar)]
1414
#![feature(box_syntax, rustc_private)]
15+
#![feature(macro_vis_matcher)]
1516

1617
extern crate syntax;
1718

src/test/run-pass-fulldeps/auxiliary/lint_for_crate.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212

1313
#![feature(plugin_registrar, rustc_private)]
1414
#![feature(box_syntax)]
15+
#![feature(macro_vis_matcher)]
1516

1617
#[macro_use] extern crate rustc;
1718
extern crate rustc_plugin;

src/test/run-pass-fulldeps/proc-macro/auxiliary/issue-40001-plugin.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010
#![feature(box_syntax, plugin, plugin_registrar, rustc_private)]
11+
#![feature(macro_vis_matcher)]
1112
#![crate_type = "dylib"]
1213

1314
#[macro_use]

src/test/ui-fulldeps/auxiliary/lint_group_plugin_test.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212

1313
#![feature(plugin_registrar)]
1414
#![feature(box_syntax, rustc_private)]
15+
#![feature(macro_vis_matcher)]
1516

1617
// Load rustc as a plugin to get macros
1718
#[macro_use]

src/test/ui-fulldeps/auxiliary/lint_plugin_test.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212

1313
#![feature(plugin_registrar)]
1414
#![feature(box_syntax, rustc_private)]
15+
#![feature(macro_vis_matcher)]
1516

1617
extern crate syntax;
1718

0 commit comments

Comments
 (0)