From: Klaus Purer <klaus.purer@gmail.com>
Date: Wed, 4 Apr 2018 21:06:26 +0000 (+0200)
Subject: chore(clippy): Fix test assertion and simplify code in crates-io
X-Git-Tag: archive/raspbian/0.35.0-2+rpi1~3^2^2^2^2^2^2^2~22^2~1^2~95^2
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=51d19d01c3122bd5708fa78ba1b3430a2837af87;p=cargo.git

chore(clippy): Fix test assertion and simplify code in crates-io
---

diff --git a/src/cargo/core/interning.rs b/src/cargo/core/interning.rs
index e5b582dee..d8c18df2d 100644
--- a/src/cargo/core/interning.rs
+++ b/src/cargo/core/interning.rs
@@ -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
     }
 }
 
diff --git a/src/cargo/core/resolver/context.rs b/src/cargo/core/resolver/context.rs
index ea15e0501..b2b49a6b5 100644
--- a/src/cargo/core/resolver/context.rs
+++ b/src/cargo/core/resolver/context.rs
@@ -390,7 +390,7 @@ impl<'r> Requirements<'r> {
                 ),
                 _ => {}
             }
-            self.require_value(&fv)?;
+            self.require_value(fv)?;
         }
         Ok(())
     }
diff --git a/src/cargo/core/summary.rs b/src/cargo/core/summary.rs
index a7afcdf93..1392aa36f 100644
--- a/src/cargo/core/summary.rs
+++ b/src/cargo/core/summary.rs
@@ -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)
             };
diff --git a/src/crates-io/lib.rs b/src/crates-io/lib.rs
index 54cd7f242..11e319334 100644
--- a/src/crates-io/lib.rs
+++ b/src/crates-io/lib.rs
@@ -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)
 }
diff --git a/tests/testsuite/resolve.rs b/tests/testsuite/resolve.rs
index 8ec3a6e46..427f06938 100644
--- a/tests/testsuite/resolve.rs
+++ b/tests/testsuite/resolve.rs
@@ -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();