diff options
| -rw-r--r-- | gclient_config.py | 2 | ||||
| -rw-r--r-- | src/handlers.rs | 16 | ||||
| m--------- | third_party | 0 |
3 files changed, 9 insertions, 9 deletions
diff --git a/gclient_config.py b/gclient_config.py index 214f5ecff..a319b7ece 100644 --- a/gclient_config.py +++ b/gclient_config.py @@ -38,7 +38,7 @@ solutions = [{ # https://github.com/google/flatbuffers/pull/3894 # https://github.com/rw/flatbuffers/tree/2018-08-12--all-tests-passing 'url': - 'https://github.com/rw/flatbuffers.git@05e594342043179178da5331407eb1cd43d1cf02', + 'https://github.com/rw/flatbuffers.git@9ab5d42b4471d7df06a45fd3939e4aec8a04dfe2', 'name': 'flatbuffers' }] diff --git a/src/handlers.rs b/src/handlers.rs index d098bdfa0..7e0310ed7 100644 --- a/src/handlers.rs +++ b/src/handlers.rs @@ -12,7 +12,7 @@ use std::path::Path; pub extern "C" fn msg_from_js(d: *const DenoC, buf: deno_buf) { let bytes = unsafe { std::slice::from_raw_parts(buf.data_ptr, buf.data_len) }; - let base = msg::GetRootAsBase(bytes); + let base = msg::get_root_as_base(bytes); let msg_type = base.msg_type(); match msg_type { msg::Any::Start => { @@ -60,7 +60,7 @@ pub extern "C" fn msg_from_js(d: *const DenoC, buf: deno_buf) { _ => { assert!( false, - format!("Unhandled message {}", msg::EnumNameAny(msg_type)) + format!("Unhandled message {}", msg::enum_name_any(msg_type)) ); } } @@ -77,7 +77,7 @@ fn reply_start(d: *const DenoC) { let cwd_path = std::env::current_dir().unwrap(); let cwd_off = builder.create_string(cwd_path.to_str().unwrap()); - let msg = msg::CreateStartRes( + let msg = msg::StartRes::create( &mut builder, &msg::StartResArgs { cwd: Some(cwd_off), @@ -114,8 +114,8 @@ fn create_msg( builder: &mut flatbuffers::FlatBufferBuilder, args: &msg::BaseArgs, ) -> deno_buf { - let base = msg::CreateBase(builder, &args); - msg::FinishBaseBuffer(builder, base); + let base = msg::Base::create(builder, &args); + msg::finish_base_buffer(builder, base); let data = builder.get_active_buf_slice(); deno_buf { // TODO(ry) @@ -184,7 +184,7 @@ fn handle_code_fetch( } _ => (), }; - let msg = msg::CreateCodeFetchRes(&mut builder, &msg_args); + let msg = msg::CodeFetchRes::create(&mut builder, &msg_args); let args = msg::BaseArgs { msg: Some(flatbuffers::Offset::new(msg.value())), msg_type: msg::Any::CodeFetchRes, @@ -265,7 +265,7 @@ where // TODO(ry) Use Deno instead of DenoC as first arg. fn send_timer_ready(d: *const DenoC, timer_id: u32, done: bool) { let mut builder = flatbuffers::FlatBufferBuilder::new(); - let msg = msg::CreateTimerReady( + let msg = msg::TimerReady::create( &mut builder, &msg::TimerReadyArgs { id: timer_id, @@ -300,7 +300,7 @@ fn handle_read_file_sync(d: *const DenoC, filename: &str) { let mut builder = flatbuffers::FlatBufferBuilder::new(); let vec = result.unwrap(); let data_off = builder.create_byte_vector(vec.as_slice()); - let msg = msg::CreateReadFileSyncRes( + let msg = msg::ReadFileSyncRes::create( &mut builder, &msg::ReadFileSyncResArgs { data: Some(data_off), diff --git a/third_party b/third_party -Subproject a5e8ed0c36f4d878a96ec8c41874e19abe46605 +Subproject cd487d4d507e8fb9b4ae8f114e98474e6f51bd8 |