Skip to content

Commit a4e3b81

Browse files
author
Guanqun Lu
committed
run cargo fmt to pass the CI build
1 parent ba1f16a commit a4e3b81

File tree

3 files changed

+28
-14
lines changed

3 files changed

+28
-14
lines changed

src/cargo/ops/registry.rs

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -448,9 +448,11 @@ pub fn configure_http_handle(config: &Config, handle: &mut Easy) -> CargoResult<
448448
"tlsv1.1" => SslVersion::Tlsv11,
449449
"tlsv1.2" => SslVersion::Tlsv12,
450450
"tlsv1.3" => SslVersion::Tlsv13,
451-
_ => bail!("Invalid ssl version `{}`,\
452-
choose from 'default', 'tlsv1', 'tlsv1.0', 'tlsv1.1', 'tlsv1.2', 'tlsv1.3'.",
453-
s),
451+
_ => bail!(
452+
"Invalid ssl version `{}`,\
453+
choose from 'default', 'tlsv1', 'tlsv1.0', 'tlsv1.1', 'tlsv1.2', 'tlsv1.3'.",
454+
s
455+
),
454456
};
455457
Ok(version)
456458
}
@@ -459,10 +461,12 @@ pub fn configure_http_handle(config: &Config, handle: &mut Easy) -> CargoResult<
459461
SslVersionConfig::Single(s) => {
460462
let version = to_ssl_version(s.as_str())?;
461463
handle.ssl_version(version)?;
462-
},
463-
SslVersionConfig::Range(SslVersionConfigRange{ min, max}) => {
464-
let min_version = min.map_or(Ok(SslVersion::Default), |s| to_ssl_version(s.as_str()))?;
465-
let max_version = max.map_or(Ok(SslVersion::Default), |s| to_ssl_version(s.as_str()))?;
464+
}
465+
SslVersionConfig::Range(SslVersionConfigRange { min, max }) => {
466+
let min_version =
467+
min.map_or(Ok(SslVersion::Default), |s| to_ssl_version(s.as_str()))?;
468+
let max_version =
469+
max.map_or(Ok(SslVersion::Default), |s| to_ssl_version(s.as_str()))?;
466470
handle.ssl_min_max_version(min_version, max_version)?;
467471
}
468472
}

src/cargo/util/config.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1880,4 +1880,3 @@ pub struct SslVersionConfigRange {
18801880
pub min: Option<String>,
18811881
pub max: Option<String>,
18821882
}
1883-

tests/testsuite/config.rs

Lines changed: 17 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -845,9 +845,12 @@ hello = 'world'
845845

846846
let config = new_config(&[]);
847847

848-
assert!(config.get::<Option<SslVersionConfig>>("http.ssl-version").unwrap().is_none());
848+
assert!(config
849+
.get::<Option<SslVersionConfig>>("http.ssl-version")
850+
.unwrap()
851+
.is_none());
849852

850-
let b = config.get_string("http.ssl-version").unwrap();
853+
let b = config.get_string("http.ssl-version").unwrap();
851854
println!("b: {:?}", if b.is_some() { "some" } else { "none" });
852855
}
853856

@@ -862,7 +865,10 @@ ssl-version = 'tlsv1.2'
862865

863866
let config = new_config(&[]);
864867

865-
let a = config.get::<Option<SslVersionConfig>>("http.ssl-version").unwrap().unwrap();
868+
let a = config
869+
.get::<Option<SslVersionConfig>>("http.ssl-version")
870+
.unwrap()
871+
.unwrap();
866872
match a {
867873
SslVersionConfig::Single(v) => assert_eq!(&v, "tlsv1.2"),
868874
SslVersionConfig::Range(_) => panic!("Did not expect ssl version min/max."),
@@ -881,7 +887,10 @@ ssl-version.max = 'tlsv1.3'
881887

882888
let config = new_config(&[]);
883889

884-
let a = config.get::<Option<SslVersionConfig>>("http.ssl-version").unwrap().unwrap();
890+
let a = config
891+
.get::<Option<SslVersionConfig>>("http.ssl-version")
892+
.unwrap()
893+
.unwrap();
885894
match a {
886895
SslVersionConfig::Single(_) => panic!("Did not expect exact ssl version."),
887896
SslVersionConfig::Range(range) => {
@@ -906,6 +915,8 @@ ssl-version.max = 'tlsv1.3'
906915
let config = new_config(&[]);
907916

908917
assert!(config.get::<SslVersionConfig>("http.ssl-version").is_err());
909-
assert!(config.get::<Option<SslVersionConfig>>("http.ssl-version").unwrap().is_none());
918+
assert!(config
919+
.get::<Option<SslVersionConfig>>("http.ssl-version")
920+
.unwrap()
921+
.is_none());
910922
}
911-

0 commit comments

Comments
 (0)