Dedupe lazy_static

🎉 🎉 🎉
servo · Mar 23, 2018 · 6c6a415 · 6c6a415
1 parent 4a6453a
commit 6c6a415
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 30 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/components/net/connector.rs b/components/net/connector.rs
@@ -52,12 +52,9 @@ pub type Connector = HttpsConnector;
 
 pub fn create_ssl_client(ca_file: &PathBuf) -> OpensslClient {
     let mut ssl_connector_builder = SslConnectorBuilder::new(SslMethod::tls()).unwrap();
-    {
-        let context = ssl_connector_builder.builder_mut();
-        context.set_ca_file(ca_file).expect("could not set CA file");
-        context.set_cipher_list(DEFAULT_CIPHERS).expect("could not set ciphers");
-        context.set_options(SSL_OP_NO_SSLV2 | SSL_OP_NO_SSLV3 | SSL_OP_NO_COMPRESSION);
-    }
+    ssl_connector_builder.set_ca_file(ca_file).expect("could not set CA file");
+    ssl_connector_builder.set_cipher_list(DEFAULT_CIPHERS).expect("could not set ciphers");
+    ssl_connector_builder.set_options(SSL_OP_NO_SSLV2 | SSL_OP_NO_SSLV3 | SSL_OP_NO_COMPRESSION);
     let ssl_connector = ssl_connector_builder.build();
     OpensslClient::from(ssl_connector)
 }

diff --git a/servo-tidy.toml b/servo-tidy.toml
@@ -39,7 +39,6 @@ num = [
 # Ignored packages with duplicated versions
 packages = [
   "bitflags",
-  "lazy_static",
   "winapi",
   "syn",
   "quote",