Merging upstream version 1.75.0+dfsg1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

4 files changed, 128 insertions, 4 deletions

diff --git a/vendor/litemap/examples/language_names_hash_map.rs b/vendor/litemap/examples/language_names_hash_map.rs
index d34af7665..cb0f750b8 100644
--- a/vendor/litemap/examples/language_names_hash_map.rs
+++ b/vendor/litemap/examples/language_names_hash_map.rs
@@ -11,8 +11,7 @@
 
 icu_benchmark_macros::static_setup!();
 
-use icu_locid::subtags::Language;
-use icu_locid::subtags_language as language;
+use icu_locid::subtags::{language, Language};
 use std::collections::HashMap;
 
 const DATA: [(Language, &str); 11] = [
diff --git a/vendor/litemap/examples/language_names_lite_map.rs b/vendor/litemap/examples/language_names_lite_map.rs
index 28b4ee807..a8641bf82 100644
--- a/vendor/litemap/examples/language_names_lite_map.rs
+++ b/vendor/litemap/examples/language_names_lite_map.rs
@@ -11,8 +11,7 @@
 
 icu_benchmark_macros::static_setup!();
 
-use icu_locid::subtags::Language;
-use icu_locid::subtags_language as language;
+use icu_locid::subtags::{language, Language};
 use litemap::LiteMap;
 
 const DATA: [(Language, &str); 11] = [
diff --git a/vendor/litemap/examples/litemap_bincode.rs b/vendor/litemap/examples/litemap_bincode.rs
new file mode 100644
index 000000000..bb17aaba0
--- /dev/null
+++ b/vendor/litemap/examples/litemap_bincode.rs
@@ -0,0 +1,66 @@
+// This file is part of ICU4X. For terms of use, please see the file
+// called LICENSE at the top level of the ICU4X source tree
+// (online at: https://github.com/unicode-org/icu4x/blob/main/LICENSE ).
+
+// LiteMap is intended as a small and low-memory drop-in replacement for
+// HashMap. This example demonstrates how it works with Serde.
+
+#![no_main] // https://github.com/unicode-org/icu4x/issues/395
+
+icu_benchmark_macros::static_setup!();
+
+use litemap::LiteMap;
+
+const DATA: [(&str, &str); 11] = [
+    ("ar", "Arabic"),
+    ("bn", "Bangla"),
+    ("ccp", "Chakma"),
+    ("en", "English"),
+    ("es", "Spanish"),
+    ("fr", "French"),
+    ("ja", "Japanese"),
+    ("ru", "Russian"),
+    ("sr", "Serbian"),
+    ("th", "Thai"),
+    ("tr", "Turkish"),
+];
+
+#[allow(dead_code)]
+const BINCODE: [u8; 278] = [
+    11, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 97, 114, 6, 0, 0, 0, 0, 0, 0, 0, 65, 114, 97,
+    98, 105, 99, 2, 0, 0, 0, 0, 0, 0, 0, 98, 110, 6, 0, 0, 0, 0, 0, 0, 0, 66, 97, 110, 103, 108,
+    97, 3, 0, 0, 0, 0, 0, 0, 0, 99, 99, 112, 6, 0, 0, 0, 0, 0, 0, 0, 67, 104, 97, 107, 109, 97, 2,
+    0, 0, 0, 0, 0, 0, 0, 101, 110, 7, 0, 0, 0, 0, 0, 0, 0, 69, 110, 103, 108, 105, 115, 104, 2, 0,
+    0, 0, 0, 0, 0, 0, 101, 115, 7, 0, 0, 0, 0, 0, 0, 0, 83, 112, 97, 110, 105, 115, 104, 2, 0, 0,
+    0, 0, 0, 0, 0, 102, 114, 6, 0, 0, 0, 0, 0, 0, 0, 70, 114, 101, 110, 99, 104, 2, 0, 0, 0, 0, 0,
+    0, 0, 106, 97, 8, 0, 0, 0, 0, 0, 0, 0, 74, 97, 112, 97, 110, 101, 115, 101, 2, 0, 0, 0, 0, 0,
+    0, 0, 114, 117, 7, 0, 0, 0, 0, 0, 0, 0, 82, 117, 115, 115, 105, 97, 110, 2, 0, 0, 0, 0, 0, 0,
+    0, 115, 114, 7, 0, 0, 0, 0, 0, 0, 0, 83, 101, 114, 98, 105, 97, 110, 2, 0, 0, 0, 0, 0, 0, 0,
+    116, 104, 4, 0, 0, 0, 0, 0, 0, 0, 84, 104, 97, 105, 2, 0, 0, 0, 0, 0, 0, 0, 116, 114, 7, 0, 0,
+    0, 0, 0, 0, 0, 84, 117, 114, 107, 105, 115, 104,
+];
+
+/// Run this function to print new data to the console.
+#[allow(dead_code)]
+fn generate() {
+    let mut map = LiteMap::new_vec();
+    for (lang, name) in DATA.iter() {
+        map.try_append(lang, name).ok_or(()).unwrap_err();
+    }
+
+    let buf = bincode::serialize(&map).unwrap();
+    println!("{buf:?}");
+}
+
+#[no_mangle]
+fn main(_argc: isize, _argv: *const *const u8) -> isize {
+    icu_benchmark_macros::main_setup!();
+
+    // Uncomment the following line to re-generate the binary data.
+    // generate();
+
+    let map: LiteMap<&str, &str> = bincode::deserialize(&BINCODE).unwrap();
+    assert_eq!(map.get("tr"), Some(&"Turkish"));
+
+    0
+}
diff --git a/vendor/litemap/examples/litemap_postcard.rs b/vendor/litemap/examples/litemap_postcard.rs
new file mode 100644
index 000000000..d7033c21c
--- /dev/null
+++ b/vendor/litemap/examples/litemap_postcard.rs
@@ -0,0 +1,60 @@
+// This file is part of ICU4X. For terms of use, please see the file
+// called LICENSE at the top level of the ICU4X source tree
+// (online at: https://github.com/unicode-org/icu4x/blob/main/LICENSE ).
+
+// LiteMap is intended as a small and low-memory drop-in replacement for
+// HashMap. This example demonstrates how it works with Serde.
+
+#![no_main] // https://github.com/unicode-org/icu4x/issues/395
+
+icu_benchmark_macros::static_setup!();
+
+use litemap::LiteMap;
+
+const DATA: [(&str, &str); 11] = [
+    ("ar", "Arabic"),
+    ("bn", "Bangla"),
+    ("ccp", "Chakma"),
+    ("en", "English"),
+    ("es", "Spanish"),
+    ("fr", "French"),
+    ("ja", "Japanese"),
+    ("ru", "Russian"),
+    ("sr", "Serbian"),
+    ("th", "Thai"),
+    ("tr", "Turkish"),
+];
+
+const POSTCARD: [u8; 117] = [
+    11, 2, 97, 114, 6, 65, 114, 97, 98, 105, 99, 2, 98, 110, 6, 66, 97, 110, 103, 108, 97, 3, 99,
+    99, 112, 6, 67, 104, 97, 107, 109, 97, 2, 101, 110, 7, 69, 110, 103, 108, 105, 115, 104, 2,
+    101, 115, 7, 83, 112, 97, 110, 105, 115, 104, 2, 102, 114, 6, 70, 114, 101, 110, 99, 104, 2,
+    106, 97, 8, 74, 97, 112, 97, 110, 101, 115, 101, 2, 114, 117, 7, 82, 117, 115, 115, 105, 97,
+    110, 2, 115, 114, 7, 83, 101, 114, 98, 105, 97, 110, 2, 116, 104, 4, 84, 104, 97, 105, 2, 116,
+    114, 7, 84, 117, 114, 107, 105, 115, 104,
+];
+
+/// Run this function to print new data to the console.
+#[allow(dead_code)]
+fn generate() {
+    let mut map = LiteMap::new_vec();
+    for (lang, name) in DATA.iter() {
+        map.try_append(lang, name).ok_or(()).unwrap_err();
+    }
+
+    let buf = postcard::to_stdvec(&map).unwrap();
+    println!("{buf:?}");
+}
+
+#[no_mangle]
+fn main(_argc: isize, _argv: *const *const u8) -> isize {
+    icu_benchmark_macros::main_setup!();
+
+    // Uncomment the following line to re-generate the binary data.
+    // generate();
+
+    let map: LiteMap<&str, &str> = postcard::from_bytes(&POSTCARD).unwrap();
+    assert_eq!(map.get("tr"), Some(&"Turkish"));
+
+    0
+}