diff options
author | Pierre-Henri Symoneaux <pierre-henri.symoneaux@nokia.com> | 2017-12-03 13:24:49 +0100 |
---|---|---|
committer | Pierre-Henri Symoneaux <pierre-henri.symoneaux@nokia.com> | 2017-12-03 13:34:06 +0100 |
commit | e51b96e215a1a5bf343fd51785e7d5dc7910e0bc (patch) | |
tree | 9b0f9128188fe1af401330a36d8ba707c98b98b3 | |
parent | 31ff6acd4b69338a1e177c51406136980f6127af (diff) |
Try to make macro works on rust releases 1.13 to 1.19
-rw-r--r-- | src/main.rs | 3 | ||||
-rw-r--r-- | src/row.rs | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/main.rs b/src/main.rs index 2bac3e6..71c0ebe 100644 --- a/src/main.rs +++ b/src/main.rs @@ -1,3 +1,4 @@ +// #![feature(trace_macros)] #[macro_use] extern crate prettytable; extern crate term; @@ -8,7 +9,7 @@ use prettytable::format::*; use term::{Attr, color}; -//trace_macros!(true); +// trace_macros!(true); #[allow(dead_code)] fn main() { @@ -245,6 +245,7 @@ macro_rules! row { (($($out:tt)*); $style:ident -> $value:expr) => (vec![$($out)* cell!($style -> $value)]); (($($out:tt)*); $style:ident -> $value:expr, $($n: tt)*) => (row!(($($out)* cell!($style -> $value),); $($n)*)); + ($($content:expr), *) => ($crate::row::Row::new(vec![$(cell!($content)), *])); // This line may not be needed starting from Rust 1.20 ($style:ident => $($content:expr), *) => ($crate::row::Row::new(vec![$(cell!($style -> $content)), *])); ($style:ident => $($content:expr,) *) => ($crate::row::Row::new(vec![$(cell!($style -> $content)), *])); ($($content:tt)*) => ($crate::row::Row::new(row!((); $($content)*))); |