This is an automated email from the ASF dual-hosted git repository.
dkulp pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/avro.git
The following commit(s) were added to refs/heads/master by this push:
new 5ad692b AVRO-3200 Fix some new lint errors
5ad692b is described below
commit 5ad692bb5f4c29433a7a737ff3b01d24315aad52
Author: Martin Tzvetanov Grigorov <[email protected]>
AuthorDate: Fri Sep 10 16:22:27 2021 +0300
AVRO-3200 Fix some new lint errors
Reported by a the latest version of cargo-clippy
---
lang/rust/benches/serde.rs | 2 +-
lang/rust/examples/benchmark.rs | 2 +-
lang/rust/src/de.rs | 10 +++++-----
lang/rust/src/encode.rs | 4 ++--
lang/rust/src/reader.rs | 2 +-
lang/rust/src/schema.rs | 2 +-
lang/rust/src/writer.rs | 4 ++--
lang/rust/tests/schema.rs | 12 ++++++------
8 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/lang/rust/benches/serde.rs b/lang/rust/benches/serde.rs
index a845180..2d74dea 100644
--- a/lang/rust/benches/serde.rs
+++ b/lang/rust/benches/serde.rs
@@ -176,7 +176,7 @@ fn make_records(record: Value, count: usize) -> Vec<Value> {
}
fn write(schema: &Schema, records: &[Value]) -> Vec<u8> {
- let mut writer = Writer::new(&schema, Vec::new());
+ let mut writer = Writer::new(schema, Vec::new());
writer.extend_from_slice(records).unwrap();
writer.into_inner().unwrap()
}
diff --git a/lang/rust/examples/benchmark.rs b/lang/rust/examples/benchmark.rs
index 45a9291..9ec23da 100644
--- a/lang/rust/examples/benchmark.rs
+++ b/lang/rust/examples/benchmark.rs
@@ -49,7 +49,7 @@ fn benchmark(schema: &Schema, record: &Value, s: &str, count:
usize, runs: usize
let records = records.clone();
let start = Instant::now();
- let mut writer = Writer::new(&schema, Vec::new());
+ let mut writer = Writer::new(schema, Vec::new());
writer.extend(records.into_iter()).unwrap();
let duration = Instant::now().duration_since(start);
diff --git a/lang/rust/src/de.rs b/lang/rust/src/de.rs
index 8f485e1..cd275bc 100644
--- a/lang/rust/src/de.rs
+++ b/lang/rust/src/de.rs
@@ -453,9 +453,9 @@ impl<'a, 'de> de::Deserializer<'de> for &'a
Deserializer<'de> {
{
match *self.input {
// This branch can be anything...
- Value::Record(ref fields) =>
visitor.visit_enum(EnumDeserializer::new(&fields)),
+ Value::Record(ref fields) =>
visitor.visit_enum(EnumDeserializer::new(fields)),
// This has to be a unit Enum
- Value::Enum(_index, ref field) =>
visitor.visit_enum(EnumUnitDeserializer::new(&field)),
+ Value::Enum(_index, ref field) =>
visitor.visit_enum(EnumUnitDeserializer::new(field)),
_ => Err(de::Error::custom("not an enum")),
}
}
@@ -483,7 +483,7 @@ impl<'de> de::SeqAccess<'de> for SeqDeserializer<'de> {
T: DeserializeSeed<'de>,
{
match self.input.next() {
- Some(item) =>
seed.deserialize(&Deserializer::new(&item)).map(Some),
+ Some(item) => seed.deserialize(&Deserializer::new(item)).map(Some),
None => Ok(None),
}
}
@@ -497,7 +497,7 @@ impl<'de> de::MapAccess<'de> for MapDeserializer<'de> {
K: DeserializeSeed<'de>,
{
match self.input_keys.next() {
- Some(ref key) => seed
+ Some(key) => seed
.deserialize(StringDeserializer {
input: (*key).clone(),
})
@@ -511,7 +511,7 @@ impl<'de> de::MapAccess<'de> for MapDeserializer<'de> {
V: DeserializeSeed<'de>,
{
match self.input_values.next() {
- Some(ref value) => seed.deserialize(&Deserializer::new(value)),
+ Some(value) => seed.deserialize(&Deserializer::new(value)),
None => Err(de::Error::custom("should not happen - too many
values")),
}
}
diff --git a/lang/rust/src/encode.rs b/lang/rust/src/encode.rs
index f9093f7..5c68051 100644
--- a/lang/rust/src/encode.rs
+++ b/lang/rust/src/encode.rs
@@ -28,7 +28,7 @@ use std::convert::TryInto;
/// be valid with regards to the schema. Schema are needed only to guide the
/// encoding for complex type values.
pub fn encode(value: &Value, schema: &Schema, buffer: &mut Vec<u8>) {
- encode_ref(&value, schema, buffer)
+ encode_ref(value, schema, buffer)
}
fn encode_bytes<B: AsRef<[u8]> + ?Sized>(s: &B, buffer: &mut Vec<u8>) {
@@ -153,7 +153,7 @@ pub fn encode_ref(value: &Value, schema: &Schema, buffer:
&mut Vec<u8>) {
pub fn encode_to_vec(value: &Value, schema: &Schema) -> Vec<u8> {
let mut buffer = Vec::new();
- encode(&value, schema, &mut buffer);
+ encode(value, schema, &mut buffer);
buffer
}
diff --git a/lang/rust/src/reader.rs b/lang/rust/src/reader.rs
index 6fb4561..467c658 100644
--- a/lang/rust/src/reader.rs
+++ b/lang/rust/src/reader.rs
@@ -296,7 +296,7 @@ pub fn from_avro_datum<R: Read>(
) -> AvroResult<Value> {
let value = decode(writer_schema, reader)?;
match reader_schema {
- Some(ref schema) => value.resolve(schema),
+ Some(schema) => value.resolve(schema),
None => Ok(value),
}
}
diff --git a/lang/rust/src/schema.rs b/lang/rust/src/schema.rs
index cd052e8..efafed5 100644
--- a/lang/rust/src/schema.rs
+++ b/lang/rust/src/schema.rs
@@ -464,7 +464,7 @@ impl Schema {
for js in input {
let schema: Value =
serde_json::from_str(js).map_err(Error::ParseSchemaJson)?;
if let Value::Object(inner) = &schema {
- let fullname = Name::parse(&inner)?.fullname(None);
+ let fullname = Name::parse(inner)?.fullname(None);
let previous_value = input_schemas.insert(fullname.clone(),
schema);
if previous_value.is_some() {
return Err(Error::NameCollision(fullname));
diff --git a/lang/rust/src/writer.rs b/lang/rust/src/writer.rs
index 775e324..efdd992 100644
--- a/lang/rust/src/writer.rs
+++ b/lang/rust/src/writer.rs
@@ -278,7 +278,7 @@ impl<'a, W: Write> Writer<'a, W> {
/// Append a raw Avro Value to the payload avoiding to encode it again.
fn append_raw(&mut self, value: &Value, schema: &Schema) ->
AvroResult<usize> {
- self.append_bytes(encode_to_vec(&value, schema).as_ref())
+ self.append_bytes(encode_to_vec(value, schema).as_ref())
}
/// Append pure bytes to the payload.
@@ -433,7 +433,7 @@ mod tests {
assert_eq!(&schema, expected_schema);
// The serialized format should be the same as the schema.
let ser = to_avro_datum(&schema, value.clone())?;
- let raw_ser = to_avro_datum(&raw_schema, raw_value)?;
+ let raw_ser = to_avro_datum(raw_schema, raw_value)?;
assert_eq!(ser, raw_ser);
// Should deserialize from the schema into the logical type.
diff --git a/lang/rust/tests/schema.rs b/lang/rust/tests/schema.rs
index 4f20c8c..14edc0f 100644
--- a/lang/rust/tests/schema.rs
+++ b/lang/rust/tests/schema.rs
@@ -707,8 +707,8 @@ fn test_parse_list_with_cross_deps_basic() {
let schemas_first = Schema::parse_list(&schema_strs_first).expect("Test
failed");
let schemas_second = Schema::parse_list(&schema_strs_second).expect("Test
failed");
- let parsed_1 = Schema::parse_str(&schema_str_1).expect("Test failed");
- let parsed_2 = Schema::parse_str(&schema_composite).expect("Test failed");
+ let parsed_1 = Schema::parse_str(schema_str_1).expect("Test failed");
+ let parsed_2 = Schema::parse_str(schema_composite).expect("Test failed");
assert_eq!(schemas_first, vec!(parsed_1.clone(), parsed_2.clone()));
assert_eq!(schemas_second, vec!(parsed_2, parsed_1));
}
@@ -777,8 +777,8 @@ fn test_parse_list_with_cross_deps_and_namespaces() {
let schemas_first = Schema::parse_list(&schema_strs_first).expect("Test
failed");
let schemas_second = Schema::parse_list(&schema_strs_second).expect("Test
failed");
- let parsed_1 = Schema::parse_str(&schema_str_1).expect("Test failed");
- let parsed_2 = Schema::parse_str(&schema_composite).expect("Test failed");
+ let parsed_1 = Schema::parse_str(schema_str_1).expect("Test failed");
+ let parsed_2 = Schema::parse_str(schema_composite).expect("Test failed");
assert_eq!(schemas_first, vec!(parsed_1.clone(), parsed_2.clone()));
assert_eq!(schemas_second, vec!(parsed_2, parsed_1));
}
@@ -1027,8 +1027,8 @@ fn test_namespace_prevents_collisions() {
}"#;
let parsed = Schema::parse_list(&[schema_str_1,
schema_str_2]).expect("Test failed");
- let parsed_1 = Schema::parse_str(&schema_str_1).expect("Test failed");
- let parsed_2 = Schema::parse_str(&schema_str_2).expect("Test failed");
+ let parsed_1 = Schema::parse_str(schema_str_1).expect("Test failed");
+ let parsed_2 = Schema::parse_str(schema_str_2).expect("Test failed");
assert_eq!(parsed, vec!(parsed_1, parsed_2));
}
