Handle rebase conflicts

Author: alexcrichton

src/cargo/ops/registry.rs

@@ -448,17 +448,19 @@ pub fn configure_http_handle(config: &Config, handle: &mut Easy) -> CargoResult<
         };
         Ok(version)
     }
-    if let Some(ssl_version) = &http_config.ssl_version {
+    if let Some(ssl_version) = &http.ssl_version {
         match ssl_version {
             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()))?;
+                let min_version = min
+                    .as_ref()
+                    .map_or(Ok(SslVersion::Default), |s| to_ssl_version(s))?;
+                let max_version = max
+                    .as_ref()
+                    .map_or(Ok(SslVersion::Default), |s| to_ssl_version(s))?;
                 handle.ssl_min_max_version(min_version, max_version)?;
             }
         }

src/cargo/util/config/mod.rs

@@ -1406,12 +1406,6 @@ pub fn clippy_driver() -> PathBuf {
         .into()
 }
 
-#[derive(Clone, Debug, Deserialize)]
-pub struct SslVersionConfigRange {
-    pub min: Option<String>,
-    pub max: Option<String>,
-}
-
 #[derive(Debug, Default, Deserialize, PartialEq)]
 pub struct CargoHttpConfig {
     pub proxy: Option<String>,
@@ -1442,13 +1436,19 @@ pub struct CargoHttpConfig {
 /// ssl-version.min = "tlsv1.2"
 /// ssl-version.max = "tlsv1.3"
 /// ```
-#[derive(Clone, Debug, Deserialize)]
+#[derive(Clone, Debug, Deserialize, PartialEq)]
 #[serde(untagged)]
 pub enum SslVersionConfig {
     Single(String),
     Range(SslVersionConfigRange),
 }
 
+#[derive(Clone, Debug, Deserialize, PartialEq)]
+pub struct SslVersionConfigRange {
+    pub min: Option<String>,
+    pub max: Option<String>,
+}
+
 #[derive(Debug, Deserialize)]
 pub struct CargoNetConfig {
     pub retry: Option<u32>,