Stop using old format macros

Author: sfackler

lib.rs

@@ -146,7 +146,7 @@ pub struct DefaultNoticeHandler;
 
 impl PostgresNoticeHandler for DefaultNoticeHandler {
     fn handle(&mut self, notice: PostgresDbError) {
-        info2!("{}: {}", notice.severity, notice.message);
+        info!("{}: {}", notice.severity, notice.message);
     }
 }
 
@@ -653,7 +653,7 @@ impl PostgresConnection {
     pub fn connect(url: &str) -> PostgresConnection {
         match PostgresConnection::try_connect(url) {
             Ok(conn) => conn,
-            Err(err) => fail2!("Failed to connect: {}", err.to_str())
+            Err(err) => fail!("Failed to connect: {}", err.to_str())
         }
     }
 
@@ -698,7 +698,7 @@ impl PostgresConnection {
     pub fn prepare<'a>(&'a self, query: &str) -> NormalPostgresStatement<'a> {
         match self.try_prepare(query) {
             Ok(stmt) => stmt,
-            Err(err) => fail2!("Error preparing statement:\n{}",
+            Err(err) => fail!("Error preparing statement:\n{}",
                                err.pretty_error(query))
         }
     }
@@ -740,7 +740,7 @@ impl PostgresConnection {
     pub fn update(&self, query: &str, params: &[&ToSql]) -> uint {
         match self.try_update(query, params) {
             Ok(res) => res,
-            Err(err) => fail2!("Error running update:\n{}",
+            Err(err) => fail!("Error running update:\n{}",
                                err.pretty_error(query))
         }
     }
@@ -763,7 +763,7 @@ impl PostgresConnection {
                 match conn.read_message() {
                     ReadyForQuery {_} => break,
                     ErrorResponse { fields } =>
-                        fail2!("Error: {}",
+                        fail!("Error: {}",
                                PostgresDbError::new(fields).to_str()),
                     _ => ()
                 }
@@ -910,7 +910,7 @@ pub trait PostgresStatement {
     fn update(&self, params: &[&ToSql]) -> uint {
         match self.try_update(params) {
             Ok(count) => count,
-            Err(err) => fail2!("Error running update\n{}", err.to_str())
+            Err(err) => fail!("Error running update\n{}", err.to_str())
         }
     }
 
@@ -932,7 +932,7 @@ pub trait PostgresStatement {
     fn query<'a>(&'a self, params: &[&ToSql]) -> PostgresResult<'a> {
         match self.try_query(params) {
             Ok(result) => result,
-            Err(err) => fail2!("Error executing query:\n{}", err.to_str())
+            Err(err) => fail!("Error executing query:\n{}", err.to_str())
         }
     }
 
@@ -1168,7 +1168,7 @@ impl<'self> TransactionalPostgresStatement<'self> {
             -> PostgresResult<'a> {
         match self.try_lazy_query(row_limit, params) {
             Ok(result) => result,
-            Err(err) => fail2!("Error executing query:\n{}", err.to_str())
+            Err(err) => fail!("Error executing query:\n{}", err.to_str())
         }
     }
 }
@@ -1308,7 +1308,7 @@ impl<'self> RowIndex for &'self str {
     fn idx(&self, stmt: &NormalPostgresStatement) -> uint {
         match stmt.find_col_named(*self) {
             Some(idx) => idx,
-            None => fail2!("No column with name {}", *self)
+            None => fail!("No column with name {}", *self)
         }
     }
 }

message.rs

@@ -139,7 +139,7 @@ pub trait WriteMessage {
 
 impl<W: Writer> WriteMessage for W {
     fn write_message(&mut self, message: &FrontendMessage) {
-        debug2!("Writing message {:?}", message);
+        debug!("Writing message {:?}", message);
         let mut buf = MemWriter::new();
         let mut ident = None;
 
@@ -298,10 +298,10 @@ impl<R: Reader> ReadMessage for R {
             't' => read_parameter_description(&mut buf),
             'T' => read_row_description(&mut buf),
             'Z' => ReadyForQuery { state: buf.read_u8_() },
-            ident => fail2!("Unknown message identifier `{}`", ident)
+            ident => fail!("Unknown message identifier `{}`", ident)
         };
         assert!(buf.eof());
-        debug2!("Read message {:?}", ret);
+        debug!("Read message {:?}", ret);
         ret
     }
 }
@@ -344,7 +344,7 @@ fn read_auth_message(buf: &mut MemReader) -> BackendMessage {
         6 => AuthenticationSCMCredential,
         7 => AuthenticationGSS,
         9 => AuthenticationSSPI,
-        val => fail2!("Invalid authentication identifier `{}`", val)
+        val => fail!("Invalid authentication identifier `{}`", val)
     }
 }
 

tests.rs

@@ -437,7 +437,7 @@ fn test_notification_iterator_some() {
                 assert_eq!(&expected.channel, &channel);
                 assert_eq!(&expected.payload, &payload);
             }
-            x => fail2!("Expected {:?} but got {:?}", expected, x)
+            x => fail!("Expected {:?} but got {:?}", expected, x)
         }
     }
 
@@ -497,8 +497,8 @@ fn test_plaintext_pass_no_pass() {
     let ret = PostgresConnection::try_connect("postgres://pass_user@localhost/postgres");
     match ret {
         Err(MissingPassword) => (),
-        Err(err) => fail2!("Unexpected error {}", err.to_str()),
-        _ => fail2!("Expected error")
+        Err(err) => fail!("Unexpected error {}", err.to_str()),
+        _ => fail!("Expected error")
     }
 }
 
@@ -507,8 +507,8 @@ fn test_plaintext_pass_wrong_pass() {
     let ret = PostgresConnection::try_connect("postgres://pass_user:asdf@localhost/postgres");
     match ret {
         Err(DbError(PostgresDbError { code: InvalidPassword, _ })) => (),
-        Err(err) => fail2!("Unexpected error {}", err.to_str()),
-        _ => fail2!("Expected error")
+        Err(err) => fail!("Unexpected error {}", err.to_str()),
+        _ => fail!("Expected error")
     }
 }
 
@@ -522,8 +522,8 @@ fn test_md5_pass_no_pass() {
     let ret = PostgresConnection::try_connect("postgres://md5_user@localhost/postgres");
     match ret {
         Err(MissingPassword) => (),
-        Err(err) => fail2!("Unexpected error {}", err.to_str()),
-        _ => fail2!("Expected error")
+        Err(err) => fail!("Unexpected error {}", err.to_str()),
+        _ => fail!("Expected error")
     }
 }
 
@@ -532,8 +532,8 @@ fn test_md5_pass_wrong_pass() {
     let ret = PostgresConnection::try_connect("postgres://md5_user:asdf@localhost/postgres");
     match ret {
         Err(DbError(PostgresDbError { code: InvalidPassword, _ })) => (),
-        Err(err) => fail2!("Unexpected error {}", err.to_str()),
-        _ => fail2!("Expected error")
+        Err(err) => fail!("Unexpected error {}", err.to_str()),
+        _ => fail!("Expected error")
     }
 }
 
@@ -542,7 +542,7 @@ fn test_dns_failure() {
     let ret = PostgresConnection::try_connect("postgres://postgres@asdfasdfasdf");
     match ret {
         Err(DnsError) => (),
-        Err(err) => fail2!("Unexpected error {}", err.to_str()),
-        _ => fail2!("Expected error")
+        Err(err) => fail!("Unexpected error {}", err.to_str()),
+        _ => fail!("Expected error")
     }
 }

types.rs

@@ -118,7 +118,7 @@ macro_rules! check_types(
     ($($expected:pat)|+, $actual:ident) => (
         match $actual {
             $($expected)|+ => (),
-            actual => fail2!("Invalid Postgres type {:?}", actual)
+            actual => fail!("Invalid Postgres type {:?}", actual)
         }
     )
 )