From 8175b98a7cdb808db2f43e6b7d02f23ceb459635 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 3 May 2022 17:30:32 +0000 Subject: [PATCH 1/2] Update uuid requirement from ~0.8 to ~1.0 Updates the requirements on [uuid](https://github.com/uuid-rs/uuid) to permit the latest version. - [Release notes](https://github.com/uuid-rs/uuid/releases) - [Commits](https://github.com/uuid-rs/uuid/compare/0.8.0...1.0.0) --- updated-dependencies: - dependency-name: uuid dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- Cargo.toml | 2 +- core-traits/Cargo.toml | 2 +- core/Cargo.toml | 2 +- edn/Cargo.toml | 2 +- public-traits/Cargo.toml | 2 +- tolstoy-traits/Cargo.toml | 2 +- tolstoy/Cargo.toml | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 4ce17e41..735aee39 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -50,7 +50,7 @@ failure = "~0.1" lazy_static = "~1.4" time = "0.3.1" log = "~0.4" -uuid = { version = "~0.8", features = ["v4", "serde"] } +uuid = { version = "~1.0", features = ["v4", "serde"] } [dependencies.rusqlite] version = "~0.26" diff --git a/core-traits/Cargo.toml b/core-traits/Cargo.toml index b8a82553..c43d6231 100644 --- a/core-traits/Cargo.toml +++ b/core-traits/Cargo.toml @@ -13,7 +13,7 @@ enum-set = "~0.0.8" lazy_static = "~1.4" indexmap = "~1.7" ordered-float = { version = "~2.8", features = ["serde"] } -uuid = { version = "~0.8", features = ["v4", "serde"] } +uuid = { version = "~1.0", features = ["v4", "serde"] } serde = { version = "~1.0", features = ["rc"] } serde_derive = "~1.0" bytes = { version = "1.0.1", features = ["serde"] } diff --git a/core/Cargo.toml b/core/Cargo.toml index e7a6c811..0bc4142b 100644 --- a/core/Cargo.toml +++ b/core/Cargo.toml @@ -9,7 +9,7 @@ enum-set = "~0.0" failure = "~0.1" indexmap = "~1.7" ordered-float = { version = "~2.8", features = ["serde"] } -uuid = { version = "~0.8", features = ["v4", "serde"] } +uuid = { version = "~1.0", features = ["v4", "serde"] } [dependencies.core_traits] path = "../core-traits" diff --git a/edn/Cargo.toml b/edn/Cargo.toml index 73e37689..9ac64a04 100644 --- a/edn/Cargo.toml +++ b/edn/Cargo.toml @@ -15,7 +15,7 @@ itertools = "~0.10" num = "~0.4" ordered-float = "~2.8" pretty = "~0.10" -uuid = { version = "~0.8", features = ["v4", "serde"] } +uuid = { version = "~1.0", features = ["v4", "serde"] } serde = { version = "~1.0", optional = true } serde_derive = { version = "~1.0", optional = true } peg = "~0.7" diff --git a/public-traits/Cargo.toml b/public-traits/Cargo.toml index f5286625..0804984a 100644 --- a/public-traits/Cargo.toml +++ b/public-traits/Cargo.toml @@ -17,7 +17,7 @@ failure = "~0.1" failure_derive = "~0.1" http = "~0.2" tokio = { version = "1.8.0", features = ["full"] } -uuid = "~0.8" +uuid = "~1.0" [dependencies.rusqlite] version = "~0.26" diff --git a/tolstoy-traits/Cargo.toml b/tolstoy-traits/Cargo.toml index 631eab51..0ea6b071 100644 --- a/tolstoy-traits/Cargo.toml +++ b/tolstoy-traits/Cargo.toml @@ -16,7 +16,7 @@ failure_derive = "~0.1" http = "~0.2" hyper = "~0.14" serde_json = "~1.0" -uuid = { version = "~0.8" } +uuid = { version = "~1.0" } [dependencies.rusqlite] version = "~0.26" diff --git a/tolstoy/Cargo.toml b/tolstoy/Cargo.toml index 7f022061..f12388d7 100644 --- a/tolstoy/Cargo.toml +++ b/tolstoy/Cargo.toml @@ -22,7 +22,7 @@ serde_json = "~1.0" serde_cbor = "~0.11" serde_derive = "~1.0" lazy_static = "~1.4" -uuid = { version = "~0.8", features = ["v4", "serde"] } +uuid = { version = "~1.0", features = ["v4", "serde"] } [dependencies.rusqlite] version = "~0.26" -- 2.45.2 From 7cfff34602c5d59ee99c4f836c26875bbd6bef73 Mon Sep 17 00:00:00 2001 From: Greg Burd Date: Wed, 4 May 2022 11:36:23 -0400 Subject: [PATCH 2/2] Name changed, prefix 'to_' was removed. Signed-off-by: Greg Burd --- core-traits/lib.rs | 6 +++--- edn/src/pretty_print.rs | 2 +- edn/src/types.rs | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/core-traits/lib.rs b/core-traits/lib.rs index 53380b11..5bf7c697 100644 --- a/core-traits/lib.rs +++ b/core-traits/lib.rs @@ -582,7 +582,7 @@ impl TypedValue { match self { TypedValue::Uuid(v) => { // Get an independent copy of the string. - let s: String = v.to_hyphenated().to_string(); + let s: String = v.hyphenated().to_string(); // Make a CString out of the new bytes. let c: CString = CString::new(s).expect("String conversion failed!"); @@ -603,7 +603,7 @@ impl TypedValue { pub fn into_uuid_string(self) -> Option { match self { - TypedValue::Uuid(v) => Some(v.to_hyphenated().to_string()), + TypedValue::Uuid(v) => Some(v.hyphenated().to_string()), _ => None, } } @@ -963,7 +963,7 @@ impl Binding { pub fn into_uuid_string(self) -> Option { match self { - Binding::Scalar(TypedValue::Uuid(v)) => Some(v.to_hyphenated().to_string()), + Binding::Scalar(TypedValue::Uuid(v)) => Some(v.hyphenated().to_string()), _ => None, } } diff --git a/edn/src/pretty_print.rs b/edn/src/pretty_print.rs index acaa579c..a0604fa0 100644 --- a/edn/src/pretty_print.rs +++ b/edn/src/pretty_print.rs @@ -101,7 +101,7 @@ impl Value { Value::Text(ref v) => pp.text("\"").append(v.as_str()).append("\""), Value::Uuid(ref u) => pp .text("#uuid \"") - .append(u.to_hyphenated().to_string()) + .append(u.hyphenated().to_string()) .append("\""), Value::Instant(ref v) => pp .text("#inst \"") diff --git a/edn/src/types.rs b/edn/src/types.rs index 818b0453..3622693e 100644 --- a/edn/src/types.rs +++ b/edn/src/types.rs @@ -569,7 +569,7 @@ macro_rules! def_common_value_display { } // TODO: EDN escaping. $t::Text(ref v) => write!($f, "\"{}\"", v), - $t::Uuid(ref u) => write!($f, "#uuid \"{}\"", u.to_hyphenated().to_string()), + $t::Uuid(ref u) => write!($f, "#uuid \"{}\"", u.hyphenated().to_string()), $t::PlainSymbol(ref v) => v.fmt($f), $t::NamespacedSymbol(ref v) => v.fmt($f), $t::Keyword(ref v) => v.fmt($f), -- 2.45.2