diff --git a/src/serialization.rs b/src/serialization.rs
index 1b9d02e..9dc4835 100644
--- a/src/serialization.rs
+++ b/src/serialization.rs
@@ -767,7 +767,7 @@ impl fmt::Show for DecodeError {
             NilTooLong => {
                 write!(f, "expected 0-length string")
             }
-        })
+        });
         match self.field {
             Some(ref s) => {
                 write!(f, " for the key `{}`", s)
@@ -823,18 +823,18 @@ mod tests {
         let mut e = Encoder::new();
         $t.encode(&mut e).unwrap();
         e.toml
-    }) )
+    }) );
 
     macro_rules! decode( ($t:expr) => ({
         let mut d = Decoder::new($t);
         Decodable::decode(&mut d).unwrap()
-    }) )
+    }) );
 
     macro_rules! map( ($($k:ident: $v:expr),*) => ({
         let mut _m = TreeMap::new();
         $(_m.insert(stringify!($k).to_string(), $v);)*
         _m
-    }) )
+    }) );
 
     #[test]
     fn smoke() {
diff --git a/src/show.rs b/src/show.rs
index 330b7e5..34d307f 100644
--- a/src/show.rs
+++ b/src/show.rs
@@ -109,34 +109,34 @@ mod tests {
         let mut _m = TreeMap::new();
         $(_m.insert($k.to_string(), $v);)*
         _m
-    }) )
+    }) );
 
     #[test]
     fn simple_show() {
         assert_eq!(String("foo".to_string()).to_string().as_slice(),
-                   "\"foo\"")
+                   "\"foo\"");
         assert_eq!(Integer(10).to_string().as_slice(),
-                   "10")
+                   "10");
         assert_eq!(Float(10.0).to_string().as_slice(),
-                   "10.0")
+                   "10.0");
         assert_eq!(Float(2.4).to_string().as_slice(),
-                   "2.4")
+                   "2.4");
         assert_eq!(Boolean(true).to_string().as_slice(),
-                   "true")
+                   "true");
         assert_eq!(Datetime("test".to_string()).to_string().as_slice(),
-                   "test")
+                   "test");
         assert_eq!(Array(vec![]).to_string().as_slice(),
-                   "[]")
+                   "[]");
         assert_eq!(Array(vec![Integer(1), Integer(2)]).to_string().as_slice(),
-                   "[1, 2]")
+                   "[1, 2]");
     }
 
     #[test]
     fn table() {
         assert_eq!(Table(map! { }).to_string().as_slice(),
-                   "")
+                   "");
         assert_eq!(Table(map! { "test": Integer(2) }).to_string().as_slice(),
-                   "test = 2\n")
+                   "test = 2\n");
         assert_eq!(Table(map! {
                         "test": Integer(2),
                         "test2": Table(map! {
@@ -146,7 +146,7 @@ mod tests {
                    "test = 2\n\
                     \n\
                     [test2]\n\
-                    test = \"wut\"\n")
+                    test = \"wut\"\n");
         assert_eq!(Table(map! {
                         "test": Integer(2),
                         "test2": Table(map! {
@@ -156,7 +156,7 @@ mod tests {
                    "test = 2\n\
                     \n\
                     [test2]\n\
-                    test = \"wut\"\n")
+                    test = \"wut\"\n");
         assert_eq!(Table(map! {
                         "test": Integer(2),
                         "test2": Array(vec![Table(map! {
@@ -166,6 +166,6 @@ mod tests {
                    "test = 2\n\
                     \n\
                     [[test2]]\n\
-                    test = \"wut\"\n")
+                    test = \"wut\"\n");
     }
 }
diff --git a/src/test/invalid.rs b/src/test/invalid.rs
index 9f86d13..4f69ec6 100644
--- a/src/test/invalid.rs
+++ b/src/test/invalid.rs
@@ -10,67 +10,67 @@ fn run(toml: &str) {
 macro_rules! test( ($name:ident, $toml:expr) => (
     #[test]
     fn $name() { run($toml); }
-) )
+) );
 
 test!(array_mixed_types_arrays_and_ints,
-      include_str!("invalid/array-mixed-types-arrays-and-ints.toml"))
+      include_str!("invalid/array-mixed-types-arrays-and-ints.toml"));
 test!(array_mixed_types_ints_and_floats,
-      include_str!("invalid/array-mixed-types-ints-and-floats.toml"))
+      include_str!("invalid/array-mixed-types-ints-and-floats.toml"));
 test!(array_mixed_types_strings_and_ints,
-      include_str!("invalid/array-mixed-types-strings-and-ints.toml"))
+      include_str!("invalid/array-mixed-types-strings-and-ints.toml"));
 test!(datetime_malformed_no_leads,
-      include_str!("invalid/datetime-malformed-no-leads.toml"))
+      include_str!("invalid/datetime-malformed-no-leads.toml"));
 test!(datetime_malformed_no_secs,
-      include_str!("invalid/datetime-malformed-no-secs.toml"))
+      include_str!("invalid/datetime-malformed-no-secs.toml"));
 test!(datetime_malformed_no_t,
-      include_str!("invalid/datetime-malformed-no-t.toml"))
+      include_str!("invalid/datetime-malformed-no-t.toml"));
 test!(datetime_malformed_no_z,
-      include_str!("invalid/datetime-malformed-no-z.toml"))
+      include_str!("invalid/datetime-malformed-no-z.toml"));
 test!(datetime_malformed_with_milli,
-      include_str!("invalid/datetime-malformed-with-milli.toml"))
+      include_str!("invalid/datetime-malformed-with-milli.toml"));
 test!(duplicate_keys,
-      include_str!("invalid/duplicate-keys.toml"))
+      include_str!("invalid/duplicate-keys.toml"));
 test!(duplicate_key_table,
-      include_str!("invalid/duplicate-key-table.toml"))
+      include_str!("invalid/duplicate-key-table.toml"));
 test!(duplicate_tables,
-      include_str!("invalid/duplicate-tables.toml"))
+      include_str!("invalid/duplicate-tables.toml"));
 test!(empty_implicit_table,
-      include_str!("invalid/empty-implicit-table.toml"))
+      include_str!("invalid/empty-implicit-table.toml"));
 test!(empty_table,
-      include_str!("invalid/empty-table.toml"))
+      include_str!("invalid/empty-table.toml"));
 test!(float_no_leading_zero,
-      include_str!("invalid/float-no-leading-zero.toml"))
+      include_str!("invalid/float-no-leading-zero.toml"));
 test!(float_no_trailing_digits,
-      include_str!("invalid/float-no-trailing-digits.toml"))
+      include_str!("invalid/float-no-trailing-digits.toml"));
 test!(key_two_equals,
-      include_str!("invalid/key-two-equals.toml"))
+      include_str!("invalid/key-two-equals.toml"));
 test!(string_bad_byte_escape,
-      include_str!("invalid/string-bad-byte-escape.toml"))
+      include_str!("invalid/string-bad-byte-escape.toml"));
 test!(string_bad_escape,
-      include_str!("invalid/string-bad-escape.toml"))
+      include_str!("invalid/string-bad-escape.toml"));
 test!(string_byte_escapes,
-      include_str!("invalid/string-byte-escapes.toml"))
+      include_str!("invalid/string-byte-escapes.toml"));
 test!(string_no_close,
-      include_str!("invalid/string-no-close.toml"))
+      include_str!("invalid/string-no-close.toml"));
 test!(table_array_implicit,
-      include_str!("invalid/table-array-implicit.toml"))
+      include_str!("invalid/table-array-implicit.toml"));
 test!(table_array_malformed_bracket,
-      include_str!("invalid/table-array-malformed-bracket.toml"))
+      include_str!("invalid/table-array-malformed-bracket.toml"));
 test!(table_array_malformed_empty,
-      include_str!("invalid/table-array-malformed-empty.toml"))
+      include_str!("invalid/table-array-malformed-empty.toml"));
 test!(table_nested_brackets_close,
-      include_str!("invalid/table-nested-brackets-close.toml"))
+      include_str!("invalid/table-nested-brackets-close.toml"));
 test!(table_nested_brackets_open,
-      include_str!("invalid/table-nested-brackets-open.toml"))
+      include_str!("invalid/table-nested-brackets-open.toml"));
 test!(text_after_array_entries,
-      include_str!("invalid/text-after-array-entries.toml"))
+      include_str!("invalid/text-after-array-entries.toml"));
 test!(text_after_integer,
-      include_str!("invalid/text-after-integer.toml"))
+      include_str!("invalid/text-after-integer.toml"));
 test!(text_after_string,
-      include_str!("invalid/text-after-string.toml"))
+      include_str!("invalid/text-after-string.toml"));
 test!(text_after_table,
-      include_str!("invalid/text-after-table.toml"))
+      include_str!("invalid/text-after-table.toml"));
 test!(text_before_array_separator,
-      include_str!("invalid/text-before-array-separator.toml"))
+      include_str!("invalid/text-before-array-separator.toml"));
 test!(text_in_array,
-      include_str!("invalid/text-in-array.toml"))
+      include_str!("invalid/text-in-array.toml"));
diff --git a/src/test/valid.rs b/src/test/valid.rs
index 37d58bd..e38cf5b 100644
--- a/src/test/valid.rs
+++ b/src/test/valid.rs
@@ -64,104 +64,104 @@ fn run(toml: &str, json: &str) {
 macro_rules! test( ($name:ident, $toml:expr, $json:expr) => (
     #[test]
     fn $name() { run($toml, $json); }
-) )
+) );
 
 test!(array_empty,
        include_str!("valid/array-empty.toml"),
-       include_str!("valid/array-empty.json"))
+       include_str!("valid/array-empty.json"));
 test!(array_nospaces,
        include_str!("valid/array-nospaces.toml"),
-       include_str!("valid/array-nospaces.json"))
+       include_str!("valid/array-nospaces.json"));
 test!(arrays_hetergeneous,
        include_str!("valid/arrays-hetergeneous.toml"),
-       include_str!("valid/arrays-hetergeneous.json"))
+       include_str!("valid/arrays-hetergeneous.json"));
 test!(arrays,
        include_str!("valid/arrays.toml"),
-       include_str!("valid/arrays.json"))
+       include_str!("valid/arrays.json"));
 test!(arrays_nested,
        include_str!("valid/arrays-nested.toml"),
-       include_str!("valid/arrays-nested.json"))
+       include_str!("valid/arrays-nested.json"));
 test!(empty,
        include_str!("valid/empty.toml"),
-       include_str!("valid/empty.json"))
+       include_str!("valid/empty.json"));
 test!(bool,
        include_str!("valid/bool.toml"),
-       include_str!("valid/bool.json"))
+       include_str!("valid/bool.json"));
 test!(datetime,
        include_str!("valid/datetime.toml"),
-       include_str!("valid/datetime.json"))
+       include_str!("valid/datetime.json"));
 test!(example,
        include_str!("valid/example.toml"),
-       include_str!("valid/example.json"))
+       include_str!("valid/example.json"));
 test!(float,
        include_str!("valid/float.toml"),
-       include_str!("valid/float.json"))
+       include_str!("valid/float.json"));
 test!(implicit_and_explicit_after,
        include_str!("valid/implicit-and-explicit-after.toml"),
-       include_str!("valid/implicit-and-explicit-after.json"))
+       include_str!("valid/implicit-and-explicit-after.json"));
 test!(implicit_and_explicit_before,
        include_str!("valid/implicit-and-explicit-before.toml"),
-       include_str!("valid/implicit-and-explicit-before.json"))
+       include_str!("valid/implicit-and-explicit-before.json"));
 test!(implicit_groups,
        include_str!("valid/implicit-groups.toml"),
-       include_str!("valid/implicit-groups.json"))
+       include_str!("valid/implicit-groups.json"));
 test!(integer,
        include_str!("valid/integer.toml"),
-       include_str!("valid/integer.json"))
+       include_str!("valid/integer.json"));
 test!(key_equals_nospace,
        include_str!("valid/key-equals-nospace.toml"),
-       include_str!("valid/key-equals-nospace.json"))
+       include_str!("valid/key-equals-nospace.json"));
 test!(key_special_chars,
        include_str!("valid/key-special-chars.toml"),
-       include_str!("valid/key-special-chars.json"))
+       include_str!("valid/key-special-chars.json"));
 test!(key_with_pound,
        include_str!("valid/key-with-pound.toml"),
-       include_str!("valid/key-with-pound.json"))
+       include_str!("valid/key-with-pound.json"));
 test!(long_float,
        include_str!("valid/long-float.toml"),
-       include_str!("valid/long-float.json"))
+       include_str!("valid/long-float.json"));
 test!(long_integer,
        include_str!("valid/long-integer.toml"),
-       include_str!("valid/long-integer.json"))
+       include_str!("valid/long-integer.json"));
 test!(string_empty,
        include_str!("valid/string-empty.toml"),
-       include_str!("valid/string-empty.json"))
+       include_str!("valid/string-empty.json"));
 test!(string_escapes,
        include_str!("valid/string-escapes.toml"),
-       include_str!("valid/string-escapes.json"))
+       include_str!("valid/string-escapes.json"));
 test!(string_simple,
        include_str!("valid/string-simple.toml"),
-       include_str!("valid/string-simple.json"))
+       include_str!("valid/string-simple.json"));
 test!(string_with_pound,
        include_str!("valid/string-with-pound.toml"),
-       include_str!("valid/string-with-pound.json"))
+       include_str!("valid/string-with-pound.json"));
 test!(table_array_implicit,
        include_str!("valid/table-array-implicit.toml"),
-       include_str!("valid/table-array-implicit.json"))
+       include_str!("valid/table-array-implicit.json"));
 test!(table_array_many,
        include_str!("valid/table-array-many.toml"),
-       include_str!("valid/table-array-many.json"))
+       include_str!("valid/table-array-many.json"));
 test!(table_array_nest,
        include_str!("valid/table-array-nest.toml"),
-       include_str!("valid/table-array-nest.json"))
+       include_str!("valid/table-array-nest.json"));
 test!(table_array_one,
        include_str!("valid/table-array-one.toml"),
-       include_str!("valid/table-array-one.json"))
+       include_str!("valid/table-array-one.json"));
 test!(table_empty,
        include_str!("valid/table-empty.toml"),
-       include_str!("valid/table-empty.json"))
+       include_str!("valid/table-empty.json"));
 test!(table_sub_empty,
        include_str!("valid/table-sub-empty.toml"),
-       include_str!("valid/table-sub-empty.json"))
+       include_str!("valid/table-sub-empty.json"));
 test!(table_whitespace,
        include_str!("valid/table-whitespace.toml"),
-       include_str!("valid/table-whitespace.json"))
+       include_str!("valid/table-whitespace.json"));
 test!(table_with_pound,
        include_str!("valid/table-with-pound.toml"),
-       include_str!("valid/table-with-pound.json"))
+       include_str!("valid/table-with-pound.json"));
 test!(unicode_escape,
        include_str!("valid/unicode-escape.toml"),
-       include_str!("valid/unicode-escape.json"))
+       include_str!("valid/unicode-escape.json"));
 test!(unicode_literal,
        include_str!("valid/unicode-literal.toml"),
-       include_str!("valid/unicode-literal.json"))
+       include_str!("valid/unicode-literal.json"));