This is an automated email from the ASF dual-hosted git repository.
mgrigorov pushed a commit to branch branch-1.11
in repository https://gitbox.apache.org/repos/asf/avro.git
The following commit(s) were added to refs/heads/branch-1.11 by this push:
new 05cbc2ba8 AVRO-3496: Rust: Use visitor.visit_borrowed_str() when
possible (#1652)
05cbc2ba8 is described below
commit 05cbc2ba8ca438f71dfbc338475481b83180eefa
Author: Martin Grigorov <[email protected]>
AuthorDate: Tue Apr 19 22:20:05 2022 +0300
AVRO-3496: Rust: Use visitor.visit_borrowed_str() when possible (#1652)
Signed-off-by: Martin Tzvetanov Grigorov <[email protected]>
(cherry picked from commit 82b606e4289e0a3efa88d65a59e7ae3731fd4f44)
---
lang/rust/avro/src/de.rs | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/lang/rust/avro/src/de.rs b/lang/rust/avro/src/de.rs
index 6324caea9..24e9958b2 100644
--- a/lang/rust/avro/src/de.rs
+++ b/lang/rust/avro/src/de.rs
@@ -262,7 +262,7 @@ impl<'a, 'de> de::Deserializer<'de> for &'a
Deserializer<'de> {
Value::Double(d) => visitor.visit_f64(d),
Value::Record(ref fields) =>
visitor.visit_map(StructDeserializer::new(fields)),
Value::Array(ref fields) =>
visitor.visit_seq(SeqDeserializer::new(fields)),
- Value::String(ref s) => visitor.visit_str(s),
+ Value::String(ref s) => visitor.visit_borrowed_str(s),
Value::Map(ref items) =>
visitor.visit_map(MapDeserializer::new(items)),
_ => Err(de::Error::custom(format!(
"unsupported union: {:?}",
@@ -271,7 +271,7 @@ impl<'a, 'de> de::Deserializer<'de> for &'a
Deserializer<'de> {
},
Value::Record(ref fields) =>
visitor.visit_map(StructDeserializer::new(fields)),
Value::Array(ref fields) =>
visitor.visit_seq(SeqDeserializer::new(fields)),
- Value::String(ref s) => visitor.visit_str(s),
+ Value::String(ref s) => visitor.visit_borrowed_str(s),
Value::Map(ref items) =>
visitor.visit_map(MapDeserializer::new(items)),
value => Err(de::Error::custom(format!(
"incorrect value of type: {:?}",
@@ -296,10 +296,10 @@ impl<'a, 'de> de::Deserializer<'de> for &'a
Deserializer<'de> {
V: Visitor<'de>,
{
match *self.input {
- Value::String(ref s) => visitor.visit_str(s),
+ Value::String(ref s) => visitor.visit_borrowed_str(s),
Value::Bytes(ref bytes) | Value::Fixed(_, ref bytes) =>
::std::str::from_utf8(bytes)
.map_err(|e| de::Error::custom(e.to_string()))
- .and_then(|s| visitor.visit_str(s)),
+ .and_then(|s| visitor.visit_borrowed_str(s)),
Value::Uuid(ref u) => visitor.visit_str(&u.to_string()),
_ => Err(de::Error::custom("not a string|bytes|fixed")),
}
@@ -310,14 +310,14 @@ impl<'a, 'de> de::Deserializer<'de> for &'a
Deserializer<'de> {
V: Visitor<'de>,
{
match *self.input {
- Value::String(ref s) => visitor.visit_string(s.to_owned()),
+ Value::String(ref s) => visitor.visit_borrowed_str(s),
Value::Bytes(ref bytes) | Value::Fixed(_, ref bytes) => {
String::from_utf8(bytes.to_owned())
.map_err(|e| de::Error::custom(e.to_string()))
.and_then(|s| visitor.visit_string(s))
}
Value::Union(_i, ref x) => match **x {
- Value::String(ref s) => visitor.visit_string(s.to_owned()),
+ Value::String(ref s) => visitor.visit_borrowed_str(s),
_ => Err(de::Error::custom("not a string|bytes|fixed")),
},
_ => Err(de::Error::custom("not a string|bytes|fixed")),
