From 20f8396bc3332db5bd48d137fa5337e7a0365315 Mon Sep 17 00:00:00 2001
From: Paolo Barbolini <paolo@paolo565.org>
Date: Sun, 27 Oct 2019 16:50:49 +0100
Subject: [PATCH] update uuid, unicode-xid and base64

Updates uuid, unicode-xid and base64 to reduce duplicate crate
versions in projects.
---
 contrib/lib/Cargo.toml   | 2 +-
 contrib/lib/src/uuid.rs  | 2 +-
 core/http/Cargo.toml     | 2 +-
 core/lib/Cargo.toml      | 2 +-
 examples/uuid/Cargo.toml | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/contrib/lib/Cargo.toml b/contrib/lib/Cargo.toml
index df957bdbc5..a1ab855d49 100644
--- a/contrib/lib/Cargo.toml
+++ b/contrib/lib/Cargo.toml
@@ -57,7 +57,7 @@ glob = { version = "0.3", optional = true }
 tera = { version = "0.11", optional = true }
 
 # UUID dependencies.
-uuid = { version = "0.7", optional = true }
+uuid = { version = ">=0.7.0, <0.9.0", optional = true }
 
 # Database dependencies
 diesel = { version = "1.0", default-features = false, optional = true }
diff --git a/contrib/lib/src/uuid.rs b/contrib/lib/src/uuid.rs
index 5fab5efd51..c0ed0bf559 100644
--- a/contrib/lib/src/uuid.rs
+++ b/contrib/lib/src/uuid.rs
@@ -23,7 +23,7 @@ use std::ops::Deref;
 use rocket::request::{FromParam, FromFormValue};
 use rocket::http::RawStr;
 
-pub use self::uuid_crate::parser::ParseError;
+type ParseError = <self::uuid_crate::Uuid as FromStr>::Err;
 
 /// Implements [`FromParam`] and [`FromFormValue`] for accepting UUID values.
 ///
diff --git a/core/http/Cargo.toml b/core/http/Cargo.toml
index 4b83729088..ab42b64c2e 100644
--- a/core/http/Cargo.toml
+++ b/core/http/Cargo.toml
@@ -29,7 +29,7 @@ rustls = { version = "0.15", optional = true }
 state = "0.4"
 cookie = { version = "0.12", features = ["percent-encode"] }
 pear = "0.1"
-unicode-xid = "0.1"
+unicode-xid = "0.2"
 
 [dependencies.hyper-sync-rustls]
 version = "=0.3.0-rc.5"
diff --git a/core/lib/Cargo.toml b/core/lib/Cargo.toml
index 534662ebf0..7827a2fe6a 100644
--- a/core/lib/Cargo.toml
+++ b/core/lib/Cargo.toml
@@ -33,7 +33,7 @@ num_cpus = "1.0"
 state = "0.4.1"
 time = "0.1"
 memchr = "2" # TODO: Use pear instead.
-base64 = "0.10"
+base64 = "0.11"
 base16 = "0.2"
 pear = "0.1"
 atty = "0.2"
diff --git a/examples/uuid/Cargo.toml b/examples/uuid/Cargo.toml
index 476f90d043..d64ae72b9b 100644
--- a/examples/uuid/Cargo.toml
+++ b/examples/uuid/Cargo.toml
@@ -8,7 +8,7 @@ publish = false
 [dependencies]
 rocket = { path = "../../core/lib" }
 lazy_static = "1.0"
-uuid = "0.7"
+uuid = "0.8"
 
 [dependencies.rocket_contrib]
 default-features = false