diff options
| author | Valentin Anger <syrupthinker@gryphno.de> | 2020-07-08 17:23:50 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-08 11:23:50 -0400 |
| commit | be7e0f2d490ca480aaa154845c4c5c6dccbd7546 (patch) | |
| tree | b2a2d284c490a2a1cd8ec3b6175ea5d4077cc65e /cli/state.rs | |
| parent | cbbd9443592f79f6abf9e5019840de4e01ff8580 (diff) | |
BREAKING(core): Remove control slice from ops (#6048)
Diffstat (limited to 'cli/state.rs')
| -rw-r--r-- | cli/state.rs | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/cli/state.rs b/cli/state.rs index 39bd8a565..5f3873510 100644 --- a/cli/state.rs +++ b/cli/state.rs @@ -65,7 +65,7 @@ impl State { pub fn stateful_json_op<D>( &self, dispatcher: D, - ) -> impl Fn(&mut deno_core::CoreIsolateState, &[u8], &mut [ZeroCopyBuf]) -> Op + ) -> impl Fn(&mut deno_core::CoreIsolateState, &mut [ZeroCopyBuf]) -> Op where D: Fn(&State, Value, &mut [ZeroCopyBuf]) -> Result<JsonOp, OpError>, { @@ -76,7 +76,7 @@ impl State { pub fn stateful_json_op2<D>( &self, dispatcher: D, - ) -> impl Fn(&mut deno_core::CoreIsolateState, &[u8], &mut [ZeroCopyBuf]) -> Op + ) -> impl Fn(&mut deno_core::CoreIsolateState, &mut [ZeroCopyBuf]) -> Op where D: Fn( &mut deno_core::CoreIsolateState, @@ -95,21 +95,21 @@ impl State { pub fn core_op<D>( &self, dispatcher: D, - ) -> impl Fn(&mut deno_core::CoreIsolateState, &[u8], &mut [ZeroCopyBuf]) -> Op + ) -> impl Fn(&mut deno_core::CoreIsolateState, &mut [ZeroCopyBuf]) -> Op where - D: Fn(&mut deno_core::CoreIsolateState, &[u8], &mut [ZeroCopyBuf]) -> Op, + D: Fn(&mut deno_core::CoreIsolateState, &mut [ZeroCopyBuf]) -> Op, { let state = self.clone(); move |isolate_state: &mut deno_core::CoreIsolateState, - control: &[u8], zero_copy: &mut [ZeroCopyBuf]| -> Op { - let bytes_sent_control = control.len() as u64; + let bytes_sent_control = + zero_copy.get(0).map(|s| s.len()).unwrap_or(0) as u64; let bytes_sent_zero_copy = - zero_copy.iter().map(|b| b.len()).sum::<usize>() as u64; + zero_copy[1..].iter().map(|b| b.len()).sum::<usize>() as u64; - let op = dispatcher(isolate_state, control, zero_copy); + let op = dispatcher(isolate_state, zero_copy); match op { Op::Sync(buf) => { @@ -155,7 +155,7 @@ impl State { pub fn stateful_minimal_op2<D>( &self, dispatcher: D, - ) -> impl Fn(&mut deno_core::CoreIsolateState, &[u8], &mut [ZeroCopyBuf]) -> Op + ) -> impl Fn(&mut deno_core::CoreIsolateState, &mut [ZeroCopyBuf]) -> Op where D: Fn( &mut deno_core::CoreIsolateState, |