Fix for upstream changes

Author: sfackler

Cargo.toml

@@ -23,8 +23,8 @@ path = "tests/test.rs"
 default = ["uuid"]
 
 [dependencies]
-phf = "0.3"
-phf_mac = "0.3"
+phf = "0.4"
+phf_mac = "0.4"
 openssl = "0.2.1"
 time = "0.1"
 log = "0.1"

src/error.rs

@@ -10,7 +10,7 @@ use phf;
 use Result;
 use types::Type;
 
-macro_rules! make_errors(
+macro_rules! make_errors {
     ($($code:expr => $error:ident),+) => (
         /// SQLSTATE error codes
         #[deriving(PartialEq, Eq, Clone, Show)]
@@ -34,10 +34,10 @@ macro_rules! make_errors(
             }
         }
     )
-)
+}
 
 // From http://www.postgresql.org/docs/9.2/static/errcodes-appendix.html
-make_errors!(
+make_errors! {
     // Class 00 — Successful Completion
     "00000" => SuccessfulCompletion,
 
@@ -353,7 +353,7 @@ make_errors!(
     "XX000" => InternalError,
     "XX001" => DataCorrupted,
     "XX002" => IndexCorrupted
-)
+}
 
 /// Reasons a new Postgres connection could fail
 #[deriving(Clone, PartialEq, Eq)]

src/lib.rs

@@ -1267,7 +1267,7 @@ impl<'conn> Statement<'conn> {
             more_rows: true,
             finished: false,
         };
-        try!(result.read_rows())
+        try!(result.read_rows());
 
         Ok(result)
     }

src/macros.rs

@@ -1,4 +1,4 @@
-macro_rules! try_desync(
+macro_rules! try_desync {
     ($s:expr, $e:expr) => (
         match $e {
             Ok(ok) => ok,
@@ -8,9 +8,9 @@ macro_rules! try_desync(
             }
         }
     )
-)
+}
 
-macro_rules! check_desync(
+macro_rules! check_desync {
     ($e:expr) => ({
         if $e.canary() != CANARY {
             panic!("Connection use after free. See mozilla/rust#13246.");
@@ -19,12 +19,12 @@ macro_rules! check_desync(
             return Err(::Error::StreamDesynchronized);
         }
     })
-)
+}
 
-macro_rules! bad_response(
+macro_rules! bad_response {
     ($s:expr) => ({
         debug!("Unexpected response");
         $s.desynchronized = true;
         return Err(::Error::BadResponse);
     })
-)
+}