Skip to content

Commit

Permalink
update deps
Browse files Browse the repository at this point in the history
  • Loading branch information
devsnek committed Sep 17, 2024
1 parent 4e43191 commit f04ea83
Show file tree
Hide file tree
Showing 14 changed files with 23 additions and 17 deletions.
5 changes: 4 additions & 1 deletion .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
url = https://chromium.googlesource.com/chromium/src/buildtools.git
[submodule "third_party/icu"]
path = third_party/icu
url = https://github.com/denoland/icu.git
url = https://chromium.googlesource.com/chromium/deps/icu.git
[submodule "third_party/abseil-cpp"]
path = third_party/abseil-cpp
url = https://chromium.googlesource.com/chromium/src/third_party/abseil-cpp.git
Expand All @@ -34,3 +34,6 @@
[submodule "third_party/libunwind/src"]
path = third_party/libunwind/src
url = https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libunwind.git
[submodule "third_party/fast_float/src"]
path = third_party/fast_float/src
url = https://chromium.googlesource.com/external/github.com/fastfloat/fast_float.git
4 changes: 3 additions & 1 deletion .gn
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ default_args = {

# Enable V8 object print for debugging.
# v8_enable_object_print = true

# V8 12.3 added google/fuzztest as a third party dependency.
# https://chromium.googlesource.com/v8/v8.git/+/d5acece0c9b89b18716c177d1fcc8f734191e1e2%5E%21/#F4
#
Expand All @@ -92,4 +92,6 @@ default_args = {
v8_enable_v8_checks = false

use_relative_vtables_abi = false

v8_depend_on_icu_data_file = false
}
2 changes: 1 addition & 1 deletion build
Submodule build updated 119 files
2 changes: 1 addition & 1 deletion buildtools
Submodule buildtools updated from 60a590 to a7a84a
4 changes: 2 additions & 2 deletions src/binding.cc
Original file line number Diff line number Diff line change
Expand Up @@ -3739,8 +3739,8 @@ void v8__CompiledWasmModule__DELETE(v8::CompiledWasmModule* self) {
extern "C" {

size_t icu_get_default_locale(char* output, size_t output_len) {
const icu_73::Locale& default_locale = icu::Locale::getDefault();
icu_73::CheckedArrayByteSink sink(output, static_cast<uint32_t>(output_len));
const icu_74::Locale& default_locale = icu::Locale::getDefault();
icu_74::CheckedArrayByteSink sink(output, static_cast<uint32_t>(output_len));
UErrorCode status = U_ZERO_ERROR;
default_locale.toLanguageTag(sink, status);
assert(status == U_ZERO_ERROR);
Expand Down
8 changes: 4 additions & 4 deletions src/icu.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,14 @@ use std::ffi::CString;
extern "C" {
fn icu_get_default_locale(output: *mut char, output_len: usize) -> usize;
fn icu_set_default_locale(locale: *const char);
fn udata_setCommonData_73(this: *const u8, error_code: *mut i32);
fn udata_setCommonData_74(this: *const u8, error_code: *mut i32);
}

/// This function bypasses the normal ICU data loading process and allows you to force ICU's system
/// data to come out of a user-specified area in memory.
///
/// ICU data must be at least 8-aligned, and should be 16-aligned. See
/// https://unicode-org.github.io/icu/userguide/icudata
/// https://unicode-org.github.io/icu/userguide/icu_data/
///
/// The format of this data is that of the icu common data file, as is generated by the pkgdata
/// tool with mode=common or mode=dll. You can read in a whole common mode file and pass the
Expand Down Expand Up @@ -42,10 +42,10 @@ extern "C" {
/// functionality for application data.
// TODO(ry) Map error code to something useful.
#[inline(always)]
pub fn set_common_data_73(data: &'static [u8]) -> Result<(), i32> {
pub fn set_common_data_74(data: &'static [u8]) -> Result<(), i32> {
let mut error_code = 0i32;
unsafe {
udata_setCommonData_73(data.as_ptr(), &mut error_code);
udata_setCommonData_74(data.as_ptr(), &mut error_code);
}
if error_code == 0 {
Ok(())
Expand Down
2 changes: 1 addition & 1 deletion third_party/abseil-cpp
Submodule abseil-cpp updated from ed3733 to 1f7e21
1 change: 1 addition & 0 deletions third_party/fast_float/src
Submodule src added at 3e57d8
2 changes: 1 addition & 1 deletion third_party/icu
Submodule icu updated from a22a8f to 9408c6
2 changes: 1 addition & 1 deletion third_party/libc++/src
Submodule src updated from f801c9 to 50ab69
2 changes: 1 addition & 1 deletion third_party/libc++abi/src
Submodule src updated from eb6567 to 29b2e9
2 changes: 1 addition & 1 deletion third_party/libunwind/src
Submodule src updated from 116c20 to dc7013
2 changes: 1 addition & 1 deletion tools/clang
Submodule clang updated from 63b7be to e47c18
2 changes: 1 addition & 1 deletion tools/update_deps.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
import subprocess

def process(name, dep):
if name == 'build' or name == 'third_party/icu':
if name == 'build':
# We have our own fork of this
return

Expand Down

0 comments on commit f04ea83

Please sign in to comment.