Skip to content

Commit 027e9e5

Browse files
authored
Migrate arrow-string to Rust 2024 (#8491)
# Which issue does this PR close? - Contribute to #6827 # Rationale for this change Splitting up #8227. # What changes are included in this PR? Migrate `arrow-string` to Rust 2024 # Are these changes tested? CI # Are there any user-facing changes? Yes
1 parent 9cb6bec commit 027e9e5

File tree

4 files changed

+31
-25
lines changed

4 files changed

+31
-25
lines changed

arrow-string/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 = { workspace = true }
28+
edition = "2024"
2929
rust-version = { workspace = true }
3030

3131
[lib]

arrow-string/src/length.rs

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -627,11 +627,7 @@ mod tests {
627627
let data: Vec<Option<&str>> = (0..TOTAL)
628628
.map(|n| {
629629
let i = n % 5;
630-
if i == 3 {
631-
None
632-
} else {
633-
Some(v[i as usize])
634-
}
630+
if i == 3 { None } else { Some(v[i as usize]) }
635631
})
636632
.collect();
637633

@@ -674,11 +670,7 @@ mod tests {
674670
let data: Vec<Option<&str>> = (0..TOTAL)
675671
.map(|n| {
676672
let i = n % 5;
677-
if i == 3 {
678-
None
679-
} else {
680-
Some(v[i as usize])
681-
}
673+
if i == 3 { None } else { Some(v[i as usize]) }
682674
})
683675
.collect();
684676

arrow-string/src/like.rs

Lines changed: 27 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -727,7 +727,9 @@ mod tests {
727727
"arrow",
728728
"arrow"
729729
],
730-
vec!["arrow", "ar%", "%ro%", "foo", "arr", "arrow_", "arrow_", ".*"],
730+
vec![
731+
"arrow", "ar%", "%ro%", "foo", "arr", "arrow_", "arrow_", ".*"
732+
],
731733
like,
732734
vec![true, true, true, false, false, true, false, false]
733735
);
@@ -817,7 +819,9 @@ mod tests {
817819
"arrow",
818820
"arrow"
819821
],
820-
vec!["arrow", "ar%", "row", "foo", "arr", "arrow_", "arrow_", ".*"],
822+
vec![
823+
"arrow", "ar%", "row", "foo", "arr", "arrow_", "arrow_", ".*"
824+
],
821825
starts_with,
822826
vec![true, false, false, false, true, false, false, false]
823827
);
@@ -864,7 +868,9 @@ mod tests {
864868
"arrow",
865869
"arrow"
866870
],
867-
vec!["arrow", "ar%", "row", "foo", "arr", "arrow_", "arrow_", ".*"],
871+
vec![
872+
"arrow", "ar%", "row", "foo", "arr", "arrow_", "arrow_", ".*"
873+
],
868874
ends_with,
869875
vec![true, false, true, false, false, false, false, false]
870876
);
@@ -1155,7 +1161,9 @@ mod tests {
11551161
],
11561162
"FFkoSS%",
11571163
ilike,
1158-
vec![false, true, true, false, false, false, false, true, true, false]
1164+
vec![
1165+
false, true, true, false, false, false, false, true, true, false
1166+
]
11591167
);
11601168

11611169
test_utf8_scalar!(
@@ -1174,7 +1182,9 @@ mod tests {
11741182
],
11751183
"%FFkoSS",
11761184
ilike,
1177-
vec![false, true, true, false, false, false, false, true, true, true]
1185+
vec![
1186+
false, true, true, false, false, false, false, true, true, true
1187+
]
11781188
);
11791189

11801190
test_utf8_scalar!(
@@ -1194,7 +1204,9 @@ mod tests {
11941204
],
11951205
"%FFkoSS%",
11961206
ilike,
1197-
vec![false, true, true, false, false, false, false, true, true, true, true]
1207+
vec![
1208+
false, true, true, false, false, false, false, true, true, true, true
1209+
]
11981210
);
11991211

12001212
// Replicates `test_utf8_array_ilike_unicode_contains` and
@@ -1219,7 +1231,9 @@ mod tests {
12191231
],
12201232
"FFkoSS",
12211233
contains,
1222-
vec![false, true, true, false, false, false, false, true, true, true, false]
1234+
vec![
1235+
false, true, true, false, false, false, false, true, true, true, false
1236+
]
12231237
);
12241238

12251239
test_utf8_scalar!(
@@ -1239,7 +1253,9 @@ mod tests {
12391253
],
12401254
"%FF__SS%",
12411255
ilike,
1242-
vec![false, true, true, false, false, false, false, true, true, true, true]
1256+
vec![
1257+
false, true, true, false, false, false, false, true, true, true, true
1258+
]
12431259
);
12441260

12451261
// 😈 is four bytes long.
@@ -1260,7 +1276,9 @@ mod tests {
12601276
],
12611277
"%Ssh😈klF",
12621278
like,
1263-
vec![false, false, false, false, false, false, false, true, true, false, false]
1279+
vec![
1280+
false, false, false, false, false, false, false, true, true, false, false
1281+
]
12641282
);
12651283

12661284
test_utf8_scalar!(

arrow-string/src/substring.rs

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -915,11 +915,7 @@ mod tests {
915915
let data: Vec<Option<&str>> = (0..TOTAL)
916916
.map(|n| {
917917
let i = n % 5;
918-
if i == 3 {
919-
None
920-
} else {
921-
Some(v[i as usize])
922-
}
918+
if i == 3 { None } else { Some(v[i as usize]) }
923919
})
924920
.collect();
925921

0 commit comments

Comments
 (0)