Skip to content

Commit 6ae51a5

Browse files
authored
Rollup merge of #122827 - compiler-errors:span-bugs, r=WaffleLapkin
Remove unnecessary braces from `bug`/`span_bug` They make never fallback weird and are unnecessary r? `@WaffleLapkin`
2 parents 55a9165 + abb59b2 commit 6ae51a5

File tree

1 file changed

+19
-9
lines changed

1 file changed

+19
-9
lines changed

compiler/rustc_middle/src/macros.rs

+19-9
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,18 @@
1111
/// [`span_bug`]: crate::span_bug
1212
#[macro_export]
1313
macro_rules! bug {
14-
() => ( $crate::bug!("impossible case reached") );
15-
($msg:expr) => ({ $crate::util::bug::bug_fmt(::std::format_args!($msg)) });
16-
($msg:expr,) => ({ $crate::bug!($msg) });
17-
($fmt:expr, $($arg:tt)+) => ({
14+
() => (
15+
$crate::bug!("impossible case reached")
16+
);
17+
($msg:expr) => (
18+
$crate::util::bug::bug_fmt(::std::format_args!($msg))
19+
);
20+
($msg:expr,) => (
21+
$crate::bug!($msg)
22+
);
23+
($fmt:expr, $($arg:tt)+) => (
1824
$crate::util::bug::bug_fmt(::std::format_args!($fmt, $($arg)+))
19-
});
25+
);
2026
}
2127

2228
/// A macro for triggering an ICE with a span.
@@ -30,11 +36,15 @@ macro_rules! bug {
3036
/// [`DiagCtxt::span_delayed_bug`]: rustc_errors::DiagCtxt::span_delayed_bug
3137
#[macro_export]
3238
macro_rules! span_bug {
33-
($span:expr, $msg:expr) => ({ $crate::util::bug::span_bug_fmt($span, ::std::format_args!($msg)) });
34-
($span:expr, $msg:expr,) => ({ $crate::span_bug!($span, $msg) });
35-
($span:expr, $fmt:expr, $($arg:tt)+) => ({
39+
($span:expr, $msg:expr) => (
40+
$crate::util::bug::span_bug_fmt($span, ::std::format_args!($msg))
41+
);
42+
($span:expr, $msg:expr,) => (
43+
$crate::span_bug!($span, $msg)
44+
);
45+
($span:expr, $fmt:expr, $($arg:tt)+) => (
3646
$crate::util::bug::span_bug_fmt($span, ::std::format_args!($fmt, $($arg)+))
37-
});
47+
);
3848
}
3949

4050
///////////////////////////////////////////////////////////////////////////

0 commit comments

Comments
 (0)