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 /deno_typescript/lib.rs | |
parent | cbbd9443592f79f6abf9e5019840de4e01ff8580 (diff) |
BREAKING(core): Remove control slice from ops (#6048)
Diffstat (limited to 'deno_typescript/lib.rs')
-rw-r--r-- | deno_typescript/lib.rs | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/deno_typescript/lib.rs b/deno_typescript/lib.rs index 54d9b1d3b..70d6d42d0 100644 --- a/deno_typescript/lib.rs +++ b/deno_typescript/lib.rs @@ -50,17 +50,16 @@ pub struct TSState { fn compiler_op<D>( ts_state: Arc<Mutex<TSState>>, dispatcher: D, -) -> impl Fn(&mut CoreIsolateState, &[u8], &mut [ZeroCopyBuf]) -> Op +) -> impl Fn(&mut CoreIsolateState, &mut [ZeroCopyBuf]) -> Op where D: Fn(&mut TSState, &[u8]) -> Op, { move |_state: &mut CoreIsolateState, - control: &[u8], zero_copy_bufs: &mut [ZeroCopyBuf]| -> Op { - assert!(zero_copy_bufs.is_empty()); // zero_copy_bufs unused in compiler. + assert_eq!(zero_copy_bufs.len(), 1, "Invalid number of arguments"); let mut s = ts_state.lock().unwrap(); - dispatcher(&mut s, control) + dispatcher(&mut s, &zero_copy_bufs[0]) } } @@ -338,16 +337,15 @@ pub fn trace_serializer() { /// CoreIsolate. pub fn op_fetch_asset<S: ::std::hash::BuildHasher>( custom_assets: HashMap<String, PathBuf, S>, -) -> impl Fn(&mut CoreIsolateState, &[u8], &mut [ZeroCopyBuf]) -> Op { +) -> impl Fn(&mut CoreIsolateState, &mut [ZeroCopyBuf]) -> Op { for (_, path) in custom_assets.iter() { println!("cargo:rerun-if-changed={}", path.display()); } move |_state: &mut CoreIsolateState, - control: &[u8], zero_copy_bufs: &mut [ZeroCopyBuf]| -> Op { - assert!(zero_copy_bufs.is_empty()); // zero_copy_bufs unused in this op. - let name = std::str::from_utf8(control).unwrap(); + assert_eq!(zero_copy_bufs.len(), 1, "Invalid number of arguments"); + let name = std::str::from_utf8(&zero_copy_bufs[0]).unwrap(); let asset_code = if let Some(source_code) = get_asset(name) { source_code.to_string() |