rust: remove unnecessary repetitive options

Reviewed-by: Zhao Liu <zhao1.liu@intel.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

diff --git a/meson.build b/meson.build
index d9293294d8e760ac3619010b4488dd057b3e3f54..270181038bf1057d0be15578280200e1cf6f78f4 100644 (file)
--- 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 359ca86f1556cc6c80853f71387bbb4acbfb26ff..c0094ffcf380b5eb9161c5cf0b3d2ec849318125 100644 (file)
--- 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 091372dd7b660fd99e4d49f25a117273527dcb53..e5836e3f566c396f8ec1094833c93ec2ff6cf6b2 100644 (file)
--- 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 36ada7c454662f88ed02791d2731aec2a3dad269..6b681c609adf5bd1eaeb6c58d9c4dca44b4fc813 100644 (file)
--- 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 aff601d1df27cb3bbb0c39240dde15a4ca59f2ac..4b1cd35f639f816034395e61542f82e8025abb04 100644 (file)
--- 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 444494700ad02d93d66e47ae53e756a7dcbc94b3..94590dc1b87b4e43b5a9ff8372755f8b93762b08 100644 (file)
--- 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 17b2a4e2e24cbbfab0e9e11bcd25207f961a9df6..cdea5bf439e5d3d4ca2dc66a766f51a9a0a2c62d 100644 (file)
--- 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 e50f41858d61850c39ae1589c7bfdfe97b330d0c..551c4f0bf5fcabfba5240174ddd1c5cdb7561cfc 100644 (file)
--- 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 73d61991146ac7ff42a0962cf5fe8ec436284340..2cd2dd366790fb858fe598330893e5c3761ec557 100644 (file)
--- 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 00688c66fb1342fa36cf87b34437df6ba17a176f..3c5020490b03cbd8f1eec063873ac51c4a1e8cbc 100644 (file)
--- 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 adca57e5507537e6868219d2e9ccf86be1f4250d..1b3498f7fc1ee1c67940d141e74a0465c2016359 100644 (file)
--- 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 8ad344dccbdd0c6e7248ea2b65cf9372a97d00f4..18d67a4b3740b7203d539621d23a547bf4e19b5c 100644 (file)
--- 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],
 )