From a8611e5f45cf6b3955aedd934bca0b42be1e1a96 Mon Sep 17 00:00:00 2001
From: Paolo Barbolini <paolo.barbolini@m4ss.net>
Date: Wed, 20 Apr 2022 08:27:55 +0200
Subject: [PATCH] Update uuid crate to v1

---
 Cargo.lock                         | 4 ++--
 sqlx-core/Cargo.toml               | 2 +-
 sqlx-core/src/mysql/types/uuid.rs  | 4 ++--
 sqlx-core/src/sqlite/types/uuid.rs | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 28dc50c4d1..d873ab0af4 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2866,9 +2866,9 @@ checksum = "936e4b492acfd135421d8dca4b1aa80a7bfc26e702ef3af710e0752684df5372"
 
 [[package]]
 name = "uuid"
-version = "0.8.2"
+version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bc5cf98d8186244414c848017f0e2676b3fcb46807f6668a97dfe67359a3c4b7"
+checksum = "8cfcd319456c4d6ea10087ed423473267e1a071f3bc0aa89f80d60997843c6f0"
 
 [[package]]
 name = "value-bag"
diff --git a/sqlx-core/Cargo.toml b/sqlx-core/Cargo.toml
index e7a5bcd134..97e18b6908 100644
--- a/sqlx-core/Cargo.toml
+++ b/sqlx-core/Cargo.toml
@@ -173,7 +173,7 @@ time = { version = "0.3.2", features = ["macros", "formatting", "parsing"], opti
 tokio-stream = { version = "0.1.8", features = ["fs"], optional = true }
 smallvec = "1.7.0"
 url = { version = "2.2.2", default-features = false }
-uuid = { version = "0.8.2", default-features = false, optional = true, features = ["std"] }
+uuid = { version = "1.0", default-features = false, optional = true, features = ["std"] }
 webpki-roots = { version = "0.22.0", optional = true }
 whoami = { version = "1.2.1", optional = true }
 stringprep = "0.1.2"
diff --git a/sqlx-core/src/mysql/types/uuid.rs b/sqlx-core/src/mysql/types/uuid.rs
index 594463cd3d..114405db22 100644
--- a/sqlx-core/src/mysql/types/uuid.rs
+++ b/sqlx-core/src/mysql/types/uuid.rs
@@ -1,4 +1,4 @@
-use uuid::{adapter::Hyphenated, Uuid};
+use uuid::{fmt::Hyphenated, Uuid};
 
 use crate::decode::Decode;
 use crate::encode::{Encode, IsNull};
@@ -61,6 +61,6 @@ impl Decode<'_, MySql> for Hyphenated {
         // parse a UUID from the text
         Uuid::parse_str(text)
             .map_err(Into::into)
-            .map(|u| u.to_hyphenated())
+            .map(|u| u.hyphenated())
     }
 }
diff --git a/sqlx-core/src/sqlite/types/uuid.rs b/sqlx-core/src/sqlite/types/uuid.rs
index 272f58bf80..fca8095fcf 100644
--- a/sqlx-core/src/sqlite/types/uuid.rs
+++ b/sqlx-core/src/sqlite/types/uuid.rs
@@ -5,7 +5,7 @@ use crate::sqlite::type_info::DataType;
 use crate::sqlite::{Sqlite, SqliteArgumentValue, SqliteTypeInfo, SqliteValueRef};
 use crate::types::Type;
 use std::borrow::Cow;
-use uuid::{adapter::Hyphenated, Uuid};
+use uuid::{fmt::Hyphenated, Uuid};
 
 impl Type<Sqlite> for Uuid {
     fn type_info() -> SqliteTypeInfo {
@@ -53,6 +53,6 @@ impl Decode<'_, Sqlite> for Hyphenated {
         let uuid: Result<Uuid, BoxDynError> =
             Uuid::parse_str(&value.text().map(ToOwned::to_owned)?).map_err(Into::into);
 
-        Ok(uuid?.to_hyphenated())
+        Ok(uuid?.hyphenated())
     }
 }