diff options
| author | Huon Wilson <dbau.pp+github@gmail.com> | 2013-08-05 19:46:22 +1000 |
|---|---|---|
| committer | Huon Wilson <dbau.pp+github@gmail.com> | 2013-08-07 23:17:52 +1000 |
| commit | c57fde2b5f336a2364aaa6246f987adfe179834b (patch) | |
| tree | 139264abb40e33682c63a293cbe4f53576c02845 /src/libstd | |
| parent | f8cf234b344f898a17753795597203fe64371c6c (diff) | |
| download | rust-c57fde2b5f336a2364aaa6246f987adfe179834b.tar.gz rust-c57fde2b5f336a2364aaa6246f987adfe179834b.zip | |
std: adjust str::test_add so that the macro expands to all 3 items (#8012).
Closes #3682.
Diffstat (limited to 'src/libstd')
| -rw-r--r-- | src/libstd/str.rs | 25 |
1 files changed, 14 insertions, 11 deletions
diff --git a/src/libstd/str.rs b/src/libstd/str.rs index 95a411a3f96..55faf7e3192 100644 --- a/src/libstd/str.rs +++ b/src/libstd/str.rs @@ -3304,19 +3304,22 @@ mod tests { fn test_add() { #[allow(unnecessary_allocation)]; macro_rules! t ( - ($s1:expr, $s2:expr, $e:expr) => { - assert_eq!($s1 + $s2, $e); - assert_eq!($s1.to_owned() + $s2, $e); - assert_eq!($s1.to_managed() + $s2, $e); - } + ($s1:expr, $s2:expr, $e:expr) => { { + let s1 = $s1; + let s2 = $s2; + let e = $e; + assert_eq!(s1 + s2, e.to_owned()); + assert_eq!(s1.to_owned() + s2, e.to_owned()); + assert_eq!(s1.to_managed() + s2, e.to_owned()); + } } ); - t!("foo", "bar", ~"foobar"); - t!("foo", @"bar", ~"foobar"); - t!("foo", ~"bar", ~"foobar"); - t!("ศไทย中", "华Việt Nam", ~"ศไทย中华Việt Nam"); - t!("ศไทย中", @"华Việt Nam", ~"ศไทย中华Việt Nam"); - t!("ศไทย中", ~"华Việt Nam", ~"ศไทย中华Việt Nam"); + t!("foo", "bar", "foobar"); + t!("foo", @"bar", "foobar"); + t!("foo", ~"bar", "foobar"); + t!("ศไทย中", "华Việt Nam", "ศไทย中华Việt Nam"); + t!("ศไทย中", @"华Việt Nam", "ศไทย中华Việt Nam"); + t!("ศไทย中", ~"华Việt Nam", "ศไทย中华Việt Nam"); } #[test] |