run cargo fmt to pass the CI build

rust-lang · Sep 30, 2019 · a4e3b81 · a4e3b81
1 parent ba1f16a
commit a4e3b81
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 14 deletions.
diff --git a/src/cargo/ops/registry.rs b/src/cargo/ops/registry.rs
@@ -448,9 +448,11 @@ pub fn configure_http_handle(config: &Config, handle: &mut Easy) -> CargoResult<
             "tlsv1.1" => SslVersion::Tlsv11,
             "tlsv1.2" => SslVersion::Tlsv12,
             "tlsv1.3" => SslVersion::Tlsv13,
-            _ => bail!("Invalid ssl version `{}`,\
-                       choose from 'default', 'tlsv1', 'tlsv1.0', 'tlsv1.1', 'tlsv1.2', 'tlsv1.3'.",
-                       s),
+            _ => bail!(
+                "Invalid ssl version `{}`,\
+                 choose from 'default', 'tlsv1', 'tlsv1.0', 'tlsv1.1', 'tlsv1.2', 'tlsv1.3'.",
+                s
+            ),
         };
         Ok(version)
     }
@@ -459,10 +461,12 @@ pub fn configure_http_handle(config: &Config, handle: &mut Easy) -> CargoResult<
             SslVersionConfig::Single(s) => {
                 let version = to_ssl_version(s.as_str())?;
                 handle.ssl_version(version)?;
-            },
-            SslVersionConfig::Range(SslVersionConfigRange{ min, max}) => {
-                let min_version = min.map_or(Ok(SslVersion::Default), |s| to_ssl_version(s.as_str()))?;
-                let max_version = max.map_or(Ok(SslVersion::Default), |s| to_ssl_version(s.as_str()))?;
+            }
+            SslVersionConfig::Range(SslVersionConfigRange { min, max }) => {
+                let min_version =
+                    min.map_or(Ok(SslVersion::Default), |s| to_ssl_version(s.as_str()))?;
+                let max_version =
+                    max.map_or(Ok(SslVersion::Default), |s| to_ssl_version(s.as_str()))?;
                 handle.ssl_min_max_version(min_version, max_version)?;
             }
         }

diff --git a/src/cargo/util/config.rs b/src/cargo/util/config.rs
@@ -1880,4 +1880,3 @@ pub struct SslVersionConfigRange {
     pub min: Option<String>,
     pub max: Option<String>,
 }
-
diff --git a/tests/testsuite/config.rs b/tests/testsuite/config.rs
@@ -845,9 +845,12 @@ hello = 'world'
 
     let config = new_config(&[]);
 
-    assert!(config.get::<Option<SslVersionConfig>>("http.ssl-version").unwrap().is_none());
+    assert!(config
+        .get::<Option<SslVersionConfig>>("http.ssl-version")
+        .unwrap()
+        .is_none());
 
-    let b =  config.get_string("http.ssl-version").unwrap();
+    let b = config.get_string("http.ssl-version").unwrap();
     println!("b: {:?}", if b.is_some() { "some" } else { "none" });
 }
 
@@ -862,7 +865,10 @@ ssl-version = 'tlsv1.2'
 
     let config = new_config(&[]);
 
-    let a = config.get::<Option<SslVersionConfig>>("http.ssl-version").unwrap().unwrap();
+    let a = config
+        .get::<Option<SslVersionConfig>>("http.ssl-version")
+        .unwrap()
+        .unwrap();
     match a {
         SslVersionConfig::Single(v) => assert_eq!(&v, "tlsv1.2"),
         SslVersionConfig::Range(_) => panic!("Did not expect ssl version min/max."),
@@ -881,7 +887,10 @@ ssl-version.max = 'tlsv1.3'
 
     let config = new_config(&[]);
 
-    let a = config.get::<Option<SslVersionConfig>>("http.ssl-version").unwrap().unwrap();
+    let a = config
+        .get::<Option<SslVersionConfig>>("http.ssl-version")
+        .unwrap()
+        .unwrap();
     match a {
         SslVersionConfig::Single(_) => panic!("Did not expect exact ssl version."),
         SslVersionConfig::Range(range) => {
@@ -906,6 +915,8 @@ ssl-version.max = 'tlsv1.3'
     let config = new_config(&[]);
 
     assert!(config.get::<SslVersionConfig>("http.ssl-version").is_err());
-    assert!(config.get::<Option<SslVersionConfig>>("http.ssl-version").unwrap().is_none());
+    assert!(config
+        .get::<Option<SslVersionConfig>>("http.ssl-version")
+        .unwrap()
+        .is_none());
 }
-
Original file line number	Diff line number	Diff line change
Expand Up		@@ -1880,4 +1880,3 @@ pub struct SslVersionConfigRange {
		pub min: Option<String>,
		pub max: Option<String>,
		}