Merge pull request #730 from sgrif/sg-update-serde

Update to serde 1.0, diesel 0.13

Author: carols10cents

Cargo.lock

@@ -28,11 +28,6 @@ flate2 = "0.2"
 semver = "0.5"
 url = "1.2.1"
 
-# Needs to be locked down because postgres-shared 0.2.1 allows serde_json 1.0.
-# When postgres, diesel, and this repo can be updated to all use serde_json >1.0,
-# this restriction can be removed.
-postgres-shared = "=0.2.0"
-
 postgres = { version = "0.14.0", features = ["with-time", "with-openssl", "with-serde_json", "with-chrono"] }
 r2d2 = "0.7.0"
 r2d2_postgres = "0.12.0"
@@ -45,13 +40,13 @@ rustc-serialize = "0.3"
 license-exprs = "^1.3"
 dotenv = "0.10.0"
 toml = "0.2"
-diesel = { version = "0.12.0", features = ["postgres", "serde_json", "deprecated-time"] }
-diesel_codegen = "0.12.0"
-r2d2-diesel = "0.12.0"
-diesel_full_text_search = "0.12.0"
-serde_json = "0.9.9"
-serde_derive = "0.9.11"
-serde = "0.9.11"
+diesel = { version = "0.13.0", features = ["postgres", "serde_json", "deprecated-time"] }
+diesel_codegen = "0.13.0"
+r2d2-diesel = "0.13.0"
+diesel_full_text_search = "0.13.0"
+serde_json = "1.0.0"
+serde_derive = "1.0.0"
+serde = "1.0.0"
 clippy = { version = "=0.0.118", optional = true }
 chrono = "0.3.0"
 

Cargo.toml

@@ -27,7 +27,7 @@ pub enum Badge {
 #[derive(RustcEncodable, RustcDecodable, PartialEq, Debug, Deserialize)]
 pub struct EncodableBadge {
     pub badge_type: String,
-    pub attributes: HashMap<String, String>,
+    pub attributes: HashMap<String, Option<String>>,
 }
 
 impl Queryable<badges::SqlType, Pg> for Badge {

src/badge.rs

@@ -1315,7 +1315,7 @@ fn good_badges() {
     assert_eq!(badges[0].badge_type, "travis-ci");
     assert_eq!(
         badges[0].attributes.get("repository").unwrap(),
-        &String::from("rust-lang/crates.io")
+        &Some(String::from("rust-lang/crates.io"))
     );
 }