Merge pull request #117 from scpwiki/dependencies

[chore] Update dependencies

Author: emmiegit

.tarpaulin.toml

@@ -4,6 +4,7 @@ all-features = true
 workspace = true
 exclude-files = [
     "src/wasm/*",
+    "src/render/html/random.rs",
 ]
 
 [report]

Cargo.toml

@@ -8,7 +8,7 @@ keywords = ["wikidot", "wikijump", "ftml", "parsing", "html"]
 categories = ["parser-implementations"]
 exclude = [".gitignore", ".editorconfig"]
 
-version = "1.41.0"
+version = "1.42.0"
 authors = ["Emmie Smith <emmie.maeda@gmail.com>"]
 edition = "2024"
 
@@ -27,19 +27,19 @@ mathml   = ["html", "latex2mathml"]
 cfg-if = "1"
 enum-map = "2"
 entities = "1"
-icu_calendar = "2.1"
-icu_decimal = "2.1"
-icu_datetime = { version = "2.1", features = ["compiled_data"] }
-icu_experimental = { version = "0.4", features = ["compiled_data"] }
-icu_locale = "2.1"
+icu_calendar = "2.2"
+icu_decimal = "2.2"
+icu_datetime = { version = "2.2", features = ["compiled_data"] }
+icu_experimental = { version = "0.5", features = ["compiled_data"] }
+icu_locale = "2.2"
 latex2mathml = { version = "0.2", optional = true }
-lightningcss = { version = "1.0.0-alpha.67", optional = true }
+lightningcss = { version = "1.0.0-alpha.70", optional = true }
 log = "0.4"
 maplit = "1"
 pest = "2"
 pest_derive = "2"
-rand = { version = "0.9", features = ["small_rng"] }
-ref-map = "0.1"
+rand = "0.10"
+ref-map = "0.2"
 regex = "1"
 serde = { version = "1", features = ["derive"] }
 serde_json = "1"
@@ -62,7 +62,14 @@ proptest = "1"
 termcolor = "1"
 
 [target.'cfg(target_arch = "wasm32")'.dependencies]
-getrandom = { version = "0.3", features = ["wasm_js"] }
+getrandom = { version = "0.4", features = ["wasm_js"] }
+# Ugly annoying bullshit because downstream packages depend on
+# getrandom v3, but for WASM we need this feature flag or only
+# these versions of getrandom won't be able to get OS entropy.
+#
+# I hate this and we should remove this once all child dependencies
+# stop depending on this version. Ugh.
+getrandom3 = { package = "getrandom", version = "0.3", features = ["wasm_js"] }
 self_cell = "1.0"
 wasm-bindgen = { version = "0.2", features = ["serde-serialize"] }
 web-sys = { version = "0.3", features = ["console"] }

src/includes/includer/debug.rs

@@ -90,7 +90,7 @@ impl<'t> Display for MapWrap<'_, 't> {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
         // Get all entries and sort by key
         let mut entries: Vec<(&Cow<'t, str>, &Cow<'t, str>)> = self.0.iter().collect();
-        entries.sort_by(|(key1, _), (key2, _)| key1.cmp(key2));
+        entries.sort_by_key(|(key, _)| *key);
 
         // Write all entries
         write!(f, "{{")?;

src/render/html/random.rs

@@ -19,15 +19,8 @@
  */
 
 use cfg_if::cfg_if;
