Signed-off-by: Paolo Bonzini <pbonz...@redhat.com>
---
docs/devel/rust.rst | 14 +++++---------
meson.build | 6 +++---
rust/Cargo.toml | 2 +-
rust/clippy.toml | 2 +-
4 files changed, 10 insertions(+), 14 deletions(-)
diff --git a/docs/devel/rust.rst b/docs/devel/rust.rst
index 4de86375021..139c298d462 100644
--- a/docs/devel/rust.rst
+++ b/docs/devel/rust.rst
@@ -71,21 +71,17 @@ Building Rust code with ``--enable-modules`` is not
supported yet.
Supported tools
'''''''''''''''
-QEMU supports rustc version 1.77.0 and newer. Notably, the following features
-are missing:
+QEMU supports rustc version 1.83.0 and newer. The following features
+from relatively new versions of Rust are not used for historical reasons;
+patches are welcome:
* inline const expression (stable in 1.79.0), currently worked around with
associated constants in the ``FnCall`` trait.
-* associated constants have to be explicitly marked ``'static`` (`changed in
+* associated constants are still explicitly marked ``'static`` (`changed in
1.81.0`__)
-* ``&raw`` (stable in 1.82.0). Use ``addr_of!`` and ``addr_of_mut!`` instead,
- though hopefully the need for raw pointers will go down over time.
-
-* ``new_uninit`` (stable in 1.82.0). This is used internally by the
``pinned_init``
- crate, which is planned for inclusion in QEMU, but it can be easily patched
- out.
+* ``&raw`` (stable in 1.82.0).
* referencing statics in constants (stable in 1.83.0). For now use a const
function; this is an important limitation for QEMU's migration stream
diff --git a/meson.build b/meson.build
index e77da3f9b75..7afdae0ce90 100644
--- a/meson.build
+++ b/meson.build
@@ -94,12 +94,12 @@ have_rust = have_rust and add_languages('rust', native:
true,
required: get_option('rust').disable_auto_if(not have_system))
if have_rust
rustc = meson.get_compiler('rust')
- if rustc.version().version_compare('<1.77.0')
+ if rustc.version().version_compare('<1.83.0')
if get_option('rust').enabled()
- error('rustc version ' + rustc.version() + ' is unsupported. Please
upgrade to at least 1.77.0')
+ error('rustc version ' + rustc.version() + ' is unsupported. Please
upgrade to at least 1.83.0')
else
warning('rustc version ' + rustc.version() + ' is unsupported, disabling
Rust compilation.')
- message('Please upgrade to at least 1.77.0 to use Rust.')
+ message('Please upgrade to at least 1.83.0 to use Rust.')
have_rust = false
endif
endif
diff --git a/rust/Cargo.toml b/rust/Cargo.toml
index 4f6fe17b50f..b0f779986ab 100644
--- a/rust/Cargo.toml
+++ b/rust/Cargo.toml
@@ -12,7 +12,7 @@ edition = "2021"
homepage = "https://www.qemu.org";
license = "GPL-2.0-or-later"
repository = "https://gitlab.com/qemu-project/qemu/";
-rust-version = "1.77.0"
+rust-version = "1.83.0"
[workspace.lints.rust]
unexpected_cfgs = { level = "deny", check-cfg = [
diff --git a/rust/clippy.toml b/rust/clippy.toml
index 933e46a2ffb..2fae76fb3f6 100644
--- a/rust/clippy.toml
+++ b/rust/clippy.toml
@@ -1,2 +1,2 @@
doc-valid-idents = ["PrimeCell", ".."]
-msrv = "1.77.0"
+msrv = "1.83.0"
--
2.49.0
