greg/mentat
1
0
Fork 0
Code Issues 294 Pull requests Projects Releases 9 Packages Wiki Activity

Merge pull request #310 from qpdb/dependabot/cargo/uuid-approx-1.0

Browse source 
Update uuid requirement from ~0.8 to ~1.0
This commit is contained in:
Gregory Burd 2022-05-04 14:45:35 -04:00 committed by GitHub
commit d39f8aad4e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
10 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Cargo.toml
View file

@ -50,7 +50,7 @@ failure = "~0.1"
lazy_static = "~1.4" lazy_static = "~1.4"
time = "0.3.1" time = "0.3.1"
log = "~0.4" log = "~0.4"
uuid = { version = "~0.8", features = ["v4", "serde"] } uuid = { version = "~1.0", features = ["v4", "serde"] }
[dependencies.rusqlite] [dependencies.rusqlite]
version = "~0.26" version = "~0.26"

2
core-traits/Cargo.toml
View file

@ -13,7 +13,7 @@ enum-set = "~0.0.8"
lazy_static = "~1.4" lazy_static = "~1.4"
indexmap = "~1.7" indexmap = "~1.7"
ordered-float = { version = "~2.8", features = ["serde"] } 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 = { version = "~1.0", features = ["rc"] }
serde_derive = "~1.0" serde_derive = "~1.0"
bytes = { version = "1.0.1", features = ["serde"] } bytes = { version = "1.0.1", features = ["serde"] }

6
core-traits/lib.rs
View file

@ -582,7 +582,7 @@ impl TypedValue {
match self { match self {
TypedValue::Uuid(v) => { TypedValue::Uuid(v) => {
// Get an independent copy of the string. // 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. // Make a CString out of the new bytes.
let c: CString = CString::new(s).expect("String conversion failed!"); let c: CString = CString::new(s).expect("String conversion failed!");
@ -603,7 +603,7 @@ impl TypedValue {
pub fn into_uuid_string(self) -> Option<String> { pub fn into_uuid_string(self) -> Option<String> {
match self { match self {
TypedValue::Uuid(v) => Some(v.to_hyphenated().to_string()), TypedValue::Uuid(v) => Some(v.hyphenated().to_string()),
_ => None, _ => None,
} }
} }
@ -963,7 +963,7 @@ impl Binding {
pub fn into_uuid_string(self) -> Option<String> { pub fn into_uuid_string(self) -> Option<String> {
match self { match self {
Binding::Scalar(TypedValue::Uuid(v)) => Some(v.to_hyphenated().to_string()), Binding::Scalar(TypedValue::Uuid(v)) => Some(v.hyphenated().to_string()),
_ => None, _ => None,
} }
} }

2
core/Cargo.toml
View file

@ -9,7 +9,7 @@ enum-set = "~0.0"
failure = "~0.1" failure = "~0.1"
indexmap = "~1.7" indexmap = "~1.7"
ordered-float = { version = "~2.8", features = ["serde"] } ordered-float = { version = "~2.8", features = ["serde"] }
uuid = { version = "~0.8", features = ["v4", "serde"] } uuid = { version = "~1.0", features = ["v4", "serde"] }
[dependencies.core_traits] [dependencies.core_traits]
path = "../core-traits" path = "../core-traits"

2
edn/Cargo.toml
View file

@ -15,7 +15,7 @@ itertools = "~0.10"
num = "~0.4" num = "~0.4"
ordered-float = "~2.8" ordered-float = "~2.8"
pretty = "~0.10" pretty = "~0.10"
uuid = { version = "~0.8", features = ["v4", "serde"] } uuid = { version = "~1.0", features = ["v4", "serde"] }
serde = { version = "~1.0", optional = true } serde = { version = "~1.0", optional = true }
serde_derive = { version = "~1.0", optional = true } serde_derive = { version = "~1.0", optional = true }
peg = "~0.7" peg = "~0.7"

2
edn/src/pretty_print.rs
View file

@ -101,7 +101,7 @@ impl Value {
Value::Text(ref v) => pp.text("\"").append(v.as_str()).append("\""), Value::Text(ref v) => pp.text("\"").append(v.as_str()).append("\""),
Value::Uuid(ref u) => pp Value::Uuid(ref u) => pp
.text("#uuid \"") .text("#uuid \"")
.append(u.to_hyphenated().to_string()) .append(u.hyphenated().to_string())
.append("\""), .append("\""),
Value::Instant(ref v) => pp Value::Instant(ref v) => pp
.text("#inst \"") .text("#inst \"")

2
edn/src/types.rs
View file

@ -569,7 +569,7 @@ macro_rules! def_common_value_display {
} }
// TODO: EDN escaping. // TODO: EDN escaping.
$t::Text(ref v) => write!($f, "\"{}\"", v), $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::PlainSymbol(ref v) => v.fmt($f),
$t::NamespacedSymbol(ref v) => v.fmt($f), $t::NamespacedSymbol(ref v) => v.fmt($f),
$t::Keyword(ref v) => v.fmt($f), $t::Keyword(ref v) => v.fmt($f),

2
public-traits/Cargo.toml
View file

@ -17,7 +17,7 @@ failure = "~0.1"
failure_derive = "~0.1" failure_derive = "~0.1"
http = "~0.2" http = "~0.2"
tokio = { version = "1.8.0", features = ["full"] } tokio = { version = "1.8.0", features = ["full"] }
uuid = "~0.8" uuid = "~1.0"
[dependencies.rusqlite] [dependencies.rusqlite]
version = "~0.26" version = "~0.26"

2
tolstoy-traits/Cargo.toml
View file

@ -16,7 +16,7 @@ failure_derive = "~0.1"
http = "~0.2" http = "~0.2"
hyper = "~0.14" hyper = "~0.14"
serde_json = "~1.0" serde_json = "~1.0"
uuid = { version = "~0.8" } uuid = { version = "~1.0" }
[dependencies.rusqlite] [dependencies.rusqlite]
version = "~0.26" version = "~0.26"

2
tolstoy/Cargo.toml
View file

@ -22,7 +22,7 @@ serde_json = "~1.0"
serde_cbor = "~0.11" serde_cbor = "~0.11"
serde_derive = "~1.0" serde_derive = "~1.0"
lazy_static = "~1.4" lazy_static = "~1.4"
uuid = { version = "~0.8", features = ["v4", "serde"] } uuid = { version = "~1.0", features = ["v4", "serde"] }
[dependencies.rusqlite] [dependencies.rusqlite]
version = "~0.26" version = "~0.26"