-use rand::{Rng, SeedableRng, distr::Alphanumeric, rngs::SmallRng};
-use std::iter;
-
-#[cfg(test)]
-const TEST_RANDOM_SEED: [u8; 32] = [
-    0x53, 0x43, 0x50, 0x2d, 0x31, 0x37, 0x33, 0x3a, 0x20, 0x4d, 0x6f, 0x76, 0x65, 0x64,
-    0x20, 0x74, 0x6f, 0x20, 0x53, 0x69, 0x74, 0x65, 0x2d, 0x31, 0x39, 0x20, 0x31, 0x39,
-    0x39, 0x33, 0x2e, 0x0a,
-];
+use rand::distr::{Alphanumeric, SampleString};
+use rand::rngs::SmallRng;
 
 #[derive(Debug)]
 pub struct Random {
@@ -39,9 +32,10 @@ impl Default for Random {
     fn default() -> Self {
         cfg_if! {
             if #[cfg(test)] {
-                let rng = SmallRng::from_seed(TEST_RANDOM_SEED);
+                use rand::SeedableRng;
+                let rng = SmallRng::seed_from_u64(1);
             } else {
-                let rng = SmallRng::from_rng(&mut rand::rng());
+                let rng = rand::make_rng();
             }
         }
 
@@ -52,13 +46,7 @@ impl Default for Random {
 impl Random {
     pub fn generate_html_id_into(&mut self, buffer: &mut String) {
         buffer.push_str("wj-id-");
-
-        let char_stream = iter::repeat(())
-            .map(|_| self.rng.sample(Alphanumeric))
-            .map(char::from)
-            .take(16);
-
-        buffer.extend(char_stream);
+        Alphanumeric.append_string(&mut self.rng, buffer, 16);
     }
 
     pub fn generate_html_id(&mut self) -> String {
@@ -80,13 +68,13 @@ fn html_id() {
 
     rand.generate_html_id_into(&mut buffer);
     assert_eq!(
-        buffer, "wj-id-bW5Ql2DLZtnd9s18",
+        buffer, "wj-id-zvGvLlhGI6VEZFKj",
         "Generated HTML ID doesn't match expected",
     );
 
     let html_id = rand.generate_html_id();
     assert_eq!(
-        html_id, "wj-id-ePZbhugrfP89c4Fk",
+        html_id, "wj-id-e9pQyKaPmLnulpgn",
         "Generated HTML ID doesn't match expected",
     );
 }

src/tree/date.rs

@@ -338,34 +338,35 @@ fn append_relative_time(
     let formatter = match unit {
         RelativeTimeUnit::Second => RelativeTimeFormatter::try_new_long_second(
             prefs,
-            RelativeTimeFormatterOptions {
-                numeric: Numeric::Always,
-            },
+            relative_time_fmt_options(Numeric::Always),
         ),
         RelativeTimeUnit::Minute => RelativeTimeFormatter::try_new_long_minute(
             prefs,
-            RelativeTimeFormatterOptions {
-                numeric: Numeric::Always,
-            },
+            relative_time_fmt_options(Numeric::Always),
         ),
         RelativeTimeUnit::Hour => RelativeTimeFormatter::try_new_long_hour(
             prefs,
-            RelativeTimeFormatterOptions {
-                numeric: Numeric::Always,
-            },
+            relative_time_fmt_options(Numeric::Always),
         ),
         RelativeTimeUnit::Day => RelativeTimeFormatter::try_new_long_day(
             prefs,
-            RelativeTimeFormatterOptions {
-                numeric: Numeric::Auto,
-            },
+            relative_time_fmt_options(Numeric::Auto),
         ),
     }
     .map_err(localization_error)?;
 
     append_normalized_display(rendered, formatter.format(Decimal::from(value)))
 }
 
+/// Helper to create a `RelativeTimeFormatterOptions`.
+/// Because the struct is non-exhaustive, we cannot use the struct syntax to
+/// create new instances here.
+fn relative_time_fmt_options(numeric: Numeric) -> RelativeTimeFormatterOptions {
+    let mut options = RelativeTimeFormatterOptions::default();
+    options.numeric = numeric;
+    options
+}
+
 fn relative_time_value(datetime: OffsetDateTime) -> (i64, RelativeTimeUnit) {
     let delta_seconds = datetime.unix_timestamp() - now().timestamp();
     let abs_delta = delta_seconds.unsigned_abs();