From f6615b0fb8172e7b4d42f153d7a4f6afe6d8350c Mon Sep 17 00:00:00 2001 From: Jorge Aparicio Date: Fri, 10 Mar 2017 23:34:59 -0500 Subject: reformat --- src/macros.rs | 36 +++++++++++++++++++++++++++--------- 1 file changed, 27 insertions(+), 9 deletions(-) (limited to 'src/macros.rs') diff --git a/src/macros.rs b/src/macros.rs index 1c39f18..1ee2cf2 100644 --- a/src/macros.rs +++ b/src/macros.rs @@ -1,31 +1,49 @@ /// Macro for printing to the **host's** standard stderr #[macro_export] macro_rules! ehprint { - ($s:expr) => ($crate::semihosting:::io:ewrite_str($s)); - ($($arg:tt)*) => ($crate::semihosting::io::ewrite_fmt(format_args!($($arg)*))); + ($s:expr) => { + $crate::semihosting:::io:ewrite_str($s); + }; + ($($arg:tt)*) => { + $crate::semihosting::io::ewrite_fmt(format_args!($($arg)*)); + }; } /// Macro for printing to the **host's** standard error, with a newline. #[macro_export] macro_rules! ehprintln { () => (ehprint!("\n")); - ($fmt:expr) => (ehprint!(concat!($fmt, "\n"))); - ($fmt:expr, $($arg:tt)*) => (ehprint!(concat!($fmt, "\n"), $($arg)*)); + ($fmt:expr) => { + ehprint!(concat!($fmt, "\n")); + }; + ($fmt:expr, $($arg:tt)*) => { + ehprint!(concat!($fmt, "\n"), $($arg)*); + }; } /// Macro for printing to the **host's** standard output #[macro_export] macro_rules! hprint { - ($s:expr) => ($crate::semihosting::io::write_str($s)); - ($($arg:tt)*) => ($crate::semihosting::io::write_fmt(format_args!($($arg)*))); + ($s:expr) => { + $crate::semihosting::io::write_str($s); + }; + ($($arg:tt)*) => { + $crate::semihosting::io::write_fmt(format_args!($($arg)*)); + }; } /// Macro for printing to the **host's** standard output, with a newline. #[macro_export] macro_rules! hprintln { - () => (hprint!("\n")); - ($fmt:expr) => (hprint!(concat!($fmt, "\n"))); - ($fmt:expr, $($arg:tt)*) => (hprint!(concat!($fmt, "\n"), $($arg)*)); + () => { + hprint!("\n"); + }; + ($fmt:expr) => { + hprint!(concat!($fmt, "\n")); + }; + ($fmt:expr, $($arg:tt)*) => { + hprint!(concat!($fmt, "\n"), $($arg)*); + }; } /// Macro for sending a formatted string through an ITM channel -- cgit v1.2.3