mirror of https://github.com/rust-lang/cargo
chore(clippy): Fix test assertion and simplify code in crates-io
This commit is contained in:
parent
e8ea433ce2
commit
51d19d01c3
|
@ -51,11 +51,9 @@ impl InternedString {
|
|||
|
||||
InternedString { inner: s }
|
||||
}
|
||||
pub fn to_inner(&self) -> &'static str {
|
||||
unsafe {
|
||||
let slice = slice::from_raw_parts(self.ptr, self.len);
|
||||
str::from_utf8_unchecked(slice)
|
||||
}
|
||||
|
||||
pub fn as_str(&self) -> &'static str {
|
||||
self.inner
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -390,7 +390,7 @@ impl<'r> Requirements<'r> {
|
|||
),
|
||||
_ => {}
|
||||
}
|
||||
self.require_value(&fv)?;
|
||||
self.require_value(fv)?;
|
||||
}
|
||||
Ok(())
|
||||
}
|
||||
|
|
|
@ -130,7 +130,7 @@ impl PartialEq for Summary {
|
|||
// and creates FeatureValues for each feature.
|
||||
fn build_feature_map(
|
||||
features: BTreeMap<String, Vec<String>>,
|
||||
dependencies: &Vec<Dependency>,
|
||||
dependencies: &[Dependency],
|
||||
) -> CargoResult<FeatureMap> {
|
||||
use self::FeatureValue::*;
|
||||
let mut map = BTreeMap::new();
|
||||
|
@ -145,9 +145,9 @@ fn build_feature_map(
|
|||
|
||||
// Find data for the referenced dependency...
|
||||
let dep_data = {
|
||||
let dep_name = match &val {
|
||||
&Feature(_) => "",
|
||||
&Crate(ref dep_name) | &CrateFeature(ref dep_name, _) => dep_name,
|
||||
let dep_name = match val {
|
||||
Feature(_) => "",
|
||||
Crate(ref dep_name) | CrateFeature(ref dep_name, _) => dep_name,
|
||||
};
|
||||
dependencies.iter().find(|d| *d.name() == *dep_name)
|
||||
};
|
||||
|
|
|
@ -167,18 +167,16 @@ impl Registry {
|
|||
(json.len() >> 8) as u8,
|
||||
(json.len() >> 16) as u8,
|
||||
(json.len() >> 24) as u8,
|
||||
].iter()
|
||||
.map(|x| *x),
|
||||
].iter().cloned(),
|
||||
);
|
||||
w.extend(json.as_bytes().iter().map(|x| *x));
|
||||
w.extend(json.as_bytes().iter().cloned());
|
||||
w.extend(
|
||||
[
|
||||
(stat.len() >> 0) as u8,
|
||||
(stat.len() >> 8) as u8,
|
||||
(stat.len() >> 16) as u8,
|
||||
(stat.len() >> 24) as u8,
|
||||
].iter()
|
||||
.map(|x| *x),
|
||||
].iter().cloned(),
|
||||
);
|
||||
w
|
||||
};
|
||||
|
@ -201,10 +199,10 @@ impl Registry {
|
|||
|
||||
let body = handle(&mut self.handle, &mut |buf| body.read(buf).unwrap_or(0))?;
|
||||
|
||||
let response = if body.len() > 0 {
|
||||
body.parse::<serde_json::Value>()?
|
||||
} else {
|
||||
let response = if body.is_empty() {
|
||||
"{}".parse()?
|
||||
} else {
|
||||
body.parse::<serde_json::Value>()?
|
||||
};
|
||||
|
||||
let invalid_categories: Vec<String> = response
|
||||
|
@ -329,12 +327,9 @@ fn handle(handle: &mut Easy, read: &mut FnMut(&mut [u8]) -> usize) -> Result<Str
|
|||
Ok(body) => body,
|
||||
Err(..) => bail!("response body was not valid utf-8"),
|
||||
};
|
||||
match serde_json::from_str::<ApiErrorList>(&body) {
|
||||
Ok(errors) => {
|
||||
let errors = errors.errors.into_iter().map(|s| s.detail);
|
||||
bail!("api errors: {}", errors.collect::<Vec<_>>().join(", "))
|
||||
}
|
||||
Err(..) => {}
|
||||
if let Ok(errors) = serde_json::from_str::<ApiErrorList>(&body) {
|
||||
let errors = errors.errors.into_iter().map(|s| s.detail);
|
||||
bail!("api errors: {}", errors.collect::<Vec<_>>().join(", "));
|
||||
}
|
||||
Ok(body)
|
||||
}
|
||||
|
|
|
@ -186,7 +186,7 @@ fn loc_names(names: &[(&'static str, &'static str)]) -> Vec<PackageId> {
|
|||
}
|
||||
|
||||
#[test]
|
||||
#[should_panic(expected = "assertion failed: name.len() > 0")]
|
||||
#[should_panic(expected = "assertion failed: !name.is_empty()")]
|
||||
fn test_dependency_with_empty_name() {
|
||||
// Bug 5229, dependency-names must not be empty
|
||||
"".to_dep();
|
||||
|
|
Loading…
Reference in New Issue