From 3e25debd3a7c9a4f0ab5604cc438ebba80a86967 Mon Sep 17 00:00:00 2001 From: Tobie Morgan Hitchcock Date: Sun, 16 Oct 2022 22:25:19 +0100 Subject: [PATCH] Simplify string formatting of UUIDs --- lib/src/sql/uuid.rs | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/lib/src/sql/uuid.rs b/lib/src/sql/uuid.rs index bb260867..a01f28ad 100644 --- a/lib/src/sql/uuid.rs +++ b/lib/src/sql/uuid.rs @@ -1,5 +1,6 @@ use crate::sql::common::is_hex; use crate::sql::error::IResult; +use crate::sql::escape::escape_str; use crate::sql::serde::is_internal_serialization; use nom::branch::alt; use nom::bytes::complete::take_while_m_n; @@ -8,7 +9,7 @@ use nom::combinator::recognize; use nom::sequence::delimited; use nom::sequence::tuple; use serde::{Deserialize, Serialize}; -use std::fmt; +use std::fmt::{self, Display, Formatter}; use std::ops::Deref; use std::str; @@ -43,9 +44,9 @@ impl Uuid { } } -impl fmt::Display for Uuid { - fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { - write!(f, "\"{}\"", self.0) +impl Display for Uuid { + fn fmt(&self, f: &mut Formatter) -> fmt::Result { + Display::fmt(&escape_str(&self.0.to_string()), f) } }