Skip to content

Commit 246998f

Browse files
committed
Remove some unused lint allows
1 parent 1b8ea07 commit 246998f

File tree

3 files changed

+13
-20
lines changed

3 files changed

+13
-20
lines changed

src/intrinsics/llvm.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,14 @@ use rustc_middle::ty::subst::SubstsRef;
88
pub(crate) fn codegen_llvm_intrinsic_call<'tcx>(
99
fx: &mut FunctionCx<'_, '_, 'tcx>,
1010
intrinsic: &str,
11-
substs: SubstsRef<'tcx>,
11+
_substs: SubstsRef<'tcx>,
1212
args: &[mir::Operand<'tcx>],
1313
destination: Option<(CPlace<'tcx>, BasicBlock)>,
1414
) {
1515
let ret = destination.unwrap().0;
1616

1717
intrinsic_match! {
18-
fx, intrinsic, substs, args,
18+
fx, intrinsic, args,
1919
_ => {
2020
fx.tcx.sess.warn(&format!("unsupported llvm intrinsic {}; replacing with trap", intrinsic));
2121
crate::trap::trap_unimplemented(fx, intrinsic);

src/intrinsics/mod.rs

Lines changed: 9 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -43,28 +43,21 @@ macro intrinsic_arg {
4343
}
4444

4545
macro intrinsic_match {
46-
($fx:expr, $intrinsic:expr, $substs:expr, $args:expr,
46+
($fx:expr, $intrinsic:expr, $args:expr,
4747
_ => $unknown:block;
4848
$(
4949
$($($name:tt).*)|+ $(if $cond:expr)?, ($($a:ident $arg:ident),*) $content:block;
5050
)*) => {
51-
let _ = $substs; // Silence warning when substs is unused.
5251
match $intrinsic {
5352
$(
5453
$(intrinsic_pat!($($name).*))|* $(if $cond)? => {
55-
#[allow(unused_parens, non_snake_case)]
56-
{
57-
if let [$($arg),*] = $args {
58-
let ($($arg,)*) = (
59-
$(intrinsic_arg!($a $fx, $arg),)*
60-
);
61-
#[warn(unused_parens, non_snake_case)]
62-
{
63-
$content
64-
}
65-
} else {
66-
bug!("wrong number of args for intrinsic {:?}", $intrinsic);
67-
}
54+
if let [$($arg),*] = $args {
55+
let ($($arg,)*) = (
56+
$(intrinsic_arg!($a $fx, $arg),)*
57+
);
58+
$content
59+
} else {
60+
bug!("wrong number of args for intrinsic {:?}", $intrinsic);
6861
}
6962
}
7063
)*
@@ -357,7 +350,7 @@ fn codegen_regular_intrinsic_call<'tcx>(
357350
let usize_layout = fx.layout_of(fx.tcx.types.usize);
358351

359352
intrinsic_match! {
360-
fx, intrinsic, substs, args,
353+
fx, intrinsic, args,
361354
_ => {
362355
fx.tcx.sess.span_fatal(span, &format!("unsupported intrinsic {}", intrinsic));
363356
};

src/intrinsics/simd.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,13 +68,13 @@ macro simd_flt_binop($fx:expr, $op:ident($x:ident, $y:ident) -> $ret:ident) {
6868
pub(super) fn codegen_simd_intrinsic_call<'tcx>(
6969
fx: &mut FunctionCx<'_, '_, 'tcx>,
7070
intrinsic: Symbol,
71-
substs: SubstsRef<'tcx>,
71+
_substs: SubstsRef<'tcx>,
7272
args: &[mir::Operand<'tcx>],
7373
ret: CPlace<'tcx>,
7474
span: Span,
7575
) {
7676
intrinsic_match! {
77-
fx, intrinsic, substs, args,
77+
fx, intrinsic, args,
7878
_ => {
7979
fx.tcx.sess.span_fatal(span, &format!("Unknown SIMD intrinsic {}", intrinsic));
8080
};

0 commit comments

Comments
 (0)