rust: let bilge use "let ... else"

"let ... else" was stabilized in 1.65.0; bumping the minimum supported
Rust version means we don't need to patch it out anymore.

Reviewed-by: Manos Pitsidianakis <manos.pitsidianakis@linaro.org>
Reviewed-by: Zhao Liu <zhao1.liu@intel.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

diff --git a/docs/devel/rust.rst b/docs/devel/rust.rst
index c7dfba98de173426489b71e414d04125a709ce26..8167ff49aa9cade8675470ae9765d1a316432574 100644 (file)
--- a/docs/devel/rust.rst
+++ b/docs/devel/rust.rst
@@ -76,9 +76,6 @@ are missing:
 
 * ``cast_mut()``/``cast_const()`` (1.65.0).  Use ``as`` instead.
 
-* "let ... else" (1.65.0).  Use ``if let`` instead.  This is currently patched
-  in QEMU's vendored copy of the bilge crate.
-
 * Generic Associated Types (1.65.0)
 
 * ``CStr::from_bytes_with_nul()`` as a ``const`` function (1.72.0).

diff --git a/subprojects/bilge-impl-0.2-rs.wrap b/subprojects/bilge-impl-0.2-rs.wrap
index d14c3dc769be8a8cc5fbf4d086a93fc9d961ed32..4f84eca1ccd51ec3f2076e4dd17e5bccbf073838 100644 (file)
--- a/subprojects/bilge-impl-0.2-rs.wrap
+++ b/subprojects/bilge-impl-0.2-rs.wrap
@@ -5,7 +5,6 @@ source_filename = bilge-impl-0.2.0.tar.gz
 source_hash = feb11e002038ad243af39c2068c8a72bcf147acf05025dcdb916fcc000adb2d8
 #method = cargo
 patch_directory = bilge-impl-0.2-rs
-diff_files = bilge-impl-1.63.0.patch
 
 # bump this version number on every change to meson.build or the patches:
 # v2

diff --git a/subprojects/packagefiles/bilge-impl-1.63.0.patch b/subprojects/packagefiles/bilge-impl-1.63.0.patch
deleted file mode 100644 (file)
index 987428a..0000000
--- a/subprojects/packagefiles/bilge-impl-1.63.0.patch
+++ /dev/null
@@ -1,45 +0,0 @@
---- a/src/shared/discriminant_assigner.rs
-+++ b/src/shared/discriminant_assigner.rs
-@@ -26,20 +26,20 @@
-         let discriminant_expr = &discriminant.1;\r
-         let variant_name = &variant.ident;\r
- \r
--        let Expr::Lit(ExprLit { lit: Lit::Int(int), .. }) = discriminant_expr else {\r
-+        if let Expr::Lit(ExprLit { lit: Lit::Int(int), .. }) = discriminant_expr {\r
-+            let discriminant_value: u128 = int.base10_parse().unwrap_or_else(unreachable);\r
-+            if discriminant_value > self.max_value() {\r
-+                abort!(variant, "Value of variant exceeds the given number of bits")\r
-+            }\r
-+\r
-+            Some(discriminant_value)\r
-+        } else {\r
-             abort!(\r
-                 discriminant_expr,\r
-                 "variant `{}` is not a number", variant_name;\r
-                 help = "only literal integers currently supported"\r
-             )\r
--        };\r
--\r
--        let discriminant_value: u128 = int.base10_parse().unwrap_or_else(unreachable);\r
--        if discriminant_value > self.max_value() {\r
--            abort!(variant, "Value of variant exceeds the given number of bits")\r
-         }\r
--\r
--        Some(discriminant_value)\r
-     }\r
- \r
-     fn assign(&mut self, variant: &Variant) -> u128 {\r
---- a/src/shared/fallback.rs
-+++ b/src/shared/fallback.rs
-@@ -22,8 +22,9 @@
-             }\r
-             Unnamed(fields) => {\r
-                 let variant_fields = fields.unnamed.iter();\r
--                let Ok(fallback_value) = variant_fields.exactly_one() else {\r
--                    abort!(variant, "fallback variant must have exactly one field"; help = "use only one field or change to a unit variant")\r
-+                let fallback_value = match variant_fields.exactly_one() {\r
-+                    Ok(ok) => ok,\r
-+                    _ => abort!(variant, "fallback variant must have exactly one field"; help = "use only one field or change to a unit variant")\r
-                 };\r
- \r
-                 if !is_last_variant {\r