From 035f811dd06f934cde7bc7a4bd48eb91184c2be0 Mon Sep 17 00:00:00 2001 From: Max Semenik Date: Fri, 26 Mar 2021 13:09:16 +0300 Subject: [PATCH] Fix "panic message is not a string literal" warnings (#1915) New in Rust 1.51. Closes #1914 --- src/uu/tail/src/tail.rs | 6 +++--- src/uucore_procs/src/lib.rs | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/uu/tail/src/tail.rs b/src/uu/tail/src/tail.rs index 3a6b04b29..ffe27e26c 100644 --- a/src/uu/tail/src/tail.rs +++ b/src/uu/tail/src/tail.rs @@ -382,7 +382,7 @@ fn follow(readers: &mut [BufReader], filenames: &[String], settings: } print!("{}", datum); } - Err(err) => panic!(err), + Err(err) => panic!("{}", err), } } } @@ -509,7 +509,7 @@ fn unbounded_tail(reader: &mut BufReader, settings: &Settings) { ringbuf.push_back(datum); } } - Err(err) => panic!(err), + Err(err) => panic!("{}", err), } } let mut stdout = stdout(); @@ -540,7 +540,7 @@ fn unbounded_tail(reader: &mut BufReader, settings: &Settings) { ringbuf.push_back(datum[0]); } } - Err(err) => panic!(err), + Err(err) => panic!("{}", err), } } let mut stdout = stdout(); diff --git a/src/uucore_procs/src/lib.rs b/src/uucore_procs/src/lib.rs index aa77316ee..10368a5bd 100644 --- a/src/uucore_procs/src/lib.rs +++ b/src/uucore_procs/src/lib.rs @@ -56,10 +56,10 @@ pub fn main(stream: proc_macro::TokenStream) -> proc_macro::TokenStream { let mut expr = match expr { syn::Expr::Lit(expr_lit) => match expr_lit.lit { syn::Lit::Str(ref lit_str) => lit_str.parse::().unwrap(), - _ => panic!(ARG_PANIC_TEXT), + _ => panic!("{}", ARG_PANIC_TEXT), }, syn::Expr::Path(expr_path) => expr_path, - _ => panic!(ARG_PANIC_TEXT), + _ => panic!("{}", ARG_PANIC_TEXT), }; proc_dbg!(&expr);