Skip to content

Commit 5646e9a

Browse files
committed
Allow unused rules in some places in the compiler, library and tools
1 parent 0bd2232 commit 5646e9a

File tree

4 files changed

+6
-4
lines changed

4 files changed

+6
-4
lines changed

compiler/rustc_codegen_llvm/src/intrinsic.rs

+2
Original file line numberDiff line numberDiff line change
@@ -816,6 +816,7 @@ fn generic_simd_intrinsic<'ll, 'tcx>(
816816
span: Span,
817817
) -> Result<&'ll Value, ()> {
818818
// macros for error handling:
819+
#[cfg_attr(not(bootstrap), allow(unused_macro_rules))]
819820
macro_rules! emit_error {
820821
($msg: tt) => {
821822
emit_error!($msg, )
@@ -1144,6 +1145,7 @@ fn generic_simd_intrinsic<'ll, 'tcx>(
11441145
span: Span,
11451146
args: &[OperandRef<'tcx, &'ll Value>],
11461147
) -> Result<&'ll Value, ()> {
1148+
#[cfg_attr(not(bootstrap), allow(unused_macro_rules))]
11471149
macro_rules! emit_error {
11481150
($msg: tt) => {
11491151
emit_error!($msg, )

compiler/rustc_middle/src/mir/visit.rs

+3
Original file line numberDiff line numberDiff line change
@@ -258,6 +258,7 @@ macro_rules! make_mir_visitor {
258258
// for best performance, we want to use an iterator rather
259259
// than a for-loop, to avoid calling `body::Body::invalidate` for
260260
// each basic block.
261+
#[cfg_attr(not(bootstrap), allow(unused_macro_rules))]
261262
macro_rules! basic_blocks {
262263
(mut) => (body.basic_blocks_mut().iter_enumerated_mut());
263264
() => (body.basic_blocks().iter_enumerated());
@@ -279,6 +280,7 @@ macro_rules! make_mir_visitor {
279280
self.visit_local_decl(local, & $($mutability)? body.local_decls[local]);
280281
}
281282

283+
#[cfg_attr(not(bootstrap), allow(unused_macro_rules))]
282284
macro_rules! type_annotations {
283285
(mut) => (body.user_type_annotations.iter_enumerated_mut());
284286
() => (body.user_type_annotations.iter_enumerated());
@@ -932,6 +934,7 @@ macro_rules! make_mir_visitor {
932934
body: &$($mutability)? Body<'tcx>,
933935
location: Location
934936
) {
937+
#[cfg_attr(not(bootstrap), allow(unused_macro_rules))]
935938
macro_rules! basic_blocks {
936939
(mut) => (body.basic_blocks_mut());
937940
() => (body.basic_blocks());

library/alloc/src/macros.rs

+1
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@ macro_rules! vec {
5656
// `slice::into_vec` function which is only available with cfg(test)
5757
// NB see the slice::hack module in slice.rs for more information
5858
#[cfg(all(not(no_global_oom_handling), test))]
59+
#[cfg_attr(not(bootstrap), allow(unused_macro_rules))]
5960
macro_rules! vec {
6061
() => (
6162
$crate::vec::Vec::new()

src/tools/error_index_generator/main.rs

-4
Original file line numberDiff line numberDiff line change
@@ -280,10 +280,6 @@ fn main() {
280280
fn register_all() -> Vec<(&'static str, Option<&'static str>)> {
281281
let mut long_codes: Vec<(&'static str, Option<&'static str>)> = Vec::new();
282282
macro_rules! register_diagnostics {
283-
($($ecode:ident: $message:expr,)*) => (
284-
register_diagnostics!{$($ecode:$message,)* ;}
285-
);
286-
287283
($($ecode:ident: $message:expr,)* ; $($code:ident,)*) => (
288284
$(
289285
{long_codes.extend([

0 commit comments

Comments
 (0)