Skip to content

Commit 75f0035

Browse files
committed
Fix Rust 2021 warning about panic!(...)
See <rust-lang/rust#81645> for example
1 parent f2ea145 commit 75f0035

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[package]
22
name = "tear"
33
description = "Typed early returns and loop control + Syntax sugar for try!-like error handling"
4-
version = "0.5.0"
4+
version = "0.5.1"
55
authors = ["Tilwa Qendov <[email protected]>"]
66
edition = "2018"
77
license = "MIT OR Apache-2.0"

src/twist_impl.rs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -451,8 +451,8 @@ macro_rules! twist {
451451
match $e {
452452
$crate::Looping::Resume(v) => v,
453453
$( $crate::Looping::Break { label: None } => { $crate::__unit!($bk); break; }, )?
454-
$( $crate::Looping::Break { label: None } => { $crate::__unit!($bv); panic!($crate::BREAK_WITHOUT_VAL) }, )?
455-
$( $crate::Looping::Break { label: None } => { $crate::__unit!($bx); panic!($crate::BREAK_WITHOUT_VAL) }, )?
454+
$( $crate::Looping::Break { label: None } => { $crate::__unit!($bv); panic!("{}", $crate::BREAK_WITHOUT_VAL) }, )?
455+
$( $crate::Looping::Break { label: None } => { $crate::__unit!($bx); panic!("{}", $crate::BREAK_WITHOUT_VAL) }, )?
456456
$crate::Looping::Break { label: Some(l) } => {
457457
match l {
458458
$( x if x == $c => { break $l; }, )*
@@ -468,12 +468,12 @@ macro_rules! twist {
468468
_ => panic!("Invalid label index in Looping::Continue object."),
469469
};
470470
},
471-
$( $crate::Looping::BreakVal { label: None, .. } => { $crate::__unit!($bk); panic!($crate::BREAKVAL_IN_NOT_LOOP); }, )?
471+
$( $crate::Looping::BreakVal { label: None, .. } => { $crate::__unit!($bk); panic!("{}", $crate::BREAKVAL_IN_NOT_LOOP); }, )?
472472
$( $crate::Looping::BreakVal { label: None, value: v } => { $crate::__unit!($bv); break v; }, )?
473473
$( $crate::Looping::BreakVal { label: None, value: v } => { // Unbox version
474474
match v.downcast::<$bx>() {
475475
Ok(v) => { break *v; },
476-
_ => panic!(format!("At label None with type {}: {}", stringify!($bx), $crate::BAD_BREAKVAL_TYPE)),
476+
_ => panic!("At label None with type {}: {}", stringify!($bx), $crate::BAD_BREAKVAL_TYPE),
477477
};
478478
}, )?
479479
// Add explicit breakval type when it can't be infered by the labeled breaksvals
@@ -484,7 +484,7 @@ macro_rules! twist {
484484
$( x if x == $bcount => { // Unbox version
485485
match v.downcast::<$btype>() {
486486
Ok(v) => { break $blabel *v; }, // We got a ref so dereference it
487-
_ => panic!(format!("At label {} with type {}: {}", stringify!($blabel), stringify!($btype), $crate::BAD_BREAKVAL_TYPE)),
487+
_ => panic!("At label {} with type {}: {}", stringify!($blabel), stringify!($btype), $crate::BAD_BREAKVAL_TYPE),
488488
}
489489
}, )*
490490
_ => panic!("Invalid label index in Looping::BreakVal object."),
@@ -508,9 +508,9 @@ macro_rules! twist {
508508
$( _ if $crate::__bool!($breaker) => unreachable!(), $crate::Looping::Resume::<_, $crate::BreakValError>(v) => v, )?
509509
$( _ if $crate::__bool!($breakval) => unreachable!(), $crate::Looping::Resume(v) => v, )?
510510
$( _ if $crate::__bool!($breaker) => unreachable!(), $crate::Looping::Break { .. } => break $($label)?, )?
511-
$( _ if $crate::__bool!($breakval) => unreachable!(), $crate::Looping::Break { .. } => panic!($crate::BREAK_WITHOUT_VAL), )?
511+
$( _ if $crate::__bool!($breakval) => unreachable!(), $crate::Looping::Break { .. } => panic!("{}", $crate::BREAK_WITHOUT_VAL), )?
512512
$crate::Looping::Continue { .. } => continue $($($label)?)? $($($vlabel)?)?,
513-
$( _ if $crate::__bool!($breaker) => unreachable!(), $crate::Looping::BreakVal { .. } => panic!($crate::BREAKVAL_IN_NOT_LOOP), )?
513+
$( _ if $crate::__bool!($breaker) => unreachable!(), $crate::Looping::BreakVal { .. } => panic!("{}", $crate::BREAKVAL_IN_NOT_LOOP), )?
514514
$( _ if $crate::__bool!($breakval) => unreachable!(), $crate::Looping::BreakVal { value: v, .. } => break $($vlabel)? v, )?
515515
}
516516
};

0 commit comments

Comments
 (0)