From: Carol (Nichols || Goulding) <carol.nichols@gmail.com>
Date: Tue, 29 Nov 2016 21:09:00 +0000 (-0500)
Subject: Have a fallback for an empty response
X-Git-Tag: archive/raspbian/0.35.0-2+rpi1~3^2^2^2^2^2^2^2~22^2~11^2~34^2~1
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=7dd0f932a864d97bef5da26a0e148fca3f06d448;p=cargo.git

Have a fallback for an empty response

This happens in tests.
---

diff --git a/src/crates-io/lib.rs b/src/crates-io/lib.rs
index 12c195edb..e35d82440 100644
--- a/src/crates-io/lib.rs
+++ b/src/crates-io/lib.rs
@@ -202,7 +202,11 @@ impl Registry {
             body.read(buf).unwrap_or(0)
         })?;
         // Can't derive RustcDecodable because JSON has a key named "crate" :(
-        let response = Json::from_str(&body)?;
+        let response = if body.len() > 0 {
+            Json::from_str(&body)?
+        } else {
+            Json::from_str("{}")?
+        };
         let invalid_categories: Vec<String> =
             response
                 .find_path(&["warnings", "invalid_categories"])