diff options
| -rw-r--r-- | docs/devel/rust.rst | 3 | ||||
| -rw-r--r-- | subprojects/bilge-impl-0.2-rs.wrap | 1 | ||||
| -rw-r--r-- | subprojects/packagefiles/bilge-impl-1.63.0.patch | 45 |
3 files changed, 0 insertions, 49 deletions
diff --git a/docs/devel/rust.rst b/docs/devel/rust.rst index c7dfba98de..8167ff49aa 100644 --- 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 d14c3dc769..4f84eca1cc 100644 --- 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 index 987428a6d6..0000000000 --- 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; - let variant_name = &variant.ident; - -- let Expr::Lit(ExprLit { lit: Lit::Int(int), .. }) = discriminant_expr else { -+ if let Expr::Lit(ExprLit { lit: Lit::Int(int), .. }) = discriminant_expr { -+ let discriminant_value: u128 = int.base10_parse().unwrap_or_else(unreachable); -+ if discriminant_value > self.max_value() { -+ abort!(variant, "Value of variant exceeds the given number of bits") -+ } -+ -+ Some(discriminant_value) -+ } else { - abort!( - discriminant_expr, - "variant `{}` is not a number", variant_name; - help = "only literal integers currently supported" - ) -- }; -- -- let discriminant_value: u128 = int.base10_parse().unwrap_or_else(unreachable); -- if discriminant_value > self.max_value() { -- abort!(variant, "Value of variant exceeds the given number of bits") - } -- -- Some(discriminant_value) - } - - fn assign(&mut self, variant: &Variant) -> u128 { ---- a/src/shared/fallback.rs -+++ b/src/shared/fallback.rs -@@ -22,8 +22,9 @@ - } - Unnamed(fields) => { - let variant_fields = fields.unnamed.iter(); -- let Ok(fallback_value) = variant_fields.exactly_one() else { -- abort!(variant, "fallback variant must have exactly one field"; help = "use only one field or change to a unit variant") -+ let fallback_value = match variant_fields.exactly_one() { -+ Ok(ok) => ok, -+ _ => abort!(variant, "fallback variant must have exactly one field"; help = "use only one field or change to a unit variant") - }; - - if !is_last_variant { |