From aed5a77540cda0365d245621876f69058445b7a3 Mon Sep 17 00:00:00 2001
From: David Tolnay <dtolnay@gmail.com>
Date: Mon, 10 Apr 2017 19:41:32 -0700
Subject: [PATCH] Fix assert_next_token on old rustc

---
 serde_test/src/ser.rs | 16 ++++++++--------
 travis.sh             |  4 ++++
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/serde_test/src/ser.rs b/serde_test/src/ser.rs
index f6c401ee..537393b5 100644
--- a/serde_test/src/ser.rs
+++ b/serde_test/src/ser.rs
@@ -28,17 +28,17 @@ impl<'a> Serializer<'a> {
 }
 
 macro_rules! assert_next_token {
-    ($self:ident, $expected:ident($a:expr)) => {
-        assert_next_token!($self, $expected { a: $a });
+    ($ser:ident, $expected:ident($a:expr)) => {
+        assert_next_token!($ser, $expected { a: $a });
     };
-    ($self:ident, $expected:ident($a:expr, $b:expr)) => {
-        assert_next_token!($self, $expected { a: $a, b: $b });
+    ($ser:ident, $expected:ident($a:expr, $b:expr)) => {
+        assert_next_token!($ser, $expected { a: $a, b: $b });
     };
-    ($self:ident, $expected:ident($a:expr, $b:expr, $c:expr)) => {
-        assert_next_token!($self, $expected { a: $a, b: $b, c: $c });
+    ($ser:ident, $expected:ident($a:expr, $b:expr, $c:expr)) => {
+        assert_next_token!($ser, $expected { a: $a, b: $b, c: $c });
     };
-    ($self:ident, $expected:ident $({ $($n:ident: $v:expr),* })*) => {
-        match $self.next_token() {
+    ($ser:ident, $expected:ident $({ $($n:ident: $v:expr),* })*) => {
+        match $ser.next_token() {
             Some(Token::$expected $(($($n),*))*) $(if $($n == $v)&&*)* => {}
             Some(other) => {
                 panic!("expected Token::{} but serialized as {:?}",
diff --git a/travis.sh b/travis.sh
index 7a122feb..fa760b57 100755
--- a/travis.sh
+++ b/travis.sh
@@ -67,10 +67,14 @@ else
     cd "$DIR/serde"
     channel build --features rc
     channel build --no-default-features
+    cd "$DIR/serde_test"
+    channel build
 
     CHANNEL=1.13.0
     cargo clean
     cd "$DIR/serde"
     channel build --features rc
     channel build --no-default-features
+    cd "$DIR/serde_test"
+    channel build
 fi