From: Mike Hommey <mh@glandium.org>
Date: Tue, 19 Dec 2023 23:47:32 +0000 (+0900)
Subject: Allow to build oxilangtag-ffi with rustc < 1.65
X-Git-Tag: archive/raspbian/115.15.0esr-1_deb12u1+rpi1~10
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=126f9dddd3e662c8ca41ddd2b0abb34b286758a0;p=firefox-esr.git

Allow to build oxilangtag-ffi with rustc < 1.65


Gbp-Pq: Topic debian-hacks
Gbp-Pq: Name Allow-to-build-oxilangtag-ffi-with-rustc-1.65.patch
---

diff --git a/intl/locale/rust/oxilangtag-ffi/src/lib.rs b/intl/locale/rust/oxilangtag-ffi/src/lib.rs
index 5a30e9b77f4..e647fb0ae60 100644
--- a/intl/locale/rust/oxilangtag-ffi/src/lib.rs
+++ b/intl/locale/rust/oxilangtag-ffi/src/lib.rs
@@ -85,7 +85,9 @@ pub extern "C" fn lang_tag_matches(attribute: *const LangTag, selector: &nsACStr
     loop {
         // 4.  When the language range's list has no more subtags, the match
         // succeeds.
-        let Some(range_subtag_str) = range_subtag else {
+        let range_subtag_str = if let Some(range_subtag_str) = range_subtag {
+            range_subtag_str
+        } else {
             return true;
         };
 
@@ -99,7 +101,9 @@ pub extern "C" fn lang_tag_matches(attribute: *const LangTag, selector: &nsACStr
 
         // B.  Else, if there are no more subtags in the language tag's
         //     list, the match fails.
-        let Some(lang_subtag_str) = lang_subtag else {
+        let lang_subtag_str = if let Some(lang_subtag_str) = lang_subtag {
+            lang_subtag_str
+        } else {
             return false;
         };