Skip to content

Commit 39cda62

Browse files
authored
Migrate arrow and workspace to Rust 2024 (#8578)
# Which issue does this PR close? - Closes #6827 - Closes #8227 # Rationale for this change This is the last part of #8227, reverting package editions back to use the workspace edition. # What changes are included in this PR? Migrate `arrow` to Rust 2024, update workspace edition and use workspace edition in workspace packages. # Are these changes tested? CI # Are there any user-facing changes? Yes
1 parent b3c4f53 commit 39cda62

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

67 files changed

+246
-214
lines changed

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ include = [
8181
"LICENSE.txt",
8282
"NOTICE.txt",
8383
]
84-
edition = "2021"
84+
edition = "2024"
8585
rust-version = "1.85"
8686

8787
[workspace.dependencies]

arrow-arith/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ authors = { workspace = true }
2525
license = { workspace = true }
2626
keywords = { workspace = true }
2727
include = { workspace = true }
28-
edition = "2024"
28+
edition = { workspace = true }
2929
rust-version = { workspace = true }
3030

3131
[lib]

arrow-array/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ authors = { workspace = true }
2525
license = { workspace = true }
2626
keywords = { workspace = true }
2727
include = { workspace = true }
28-
edition = "2024"
28+
edition = { workspace = true }
2929
rust-version = { workspace = true }
3030

3131
[lib]

arrow-avro/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ authors = { workspace = true }
2525
license = { workspace = true }
2626
keywords = { workspace = true }
2727
include = { workspace = true }
28-
edition = "2024"
28+
edition = { workspace = true }
2929
rust-version = { workspace = true }
3030

3131
[lib]

arrow-buffer/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ authors = { workspace = true }
2525
license = { workspace = true }
2626
keywords = { workspace = true }
2727
include = { workspace = true }
28-
edition = "2024"
28+
edition = { workspace = true }
2929
rust-version = { workspace = true }
3030

3131
[lib]

arrow-cast/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ authors = { workspace = true }
2525
license = { workspace = true }
2626
keywords = { workspace = true }
2727
include = { workspace = true }
28-
edition = "2024"
28+
edition = { workspace = true }
2929
rust-version = { workspace = true }
3030

3131
[lib]

arrow-csv/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ authors = { workspace = true }
2525
license = { workspace = true }
2626
keywords = { workspace = true }
2727
include = { workspace = true }
28-
edition = "2024"
28+
edition = { workspace = true }
2929
rust-version = { workspace = true }
3030

3131
[lib]

arrow-data/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ authors = { workspace = true }
2525
license = { workspace = true }
2626
keywords = { workspace = true }
2727
include = { workspace = true }
28-
edition = "2024"
28+
edition = { workspace = true }
2929
rust-version = { workspace = true }
3030

3131
[lib]

arrow-flight/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
name = "arrow-flight"
2020
description = "Apache Arrow Flight"
2121
version = { workspace = true }
22-
edition = "2024"
22+
edition = { workspace = true }
2323
rust-version = { workspace = true }
2424
authors = { workspace = true }
2525
homepage = { workspace = true }

arrow-integration-test/src/field.rs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ pub fn field_from_json(json: &serde_json::Value) -> Result<Field> {
142142
Some(_) => {
143143
return Err(ArrowError::ParseError(
144144
"Field 'children' must be an array".to_string(),
145-
))
145+
));
146146
}
147147
None => {
148148
return Err(ArrowError::ParseError(
@@ -158,7 +158,7 @@ pub fn field_from_json(json: &serde_json::Value) -> Result<Field> {
158158
Some(_) => {
159159
return Err(ArrowError::ParseError(
160160
"Field 'children' must be an array".to_string(),
161-
))
161+
));
162162
}
163163
None => {
164164
return Err(ArrowError::ParseError(
@@ -177,15 +177,15 @@ pub fn field_from_json(json: &serde_json::Value) -> Result<Field> {
177177
}
178178
t => {
179179
return Err(ArrowError::ParseError(format!(
180-
"Map children should be a struct with 2 fields, found {t:?}"
181-
)))
180+
"Map children should be a struct with 2 fields, found {t:?}"
181+
)));
182182
}
183183
}
184184
}
185185
Some(_) => {
186186
return Err(ArrowError::ParseError(
187187
"Field 'children' must be an array with 1 element".to_string(),
188-
))
188+
));
189189
}
190190
None => {
191191
return Err(ArrowError::ParseError(
@@ -207,7 +207,7 @@ pub fn field_from_json(json: &serde_json::Value) -> Result<Field> {
207207
Some(_) => {
208208
return Err(ArrowError::ParseError(
209209
"Field 'children' must be an array".to_string(),
210-
))
210+
));
211211
}
212212
None => {
213213
return Err(ArrowError::ParseError(
@@ -275,7 +275,7 @@ pub fn field_to_json(field: &Field) -> serde_json::Value {
275275
};
276276

277277
match field.data_type() {
278-
DataType::Dictionary(ref index_type, ref value_type) => {
278+
DataType::Dictionary(index_type, value_type) => {
279279
#[allow(deprecated)]
280280
let dict_id = field.dict_id().unwrap();
281281
serde_json::json!({

0 commit comments

Comments
 (0)