Switch to new destructure wildcard format

Author: sfackler

lib.rs

@@ -207,7 +207,7 @@ pub struct PostgresCancelData {
 /// that connection.
 pub fn cancel_query(url: &str, ssl: &SslMode, data: PostgresCancelData)
         -> Option<PostgresConnectError> {
-    let Url { host, port, _ }: Url = match FromStr::from_str(url) {
+    let Url { host, port, .. }: Url = match FromStr::from_str(url) {
         Some(url) => url,
         None => return Some(InvalidUrl)
     };
@@ -339,7 +339,7 @@ impl InnerPostgresConnection {
             user,
             path,
             query: args,
-            _
+            ..
         }: Url = match FromStr::from_str(url) {
             Some(url) => url,
             None => return Err(InvalidUrl)
@@ -394,7 +394,7 @@ impl InnerPostgresConnection {
                     conn.cancel_data.process_id = process_id;
                     conn.cancel_data.secret_key = secret_key;
                 }
-                ReadyForQuery { _ } => break,
+                ReadyForQuery { .. } => break,
                 ErrorResponse { fields } =>
                     return Err(DbError(PostgresDbError::new(fields))),
                 _ => unreachable!()
@@ -539,7 +539,7 @@ impl InnerPostgresConnection {
 
     fn wait_for_ready(&mut self) {
         match self.read_message() {
-            ReadyForQuery { _ } => {}
+            ReadyForQuery { .. } => {}
             _ => unreachable!()
         }
     }
@@ -679,7 +679,7 @@ impl PostgresConnection {
 
             loop {
                 match conn.read_message() {
-                    ReadyForQuery { _ } => break,
+                    ReadyForQuery { .. } => break,
                     ErrorResponse { fields } =>
                         fail!("Error: {}",
                                PostgresDbError::new(fields).to_str()),
@@ -876,7 +876,7 @@ impl<'conn> Drop for NormalPostgresStatement<'conn> {
                 Sync]);
             loop {
                 match self.conn.read_message() {
-                    ReadyForQuery { _ } => break,
+                    ReadyForQuery { .. } => break,
                     _ => {}
                 }
             }
@@ -972,7 +972,7 @@ impl<'conn> PostgresStatement for NormalPostgresStatement<'conn> {
         let num;
         loop {
             match self.conn.read_message() {
-                DataRow { _ } => {}
+                DataRow { .. } => {}
                 ErrorResponse { fields } => {
                     self.conn.wait_for_ready();
                     return Err(PostgresDbError::new(fields));
@@ -1015,7 +1015,7 @@ pub struct ResultDescription {
 impl ResultDescription {
     fn from_row_description_entry(row: RowDescriptionEntry)
             -> ResultDescription {
-        let RowDescriptionEntry { name, type_oid, _ } = row;
+        let RowDescriptionEntry { name, type_oid, .. } = row;
 
         ResultDescription {
             name: name,
@@ -1102,7 +1102,7 @@ impl<'stmt> Drop for PostgresResult<'stmt> {
                 Sync]);
             loop {
                 match self.stmt.conn.read_message() {
-                    ReadyForQuery { _ } => break,
+                    ReadyForQuery { .. } => break,
                     _ => {}
                 }
             }
@@ -1115,7 +1115,7 @@ impl<'stmt> PostgresResult<'stmt> {
         loop {
             match self.stmt.conn.read_message() {
                 EmptyQueryResponse |
-                CommandComplete { _ } => {
+                CommandComplete { .. } => {
                     self.more_rows = false;
                     break;
                 },

test.rs

@@ -79,15 +79,15 @@ fn test_url_terminating_slash() {
 fn test_prepare_err() {
     let conn = PostgresConnection::connect("postgres://postgres@localhost", &NoSsl);
     match conn.try_prepare("invalid sql statment") {
-        Err(PostgresDbError { code: SyntaxError, position: Some(Position(1)), _ }) => (),
+        Err(PostgresDbError { code: SyntaxError, position: Some(Position(1)), .. }) => (),
         resp => fail!("Unexpected result {:?}", resp)
     }
 }
 
 #[test]
 fn test_unknown_database() {
     match PostgresConnection::try_connect("postgres://postgres@localhost/asdf", &NoSsl) {
-        Err(DbError(PostgresDbError { code: InvalidCatalogName, _ })) => {}
+        Err(DbError(PostgresDbError { code: InvalidCatalogName, .. })) => {}
         resp => fail!("Unexpected result {:?}", resp)
     }
 }
@@ -520,7 +520,7 @@ fn test_notification_iterator_some() {
     fn check_notification(expected: PostgresNotification,
                           actual: Option<PostgresNotification>) {
         match actual {
-            Some(PostgresNotification { channel, payload, _ }) => {
+            Some(PostgresNotification { channel, payload, .. }) => {
                 assert_eq!(&expected.channel, &channel);
                 assert_eq!(&expected.payload, &payload);
             }
@@ -569,7 +569,7 @@ fn test_cancel_query() {
     }
 
     match conn.try_update("SELECT pg_sleep(10)", []) {
-        Err(PostgresDbError { code: QueryCanceled, _ }) => {}
+        Err(PostgresDbError { code: QueryCanceled, .. }) => {}
         res => fail!("Unexpected result {:?}", res)
     }
 }
@@ -609,7 +609,7 @@ fn test_plaintext_pass_no_pass() {
 fn test_plaintext_pass_wrong_pass() {
     let ret = PostgresConnection::try_connect("postgres://pass_user:asdf@localhost/postgres", &NoSsl);
     match ret {
-        Err(DbError(PostgresDbError { code: InvalidPassword, _ })) => (),
+        Err(DbError(PostgresDbError { code: InvalidPassword, .. })) => (),
         Err(err) => fail!("Unexpected error {}", err.to_str()),
         _ => fail!("Expected error")
     }
@@ -634,7 +634,7 @@ fn test_md5_pass_no_pass() {
 fn test_md5_pass_wrong_pass() {
     let ret = PostgresConnection::try_connect("postgres://md5_user:asdf@localhost/postgres", &NoSsl);
     match ret {
-        Err(DbError(PostgresDbError { code: InvalidPassword, _ })) => (),
+        Err(DbError(PostgresDbError { code: InvalidPassword, .. })) => (),
         Err(err) => fail!("Unexpected error {}", err.to_str()),
         _ => fail!("Expected error")
     }

types/mod.rs

@@ -125,7 +125,7 @@ impl PostgresType {
     /// Returns the wire format needed for the value of `self`.
     pub fn result_format(&self) -> Format {
         match *self {
-            PgUnknownType(*) => Text,
+            PgUnknownType(..) => Text,
             _ => Binary
         }
     }
@@ -504,13 +504,13 @@ macro_rules! to_range_impl(
                 } else {
                     match self.lower() {
                         &None => tag |= RANGE_LOWER_UNBOUNDED,
-                        &Some(RangeBound { type_: Inclusive, _ }) =>
+                        &Some(RangeBound { type_: Inclusive, .. }) =>
                             tag |= RANGE_LOWER_INCLUSIVE,
                         _ => {}
                     }
                     match self.upper() {
                         &None => tag |= RANGE_UPPER_UNBOUNDED,
-                        &Some(RangeBound { type_: Inclusive, _ }) =>
+                        &Some(RangeBound { type_: Inclusive, .. }) =>
                             tag |= RANGE_UPPER_INCLUSIVE,
                         _ => {}
                     }

types/range.rs

@@ -184,7 +184,7 @@ impl<T: Ord+Normalizable> Range<T> {
     pub fn is_empty(&self) -> bool {
         match *self {
             Empty => true,
-            Normal(*) => false
+            Normal(..) => false
         }
     }