mirror of
https://github.com/mborgerson/xemu.git
synced 2025-12-01 16:10:01 +00:00
Revert "rust: add PL011 device model"
Patch was applied with invalid authorship by accident, which confuses
git tooling that look at git blame for contributors etc.
Patch will be re-applied with correct authorship right after this
commit.
This reverts commit d0f0cd5b1f.
Signed-off-by: Manos Pitsidianakis <manos.pitsidianakis@linaro.org>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Link: https://lore.kernel.org/r/20241024-rust-round-2-v1-1-051e7a25b978@linaro.org
This commit is contained in:
Manos Pitsidianakis
committed by
Paolo Bonzini
Paolo Bonzini
parent
b278b60d51
commit
ca5aa28e24
7
subprojects/.gitignore
vendored
7
subprojects/.gitignore
vendored
@ -6,13 +6,6 @@
|
||||
/keycodemapdb
|
||||
/libvfio-user
|
||||
/slirp
|
||||
/arbitrary-int-1.2.7
|
||||
/bilge-0.2.0
|
||||
/bilge-impl-0.2.0
|
||||
/either-1.12.0
|
||||
/itertools-0.11.0
|
||||
/proc-macro-error-1.0.4
|
||||
/proc-macro-error-attr-1.0.4
|
||||
/proc-macro2-1.0.84
|
||||
/quote-1.0.36
|
||||
/syn-2.0.66
|
||||
|
||||
@ -1,7 +0,0 @@
|
||||
[wrap-file]
|
||||
directory = arbitrary-int-1.2.7
|
||||
source_url = https://crates.io/api/v1/crates/arbitrary-int/1.2.7/download
|
||||
source_filename = arbitrary-int-1.2.7.tar.gz
|
||||
source_hash = c84fc003e338a6f69fbd4f7fe9f92b535ff13e9af8997f3b14b6ddff8b1df46d
|
||||
#method = cargo
|
||||
patch_directory = arbitrary-int-1-rs
|
||||
@ -1,7 +0,0 @@
|
||||
[wrap-file]
|
||||
directory = bilge-0.2.0
|
||||
source_url = https://crates.io/api/v1/crates/bilge/0.2.0/download
|
||||
source_filename = bilge-0.2.0.tar.gz
|
||||
source_hash = dc707ed8ebf81de5cd6c7f48f54b4c8621760926cdf35a57000747c512e67b57
|
||||
#method = cargo
|
||||
patch_directory = bilge-0.2-rs
|
||||
@ -1,7 +0,0 @@
|
||||
[wrap-file]
|
||||
directory = bilge-impl-0.2.0
|
||||
source_url = https://crates.io/api/v1/crates/bilge-impl/0.2.0/download
|
||||
source_filename = bilge-impl-0.2.0.tar.gz
|
||||
source_hash = feb11e002038ad243af39c2068c8a72bcf147acf05025dcdb916fcc000adb2d8
|
||||
#method = cargo
|
||||
patch_directory = bilge-impl-0.2-rs
|
||||
@ -1,7 +0,0 @@
|
||||
[wrap-file]
|
||||
directory = either-1.12.0
|
||||
source_url = https://crates.io/api/v1/crates/either/1.12.0/download
|
||||
source_filename = either-1.12.0.tar.gz
|
||||
source_hash = 3dca9240753cf90908d7e4aac30f630662b02aebaa1b58a3cadabdb23385b58b
|
||||
#method = cargo
|
||||
patch_directory = either-1-rs
|
||||
@ -1,7 +0,0 @@
|
||||
[wrap-file]
|
||||
directory = itertools-0.11.0
|
||||
source_url = https://crates.io/api/v1/crates/itertools/0.11.0/download
|
||||
source_filename = itertools-0.11.0.tar.gz
|
||||
source_hash = b1c173a5686ce8bfa551b3563d0c2170bf24ca44da99c7ca4bfdab5418c3fe57
|
||||
#method = cargo
|
||||
patch_directory = itertools-0.11-rs
|
||||
@ -1,19 +0,0 @@
|
||||
project('arbitrary-int-1-rs', 'rust',
|
||||
version: '1.2.7',
|
||||
license: 'MIT',
|
||||
default_options: [])
|
||||
|
||||
_arbitrary_int_rs = static_library(
|
||||
'arbitrary_int',
|
||||
files('src/lib.rs'),
|
||||
gnu_symbol_visibility: 'hidden',
|
||||
override_options: ['rust_std=2021', 'build.rust_std=2021'],
|
||||
rust_abi: 'rust',
|
||||
dependencies: [],
|
||||
)
|
||||
|
||||
arbitrary_int_dep = declare_dependency(
|
||||
link_with: _arbitrary_int_rs,
|
||||
)
|
||||
|
||||
meson.override_dependency('arbitrary-int-1-rs', arbitrary_int_dep)
|
||||
@ -1,29 +0,0 @@
|
||||
project(
|
||||
'bilge-0.2-rs',
|
||||
'rust',
|
||||
version : '0.2.0',
|
||||
license : 'MIT or Apache-2.0',
|
||||
)
|
||||
|
||||
subproject('arbitrary-int-1-rs', required: true)
|
||||
subproject('bilge-impl-0.2-rs', required: true)
|
||||
|
||||
arbitrary_int_dep = dependency('arbitrary-int-1-rs')
|
||||
bilge_impl_dep = dependency('bilge-impl-0.2-rs')
|
||||
|
||||
lib = static_library(
|
||||
'bilge',
|
||||
'src/lib.rs',
|
||||
override_options : ['rust_std=2021', 'build.rust_std=2021'],
|
||||
rust_abi : 'rust',
|
||||
dependencies: [
|
||||
arbitrary_int_dep,
|
||||
bilge_impl_dep,
|
||||
],
|
||||
)
|
||||
|
||||
bilge_dep = declare_dependency(
|
||||
link_with : [lib],
|
||||
)
|
||||
|
||||
meson.override_dependency('bilge-0.2-rs', bilge_dep)
|
||||
@ -1,45 +0,0 @@
|
||||
project('bilge-impl-0.2-rs', 'rust',
|
||||
version: '0.2.0',
|
||||
license: 'MIT OR Apache-2.0',
|
||||
default_options: [])
|
||||
|
||||
subproject('itertools-0.11-rs', required: true)
|
||||
subproject('proc-macro-error-attr-1-rs', required: true)
|
||||
subproject('proc-macro-error-1-rs', required: true)
|
||||
subproject('quote-1-rs', required: true)
|
||||
subproject('syn-2-rs', required: true)
|
||||
subproject('proc-macro2-1-rs', required: true)
|
||||
|
||||
itertools_dep = dependency('itertools-0.11-rs', native: true)
|
||||
proc_macro_error_attr_dep = dependency('proc-macro-error-attr-1-rs', native: true)
|
||||
proc_macro_error_dep = dependency('proc-macro-error-1-rs', native: true)
|
||||
quote_dep = dependency('quote-1-rs', native: true)
|
||||
syn_dep = dependency('syn-2-rs', native: true)
|
||||
proc_macro2_dep = dependency('proc-macro2-1-rs', native: true)
|
||||
|
||||
rust = import('rust')
|
||||
|
||||
_bilge_impl_rs = rust.proc_macro(
|
||||
'bilge_impl',
|
||||
files('src/lib.rs'),
|
||||
override_options: ['rust_std=2021', 'build.rust_std=2021'],
|
||||
rust_args: [
|
||||
'--cfg', 'use_fallback',
|
||||
'--cfg', 'feature="syn-error"',
|
||||
'--cfg', 'feature="proc-macro"',
|
||||
],
|
||||
dependencies: [
|
||||
itertools_dep,
|
||||
proc_macro_error_attr_dep,
|
||||
proc_macro_error_dep,
|
||||
quote_dep,
|
||||
syn_dep,
|
||||
proc_macro2_dep,
|
||||
],
|
||||
)
|
||||
|
||||
bilge_impl_dep = declare_dependency(
|
||||
link_with: _bilge_impl_rs,
|
||||
)
|
||||
|
||||
meson.override_dependency('bilge-impl-0.2-rs', bilge_impl_dep)
|
||||
@ -1,24 +0,0 @@
|
||||
project('either-1-rs', 'rust',
|
||||
version: '1.12.0',
|
||||
license: 'MIT OR Apache-2.0',
|
||||
default_options: [])
|
||||
|
||||
_either_rs = static_library(
|
||||
'either',
|
||||
files('src/lib.rs'),
|
||||
gnu_symbol_visibility: 'hidden',
|
||||
override_options: ['rust_std=2018', 'build.rust_std=2018'],
|
||||
rust_abi: 'rust',
|
||||
rust_args: [
|
||||
'--cfg', 'feature="use_std"',
|
||||
'--cfg', 'feature="use_alloc"',
|
||||
],
|
||||
dependencies: [],
|
||||
native: true,
|
||||
)
|
||||
|
||||
either_dep = declare_dependency(
|
||||
link_with: _either_rs,
|
||||
)
|
||||
|
||||
meson.override_dependency('either-1-rs', either_dep, native: true)
|
||||
@ -1,30 +0,0 @@
|
||||
project('itertools-0.11-rs', 'rust',
|
||||
version: '0.11.0',
|
||||
license: 'MIT OR Apache-2.0',
|
||||
default_options: [])
|
||||
|
||||
subproject('either-1-rs', required: true)
|
||||
|
||||
either_dep = dependency('either-1-rs', native: true)
|
||||
|
||||
_itertools_rs = static_library(
|
||||
'itertools',
|
||||
files('src/lib.rs'),
|
||||
gnu_symbol_visibility: 'hidden',
|
||||
override_options: ['rust_std=2018', 'build.rust_std=2018'],
|
||||
rust_abi: 'rust',
|
||||
rust_args: [
|
||||
'--cfg', 'feature="use_std"',
|
||||
'--cfg', 'feature="use_alloc"',
|
||||
],
|
||||
dependencies: [
|
||||
either_dep,
|
||||
],
|
||||
native: true,
|
||||
)
|
||||
|
||||
itertools_dep = declare_dependency(
|
||||
link_with: _itertools_rs,
|
||||
)
|
||||
|
||||
meson.override_dependency('itertools-0.11-rs', itertools_dep, native: true)
|
||||
@ -1,40 +0,0 @@
|
||||
project('proc-macro-error-1-rs', 'rust',
|
||||
version: '1.0.4',
|
||||
license: 'MIT OR Apache-2.0',
|
||||
default_options: [])
|
||||
|
||||
subproject('proc-macro-error-attr-1-rs', required: true)
|
||||
subproject('quote-1-rs', required: true)
|
||||
subproject('syn-2-rs', required: true)
|
||||
subproject('proc-macro2-1-rs', required: true)
|
||||
|
||||
proc_macro_error_attr_dep = dependency('proc-macro-error-attr-1-rs', native: true)
|
||||
proc_macro2_dep = dependency('proc-macro2-1-rs', native: true)
|
||||
quote_dep = dependency('quote-1-rs', native: true)
|
||||
syn_dep = dependency('syn-2-rs', native: true)
|
||||
|
||||
_proc_macro_error_rs = static_library(
|
||||
'proc_macro_error',
|
||||
files('src/lib.rs'),
|
||||
override_options: ['rust_std=2018', 'build.rust_std=2018'],
|
||||
rust_abi: 'rust',
|
||||
rust_args: [
|
||||
'--cfg', 'use_fallback',
|
||||
'--cfg', 'feature="syn-error"',
|
||||
'--cfg', 'feature="proc-macro"',
|
||||
'-A', 'non_fmt_panics'
|
||||
],
|
||||
dependencies: [
|
||||
proc_macro_error_attr_dep,
|
||||
proc_macro2_dep,
|
||||
quote_dep,
|
||||
syn_dep,
|
||||
],
|
||||
native: true,
|
||||
)
|
||||
|
||||
proc_macro_error_dep = declare_dependency(
|
||||
link_with: _proc_macro_error_rs,
|
||||
)
|
||||
|
||||
meson.override_dependency('proc-macro-error-1-rs', proc_macro_error_dep, native: true)
|
||||
@ -1,32 +0,0 @@
|
||||
project('proc-macro-error-attr-1-rs', 'rust',
|
||||
version: '1.12.0',
|
||||
license: 'MIT OR Apache-2.0',
|
||||
default_options: [])
|
||||
|
||||
subproject('proc-macro2-1-rs', required: true)
|
||||
subproject('quote-1-rs', required: true)
|
||||
|
||||
proc_macro2_dep = dependency('proc-macro2-1-rs', native: true)
|
||||
quote_dep = dependency('quote-1-rs', native: true)
|
||||
|
||||
rust = import('rust')
|
||||
_proc_macro_error_attr_rs = rust.proc_macro(
|
||||
'proc_macro_error_attr',
|
||||
files('src/lib.rs'),
|
||||
override_options: ['rust_std=2018', 'build.rust_std=2018'],
|
||||
rust_args: [
|
||||
'--cfg', 'use_fallback',
|
||||
'--cfg', 'feature="syn-error"',
|
||||
'--cfg', 'feature="proc-macro"'
|
||||
],
|
||||
dependencies: [
|
||||
proc_macro2_dep,
|
||||
quote_dep,
|
||||
],
|
||||
)
|
||||
|
||||
proc_macro_error_attr_dep = declare_dependency(
|
||||
link_with: _proc_macro_error_attr_rs,
|
||||
)
|
||||
|
||||
meson.override_dependency('proc-macro-error-attr-1-rs', proc_macro_error_attr_dep, native: true)
|
||||
@ -1,20 +0,0 @@
|
||||
project('unicode-ident-1-rs', 'rust',
|
||||
version: '1.0.12',
|
||||
license: '(MIT OR Apache-2.0) AND Unicode-DFS-2016',
|
||||
default_options: [])
|
||||
|
||||
_unicode_ident_rs = static_library(
|
||||
'unicode_ident',
|
||||
files('src/lib.rs'),
|
||||
gnu_symbol_visibility: 'hidden',
|
||||
override_options: ['rust_std=2021', 'build.rust_std=2021'],
|
||||
rust_abi: 'rust',
|
||||
dependencies: [],
|
||||
native: true,
|
||||
)
|
||||
|
||||
unicode_ident_dep = declare_dependency(
|
||||
link_with: _unicode_ident_rs,
|
||||
)
|
||||
|
||||
meson.override_dependency('unicode-ident-1-rs', unicode_ident_dep, native: true)
|
||||
@ -1,7 +0,0 @@
|
||||
[wrap-file]
|
||||
directory = proc-macro-error-1.0.4
|
||||
source_url = https://crates.io/api/v1/crates/proc-macro-error/1.0.4/download
|
||||
source_filename = proc-macro-error-1.0.4.tar.gz
|
||||
source_hash = da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c
|
||||
#method = cargo
|
||||
patch_directory = proc-macro-error-1-rs
|
||||
@ -1,7 +0,0 @@
|
||||
[wrap-file]
|
||||
directory = proc-macro-error-attr-1.0.4
|
||||
source_url = https://crates.io/api/v1/crates/proc-macro-error-attr/1.0.4/download
|
||||
source_filename = proc-macro-error-attr-1.0.4.tar.gz
|
||||
source_hash = a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869
|
||||
#method = cargo
|
||||
patch_directory = proc-macro-error-attr-1-rs
|
||||
Reference in New Issue
Block a user