refactor: simplify icu data alignment (denoland#9766)

zenozeng · Mar 12, 2021 · 10b99e8 · 10b99e8
1 parent fbec6e3
commit 10b99e8
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 14 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/core/Cargo.toml b/core/Cargo.toml
@@ -13,7 +13,6 @@ repository = "https://github.com/denoland/deno"
 path = "lib.rs"
 
 [dependencies]
-align-data = "0.1"
 anyhow = "1.0.38"
 futures = "0.3.12"
 indexmap = "1.6.1"

diff --git a/core/runtime.rs b/core/runtime.rs
@@ -200,12 +200,10 @@ impl JsRuntime {
  static DENO_INIT: Once = Once::new();
  DENO_INIT.call_once(|| {
  // Include 10MB ICU data file.
- assert!(v8::icu::set_common_data(align_data::include_aligned!(
- align_data::Align16,
- "icudtl.dat"
- ))
- .is_ok());
-
+ #[repr(C, align(16))]
+ struct ICUData([u8; 10413584]);
+ static ICU_DATA: ICUData = ICUData(*include_bytes!("icudtl.dat"));
+ v8::icu::set_common_data(&ICU_DATA.0).unwrap();
  unsafe { v8_init() };
  });