RKYV v8

Cargo.toml

@@ -27,22 +27,23 @@ unimplemented = "warn"
 cargo         = { level = "warn", priority = -1 }
 
 [workspace.dependencies]
-anyhow = "1.0"
-criterion2 = { version = "2.0.0", default-features = false }
-indexmap = "2.1"
-nom = "7.1"
-pico-args = "0.5.0"
+anyhow       = "1.0"
+criterion2   = { version = "2.0.0", default-features = false }
+indexmap     = "2.1"
+nom          = "7.1"
+pico-args    = "0.5.0"
 prettyplease = "0.2.20"
-proc-macro2 = "1.0.84"
+proc-macro2  = "1.0.84"
 project-root = "0.2.2"
-quote = "1.0"
-rustc-hash = "2.0.0"
-serde = "1.0"
-serde_json = "1.0"
-syn = "2"
-test-case = "3.3"
-thiserror = "1.0"
-time = "0.3.36"
+quote        = "1.0"
+rustc-hash   = "2.0.0"
+serde        = "1.0"
+serde_json   = "1.0"
+syn          = "2"
+test-case    = "3.3"
+thiserror    = "1.0"
+time         = "0.3.36"
+rkyv         = { version = "0.8.8", default-features = false, features = ["alloc", "std"] }
 
 [lints]
 workspace = true
@@ -61,6 +62,7 @@ nom        = { workspace = true }
 serde      = { workspace = true, features = ["derive"] }
 serde_json = { workspace = true }
 thiserror  = { workspace = true }
+rkyv       = { workspace = true }
 
 [dev-dependencies]
 pico-args  = { workspace = true }

src/data/caniuse.rs

@@ -1,5 +1,7 @@
 use std::{borrow::Cow, sync::OnceLock};
 
+use rkyv::Archive as RkyvArchive;
+use rkyv::Deserialize as RkyvDeserialize;
 use rustc_hash::FxHashMap;
 
 use crate::data::BrowserName;
@@ -10,23 +12,22 @@ pub mod region;
 pub const ANDROID_EVERGREEN_FIRST: f32 = 37.0;
 pub const OP_MOB_BLINK_FIRST: u32 = 14;
 
-#[derive(Clone, Debug)]
+#[derive(RkyvArchive, RkyvDeserialize, Clone, Debug)]
 pub struct BrowserStat {
-    pub name: BrowserName,
+    pub name: String, /* Browser name */
     pub version_list: Vec<VersionDetail>,
 }
 
-#[derive(Clone, Debug)]
+#[derive(RkyvArchive, RkyvDeserialize, Clone, Debug)]
 pub struct VersionDetail {
-    pub version: &'static str,
+    pub version: String,
     pub global_usage: f32,
     pub release_date: Option<i64>,
 }
 
-pub type CaniuseData = FxHashMap<BrowserName, BrowserStat>;
-
 pub use crate::generated::{
-    caniuse_browsers::caniuse_browsers, caniuse_global_usage::CANIUSE_GLOBAL_USAGE,
+    caniuse_browsers::caniuse_browsers, caniuse_browsers::caniuse_browsers_android_to_desktop,
+    caniuse_global_usage::caniuse_global_usage,
 };
 
 pub fn browser_version_aliases(
@@ -45,7 +46,7 @@ pub fn browser_version_aliases(
                         version
                             .version
                             .split_once('-')
-                            .map(|(bottom, top)| (bottom, top, version.version))
+                            .map(|(bottom, top)| (bottom, top, version.version.as_str()))
                     })
                     .fold(
                         FxHashMap::<&str, &str>::default(),
@@ -58,7 +59,7 @@ pub fn browser_version_aliases(
                 if aliases.is_empty() {
                     None
                 } else {
-                    Some((*name, aliases))
+                    Some((name.as_str(), aliases))
                 }
             })
             .collect::<FxHashMap<BrowserName, _>>();
@@ -71,49 +72,10 @@ pub fn browser_version_aliases(
     })
 }
 
-fn android_to_desktop() -> &'static BrowserStat {
-    static ANDROID_TO_DESKTOP: OnceLock<BrowserStat> = OnceLock::new();
-    ANDROID_TO_DESKTOP.get_or_init(|| {
-        let chrome = &caniuse_browsers()["chrome"];
-        let mut android = caniuse_browsers()["android"].clone();
-
-        android.version_list = android
-            .version_list
-            .into_iter()
-            .filter(|version| {
-                let version = version.version;
-                version.starts_with("2.")
-                    || version.starts_with("3.")
-                    || version.starts_with("4.")
-                    || version == "3"
-                    || version == "4"
-            })
-            .chain(
-                chrome
-                    .version_list
-                    .iter()
-                    .skip(
-                        chrome
-                            .version_list
-                            .iter()
-                            .position(|version| {
-                                version.version.parse::<usize>().unwrap()
-                                    == ANDROID_EVERGREEN_FIRST as usize
-                            })
-                            .unwrap(),
-                    )
-                    .cloned(),
-            )
-            .collect();
-
-        android.clone()
-    })
-}
-
 pub fn get_browser_stat(
     name: &str,
     mobile_to_desktop: bool,
-) -> Option<(&'static str, &'static BrowserStat)> {
+) -> Option<(&'static str, &'static ArchivedBrowserStat)> {
     let name = if name.bytes().all(|b| b.is_ascii_lowercase()) {
         Cow::Borrowed(name)
     } else {
@@ -124,17 +86,17 @@ pub fn get_browser_stat(
     if mobile_to_desktop {
         if let Some(desktop_name) = to_desktop_name(name) {
             match name {
-                "android" => Some(("android", android_to_desktop())),
+                "android" => Some(("android", caniuse_browsers_android_to_desktop())),
                 "op_mob" => Some(("op_mob", &caniuse_browsers()["opera"])),
                 _ => caniuse_browsers()
                     .get(desktop_name)
                     .map(|stat| (get_mobile_by_desktop_name(desktop_name), stat)),
             }
         } else {
-            caniuse_browsers().get(name).map(|stat| (stat.name, stat))
+            caniuse_browsers().get(name).map(|stat| (stat.name.as_str(), stat))
         }
     } else {
-        caniuse_browsers().get(name).map(|stat| (stat.name, stat))
+        caniuse_browsers().get(name).map(|stat| (stat.name.as_str(), stat))
     }
 }
 
@@ -174,15 +136,18 @@ fn get_mobile_by_desktop_name(name: &str) -> &'static str {
     }
 }
 
-pub fn normalize_version<'a>(stat: &'static BrowserStat, version: &'a str) -> Option<&'a str> {
+pub fn normalize_version<'a>(
+    stat: &'static ArchivedBrowserStat,
+    version: &'a str,
+) -> Option<&'a str> {
     if stat.version_list.iter().any(|v| v.version == version) {
         Some(version)
     } else if let Some(version) =
-        browser_version_aliases().get(&stat.name).and_then(|aliases| aliases.get(version))
+        browser_version_aliases().get(stat.name.as_str()).and_then(|aliases| aliases.get(version))
     {
         Some(version)
     } else if stat.version_list.len() == 1 {
-        stat.version_list.first().map(|s| s.version)
+        stat.version_list.first().map(|s| s.version.as_str())
     } else {
         None
     }