From d91274831b813b3c09d733b6999e5e3b26067b52 Mon Sep 17 00:00:00 2001 From: Kim Rutherford Date: Sun, 23 Apr 2017 01:23:45 +1200 Subject: [PATCH 1/3] Update serde_json dependency to version 1.0 --- postgres-shared/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/postgres-shared/Cargo.toml b/postgres-shared/Cargo.toml index 6ea947dfb..007584659 100644 --- a/postgres-shared/Cargo.toml +++ b/postgres-shared/Cargo.toml @@ -27,6 +27,6 @@ chrono = { version = "0.3", optional = true } eui48 = { version = "0.1", optional = true } geo = { version = "0.4", optional = true } rustc-serialize = { version = "0.3", optional = true } -serde_json = { version = "0.9", optional = true } +serde_json = { version = "1.0", optional = true } time = { version = "0.1.14", optional = true } uuid = { version = "0.4", optional = true } From db989743de426b3468d9eb6aab1086accf6ae0c2 Mon Sep 17 00:00:00 2001 From: Kim Rutherford Date: Sun, 23 Apr 2017 02:20:38 +1200 Subject: [PATCH 2/3] Update serde_json version in top-level Cargo.toml --- postgres/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/postgres/Cargo.toml b/postgres/Cargo.toml index 4993c058c..dbbfe9818 100644 --- a/postgres/Cargo.toml +++ b/postgres/Cargo.toml @@ -60,6 +60,6 @@ chrono = "0.3" eui48 = "0.1" geo = "0.4" rustc-serialize = "0.3" -serde_json = "0.9" +serde_json = "1.0" time = "0.1.14" uuid = "0.4" From 3425838f09a03e4857b3547fcde37ea2875a11f5 Mon Sep 17 00:00:00 2001 From: Kim Rutherford Date: Mon, 24 Apr 2017 10:03:04 +1200 Subject: [PATCH 3/3] Support serde_json 0.9 and 1.* --- postgres-shared/Cargo.toml | 2 +- postgres/Cargo.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/postgres-shared/Cargo.toml b/postgres-shared/Cargo.toml index 007584659..8a3b4ca36 100644 --- a/postgres-shared/Cargo.toml +++ b/postgres-shared/Cargo.toml @@ -27,6 +27,6 @@ chrono = { version = "0.3", optional = true } eui48 = { version = "0.1", optional = true } geo = { version = "0.4", optional = true } rustc-serialize = { version = "0.3", optional = true } -serde_json = { version = "1.0", optional = true } +serde_json = { version = ">=0.9,<2.0", optional = true } time = { version = "0.1.14", optional = true } uuid = { version = "0.4", optional = true } diff --git a/postgres/Cargo.toml b/postgres/Cargo.toml index dbbfe9818..05182998b 100644 --- a/postgres/Cargo.toml +++ b/postgres/Cargo.toml @@ -60,6 +60,6 @@ chrono = "0.3" eui48 = "0.1" geo = "0.4" rustc-serialize = "0.3" -serde_json = "1.0" +serde_json = ">=0.9,<2.0" time = "0.1.14" uuid = "0.4"