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

Update uuid requirement from ~0.8 to ~1.0 #310

Merged
dependabot[bot] merged 2 commits from dependabot/cargo/uuid-approx-1.0 into master 2022-05-04 18:45:35 +00:00
Conversation 0 Commits 2 Files changed 10 +5 -5
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 7cfff34602 - Show all commits

6
core-traits/lib.rs
View file

@ -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<String> {
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<String> {
match self {
Binding::Scalar(TypedValue::Uuid(v)) => Some(v.to_hyphenated().to_string()),
Binding::Scalar(TypedValue::Uuid(v)) => Some(v.hyphenated().to_string()),
_ => None,
}
}

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::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 \"")

2
edn/src/types.rs
View file

@ -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),