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 238dd1f71 Run `cargo fmt` to format the code as in main branch
238dd1f71 is described below
commit 238dd1f717d7f0716613c8d15debe9e9159e0f6b
Author: Martin Tzvetanov Grigorov <[email protected]>
AuthorDate: Tue Jul 9 08:11:55 2024 +0300
Run `cargo fmt` to format the code as in main branch
Signed-off-by: Martin Tzvetanov Grigorov <[email protected]>
---
lang/rust/avro/src/error.rs | 4 +-
lang/rust/avro/src/schema.rs | 54 +++++------
lang/rust/avro/src/schema_compatibility.rs | 144 ++++++++++++++---------------
3 files changed, 101 insertions(+), 101 deletions(-)
diff --git a/lang/rust/avro/src/error.rs b/lang/rust/avro/src/error.rs
index aafcd5dff..19e8317d3 100644
--- a/lang/rust/avro/src/error.rs
+++ b/lang/rust/avro/src/error.rs
@@ -484,7 +484,7 @@ pub enum Error {
supported_schema: Vec<SchemaKind>,
},
#[error(
- "Internal buffer not drained properly. Re-initialize the single object
writer struct!"
+ "Internal buffer not drained properly. Re-initialize the single object
writer struct!"
)]
IllegalSingleObjectWriterState,
@@ -531,7 +531,7 @@ pub enum CompatibilityError {
},
#[error(
- "Incompatible schemata! Unknown type for '{0}'. Make sure that the type is
a valid one"
+ "Incompatible schemata! Unknown type for '{0}'. Make sure that the
type is a valid one"
)]
Inconclusive(String),
}
diff --git a/lang/rust/avro/src/schema.rs b/lang/rust/avro/src/schema.rs
index 9e1eb1e5b..3d9fd4658 100644
--- a/lang/rust/avro/src/schema.rs
+++ b/lang/rust/avro/src/schema.rs
@@ -960,7 +960,7 @@ impl UnionSchema {
enclosing_namespace,
&collected_names,
)
- .expect("Schema didn't successfully parse");
+ .expect("Schema didn't successfully parse");
let resolved_names = resolved_schema.names_ref;
// extend known schemas with just resolved names
@@ -1951,13 +1951,13 @@ impl Serialize for Schema {
seq.end()
}
Schema::Record(RecordSchema {
- ref name,
- ref aliases,
- ref doc,
- ref fields,
- ref attributes,
- ..
- }) => {
+ ref name,
+ ref aliases,
+ ref doc,
+ ref fields,
+ ref attributes,
+ ..
+ }) => {
let mut map = serializer.serialize_map(None)?;
map.serialize_entry("type", "record")?;
if let Some(ref n) = name.namespace {
@@ -1977,12 +1977,12 @@ impl Serialize for Schema {
map.end()
}
Schema::Enum(EnumSchema {
- ref name,
- ref symbols,
- ref aliases,
- ref attributes,
- ..
- }) => {
+ ref name,
+ ref symbols,
+ ref aliases,
+ ref attributes,
+ ..
+ }) => {
let mut map = serializer.serialize_map(None)?;
map.serialize_entry("type", "enum")?;
if let Some(ref n) = name.namespace {
@@ -2005,10 +2005,10 @@ impl Serialize for Schema {
map.end()
}
Schema::Decimal(DecimalSchema {
- ref scale,
- ref precision,
- ref inner,
- }) => {
+ ref scale,
+ ref precision,
+ ref inner,
+ }) => {
let mut map = serializer.serialize_map(None)?;
match inner.as_ref() {
Schema::Fixed(fixed_schema) => {
@@ -2311,7 +2311,7 @@ pub mod derive {
/// ```
pub trait AvroSchemaComponent {
fn get_schema_in_ctxt(named_schemas: &mut Names, enclosing_namespace:
&Namespace)
- -> Schema;
+ -> Schema;
}
impl<T> AvroSchema for T
@@ -5750,7 +5750,7 @@ mod tests {
"ns.record1".to_string(),
r#""int""#.to_string(),
)
- .to_string();
+ .to_string();
let result = Schema::parse_str(schema_str);
assert!(result.is_err());
let err = result
@@ -5793,7 +5793,7 @@ mod tests {
r#"{"name":"ns.record2","type":"record","fields":[{"name":"f1_1","type":"int"}]}"#
.to_string(),
)
- .to_string();
+ .to_string();
let result = Schema::parse_str(schema_str);
assert!(result.is_err());
let err = result
@@ -5830,7 +5830,7 @@ mod tests {
"ns.record1".to_string(),
r#"{"name":"ns.enum1","type":"enum","symbols":["a","b","c"]}"#.to_string(),
)
- .to_string();
+ .to_string();
let result = Schema::parse_str(schema_str);
assert!(result.is_err());
let err = result
@@ -5867,7 +5867,7 @@ mod tests {
"ns.record1".to_string(),
r#"{"name":"ns.fixed1","type":"fixed","size":3}"#.to_string(),
)
- .to_string();
+ .to_string();
let result = Schema::parse_str(schema_str);
assert!(result.is_err());
let err = result
@@ -5901,7 +5901,7 @@ mod tests {
"ns.record1".to_string(),
r#"{"type":"array","items":"int"}"#.to_string(),
)
- .to_string();
+ .to_string();
let result = Schema::parse_str(schema_str);
assert!(result.is_err());
let err = result
@@ -5935,7 +5935,7 @@ mod tests {
"ns.record1".to_string(),
r#"{"type":"map","values":"string"}"#.to_string(),
)
- .to_string();
+ .to_string();
let result = Schema::parse_str(schema_str);
assert!(result.is_err());
let err = result
@@ -5980,7 +5980,7 @@ mod tests {
"ns.record1".to_string(),
r#""ns.record2""#.to_string(),
)
- .to_string();
+ .to_string();
let result = Schema::parse_str(schema_str);
assert!(result.is_err());
let err = result
@@ -6025,7 +6025,7 @@ mod tests {
symbol: "d".to_string(),
symbols: vec!["a".to_string(), "b".to_string(), "c".to_string()],
}
- .to_string();
+ .to_string();
let result = Schema::parse_str(schema_str);
assert!(result.is_err());
let err = result
diff --git a/lang/rust/avro/src/schema_compatibility.rs
b/lang/rust/avro/src/schema_compatibility.rs
index 083be7b9f..0550ad67c 100644
--- a/lang/rust/avro/src/schema_compatibility.rs
+++ b/lang/rust/avro/src/schema_compatibility.rs
@@ -86,17 +86,17 @@ impl Checker {
if w_type != SchemaKind::Union
&& (r_type.is_primitive()
- || r_type == SchemaKind::Fixed
- || r_type == SchemaKind::Uuid
- || r_type == SchemaKind::Date
- || r_type == SchemaKind::TimeMillis
- || r_type == SchemaKind::TimeMicros
- || r_type == SchemaKind::TimestampMillis
- || r_type == SchemaKind::TimestampMicros
- || r_type == SchemaKind::TimestampNanos
- || r_type == SchemaKind::LocalTimestampMillis
- || r_type == SchemaKind::LocalTimestampMicros
- || r_type == SchemaKind::LocalTimestampNanos)
+ || r_type == SchemaKind::Fixed
+ || r_type == SchemaKind::Uuid
+ || r_type == SchemaKind::Date
+ || r_type == SchemaKind::TimeMillis
+ || r_type == SchemaKind::TimeMicros
+ || r_type == SchemaKind::TimestampMillis
+ || r_type == SchemaKind::TimestampMicros
+ || r_type == SchemaKind::TimestampNanos
+ || r_type == SchemaKind::LocalTimestampMillis
+ || r_type == SchemaKind::LocalTimestampMicros
+ || r_type == SchemaKind::LocalTimestampNanos)
{
return Ok(());
}
@@ -140,12 +140,12 @@ impl Checker {
SchemaKind::Enum => {
// reader's symbols must contain all writer's symbols
if let Schema::Enum(EnumSchema {
- symbols: w_symbols, ..
- }) = writers_schema
+ symbols: w_symbols, ..
+ }) = writers_schema
{
if let Schema::Enum(EnumSchema {
- symbols: r_symbols, ..
- }) = readers_schema
+ symbols: r_symbols, ..
+ }) = readers_schema
{
if w_symbols.iter().all(|e| r_symbols.contains(e)) {
return Ok(());
@@ -184,14 +184,14 @@ impl Checker {
}
if let Schema::Record(RecordSchema {
- fields: w_fields,
- lookup: w_lookup,
- ..
- }) = writers_schema
+ fields: w_fields,
+ lookup: w_lookup,
+ ..
+ }) = writers_schema
{
if let Schema::Record(RecordSchema {
- fields: r_fields, ..
- }) = readers_schema
+ fields: r_fields, ..
+ }) = readers_schema
{
for field in r_fields.iter() {
// get all field names in a vector (field.name + aliases)
@@ -389,22 +389,22 @@ impl SchemaCompatibility {
}
SchemaKind::Fixed => {
if let Schema::Fixed(FixedSchema {
- name: w_name,
- aliases: _,
- doc: _w_doc,
- size: w_size,
- default: _w_default,
- attributes: _,
- }) = writers_schema
+ name: w_name,
+ aliases: _,
+ doc: _w_doc,
+ size: w_size,
+ default: _w_default,
+ attributes: _,
+ }) = writers_schema
{
if let Schema::Fixed(FixedSchema {
- name: r_name,
- aliases: _,
- doc: _r_doc,
- size: r_size,
- default: _r_default,
- attributes: _,
- }) = readers_schema
+ name: r_name,
+ aliases: _,
+ doc: _r_doc,
+ size: r_size,
+ default: _r_default,
+ attributes: _,
+ }) = readers_schema
{
return (w_name.name == r_name.name && w_size ==
r_size)
.then_some(())
@@ -582,14 +582,14 @@ mod tests {
Schema::parse_str(
r#"{"type":"record", "name":"Record1", "fields":[{"name":"a",
"type":"int"}]}"#,
)
- .unwrap()
+ .unwrap()
}
fn a_long_record1_schema() -> Schema {
Schema::parse_str(
r#"{"type":"record", "name":"Record1", "fields":[{"name":"a",
"type":"long"}]}"#,
)
- .unwrap()
+ .unwrap()
}
fn a_int_b_int_record1_schema() -> Schema {
@@ -630,7 +630,7 @@ mod tests {
]}
"#,
)
- .unwrap()
+ .unwrap()
}
fn union_schema(schemas: Vec<Schema>) -> Schema {
@@ -748,65 +748,65 @@ mod tests {
)]
// Fixed type test
#[case(
- r#"{"type": "fixed", "name": "EmployeeId", "size": 16}"#,
- r#"{"type": "fixed", "name": "EmployeeId", "size": 16, "default":
"u00ffffffffffffx"}"#
+ r#"{"type": "fixed", "name": "EmployeeId", "size": 16}"#,
+ r#"{"type": "fixed", "name": "EmployeeId", "size": 16, "default":
"u00ffffffffffffx"}"#
)]
// Enum type test
#[case(
- r#"{"type": "enum", "name":"Enum1", "symbols": ["A","B"]}"#,
- r#"{"type": "enum", "name":"Enum1", "symbols": ["A","B", "C"], "default":
"C"}"#
+ r#"{"type": "enum", "name":"Enum1", "symbols": ["A","B"]}"#,
+ r#"{"type": "enum", "name":"Enum1", "symbols": ["A","B", "C"],
"default": "C"}"#
)]
// Map type test
#[case(
- r#"{"type": "map", "values": "int"}"#,
- r#"{"type": "map", "values": "long"}"#
+ r#"{"type": "map", "values": "int"}"#,
+ r#"{"type": "map", "values": "long"}"#
)]
// Date type
#[case(r#"{"type": "int"}"#, r#"{"type": "int", "logicalType": "date"}"#)]
// time-millis type
#[case(
- r#"{"type": "int"}"#,
- r#"{"type": "int", "logicalType": "time-millis"}"#
+ r#"{"type": "int"}"#,
+ r#"{"type": "int", "logicalType": "time-millis"}"#
)]
// time-millis type
#[case(
- r#"{"type": "long"}"#,
- r#"{"type": "long", "logicalType": "time-micros"}"#
+ r#"{"type": "long"}"#,
+ r#"{"type": "long", "logicalType": "time-micros"}"#
)]
// timetimestamp-nanos type
#[case(
- r#"{"type": "long"}"#,
- r#"{"type": "long", "logicalType": "timestamp-nanos"}"#
+ r#"{"type": "long"}"#,
+ r#"{"type": "long", "logicalType": "timestamp-nanos"}"#
)]
// timestamp-millis type
#[case(
- r#"{"type": "long"}"#,
- r#"{"type": "long", "logicalType": "timestamp-millis"}"#
+ r#"{"type": "long"}"#,
+ r#"{"type": "long", "logicalType": "timestamp-millis"}"#
)]
// timestamp-micros type
#[case(
- r#"{"type": "long"}"#,
- r#"{"type": "long", "logicalType": "timestamp-micros"}"#
+ r#"{"type": "long"}"#,
+ r#"{"type": "long", "logicalType": "timestamp-micros"}"#
)]
// local-timestamp-millis type
#[case(
- r#"{"type": "long"}"#,
- r#"{"type": "long", "logicalType": "local-timestamp-millis"}"#
+ r#"{"type": "long"}"#,
+ r#"{"type": "long", "logicalType": "local-timestamp-millis"}"#
)]
// local-timestamp-micros type
#[case(
- r#"{"type": "long"}"#,
- r#"{"type": "long", "logicalType": "local-timestamp-micros"}"#
+ r#"{"type": "long"}"#,
+ r#"{"type": "long", "logicalType": "local-timestamp-micros"}"#
)]
// local-timestamp-nanos type
#[case(
- r#"{"type": "long"}"#,
- r#"{"type": "long", "logicalType": "local-timestamp-nanos"}"#
+ r#"{"type": "long"}"#,
+ r#"{"type": "long", "logicalType": "local-timestamp-nanos"}"#
)]
// Array type test
#[case(
- r#"{"type": "array", "items": "int"}"#,
- r#"{"type": "array", "items": "long"}"#
+ r#"{"type": "array", "items": "int"}"#,
+ r#"{"type": "array", "items": "long"}"#
)]
fn test_avro_3950_match_schemas_ok(
#[case] writer_schema_str: &str,
@@ -827,8 +827,8 @@ mod tests {
)]
// Fixed type test
#[case(
- r#"{"type": "fixed", "name": "EmployeeId", "size": 16}"#,
- r#"{"type": "fixed", "name": "EmployeeId", "size": 20}"#,
+ r#"{"type": "fixed", "name": "EmployeeId", "size": 16}"#,
+ r#"{"type": "fixed", "name": "EmployeeId", "size": 20}"#,
CompatibilityError::FixedMismatch
)]
// Enum type test
@@ -984,8 +984,8 @@ mod tests {
// )]
// When comparing different types we always get Inconclusive
#[case(
- r#"{"type": "record", "name":"record_b", "fields": [{"type": "long",
"name": "date"}]}"#,
- r#"{"type": "fixed", "name": "EmployeeId", "size": 16}"#,
+ r#"{"type": "record", "name":"record_b", "fields": [{"type": "long",
"name": "date"}]}"#,
+ r#"{"type": "fixed", "name": "EmployeeId", "size": 16}"#,
CompatibilityError::Inconclusive(String::from("writers_schema"))
)]
fn test_avro_3950_match_schemas_error(
@@ -1082,7 +1082,7 @@ mod tests {
]}
"#,
)
- .unwrap()
+ .unwrap()
}
#[test]
@@ -1282,7 +1282,7 @@ mod tests {
]}
"#,
)
- .unwrap()
+ .unwrap()
}
fn point_2d_fullname_schema() -> Schema {
@@ -1294,7 +1294,7 @@ mod tests {
]}
"#,
)
- .unwrap()
+ .unwrap()
}
fn point_3d_no_default_schema() -> Schema {
@@ -1307,7 +1307,7 @@ mod tests {
]}
"#,
)
- .unwrap()
+ .unwrap()
}
fn point_3d_schema() -> Schema {
@@ -1320,7 +1320,7 @@ mod tests {
]}
"#,
)
- .unwrap()
+ .unwrap()
}
fn point_3d_match_name_schema() -> Schema {
@@ -1333,7 +1333,7 @@ mod tests {
]}
"#,
)
- .unwrap()
+ .unwrap()
}
#[test]
