diff options
| author | Ben Noordhuis <info@bnoordhuis.nl> | 2021-03-12 23:55:32 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-12 23:55:32 +0100 |
| commit | 10b99e8eb0e04e8340187b8aafe860405114d0d7 (patch) | |
| tree | fcbadf5f7f89a230b25d817848caf1dbcbfe3eec | |
| parent | fbec6e39c7bc85a3f8a0d2a70192935be367e646 (diff) | |
refactor: simplify icu data alignment (#9766)
| -rw-r--r-- | Cargo.lock | 7 | ||||
| -rw-r--r-- | core/Cargo.toml | 1 | ||||
| -rw-r--r-- | core/runtime.rs | 10 |
3 files changed, 4 insertions, 14 deletions
diff --git a/Cargo.lock b/Cargo.lock index 21be33946..8b4ca9c41 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -43,12 +43,6 @@ dependencies = [ ] [[package]] -name = "align-data" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1926655ba000b19e21f0402be09a1d52d318c8a8a68622870bfb7af2a71315cd" - -[[package]] name = "alloc-no-stdlib" version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -563,7 +557,6 @@ dependencies = [ name = "deno_core" version = "0.81.0" dependencies = [ - "align-data", "anyhow", "futures", "indexmap", diff --git a/core/Cargo.toml b/core/Cargo.toml index d31727f8f..7e6802c76 100644 --- 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 index f6d0ab5a6..c7a945717 100644 --- 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() }; }); |