Update uuid crate to v1

launchbadge · Apr 20, 2022 · a8611e5 · a8611e5
1 parent b934f82
commit a8611e5
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git 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
@@ -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
@@ -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())
     }
 }