Skip to content

Commit a82e340

Browse files
authored
Migrate parquet-geospatial to Rust 2024 (#8509)
# Which issue does this PR close? - Contribute to #6827 # Rationale for this change Splitting up #8227. # What changes are included in this PR? Migrate `parquet-geospatial` to Rust 2024 # Are these changes tested? CI # Are there any user-facing changes? Yes
1 parent 3540c19 commit a82e340

File tree

3 files changed

+8
-7
lines changed

3 files changed

+8
-7
lines changed

parquet-geospatial/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ repository = { workspace = true }
2727
authors = { workspace = true }
2828
keywords = ["arrow", "parquet", "geometry", "geography"]
2929
readme = "README.md"
30-
edition = { workspace = true }
30+
edition = "2024"
3131
rust-version = { workspace = true }
3232

3333
[dependencies]

parquet-geospatial/src/bounding.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -239,7 +239,7 @@ fn visit_intervals(
239239
_ => {
240240
return Err(ArrowError::InvalidArgumentError(
241241
"GeometryType not supported for dimension bounds".to_string(),
242-
))
242+
));
243243
}
244244
}
245245

@@ -302,7 +302,7 @@ fn geometry_type(geom: &impl GeometryTrait<T = f64>) -> Result<i32, ArrowError>
302302
Dimensions::Unknown(_) => {
303303
return Err(ArrowError::InvalidArgumentError(
304304
"Unsupported dimensions".to_string(),
305-
))
305+
));
306306
}
307307
};
308308

@@ -317,7 +317,7 @@ fn geometry_type(geom: &impl GeometryTrait<T = f64>) -> Result<i32, ArrowError>
317317
_ => {
318318
return Err(ArrowError::InvalidArgumentError(
319319
"GeometryType not supported for dimension bounds".to_string(),
320-
))
320+
));
321321
}
322322
};
323323

parquet-geospatial/src/interval.rs

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1073,8 +1073,9 @@ mod test {
10731073

10741074
// Can't convert a wraparound interval that actually wraps around to an Interval
10751075
let err = Interval::try_from(wraparound).unwrap_err();
1076-
assert!(err
1077-
.to_string()
1078-
.contains("Can't convert wraparound interval"));
1076+
assert!(
1077+
err.to_string()
1078+
.contains("Can't convert wraparound interval")
1079+
);
10791080
}
10801081
}

0 commit comments

Comments
 (0)