message: clean up some unneeded unwraps; rustfmt
diff: @@ -2,8 +2,8 @@ use postgres::config::SslMode;
  use std::path::PathBuf;
  use openssl::ssl::{SslConnector, SslFiletype, SslMethod, SslVerifyMode};
  -use postgres_openssl::MakeTlsConnector;
  use postgres::Config;
  +use postgres_openssl::MakeTlsConnector;
  use std::collections::HashMap;
  use url::Url;
  @@ -16,7 +16,6 @@ pub struct TlsConfig {
  pub root_cert: Option<PathBuf>,
  }
  -
  impl From<TlsConfig> for MakeTlsConnector {
  // This function adapted primarily from:
  // https://github.com/sfackler/rust-postgres/pull/774
  @@ -42,17 +41,15 @@ impl From<TlsConfig> for MakeTlsConnector {
  _ => panic!("unexpected sslmode {:?}", tls_config.ssl_mode),
  };
  -
  // Configure certificates
  - if tls_config.client_cert.is_some() {
  - let (cert, key) = tls_config.client_cert.unwrap();
  + if let Some((cert, key)) = tls_config.client_cert {
  builder
  .set_certificate_file(cert, SslFiletype::PEM)
  .unwrap();
  builder.set_private_key_file(key, SslFiletype::PEM).unwrap();
  }
  - if tls_config.root_cert.is_some() {
  - builder.set_ca_file(tls_config.root_cert.unwrap()).unwrap();
  + if let Some(root_cert) = tls_config.root_cert {
  + builder.set_ca_file(root_cert).unwrap();
  }
  let mut tls_connector = MakeTlsConnector::new(builder.build());
  @@ -70,7 +67,6 @@ impl From<TlsConfig> for MakeTlsConnector {
  }
  }
  -
  pub fn get_query_params(url: Url) -> HashMap<String, String> {
  url.query_pairs().into_owned().collect()
  }
  