fixes

Author: Guanqun Lu

src/cargo/ops/registry.rs

@@ -413,14 +413,14 @@ pub fn needs_custom_http_transport(config: &Config) -> CargoResult<bool> {
     let cainfo = config.get_path("http.cainfo")?;
     let check_revoke = config.get_bool("http.check-revoke")?;
     let user_agent = config.get_string("http.user-agent")?;
-    let ssl_version = config.get::<SslVersionConfig>("http.ssl-version")?;
+    let ssl_version = config.get::<Option<SslVersionConfig>>("http.ssl-version")?;
 
     Ok(proxy_exists
         || timeout
         || cainfo.is_some()
         || check_revoke.is_some()
         || user_agent.is_some()
-        || !ssl_version.is_empty())
+        || ssl_version.is_some())
 }
 
 /// Configure a libcurl http handle with the defaults options for Cargo
@@ -456,7 +456,7 @@ pub fn configure_http_handle(config: &Config, handle: &mut Easy) -> CargoResult<
     }
     if let Some(ssl_version) = config.get::<Option<SslVersionConfig>>("http.ssl-version")? {
         match ssl_version {
-            SslVersionConfig::Exactly(s) => {
+            SslVersionConfig::Single(s) => {
                 let version = to_ssl_version(s.as_str())?;
                 handle.ssl_version(version)?;
             },

src/cargo/util/config.rs

@@ -1871,7 +1871,7 @@ pub fn clippy_driver() -> PathBuf {
 #[derive(Clone, Debug, Deserialize)]
 #[serde(untagged)]
 pub enum SslVersionConfig {
-    Exactly(String),
+    Single(String),
     Range(SslVersionConfigRange),
 }
 
@@ -1881,13 +1881,3 @@ pub struct SslVersionConfigRange {
     pub max: Option<String>,
 }
 
-impl SslVersionConfig {
-    pub fn is_empty(&self) -> bool {
-        match self {
-            SslVersionConfig::Exactly(_) => false,
-            SslVersionConfig::Range(SslVersionConfigRange{ min, max}) =>
-                min.is_none() && max.is_none(),
-        }
-    }
-}
-

tests/testsuite/config.rs

@@ -852,7 +852,7 @@ hello = 'world'
 }
 
 #[cargo_test]
-fn config_get_ssl_version_exact() {
+fn config_get_ssl_version_single() {
     write_config(
         "\
 [http]
@@ -864,7 +864,7 @@ ssl-version = 'tlsv1.2'
 
     let a = config.get::<Option<SslVersionConfig>>("http.ssl-version").unwrap().unwrap();
     match a {
-        SslVersionConfig::Exactly(v) => assert_eq!(&v, "tlsv1.2"),
+        SslVersionConfig::Single(v) => assert_eq!(&v, "tlsv1.2"),
         SslVersionConfig::Range(_) => panic!("Did not expect ssl version min/max."),
     };
 }
@@ -883,7 +883,7 @@ ssl-version.max = 'tlsv1.3'
 
     let a = config.get::<Option<SslVersionConfig>>("http.ssl-version").unwrap().unwrap();
     match a {
-        SslVersionConfig::Exactly(_) => panic!("Did not expect exact ssl version."),
+        SslVersionConfig::Single(_) => panic!("Did not expect exact ssl version."),
         SslVersionConfig::Range(range) => {
             assert_eq!(range.min, Some(String::from("tlsv1.2")));
             assert_eq!(range.max, Some(String::from("tlsv1.3")));