Skip to content

Commit c558163

Browse files
authored
GH-47512: [C++] Bump meson-fmt in pre-commit to 1.9.0 (#47513)
### Rationale for this change This improves the readability of parenthesized multi-line expressions in Meson configuration files ### What changes are included in this PR? meson-fmt in pre-commit has been bumped to version 1.9.0, and files have been cleaned accordingly ### Are these changes tested? Yes ### Are there any user-facing changes? No * GitHub Issue: #47512 Authored-by: Will Ayd <[email protected]> Signed-off-by: Will Ayd <[email protected]>
1 parent 982d31f commit c558163

File tree

4 files changed

+54
-21
lines changed

4 files changed

+54
-21
lines changed

.pre-commit-config.yaml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -391,8 +391,13 @@ repos:
391391
?^dev/release/post-09-python\.sh$|
392392
)
393393
- repo: https://github.com/trim21/pre-commit-mirror-meson
394-
rev: v1.6.1
394+
rev: v1.9.0
395395
hooks:
396396
- id: meson-fmt
397397
alias: cpp
398398
args: ['--inplace']
399+
files: >-
400+
(
401+
?.*meson\.build$|
402+
?.*meson\.options$|
403+
)

cpp/meson.build

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -66,10 +66,10 @@ needs_flight = get_option('flight').enabled()
6666
needs_ipc = get_option('ipc').enabled() or needs_tests or needs_acero or needs_benchmarks or needs_flight
6767
needs_fuzzing = get_option('fuzzing').enabled()
6868
needs_testing = (get_option('testing').enabled()
69-
or needs_tests
70-
or needs_benchmarks
71-
or needs_fuzzing
72-
or needs_integration
69+
or needs_tests
70+
or needs_benchmarks
71+
or needs_fuzzing
72+
or needs_integration
7373
)
7474
needs_json = get_option('json').enabled() or needs_testing
7575
needs_brotli = get_option('brotli').enabled() or needs_fuzzing

cpp/meson.options

Lines changed: 41 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -15,20 +15,40 @@
1515
# specific language governing permissions and limitations
1616
# under the License.
1717

18-
option('acero', type: 'feature', description: 'Build the Arrow Acero Engine Module')
18+
option(
19+
'acero',
20+
type: 'feature',
21+
description: 'Build the Arrow Acero Engine Module',
22+
)
1923
option(
2024
'azure',
2125
type: 'feature',
2226
description: 'Build Arrow with Azure support (requires the Azure SDK for C++)',
2327
)
2428

25-
option('benchmarks', type: 'feature', description: 'Build the Arrow micro benchmarks')
29+
option(
30+
'benchmarks',
31+
type: 'feature',
32+
description: 'Build the Arrow micro benchmarks',
33+
)
2634
option('brotli', type: 'feature', description: 'Build with Brotli compression')
2735
option('bz2', type: 'feature', description: 'Build with BZ2 compression')
28-
option('compute', type: 'feature', description: 'Build all Arrow Compute kernels')
36+
option(
37+
'compute',
38+
type: 'feature',
39+
description: 'Build all Arrow Compute kernels',
40+
)
2941
option('csv', type: 'feature', description: 'Build the Arrow CSV Parser Module')
30-
option('filesystem', type: 'feature', description: 'Build the Arrow Filesystem Layer')
31-
option('fuzzing', type: 'feature', description: 'Build Arrow Fuzzing executables')
42+
option(
43+
'filesystem',
44+
type: 'feature',
45+
description: 'Build the Arrow Filesystem Layer',
46+
)
47+
option(
48+
'fuzzing',
49+
type: 'feature',
50+
description: 'Build Arrow Fuzzing executables',
51+
)
3252

3353
option(
3454
'gcs',
@@ -62,11 +82,7 @@ option(
6282
option('git_id', type: 'string')
6383
option('git_description', type: 'string')
6484

65-
option(
66-
'lz4',
67-
type: 'feature',
68-
description: 'Build with lz4 compression',
69-
)
85+
option('lz4', type: 'feature', description: 'Build with lz4 compression')
7086

7187
option(
7288
'package_kind',
@@ -87,9 +103,21 @@ option(
87103
description: 'Build Arrow with TensorFlow support enabled',
88104
)
89105

90-
option('testing', type: 'feature', description: 'Build the Arrow testing libraries')
91-
option('tests', type: 'feature', description: 'Build the Arrow googletest unit tests')
106+
option(
107+
'testing',
108+
type: 'feature',
109+
description: 'Build the Arrow testing libraries',
110+
)
111+
option(
112+
'tests',
113+
type: 'feature',
114+
description: 'Build the Arrow googletest unit tests',
115+
)
92116

93-
option('utilities', type: 'feature', description: 'Build Arrow commandline utilities')
117+
option(
118+
'utilities',
119+
type: 'feature',
120+
description: 'Build Arrow commandline utilities',
121+
)
94122
option('zlib', type: 'feature', description: 'Build with zlib compression')
95123
option('zstd', type: 'feature', description: 'Build with zstd compression')

cpp/src/arrow/ipc/meson.build

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -74,9 +74,9 @@ exc = executable(
7474
benchmark('arrow-ipc-read-write-benchmark', exc)
7575

7676
if needs_fuzzing or (needs_utilities
77-
and needs_testing
78-
and needs_lz4
79-
and needs_zstd
77+
and needs_testing
78+
and needs_lz4
79+
and needs_zstd
8080
)
8181
fuzz_corpus_exc = executable(
8282
'arrow-ipc-generate-fuzz-corpus',

0 commit comments

Comments
 (0)