From e65030ed50ee55bd1d296883cfd355e737fe68f7 Mon Sep 17 00:00:00 2001 From: Paolo Bonzini Date: Wed, 26 Nov 2025 19:04:50 +0100 Subject: [PATCH] rust: remove unnecessary repetitive options Reviewed-by: Zhao Liu Signed-off-by: Paolo Bonzini --- meson.build | 3 ++- rust/bits/meson.build | 2 -- rust/bql/meson.build | 2 -- rust/chardev/meson.build | 2 -- rust/common/meson.build | 2 -- rust/migration/meson.build | 2 -- rust/qemu-macros/meson.build | 1 - rust/qom/meson.build | 2 -- rust/system/meson.build | 2 -- rust/tests/meson.build | 1 - rust/trace/meson.build | 2 -- rust/util/meson.build | 2 -- 12 files changed, 2 insertions(+), 21 deletions(-) diff --git a/meson.build b/meson.build index d9293294d8..270181038b 100644 --- a/meson.build +++ b/meson.build @@ -1,6 +1,7 @@ project('qemu', ['c'], meson_version: '>=1.5.0', default_options: ['warning_level=1', 'c_std=gnu11', 'cpp_std=gnu++11', 'b_colorout=auto', - 'b_staticpic=false', 'stdsplit=false', 'optimization=2', 'b_pie=true'], + 'b_staticpic=false', 'stdsplit=false', 'optimization=2', 'b_pie=true', + 'rust_std=2021', 'build.rust_std=2021'], version: files('VERSION')) meson.add_devenv({ 'MESON_BUILD_ROOT' : meson.project_build_root() }) diff --git a/rust/bits/meson.build b/rust/bits/meson.build index 359ca86f15..c0094ffcf3 100644 --- a/rust/bits/meson.build +++ b/rust/bits/meson.build @@ -1,8 +1,6 @@ _bits_rs = static_library( 'bits', 'src/lib.rs', - override_options: ['rust_std=2021', 'build.rust_std=2021'], - rust_abi: 'rust', dependencies: [qemu_macros], ) diff --git a/rust/bql/meson.build b/rust/bql/meson.build index 091372dd7b..e5836e3f56 100644 --- a/rust/bql/meson.build +++ b/rust/bql/meson.build @@ -34,8 +34,6 @@ _bql_rs = static_library( ], {'.': _bql_bindings_inc_rs} ), - override_options: ['rust_std=2021', 'build.rust_std=2021'], - rust_abi: 'rust', rust_args: _bql_cfg, dependencies: [glib_sys_rs], ) diff --git a/rust/chardev/meson.build b/rust/chardev/meson.build index 36ada7c454..6b681c609a 100644 --- a/rust/chardev/meson.build +++ b/rust/chardev/meson.build @@ -33,8 +33,6 @@ _chardev_rs = static_library( ], {'.': _chardev_bindings_inc_rs} ), - override_options: ['rust_std=2021', 'build.rust_std=2021'], - rust_abi: 'rust', link_with: [_bql_rs, _migration_rs, _qom_rs, _util_rs], dependencies: [glib_sys_rs, common_rs, qemu_macros], ) diff --git a/rust/common/meson.build b/rust/common/meson.build index aff601d1df..4b1cd35f63 100644 --- a/rust/common/meson.build +++ b/rust/common/meson.build @@ -16,8 +16,6 @@ _common_rs = static_library( 'src/zeroable.rs', ], ), - override_options: ['rust_std=2021', 'build.rust_std=2021'], - rust_abi: 'rust', rust_args: _common_cfg, dependencies: [libc_rs, qemu_macros], ) diff --git a/rust/migration/meson.build b/rust/migration/meson.build index 444494700a..94590dc1b8 100644 --- a/rust/migration/meson.build +++ b/rust/migration/meson.build @@ -36,8 +36,6 @@ _migration_rs = static_library( ], {'.' : _migration_bindings_inc_rs}, ), - override_options: ['rust_std=2021', 'build.rust_std=2021'], - rust_abi: 'rust', link_with: [_util_rs, _bql_rs], dependencies: [common_rs, glib_sys_rs, qemu_macros], ) diff --git a/rust/qemu-macros/meson.build b/rust/qemu-macros/meson.build index 17b2a4e2e2..cdea5bf439 100644 --- a/rust/qemu-macros/meson.build +++ b/rust/qemu-macros/meson.build @@ -1,7 +1,6 @@ _qemu_macros_rs = rust.proc_macro( 'qemu_macros', files('src/lib.rs'), - override_options: ['rust_std=2021', 'build.rust_std=2021'], dependencies: [ attrs_rs_native, proc_macro2_rs_native, diff --git a/rust/qom/meson.build b/rust/qom/meson.build index e50f41858d..551c4f0bf5 100644 --- a/rust/qom/meson.build +++ b/rust/qom/meson.build @@ -26,8 +26,6 @@ _qom_rs = static_library( ], {'.': _qom_bindings_inc_rs} ), - override_options: ['rust_std=2021', 'build.rust_std=2021'], - rust_abi: 'rust', link_with: [_bql_rs, _migration_rs], dependencies: [common_rs, glib_sys_rs, qemu_macros], ) diff --git a/rust/system/meson.build b/rust/system/meson.build index 73d6199114..2cd2dd3667 100644 --- a/rust/system/meson.build +++ b/rust/system/meson.build @@ -33,8 +33,6 @@ _system_rs = static_library( ], {'.': _system_bindings_inc_rs} ), - override_options: ['rust_std=2021', 'build.rust_std=2021'], - rust_abi: 'rust', link_with: [_bql_rs, _migration_rs, _qom_rs, _util_rs], dependencies: [glib_sys_rs, common_rs, qemu_macros], ) diff --git a/rust/tests/meson.build b/rust/tests/meson.build index 00688c66fb..3c5020490b 100644 --- a/rust/tests/meson.build +++ b/rust/tests/meson.build @@ -2,7 +2,6 @@ test('rust-integration', executable( 'rust-integration', files('tests/vmstate_tests.rs'), - override_options: ['rust_std=2021', 'build.rust_std=2021'], rust_args: ['--test'], install: false, dependencies: [bql_rs, common_rs, util_rs, migration_rs, qom_rs]), diff --git a/rust/trace/meson.build b/rust/trace/meson.build index adca57e550..1b3498f7fc 100644 --- a/rust/trace/meson.build +++ b/rust/trace/meson.build @@ -11,9 +11,7 @@ _trace_rs = static_library( 'trace', # Library name, lib_rs, trace_rs_targets, # List of generated `.rs` custom targets - override_options: ['rust_std=2021', 'build.rust_std=2021'], dependencies: [libc_rs], - rust_abi: 'rust', ) trace_rs = declare_dependency(link_with: _trace_rs) diff --git a/rust/util/meson.build b/rust/util/meson.build index 8ad344dccb..18d67a4b37 100644 --- a/rust/util/meson.build +++ b/rust/util/meson.build @@ -38,8 +38,6 @@ _util_rs = static_library( ], {'.': _util_bindings_inc_rs} ), - override_options: ['rust_std=2021', 'build.rust_std=2021'], - rust_abi: 'rust', dependencies: [anyhow_rs, libc_rs, foreign_rs, glib_sys_rs, common_rs, qom, qemuutil], )