Skip to content

Commit f1b7484

Browse files
DaniPopesDaniPopes
committed
Remove rustc_lint_defs::lint_array 
1 parent c01d8d2 commit f1b7484

File tree

11 files changed

+23
-36
lines changed

11 files changed

+23
-36
lines changed

‎compiler/rustc_lint/src/foreign_modules.rs

+3-4
Original file line numberDiff line numberDiff line change
@@ -5,19 +5,18 @@ use rustc_hir::def::DefKind;
55
use rustc_middle::query::Providers;
66
use rustc_middle::ty::layout::LayoutError;
77
use rustc_middle::ty::{self, Instance, Ty, TyCtxt};
8-
use rustc_session::lint::{lint_array, LintArray};
98
use rustc_span::{sym, Span, Symbol};
109
use rustc_target::abi::FIRST_VARIANT;
1110

1211
use crate::lints::{BuiltinClashingExtern, BuiltinClashingExternSub};
13-
use crate::types;
12+
use crate::{types, LintVec};
1413

1514
pub(crate) fn provide(providers: &mut Providers) {
1615
*providers = Providers { clashing_extern_declarations, ..*providers };
1716
}
1817

19-
pub(crate) fn get_lints() -> LintArray {
20-
lint_array!(CLASHING_EXTERN_DECLARATIONS)
18+
pub(crate) fn get_lints() -> LintVec {
19+
vec![CLASHING_EXTERN_DECLARATIONS]
2120
}
2221

2322
fn clashing_extern_declarations(tcx: TyCtxt<'_>, (): ()) {

‎compiler/rustc_lint/src/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ pub use late::{check_crate, late_lint_mod, unerased_lint_store};
130130
pub use passes::{EarlyLintPass, LateLintPass};
131131
pub use rustc_session::lint::Level::{self, *};
132132
pub use rustc_session::lint::{BufferedEarlyLint, FutureIncompatibleInfo, Lint, LintId};
133-
pub use rustc_session::lint::{LintArray, LintPass};
133+
pub use rustc_session::lint::{LintPass, LintVec};
134134

135135
fluent_messages! { "../messages.ftl" }
136136

‎compiler/rustc_lint/src/passes.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ macro_rules! declare_combined_late_lint_pass {
111111
}
112112
}
113113

114-
$v fn get_lints() -> $crate::LintArray {
114+
$v fn get_lints() -> $crate::LintVec {
115115
let mut lints = Vec::new();
116116
$(lints.extend_from_slice(&$pass::get_lints());)*
117117
lints
@@ -226,7 +226,7 @@ macro_rules! declare_combined_early_lint_pass {
226226
}
227227
}
228228

229-
$v fn get_lints() -> $crate::LintArray {
229+
$v fn get_lints() -> $crate::LintVec {
230230
let mut lints = Vec::new();
231231
$(lints.extend_from_slice(&$pass::get_lints());)*
232232
lints

‎compiler/rustc_lint_defs/src/lib.rs

+2-11
Original file line numberDiff line numberDiff line change
@@ -785,16 +785,7 @@ macro_rules! declare_tool_lint {
785785
);
786786
}
787787

788-
/// Declares a static `LintArray` and return it as an expression.
789-
#[macro_export]
790-
macro_rules! lint_array {
791-
($( $lint:expr ),* ,) => { lint_array!( $($lint),* ) };
792-
($( $lint:expr ),*) => {{
793-
vec![$($lint),*]
794-
}}
795-
}
796-
797-
pub type LintArray = Vec<&'static Lint>;
788+
pub type LintVec = Vec<&'static Lint>;
798789

799790
pub trait LintPass {
800791
fn name(&self) -> &'static str;
@@ -808,7 +799,7 @@ macro_rules! impl_lint_pass {
808799
fn name(&self) -> &'static str { stringify!($ty) }
809800
}
810801
impl $ty {
811-
pub fn get_lints() -> $crate::LintArray { $crate::lint_array!($($lint),*) }
802+
pub fn get_lints() -> $crate::LintVec { vec![$($lint),*] }
812803
}
813804
};
814805
}

‎src/doc/unstable-book/src/language-features/plugin.md

+4-6
Original file line numberDiff line numberDiff line change
@@ -43,24 +43,22 @@ extern crate rustc_ast;
4343
4444
// Load rustc as a plugin to get macros
4545
extern crate rustc_driver;
46-
#[macro_use]
4746
extern crate rustc_lint;
4847
#[macro_use]
4948
extern crate rustc_session;
5049
51-
use rustc_driver::plugin::Registry;
52-
use rustc_lint::{EarlyContext, EarlyLintPass, LintArray, LintContext, LintPass};
5350
use rustc_ast::ast;
51+
use rustc_driver::plugin::Registry;
52+
use rustc_lint::{EarlyContext, EarlyLintPass, LintContext};
53+
5454
declare_lint!(TEST_LINT, Warn, "Warn about items named 'lintme'");
5555
5656
declare_lint_pass!(Pass => [TEST_LINT]);
5757
5858
impl EarlyLintPass for Pass {
5959
fn check_item(&mut self, cx: &EarlyContext, it: &ast::Item) {
6060
if it.ident.name.as_str() == "lintme" {
61-
cx.lint(TEST_LINT, |lint| {
62-
lint.build("item is named 'lintme'").set_span(it.span).emit()
63-
});
61+
cx.lint(TEST_LINT, "item is named 'lintme'", |lint| lint.set_span(it.span));
6462
}
6563
}
6664
}

‎src/tools/clippy/clippy_lints/src/utils/internal_lints/lint_without_lint_pass.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ declare_clippy_lint! {
2828
/// know the name of the lint.
2929
///
3030
/// ### Known problems
31-
/// Only checks for lints associated using the
32-
/// `declare_lint_pass!`, `impl_lint_pass!`, and `lint_array!` macros.
31+
/// Only checks for lints associated using the `declare_lint_pass!` and
32+
/// `impl_lint_pass!` macros.
3333
///
3434
/// ### Example
3535
/// ```rust,ignore

‎tests/ui-fulldeps/internal-lints/lint_pass_impl_without_macro.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
extern crate rustc_middle;
77
extern crate rustc_session;
88

9-
use rustc_session::lint::{LintArray, LintPass};
9+
use rustc_session::lint::{LintPass, LintVec};
1010
use rustc_session::{declare_lint, declare_lint_pass, impl_lint_pass};
1111

1212
declare_lint! {

‎tests/ui-fulldeps/lint-pass-macros.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
extern crate rustc_session;
77

8-
use rustc_session::lint::{LintArray, LintPass};
8+
use rustc_session::lint::{LintPass, LintVec};
99
use rustc_session::{declare_lint, declare_lint_pass, impl_lint_pass};
1010

1111
declare_lint! {

‎tests/ui-fulldeps/plugin/auxiliary/lint-group-plugin-test.rs

+1-2
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,12 @@
55
// Load rustc as a plugin to get macros.
66
extern crate rustc_driver;
77
extern crate rustc_hir;
8-
#[macro_use]
98
extern crate rustc_lint;
109
#[macro_use]
1110
extern crate rustc_session;
1211

1312
use rustc_driver::plugin::Registry;
14-
use rustc_lint::{LateContext, LateLintPass, LintArray, LintContext, LintId, LintPass};
13+
use rustc_lint::{LateContext, LateLintPass, LintContext, LintId};
1514

1615
declare_lint!(TEST_LINT, Warn, "Warn about items named 'lintme'");
1716

‎tests/ui-fulldeps/plugin/auxiliary/lint-plugin-test.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,14 @@ extern crate rustc_ast;
66

77
// Load rustc as a plugin to get macros
88
extern crate rustc_driver;
9-
#[macro_use]
109
extern crate rustc_lint;
1110
#[macro_use]
1211
extern crate rustc_session;
1312

13+
use rustc_ast::ast;
1414
use rustc_driver::plugin::Registry;
15-
use rustc_lint::{EarlyContext, EarlyLintPass, LintArray, LintContext, LintPass};
16-
use rustc_ast as ast;
15+
use rustc_lint::{EarlyContext, EarlyLintPass, LintContext};
16+
1717
declare_lint!(TEST_LINT, Warn, "Warn about items named 'lintme'");
1818

1919
declare_lint_pass!(Pass => [TEST_LINT]);

‎tests/ui-fulldeps/plugin/auxiliary/lint-tool-test.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@ extern crate rustc_ast;
44

55
// Load rustc as a plugin to get macros
66
extern crate rustc_driver;
7-
#[macro_use]
87
extern crate rustc_lint;
98
#[macro_use]
109
extern crate rustc_session;
1110

12-
use rustc_driver::plugin::Registry;
13-
use rustc_lint::{EarlyContext, EarlyLintPass, LintArray, LintContext, LintId, LintPass};
1411
use rustc_ast as ast;
12+
use rustc_driver::plugin::Registry;
13+
use rustc_lint::{EarlyContext, EarlyLintPass, LintContext, LintId};
14+
1515
declare_tool_lint!(pub clippy::TEST_LINT, Warn, "Warn about stuff");
1616
declare_tool_lint!(
1717
/// Some docs

0 commit comments

Comments
 (0)