rust: remove unnecessary repetitive options
Reviewed-by: Zhao Liu <zhao1.liu@intel.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
@@ -1,6 +1,7 @@
|
|||||||
project('qemu', ['c'], meson_version: '>=1.5.0',
|
project('qemu', ['c'], meson_version: '>=1.5.0',
|
||||||
default_options: ['warning_level=1', 'c_std=gnu11', 'cpp_std=gnu++11', 'b_colorout=auto',
|
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'))
|
version: files('VERSION'))
|
||||||
|
|
||||||
meson.add_devenv({ 'MESON_BUILD_ROOT' : meson.project_build_root() })
|
meson.add_devenv({ 'MESON_BUILD_ROOT' : meson.project_build_root() })
|
||||||
|
|||||||
@@ -1,8 +1,6 @@
|
|||||||
_bits_rs = static_library(
|
_bits_rs = static_library(
|
||||||
'bits',
|
'bits',
|
||||||
'src/lib.rs',
|
'src/lib.rs',
|
||||||
override_options: ['rust_std=2021', 'build.rust_std=2021'],
|
|
||||||
rust_abi: 'rust',
|
|
||||||
dependencies: [qemu_macros],
|
dependencies: [qemu_macros],
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|||||||
@@ -34,8 +34,6 @@ _bql_rs = static_library(
|
|||||||
],
|
],
|
||||||
{'.': _bql_bindings_inc_rs}
|
{'.': _bql_bindings_inc_rs}
|
||||||
),
|
),
|
||||||
override_options: ['rust_std=2021', 'build.rust_std=2021'],
|
|
||||||
rust_abi: 'rust',
|
|
||||||
rust_args: _bql_cfg,
|
rust_args: _bql_cfg,
|
||||||
dependencies: [glib_sys_rs],
|
dependencies: [glib_sys_rs],
|
||||||
)
|
)
|
||||||
|
|||||||
@@ -33,8 +33,6 @@ _chardev_rs = static_library(
|
|||||||
],
|
],
|
||||||
{'.': _chardev_bindings_inc_rs}
|
{'.': _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],
|
link_with: [_bql_rs, _migration_rs, _qom_rs, _util_rs],
|
||||||
dependencies: [glib_sys_rs, common_rs, qemu_macros],
|
dependencies: [glib_sys_rs, common_rs, qemu_macros],
|
||||||
)
|
)
|
||||||
|
|||||||
@@ -16,8 +16,6 @@ _common_rs = static_library(
|
|||||||
'src/zeroable.rs',
|
'src/zeroable.rs',
|
||||||
],
|
],
|
||||||
),
|
),
|
||||||
override_options: ['rust_std=2021', 'build.rust_std=2021'],
|
|
||||||
rust_abi: 'rust',
|
|
||||||
rust_args: _common_cfg,
|
rust_args: _common_cfg,
|
||||||
dependencies: [libc_rs, qemu_macros],
|
dependencies: [libc_rs, qemu_macros],
|
||||||
)
|
)
|
||||||
|
|||||||
@@ -36,8 +36,6 @@ _migration_rs = static_library(
|
|||||||
],
|
],
|
||||||
{'.' : _migration_bindings_inc_rs},
|
{'.' : _migration_bindings_inc_rs},
|
||||||
),
|
),
|
||||||
override_options: ['rust_std=2021', 'build.rust_std=2021'],
|
|
||||||
rust_abi: 'rust',
|
|
||||||
link_with: [_util_rs, _bql_rs],
|
link_with: [_util_rs, _bql_rs],
|
||||||
dependencies: [common_rs, glib_sys_rs, qemu_macros],
|
dependencies: [common_rs, glib_sys_rs, qemu_macros],
|
||||||
)
|
)
|
||||||
|
|||||||
@@ -1,7 +1,6 @@
|
|||||||
_qemu_macros_rs = rust.proc_macro(
|
_qemu_macros_rs = rust.proc_macro(
|
||||||
'qemu_macros',
|
'qemu_macros',
|
||||||
files('src/lib.rs'),
|
files('src/lib.rs'),
|
||||||
override_options: ['rust_std=2021', 'build.rust_std=2021'],
|
|
||||||
dependencies: [
|
dependencies: [
|
||||||
attrs_rs_native,
|
attrs_rs_native,
|
||||||
proc_macro2_rs_native,
|
proc_macro2_rs_native,
|
||||||
|
|||||||
@@ -26,8 +26,6 @@ _qom_rs = static_library(
|
|||||||
],
|
],
|
||||||
{'.': _qom_bindings_inc_rs}
|
{'.': _qom_bindings_inc_rs}
|
||||||
),
|
),
|
||||||
override_options: ['rust_std=2021', 'build.rust_std=2021'],
|
|
||||||
rust_abi: 'rust',
|
|
||||||
link_with: [_bql_rs, _migration_rs],
|
link_with: [_bql_rs, _migration_rs],
|
||||||
dependencies: [common_rs, glib_sys_rs, qemu_macros],
|
dependencies: [common_rs, glib_sys_rs, qemu_macros],
|
||||||
)
|
)
|
||||||
|
|||||||
@@ -33,8 +33,6 @@ _system_rs = static_library(
|
|||||||
],
|
],
|
||||||
{'.': _system_bindings_inc_rs}
|
{'.': _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],
|
link_with: [_bql_rs, _migration_rs, _qom_rs, _util_rs],
|
||||||
dependencies: [glib_sys_rs, common_rs, qemu_macros],
|
dependencies: [glib_sys_rs, common_rs, qemu_macros],
|
||||||
)
|
)
|
||||||
|
|||||||
@@ -2,7 +2,6 @@ test('rust-integration',
|
|||||||
executable(
|
executable(
|
||||||
'rust-integration',
|
'rust-integration',
|
||||||
files('tests/vmstate_tests.rs'),
|
files('tests/vmstate_tests.rs'),
|
||||||
override_options: ['rust_std=2021', 'build.rust_std=2021'],
|
|
||||||
rust_args: ['--test'],
|
rust_args: ['--test'],
|
||||||
install: false,
|
install: false,
|
||||||
dependencies: [bql_rs, common_rs, util_rs, migration_rs, qom_rs]),
|
dependencies: [bql_rs, common_rs, util_rs, migration_rs, qom_rs]),
|
||||||
|
|||||||
@@ -11,9 +11,7 @@ _trace_rs = static_library(
|
|||||||
'trace', # Library name,
|
'trace', # Library name,
|
||||||
lib_rs,
|
lib_rs,
|
||||||
trace_rs_targets, # List of generated `.rs` custom targets
|
trace_rs_targets, # List of generated `.rs` custom targets
|
||||||
override_options: ['rust_std=2021', 'build.rust_std=2021'],
|
|
||||||
dependencies: [libc_rs],
|
dependencies: [libc_rs],
|
||||||
rust_abi: 'rust',
|
|
||||||
)
|
)
|
||||||
|
|
||||||
trace_rs = declare_dependency(link_with: _trace_rs)
|
trace_rs = declare_dependency(link_with: _trace_rs)
|
||||||
|
|||||||
@@ -38,8 +38,6 @@ _util_rs = static_library(
|
|||||||
],
|
],
|
||||||
{'.': _util_bindings_inc_rs}
|
{'.': _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],
|
dependencies: [anyhow_rs, libc_rs, foreign_rs, glib_sys_rs, common_rs, qom, qemuutil],
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user