Fix LocaleExpander::try_new_with_any_provider

components/locid_transform/src/expander.rs

@@ -317,6 +317,7 @@ impl LocaleExpander {
 
         let (likely_subtags_l, likely_subtags_sr, likely_subtags_ext) =
             match (payload_l, payload_sr, payload_ext) {
+                (Ok(l), Ok(sr), Err(_)) => (l, sr, None),
                 (Ok(l), Ok(sr), Ok(ext)) => (l, sr, Some(ext)),
                 _ => {
                     let result: DataPayload<LikelySubtagsV1Marker> =
@@ -658,6 +659,7 @@ mod tests {
             keys: vec![
                 LikelySubtagsForLanguageV1Marker::KEY,
                 LikelySubtagsForScriptRegionV1Marker::KEY,
+                LikelySubtagsExtendedV1Marker::KEY,
             ],
         };
         let lc = LocaleExpander::try_new_with_any_provider(&provider)
@@ -706,4 +708,20 @@ mod tests {
             panic!("should not create: no data present")
         };
     }
+
+    #[test]
+    fn test_new_small_keys() {
+        // Include the new small keys but not the extended key
+        let provider = RejectByKeyProvider {
+            keys: vec![
+                LikelySubtagsExtendedV1Marker::KEY,
+                LikelySubtagsV1Marker::KEY,
+            ],
+        };
+        let lc = LocaleExpander::try_new_with_any_provider(&provider)
+            .expect("should create with mixed keys");
+        let mut locale = locale!("zh-CN");
+        assert_eq!(lc.maximize(&mut locale), TransformResult::Modified);
+        assert_eq!(locale, locale!("zh-Hans-CN"));
+    }
 }