user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Wrap try_validation_pat! args in format_args!

Browse source
This commit is contained in:
jumbatm 2020-05-01 20:07:17 +10:00
parent 425a99f1eb
commit 65c36f6e38
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/librustc_mir/interpret/validity.rs
View file

@ -42,7 +42,7 @@ macro_rules! throw_validation_failure {
macro_rules! try_validation {
($e:expr, $what:expr, $where:expr $(, $expected:expr )?) => {{
try_validation_pat!($e, $where, {
_ => { $what } $( expected { $expected } )?,
_ => { "{}", $what } $( expected { $expected } )?,
})
}};
}
@ -67,12 +67,12 @@ macro_rules! try_validation {
/// ```
///
macro_rules! try_validation_pat {
($e:expr, $where:expr, { $( $p:pat )|* => { $what:tt } $( expected { $expected:expr } )? $( , )?}) => {{
($e:expr, $where:expr, { $( $p:pat )|* => { $( $what_fmt:expr ),* } $( expected { $expected:expr } )? $( , )?}) => {{
match $e {
Ok(x) => x,
// We catch the error and turn it into a validation failure. We are okay with
// allocation here as this can only slow down builds that fail anyway.
$( Err(InterpErrorInfo { kind: $p, .. }) )|* => throw_validation_failure!($what, $where $(, $expected)?),
$( Err(InterpErrorInfo { kind: $p, .. }) )|* => throw_validation_failure!(format_args!($( $what_fmt ),*), $where $(, $expected)?),
#[allow(unreachable_patterns)]
Err(e) => Err::<!, _>(e)?,
}