From 9b67c372b276e9d50ad66415ec01b79f2d744758 Mon Sep 17 00:00:00 2001 From: Haitao Li Date: Mon, 22 Dec 2014 10:48:23 +1100 Subject: [PATCH] Add semicolons to item macros --- src/common/util.rs | 32 ++++++++++++++++---------------- src/cut/cut.rs | 2 +- src/fmt/fmt.rs | 2 +- src/kill/kill.rs | 2 +- src/tail/tail.rs | 2 +- src/uptime/uptime.rs | 2 +- test/mv.rs | 4 ++-- 7 files changed, 23 insertions(+), 23 deletions(-) diff --git a/src/common/util.rs b/src/common/util.rs index 8531a5aa3..5986eca63 100644 --- a/src/common/util.rs +++ b/src/common/util.rs @@ -17,7 +17,7 @@ macro_rules! show_error( pipe_write!(&mut ::std::io::stderr(), "{}: error: ", ::NAME); pipe_writeln!(&mut ::std::io::stderr(), $($args),+); }) -) +); #[macro_export] macro_rules! show_warning( @@ -25,7 +25,7 @@ macro_rules! show_warning( pipe_write!(&mut ::std::io::stderr(), "{}: warning: ", ::NAME); pipe_writeln!(&mut ::std::io::stderr(), $($args),+); }) -) +); #[macro_export] macro_rules! show_info( @@ -33,17 +33,17 @@ macro_rules! show_info( pipe_write!(&mut ::std::io::stderr(), "{}: ", ::NAME); pipe_writeln!(&mut ::std::io::stderr(), $($args),+); }) -) +); #[macro_export] macro_rules! eprint( ($($args:expr),+) => (pipe_write!(&mut ::std::io::stderr(), $($args),+)) -) +); #[macro_export] macro_rules! eprintln( ($($args:expr),+) => (pipe_writeln!(&mut ::std::io::stderr(), $($args),+)) -) +); #[macro_export] macro_rules! crash( @@ -51,14 +51,14 @@ macro_rules! crash( show_error!($($args),+); unsafe { ::util::libc::exit($exitcode as ::util::libc::c_int); } }) -) +); #[macro_export] macro_rules! exit( ($exitcode:expr) => ({ unsafe { ::util::libc::exit($exitcode); } }) -) +); #[macro_export] macro_rules! crash_if_err( @@ -68,7 +68,7 @@ macro_rules! crash_if_err( Err(f) => crash!($exitcode, "{}", f.to_string()) } ) -) +); #[macro_export] macro_rules! return_if_err( @@ -81,7 +81,7 @@ macro_rules! return_if_err( } } ) -) +); // XXX: should the pipe_* macros return an Err just to show the write failed? @@ -99,7 +99,7 @@ macro_rules! pipe_print( } } ) -) +); #[macro_export] macro_rules! pipe_println( @@ -115,7 +115,7 @@ macro_rules! pipe_println( } } ) -) +); #[macro_export] macro_rules! pipe_write( @@ -131,7 +131,7 @@ macro_rules! pipe_write( } } ) -) +); #[macro_export] macro_rules! pipe_writeln( @@ -147,7 +147,7 @@ macro_rules! pipe_writeln( } } ) -) +); #[macro_export] macro_rules! safe_write( @@ -157,7 +157,7 @@ macro_rules! safe_write( Err(f) => panic!(f.to_string()) } ) -) +); #[macro_export] macro_rules! safe_writeln( @@ -167,7 +167,7 @@ macro_rules! safe_writeln( Err(f) => panic!(f.to_string()) } ) -) +); #[macro_export] macro_rules! safe_unwrap( @@ -177,4 +177,4 @@ macro_rules! safe_unwrap( Err(f) => crash!(1, "{}", f.to_string()) } ) -) +); diff --git a/src/cut/cut.rs b/src/cut/cut.rs index bf97e1d14..9d793204d 100644 --- a/src/cut/cut.rs +++ b/src/cut/cut.rs @@ -463,7 +463,7 @@ pub fn uumain(args: Vec) -> int { let matches = match getopts(args.tail(), &opts) { Ok(m) => m, Err(f) => { - show_error!("Invalid options\n{}", f) + show_error!("Invalid options\n{}", f); return 1; } }; diff --git a/src/fmt/fmt.rs b/src/fmt/fmt.rs index f3dd1915c..eaee850c4 100644 --- a/src/fmt/fmt.rs +++ b/src/fmt/fmt.rs @@ -27,7 +27,7 @@ macro_rules! silent_unwrap( Err(_) => unsafe { ::util::libc::exit(1) } } ) -) +); #[path = "../common/util.rs"] mod util; mod linebreak; diff --git a/src/kill/kill.rs b/src/kill/kill.rs index 6ed91df25..cec00d0b0 100644 --- a/src/kill/kill.rs +++ b/src/kill/kill.rs @@ -146,7 +146,7 @@ fn table() { fn print_signal(signal_name_or_value: &str) { for signal in ALL_SIGNALS.iter() { if signal.name == signal_name_or_value || (format!("SIG{}", signal.name).as_slice()) == signal_name_or_value { - println!("{}", signal.value) + println!("{}", signal.value); exit!(EXIT_OK as i32) } else if signal_name_or_value == signal.value.to_string().as_slice() { println!("{}", signal.name); diff --git a/src/tail/tail.rs b/src/tail/tail.rs index 6dbd10694..af95a4685 100644 --- a/src/tail/tail.rs +++ b/src/tail/tail.rs @@ -266,7 +266,7 @@ macro_rules! tail_impl ( $kindprint(&mut stdout, datum); } }) -) +); fn tail(reader: &mut BufferedReader, mut line_count: uint, mut byte_count: uint, beginning: bool, lines: bool, follow: bool, sleep_msec: u64) { if lines { diff --git a/src/uptime/uptime.rs b/src/uptime/uptime.rs index af980e3f3..3ddaa0838 100644 --- a/src/uptime/uptime.rs +++ b/src/uptime/uptime.rs @@ -97,7 +97,7 @@ fn print_loadavg() { print!("\n"); } else { - print!("load average: ") + print!("load average: "); for n in range(0, loads) { print!("{:.2}{}", avg[n as uint], if n == loads - 1 { "\n" } else { ", " } ); diff --git a/test/mv.rs b/test/mv.rs index 322e58f67..241780216 100644 --- a/test/mv.rs +++ b/test/mv.rs @@ -17,7 +17,7 @@ macro_rules! assert_empty_stderr( panic!(format!("stderr: {}", $cond.stderr)) } ); -) +); struct CmdResult { success: bool, stderr: String, @@ -388,7 +388,7 @@ fn test_mv_backup_dir() { assert_empty_stderr!(result); assert_eq!(result.stdout.as_slice(), - format!("‘{}’ -> ‘{}’ (backup: ‘{}~’)\n", dir_a, dir_b, dir_b).as_slice()) + format!("‘{}’ -> ‘{}’ (backup: ‘{}~’)\n", dir_a, dir_b, dir_b).as_slice()); assert!(result.success); assert!(!Path::new(dir_a).is_dir());