summaryrefslogtreecommitdiff
path: root/cli
diff options
context:
space:
mode:
Diffstat (limited to 'cli')
-rw-r--r--cli/build.rs6
-rw-r--r--cli/ops/compiler.rs6
-rw-r--r--cli/ops/dispatch_json.rs6
-rw-r--r--cli/ops/dispatch_minimal.rs8
-rw-r--r--cli/ops/errors.rs4
-rw-r--r--cli/ops/fetch.rs2
-rw-r--r--cli/ops/files.rs6
-rw-r--r--cli/ops/fs.rs34
-rw-r--r--cli/ops/io.rs4
-rw-r--r--cli/ops/net.rs8
-rw-r--r--cli/ops/os.rs18
-rw-r--r--cli/ops/permissions.rs6
-rw-r--r--cli/ops/plugins.rs2
-rw-r--r--cli/ops/process.rs6
-rw-r--r--cli/ops/random.rs2
-rw-r--r--cli/ops/repl.rs4
-rw-r--r--cli/ops/resources.rs2
-rw-r--r--cli/ops/runtime_compiler.rs4
-rw-r--r--cli/ops/signal.rs12
-rw-r--r--cli/ops/timers.rs6
-rw-r--r--cli/ops/tls.rs6
-rw-r--r--cli/ops/web_worker.rs4
-rw-r--r--cli/ops/worker_host.rs16
-rw-r--r--cli/state.rs28
24 files changed, 102 insertions, 98 deletions
diff --git a/cli/build.rs b/cli/build.rs
index f8e348f52..b57b86b91 100644
--- a/cli/build.rs
+++ b/cli/build.rs
@@ -2,16 +2,16 @@
use deno_core::CoreOp;
use deno_core::Isolate;
use deno_core::Op;
-use deno_core::PinnedBuf;
use deno_core::StartupData;
+use deno_core::ZeroCopyBuf;
use std::collections::HashMap;
use std::env;
use std::path::PathBuf;
fn op_fetch_asset(
custom_assets: HashMap<String, PathBuf>,
-) -> impl Fn(&[u8], Option<PinnedBuf>) -> CoreOp {
- move |control: &[u8], zero_copy_buf: Option<PinnedBuf>| -> CoreOp {
+) -> impl Fn(&[u8], Option<ZeroCopyBuf>) -> CoreOp {
+ move |control: &[u8], zero_copy_buf: Option<ZeroCopyBuf>| -> CoreOp {
assert!(zero_copy_buf.is_none()); // zero_copy_buf unused in this op.
let custom_assets = custom_assets.clone();
let name = std::str::from_utf8(control).unwrap();
diff --git a/cli/ops/compiler.rs b/cli/ops/compiler.rs
index e515081df..2d0ffe1f3 100644
--- a/cli/ops/compiler.rs
+++ b/cli/ops/compiler.rs
@@ -30,7 +30,7 @@ struct CacheArgs {
fn op_cache(
state: &ThreadSafeState,
args: Value,
- _zero_copy: Option<PinnedBuf>,
+ _zero_copy: Option<ZeroCopyBuf>,
) -> Result<JsonOp, ErrBox> {
let args: CacheArgs = serde_json::from_value(args)?;
@@ -55,7 +55,7 @@ struct SpecifiersReferrerArgs {
fn op_resolve_modules(
state: &ThreadSafeState,
args: Value,
- _data: Option<PinnedBuf>,
+ _data: Option<ZeroCopyBuf>,
) -> Result<JsonOp, ErrBox> {
let args: SpecifiersReferrerArgs = serde_json::from_value(args)?;
@@ -86,7 +86,7 @@ fn op_resolve_modules(
fn op_fetch_source_files(
state: &ThreadSafeState,
args: Value,
- _data: Option<PinnedBuf>,
+ _data: Option<ZeroCopyBuf>,
) -> Result<JsonOp, ErrBox> {
let args: SpecifiersReferrerArgs = serde_json::from_value(args)?;
diff --git a/cli/ops/dispatch_json.rs b/cli/ops/dispatch_json.rs
index 87cfff51d..0b053b1e8 100644
--- a/cli/ops/dispatch_json.rs
+++ b/cli/ops/dispatch_json.rs
@@ -48,11 +48,11 @@ struct AsyncArgs {
promise_id: Option<u64>,
}
-pub fn json_op<D>(d: D) -> impl Fn(&[u8], Option<PinnedBuf>) -> CoreOp
+pub fn json_op<D>(d: D) -> impl Fn(&[u8], Option<ZeroCopyBuf>) -> CoreOp
where
- D: Fn(Value, Option<PinnedBuf>) -> Result<JsonOp, ErrBox>,
+ D: Fn(Value, Option<ZeroCopyBuf>) -> Result<JsonOp, ErrBox>,
{
- move |control: &[u8], zero_copy: Option<PinnedBuf>| {
+ move |control: &[u8], zero_copy: Option<ZeroCopyBuf>| {
let async_args: AsyncArgs = match serde_json::from_slice(control) {
Ok(args) => args,
Err(e) => {
diff --git a/cli/ops/dispatch_minimal.rs b/cli/ops/dispatch_minimal.rs
index 2d5618d65..b9a4f7530 100644
--- a/cli/ops/dispatch_minimal.rs
+++ b/cli/ops/dispatch_minimal.rs
@@ -11,7 +11,7 @@ use deno_core::Buf;
use deno_core::CoreOp;
use deno_core::ErrBox;
use deno_core::Op;
-use deno_core::PinnedBuf;
+use deno_core::ZeroCopyBuf;
use futures::future::FutureExt;
use std::future::Future;
use std::pin::Pin;
@@ -113,11 +113,11 @@ fn test_parse_min_record() {
assert_eq!(parse_min_record(&buf), None);
}
-pub fn minimal_op<D>(d: D) -> impl Fn(&[u8], Option<PinnedBuf>) -> CoreOp
+pub fn minimal_op<D>(d: D) -> impl Fn(&[u8], Option<ZeroCopyBuf>) -> CoreOp
where
- D: Fn(i32, Option<PinnedBuf>) -> Pin<Box<MinimalOp>>,
+ D: Fn(i32, Option<ZeroCopyBuf>) -> Pin<Box<MinimalOp>>,
{
- move |control: &[u8], zero_copy: Option<PinnedBuf>| {
+ move |control: &[u8], zero_copy: Option<ZeroCopyBuf>| {
let mut record = match parse_min_record(control) {
Some(r) => r,
None => {
diff --git a/cli/ops/errors.rs b/cli/ops/errors.rs
index 19a92c8e7..14edf9cee 100644
--- a/cli/ops/errors.rs
+++ b/cli/ops/errors.rs
@@ -27,7 +27,7 @@ struct FormatErrorArgs {
fn op_format_error(
state: &ThreadSafeState,
args: Value,
- _zero_copy: Option<PinnedBuf>,
+ _zero_copy: Option<ZeroCopyBuf>,
) -> Result<JsonOp, ErrBox> {
let args: FormatErrorArgs = serde_json::from_value(args)?;
let error = JSError::from_json(&args.error, &state.global_state.ts_compiler);
@@ -47,7 +47,7 @@ struct ApplySourceMap {
fn op_apply_source_map(
state: &ThreadSafeState,
args: Value,
- _zero_copy: Option<PinnedBuf>,
+ _zero_copy: Option<ZeroCopyBuf>,
) -> Result<JsonOp, ErrBox> {
let args: ApplySourceMap = serde_json::from_value(args)?;
diff --git a/cli/ops/fetch.rs b/cli/ops/fetch.rs
index e084fdeff..ba7f7a949 100644
--- a/cli/ops/fetch.rs
+++ b/cli/ops/fetch.rs
@@ -26,7 +26,7 @@ struct FetchArgs {
pub fn op_fetch(
state: &ThreadSafeState,
args: Value,
- data: Option<PinnedBuf>,
+ data: Option<ZeroCopyBuf>,
) -> Result<JsonOp, ErrBox> {
let args: FetchArgs = serde_json::from_value(args)?;
let url = args.url;
diff --git a/cli/ops/files.rs b/cli/ops/files.rs
index 3c17a607e..76a0191fd 100644
--- a/cli/ops/files.rs
+++ b/cli/ops/files.rs
@@ -45,7 +45,7 @@ struct OpenOptions {
fn op_open(
state: &ThreadSafeState,
args: Value,
- _zero_copy: Option<PinnedBuf>,
+ _zero_copy: Option<ZeroCopyBuf>,
) -> Result<JsonOp, ErrBox> {
let args: OpenArgs = serde_json::from_value(args)?;
let filename = deno_fs::resolve_from_cwd(Path::new(&args.filename))?;
@@ -151,7 +151,7 @@ struct CloseArgs {
fn op_close(
state: &ThreadSafeState,
args: Value,
- _zero_copy: Option<PinnedBuf>,
+ _zero_copy: Option<ZeroCopyBuf>,
) -> Result<JsonOp, ErrBox> {
let args: CloseArgs = serde_json::from_value(args)?;
@@ -172,7 +172,7 @@ struct SeekArgs {
fn op_seek(
state: &ThreadSafeState,
args: Value,
- _zero_copy: Option<PinnedBuf>,
+ _zero_copy: Option<ZeroCopyBuf>,
) -> Result<JsonOp, ErrBox> {
let args: SeekArgs = serde_json::from_value(args)?;
let rid = args.rid as u32;
diff --git a/cli/ops/fs.rs b/cli/ops/fs.rs
index 80972aef1..b7a8732d1 100644
--- a/cli/ops/fs.rs
+++ b/cli/ops/fs.rs
@@ -49,7 +49,7 @@ struct ChdirArgs {
fn op_chdir(
_state: &ThreadSafeState,
args: Value,
- _zero_copy: Option<PinnedBuf>,
+ _zero_copy: Option<ZeroCopyBuf>,
) -> Result<JsonOp, ErrBox> {
let args: ChdirArgs = serde_json::from_value(args)?;
std::env::set_current_dir(&args.directory)?;
@@ -68,7 +68,7 @@ struct MkdirArgs {
fn op_mkdir(
state: &ThreadSafeState,
args: Value,
- _zero_copy: Option<PinnedBuf>,
+ _zero_copy: Option<ZeroCopyBuf>,
) -> Result<JsonOp, ErrBox> {
let args: MkdirArgs = serde_json::from_value(args)?;
let path = deno_fs::resolve_from_cwd(Path::new(&args.path))?;
@@ -95,7 +95,7 @@ struct ChmodArgs {
fn op_chmod(
state: &ThreadSafeState,
args: Value,
- _zero_copy: Option<PinnedBuf>,
+ _zero_copy: Option<ZeroCopyBuf>,
) -> Result<JsonOp, ErrBox> {
let args: ChmodArgs = serde_json::from_value(args)?;
let path = deno_fs::resolve_from_cwd(Path::new(&args.path))?;
@@ -129,7 +129,7 @@ struct ChownArgs {
fn op_chown(
state: &ThreadSafeState,
args: Value,
- _zero_copy: Option<PinnedBuf>,
+ _zero_copy: Option<ZeroCopyBuf>,
) -> Result<JsonOp, ErrBox> {
let args: ChownArgs = serde_json::from_value(args)?;
let path = deno_fs::resolve_from_cwd(Path::new(&args.path))?;
@@ -157,7 +157,7 @@ struct RemoveArgs {
fn op_remove(
state: &ThreadSafeState,
args: Value,
- _zero_copy: Option<PinnedBuf>,
+ _zero_copy: Option<ZeroCopyBuf>,
) -> Result<JsonOp, ErrBox> {
let args: RemoveArgs = serde_json::from_value(args)?;
let path = deno_fs::resolve_from_cwd(Path::new(&args.path))?;
@@ -191,7 +191,7 @@ struct CopyFileArgs {
fn op_copy_file(
state: &ThreadSafeState,
args: Value,
- _zero_copy: Option<PinnedBuf>,
+ _zero_copy: Option<ZeroCopyBuf>,
) -> Result<JsonOp, ErrBox> {
let args: CopyFileArgs = serde_json::from_value(args)?;
let from = deno_fs::resolve_from_cwd(Path::new(&args.from))?;
@@ -290,7 +290,7 @@ struct StatArgs {
fn op_stat(
state: &ThreadSafeState,
args: Value,
- _zero_copy: Option<PinnedBuf>,
+ _zero_copy: Option<ZeroCopyBuf>,
) -> Result<JsonOp, ErrBox> {
let args: StatArgs = serde_json::from_value(args)?;
let filename = deno_fs::resolve_from_cwd(Path::new(&args.filename))?;
@@ -320,7 +320,7 @@ struct RealpathArgs {
fn op_realpath(
state: &ThreadSafeState,
args: Value,
- _zero_copy: Option<PinnedBuf>,
+ _zero_copy: Option<ZeroCopyBuf>,
) -> Result<JsonOp, ErrBox> {
let args: RealpathArgs = serde_json::from_value(args)?;
let path = deno_fs::resolve_from_cwd(Path::new(&args.path))?;
@@ -352,7 +352,7 @@ struct ReadDirArgs {
fn op_read_dir(
state: &ThreadSafeState,
args: Value,
- _zero_copy: Option<PinnedBuf>,
+ _zero_copy: Option<ZeroCopyBuf>,
) -> Result<JsonOp, ErrBox> {
let args: ReadDirArgs = serde_json::from_value(args)?;
let path = deno_fs::resolve_from_cwd(Path::new(&args.path))?;
@@ -389,7 +389,7 @@ struct RenameArgs {
fn op_rename(
state: &ThreadSafeState,
args: Value,
- _zero_copy: Option<PinnedBuf>,
+ _zero_copy: Option<ZeroCopyBuf>,
) -> Result<JsonOp, ErrBox> {
let args: RenameArgs = serde_json::from_value(args)?;
let oldpath = deno_fs::resolve_from_cwd(Path::new(&args.oldpath))?;
@@ -418,7 +418,7 @@ struct LinkArgs {
fn op_link(
state: &ThreadSafeState,
args: Value,
- _zero_copy: Option<PinnedBuf>,
+ _zero_copy: Option<ZeroCopyBuf>,
) -> Result<JsonOp, ErrBox> {
let args: LinkArgs = serde_json::from_value(args)?;
let oldname = deno_fs::resolve_from_cwd(Path::new(&args.oldname))?;
@@ -446,7 +446,7 @@ struct SymlinkArgs {
fn op_symlink(
state: &ThreadSafeState,
args: Value,
- _zero_copy: Option<PinnedBuf>,
+ _zero_copy: Option<ZeroCopyBuf>,
) -> Result<JsonOp, ErrBox> {
let args: SymlinkArgs = serde_json::from_value(args)?;
let oldname = deno_fs::resolve_from_cwd(Path::new(&args.oldname))?;
@@ -478,7 +478,7 @@ struct ReadLinkArgs {
fn op_read_link(
state: &ThreadSafeState,
args: Value,
- _zero_copy: Option<PinnedBuf>,
+ _zero_copy: Option<ZeroCopyBuf>,
) -> Result<JsonOp, ErrBox> {
let args: ReadLinkArgs = serde_json::from_value(args)?;
let name = deno_fs::resolve_from_cwd(Path::new(&args.name))?;
@@ -506,7 +506,7 @@ struct TruncateArgs {
fn op_truncate(
state: &ThreadSafeState,
args: Value,
- _zero_copy: Option<PinnedBuf>,
+ _zero_copy: Option<ZeroCopyBuf>,
) -> Result<JsonOp, ErrBox> {
let args: TruncateArgs = serde_json::from_value(args)?;
let filename = deno_fs::resolve_from_cwd(Path::new(&args.name))?;
@@ -535,7 +535,7 @@ struct MakeTempDirArgs {
fn op_make_temp_dir(
state: &ThreadSafeState,
args: Value,
- _zero_copy: Option<PinnedBuf>,
+ _zero_copy: Option<ZeroCopyBuf>,
) -> Result<JsonOp, ErrBox> {
let args: MakeTempDirArgs = serde_json::from_value(args)?;
@@ -575,7 +575,7 @@ struct Utime {
fn op_utime(
state: &ThreadSafeState,
args: Value,
- _zero_copy: Option<PinnedBuf>,
+ _zero_copy: Option<ZeroCopyBuf>,
) -> Result<JsonOp, ErrBox> {
let args: Utime = serde_json::from_value(args)?;
state.check_write(Path::new(&args.filename))?;
@@ -590,7 +590,7 @@ fn op_utime(
fn op_cwd(
_state: &ThreadSafeState,
_args: Value,
- _zero_copy: Option<PinnedBuf>,
+ _zero_copy: Option<ZeroCopyBuf>,
) -> Result<JsonOp, ErrBox> {
let path = std::env::current_dir()?;
let path_str = path.into_os_string().into_string().unwrap();
diff --git a/cli/ops/io.rs b/cli/ops/io.rs
index 2a1455aca..410748ca4 100644
--- a/cli/ops/io.rs
+++ b/cli/ops/io.rs
@@ -182,7 +182,7 @@ where
pub fn op_read(
state: &ThreadSafeState,
rid: i32,
- zero_copy: Option<PinnedBuf>,
+ zero_copy: Option<ZeroCopyBuf>,
) -> Pin<Box<MinimalOp>> {
debug!("read rid={}", rid);
let zero_copy = match zero_copy {
@@ -327,7 +327,7 @@ where
pub fn op_write(
state: &ThreadSafeState,
rid: i32,
- zero_copy: Option<PinnedBuf>,
+ zero_copy: Option<ZeroCopyBuf>,
) -> Pin<Box<MinimalOp>> {
debug!("write rid={}", rid);
let zero_copy = match zero_copy {
diff --git a/cli/ops/net.rs b/cli/ops/net.rs
index 836ec2e8d..adad32815 100644
--- a/cli/ops/net.rs
+++ b/cli/ops/net.rs
@@ -98,7 +98,7 @@ struct AcceptArgs {
fn op_accept(
state: &ThreadSafeState,
args: Value,
- _zero_copy: Option<PinnedBuf>,
+ _zero_copy: Option<ZeroCopyBuf>,
) -> Result<JsonOp, ErrBox> {
let args: AcceptArgs = serde_json::from_value(args)?;
let rid = args.rid as u32;
@@ -143,7 +143,7 @@ struct ConnectArgs {
fn op_connect(
state: &ThreadSafeState,
args: Value,
- _zero_copy: Option<PinnedBuf>,
+ _zero_copy: Option<ZeroCopyBuf>,
) -> Result<JsonOp, ErrBox> {
let args: ConnectArgs = serde_json::from_value(args)?;
assert_eq!(args.transport, "tcp"); // TODO Support others.
@@ -185,7 +185,7 @@ struct ShutdownArgs {
fn op_shutdown(
state: &ThreadSafeState,
args: Value,
- _zero_copy: Option<PinnedBuf>,
+ _zero_copy: Option<ZeroCopyBuf>,
) -> Result<JsonOp, ErrBox> {
let args: ShutdownArgs = serde_json::from_value(args)?;
@@ -277,7 +277,7 @@ impl TcpListenerResource {
fn op_listen(
state: &ThreadSafeState,
args: Value,
- _zero_copy: Option<PinnedBuf>,
+ _zero_copy: Option<ZeroCopyBuf>,
) -> Result<JsonOp, ErrBox> {
let args: ListenArgs = serde_json::from_value(args)?;
assert_eq!(args.transport, "tcp");
diff --git a/cli/ops/os.rs b/cli/ops/os.rs
index 8add8759c..ffc453bc6 100644
--- a/cli/ops/os.rs
+++ b/cli/ops/os.rs
@@ -38,7 +38,7 @@ pub fn init(i: &mut Isolate, s: &ThreadSafeState) {
fn op_start(
state: &ThreadSafeState,
_args: Value,
- _zero_copy: Option<PinnedBuf>,
+ _zero_copy: Option<ZeroCopyBuf>,
) -> Result<JsonOp, ErrBox> {
let gs = &state.global_state;
let script_args = if gs.flags.argv.len() >= 2 {
@@ -70,7 +70,7 @@ struct GetDirArgs {
fn op_get_dir(
state: &ThreadSafeState,
args: Value,
- _zero_copy: Option<PinnedBuf>,
+ _zero_copy: Option<ZeroCopyBuf>,
) -> Result<JsonOp, ErrBox> {
state.check_env()?;
let args: GetDirArgs = serde_json::from_value(args)?;
@@ -116,7 +116,7 @@ fn op_get_dir(
fn op_exec_path(
state: &ThreadSafeState,
_args: Value,
- _zero_copy: Option<PinnedBuf>,
+ _zero_copy: Option<ZeroCopyBuf>,
) -> Result<JsonOp, ErrBox> {
state.check_env()?;
let current_exe = env::current_exe().unwrap();
@@ -136,7 +136,7 @@ struct SetEnv {
fn op_set_env(
state: &ThreadSafeState,
args: Value,
- _zero_copy: Option<PinnedBuf>,
+ _zero_copy: Option<ZeroCopyBuf>,
) -> Result<JsonOp, ErrBox> {
let args: SetEnv = serde_json::from_value(args)?;
state.check_env()?;
@@ -147,7 +147,7 @@ fn op_set_env(
fn op_env(
state: &ThreadSafeState,
_args: Value,
- _zero_copy: Option<PinnedBuf>,
+ _zero_copy: Option<ZeroCopyBuf>,
) -> Result<JsonOp, ErrBox> {
state.check_env()?;
let v = env::vars().collect::<HashMap<String, String>>();
@@ -162,7 +162,7 @@ struct GetEnv {
fn op_get_env(
state: &ThreadSafeState,
args: Value,
- _zero_copy: Option<PinnedBuf>,
+ _zero_copy: Option<ZeroCopyBuf>,
) -> Result<JsonOp, ErrBox> {
let args: GetEnv = serde_json::from_value(args)?;
state.check_env()?;
@@ -181,7 +181,7 @@ struct Exit {
fn op_exit(
_s: &ThreadSafeState,
args: Value,
- _zero_copy: Option<PinnedBuf>,
+ _zero_copy: Option<ZeroCopyBuf>,
) -> Result<JsonOp, ErrBox> {
let args: Exit = serde_json::from_value(args)?;
std::process::exit(args.code)
@@ -190,7 +190,7 @@ fn op_exit(
fn op_is_tty(
_s: &ThreadSafeState,
_args: Value,
- _zero_copy: Option<PinnedBuf>,
+ _zero_copy: Option<ZeroCopyBuf>,
) -> Result<JsonOp, ErrBox> {
Ok(JsonOp::Sync(json!({
"stdin": atty::is(atty::Stream::Stdin),
@@ -202,7 +202,7 @@ fn op_is_tty(
fn op_hostname(
state: &ThreadSafeState,
_args: Value,
- _zero_copy: Option<PinnedBuf>,
+ _zero_copy: Option<ZeroCopyBuf>,
) -> Result<JsonOp, ErrBox> {
state.check_env()?;
let hostname = sys_info::hostname().unwrap_or_else(|_| "".to_owned());
diff --git a/cli/ops/permissions.rs b/cli/ops/permissions.rs
index 4d1fb3337..39d49c32f 100644
--- a/cli/ops/permissions.rs
+++ b/cli/ops/permissions.rs
@@ -40,7 +40,7 @@ fn resolve_path(path: &str) -> String {
pub fn op_query_permission(
state: &ThreadSafeState,
args: Value,
- _zero_copy: Option<PinnedBuf>,
+ _zero_copy: Option<ZeroCopyBuf>,
) -> Result<JsonOp, ErrBox> {
let args: PermissionArgs = serde_json::from_value(args)?;
let permissions = state.permissions.lock().unwrap();
@@ -56,7 +56,7 @@ pub fn op_query_permission(
pub fn op_revoke_permission(
state: &ThreadSafeState,
args: Value,
- _zero_copy: Option<PinnedBuf>,
+ _zero_copy: Option<ZeroCopyBuf>,
) -> Result<JsonOp, ErrBox> {
let args: PermissionArgs = serde_json::from_value(args)?;
let mut permissions = state.permissions.lock().unwrap();
@@ -82,7 +82,7 @@ pub fn op_revoke_permission(
pub fn op_request_permission(
state: &ThreadSafeState,
args: Value,
- _zero_copy: Option<PinnedBuf>,
+ _zero_copy: Option<ZeroCopyBuf>,
) -> Result<JsonOp, ErrBox> {
let args: PermissionArgs = serde_json::from_value(args)?;
let mut permissions = state.permissions.lock().unwrap();
diff --git a/cli/ops/plugins.rs b/cli/ops/plugins.rs
index e31040a41..1f301ee27 100644
--- a/cli/ops/plugins.rs
+++ b/cli/ops/plugins.rs
@@ -60,7 +60,7 @@ pub fn op_open_plugin(
registry: &Arc<deno_core::OpRegistry>,
state: &ThreadSafeState,
args: Value,
- _zero_copy: Option<PinnedBuf>,
+ _zero_copy: Option<ZeroCopyBuf>,
) -> Result<JsonOp, ErrBox> {
let args: OpenPluginArgs = serde_json::from_value(args)?;
let filename = deno_fs::resolve_from_cwd(Path::new(&args.filename))?;
diff --git a/cli/ops/process.rs b/cli/ops/process.rs
index 30de5a735..ae762b114 100644
--- a/cli/ops/process.rs
+++ b/cli/ops/process.rs
@@ -80,7 +80,7 @@ impl Resource for ChildResource {}
fn op_run(
state: &ThreadSafeState,
args: Value,
- _zero_copy: Option<PinnedBuf>,
+ _zero_copy: Option<ZeroCopyBuf>,
) -> Result<JsonOp, ErrBox> {
let run_args: RunArgs = serde_json::from_value(args)?;
@@ -208,7 +208,7 @@ struct RunStatusArgs {
fn op_run_status(
state: &ThreadSafeState,
args: Value,
- _zero_copy: Option<PinnedBuf>,
+ _zero_copy: Option<ZeroCopyBuf>,
) -> Result<JsonOp, ErrBox> {
let args: RunStatusArgs = serde_json::from_value(args)?;
let rid = args.rid as u32;
@@ -256,7 +256,7 @@ struct KillArgs {
fn op_kill(
state: &ThreadSafeState,
args: Value,
- _zero_copy: Option<PinnedBuf>,
+ _zero_copy: Option<ZeroCopyBuf>,
) -> Result<JsonOp, ErrBox> {
state.check_run()?;
diff --git a/cli/ops/random.rs b/cli/ops/random.rs
index 334616211..950e9c7f0 100644
--- a/cli/ops/random.rs
+++ b/cli/ops/random.rs
@@ -16,7 +16,7 @@ pub fn init(i: &mut Isolate, s: &ThreadSafeState) {
fn op_get_random_values(
state: &ThreadSafeState,
_args: Value,
- zero_copy: Option<PinnedBuf>,
+ zero_copy: Option<ZeroCopyBuf>,
) -> Result<JsonOp, ErrBox> {
assert!(zero_copy.is_some());
diff --git a/cli/ops/repl.rs b/cli/ops/repl.rs
index 54c8f8574..9c40fe04f 100644
--- a/cli/ops/repl.rs
+++ b/cli/ops/repl.rs
@@ -34,7 +34,7 @@ struct ReplStartArgs {
fn op_repl_start(
state: &ThreadSafeState,
args: Value,
- _zero_copy: Option<PinnedBuf>,
+ _zero_copy: Option<ZeroCopyBuf>,
) -> Result<JsonOp, ErrBox> {
let args: ReplStartArgs = serde_json::from_value(args)?;
@@ -57,7 +57,7 @@ struct ReplReadlineArgs {
fn op_repl_readline(
state: &ThreadSafeState,
args: Value,
- _zero_copy: Option<PinnedBuf>,
+ _zero_copy: Option<ZeroCopyBuf>,
) -> Result<JsonOp, ErrBox> {
let args: ReplReadlineArgs = serde_json::from_value(args)?;
let rid = args.rid as u32;
diff --git a/cli/ops/resources.rs b/cli/ops/resources.rs
index 861df32b9..447082f80 100644
--- a/cli/ops/resources.rs
+++ b/cli/ops/resources.rs
@@ -11,7 +11,7 @@ pub fn init(i: &mut Isolate, s: &ThreadSafeState) {
fn op_resources(
state: &ThreadSafeState,
_args: Value,
- _zero_copy: Option<PinnedBuf>,
+ _zero_copy: Option<ZeroCopyBuf>,
) -> Result<JsonOp, ErrBox> {
let resource_table = state.lock_resource_table();
let serialized_resources = resource_table.entries();
diff --git a/cli/ops/runtime_compiler.rs b/cli/ops/runtime_compiler.rs
index 4202f6b3c..0cdc1094e 100644
--- a/cli/ops/runtime_compiler.rs
+++ b/cli/ops/runtime_compiler.rs
@@ -24,7 +24,7 @@ struct CompileArgs {
fn op_compile(
state: &ThreadSafeState,
args: Value,
- _zero_copy: Option<PinnedBuf>,
+ _zero_copy: Option<ZeroCopyBuf>,
) -> Result<JsonOp, ErrBox> {
let args: CompileArgs = serde_json::from_value(args)?;
Ok(JsonOp::Async(runtime_compile_async(
@@ -45,7 +45,7 @@ struct TranspileArgs {
fn op_transpile(
state: &ThreadSafeState,
args: Value,
- _zero_copy: Option<PinnedBuf>,
+ _zero_copy: Option<ZeroCopyBuf>,
) -> Result<JsonOp, ErrBox> {
let args: TranspileArgs = serde_json::from_value(args)?;
Ok(JsonOp::Async(runtime_transpile_async(
diff --git a/cli/ops/signal.rs b/cli/ops/signal.rs
index 5fef02013..b2a9b73ac 100644
--- a/cli/ops/signal.rs
+++ b/cli/ops/signal.rs
@@ -58,7 +58,7 @@ struct SignalArgs {
fn op_signal_bind(
state: &ThreadSafeState,
args: Value,
- _zero_copy: Option<PinnedBuf>,
+ _zero_copy: Option<ZeroCopyBuf>,
) -> Result<JsonOp, ErrBox> {
let args: BindSignalArgs = serde_json::from_value(args)?;
let mut table = state.lock_resource_table();
@@ -78,7 +78,7 @@ fn op_signal_bind(
fn op_signal_poll(
state: &ThreadSafeState,
args: Value,
- _zero_copy: Option<PinnedBuf>,
+ _zero_copy: Option<ZeroCopyBuf>,
) -> Result<JsonOp, ErrBox> {
let args: SignalArgs = serde_json::from_value(args)?;
let rid = args.rid as u32;
@@ -101,7 +101,7 @@ fn op_signal_poll(
pub fn op_signal_unbind(
state: &ThreadSafeState,
args: Value,
- _zero_copy: Option<PinnedBuf>,
+ _zero_copy: Option<ZeroCopyBuf>,
) -> Result<JsonOp, ErrBox> {
let args: SignalArgs = serde_json::from_value(args)?;
let rid = args.rid as u32;
@@ -122,7 +122,7 @@ pub fn op_signal_unbind(
pub fn op_signal_bind(
_state: &ThreadSafeState,
_args: Value,
- _zero_copy: Option<PinnedBuf>,
+ _zero_copy: Option<ZeroCopyBuf>,
) -> Result<JsonOp, ErrBox> {
unimplemented!();
}
@@ -131,7 +131,7 @@ pub fn op_signal_bind(
fn op_signal_unbind(
_state: &ThreadSafeState,
_args: Value,
- _zero_copy: Option<PinnedBuf>,
+ _zero_copy: Option<ZeroCopyBuf>,
) -> Result<JsonOp, ErrBox> {
unimplemented!();
}
@@ -140,7 +140,7 @@ fn op_signal_unbind(
fn op_signal_poll(
_state: &ThreadSafeState,
_args: Value,
- _zero_copy: Option<PinnedBuf>,
+ _zero_copy: Option<ZeroCopyBuf>,
) -> Result<JsonOp, ErrBox> {
unimplemented!();
}
diff --git a/cli/ops/timers.rs b/cli/ops/timers.rs
index 8bec10f70..2c21ba6f1 100644
--- a/cli/ops/timers.rs
+++ b/cli/ops/timers.rs
@@ -23,7 +23,7 @@ pub fn init(i: &mut Isolate, s: &ThreadSafeState) {
fn op_global_timer_stop(
state: &ThreadSafeState,
_args: Value,
- _zero_copy: Option<PinnedBuf>,
+ _zero_copy: Option<ZeroCopyBuf>,
) -> Result<JsonOp, ErrBox> {
let state = state;
let mut t = state.global_timer.lock().unwrap();
@@ -39,7 +39,7 @@ struct GlobalTimerArgs {
fn op_global_timer(
state: &ThreadSafeState,
args: Value,
- _zero_copy: Option<PinnedBuf>,
+ _zero_copy: Option<ZeroCopyBuf>,
) -> Result<JsonOp, ErrBox> {
let args: GlobalTimerArgs = serde_json::from_value(args)?;
let val = args.timeout;
@@ -61,7 +61,7 @@ fn op_global_timer(
fn op_now(
state: &ThreadSafeState,
_args: Value,
- _zero_copy: Option<PinnedBuf>,
+ _zero_copy: Option<ZeroCopyBuf>,
) -> Result<JsonOp, ErrBox> {
let seconds = state.start_time.elapsed().as_secs();
let mut subsec_nanos = state.start_time.elapsed().subsec_nanos();
diff --git a/cli/ops/tls.rs b/cli/ops/tls.rs
index 87a067a9e..45b6887a0 100644
--- a/cli/ops/tls.rs
+++ b/cli/ops/tls.rs
@@ -63,7 +63,7 @@ struct ConnectTLSArgs {
pub fn op_connect_tls(
state: &ThreadSafeState,
args: Value,
- _zero_copy: Option<PinnedBuf>,
+ _zero_copy: Option<ZeroCopyBuf>,
) -> Result<JsonOp, ErrBox> {
let args: ConnectTLSArgs = serde_json::from_value(args)?;
let cert_file = args.cert_file.clone();
@@ -246,7 +246,7 @@ struct ListenTlsArgs {
fn op_listen_tls(
state: &ThreadSafeState,
args: Value,
- _zero_copy: Option<PinnedBuf>,
+ _zero_copy: Option<ZeroCopyBuf>,
) -> Result<JsonOp, ErrBox> {
let args: ListenTlsArgs = serde_json::from_value(args)?;
assert_eq!(args.transport, "tcp");
@@ -357,7 +357,7 @@ struct AcceptTlsArgs {
fn op_accept_tls(
state: &ThreadSafeState,
args: Value,
- _zero_copy: Option<PinnedBuf>,
+ _zero_copy: Option<ZeroCopyBuf>,
) -> Result<JsonOp, ErrBox> {
let args: AcceptTlsArgs = serde_json::from_value(args)?;
let rid = args.rid as u32;
diff --git a/cli/ops/web_worker.rs b/cli/ops/web_worker.rs
index be987c09f..ff2c558be 100644
--- a/cli/ops/web_worker.rs
+++ b/cli/ops/web_worker.rs
@@ -27,7 +27,7 @@ pub fn init(i: &mut Isolate, s: &ThreadSafeState) {
fn op_worker_get_message(
state: &ThreadSafeState,
_args: Value,
- _data: Option<PinnedBuf>,
+ _data: Option<ZeroCopyBuf>,
) -> Result<JsonOp, ErrBox> {
let state_ = state.clone();
let op = async move {
@@ -44,7 +44,7 @@ fn op_worker_get_message(
fn op_worker_post_message(
state: &ThreadSafeState,
_args: Value,
- data: Option<PinnedBuf>,
+ data: Option<ZeroCopyBuf>,
) -> Result<JsonOp, ErrBox> {
let d = Vec::from(data.unwrap().as_ref()).into_boxed_slice();
let mut sender = state.worker_channels.sender.clone();
diff --git a/cli/ops/worker_host.rs b/cli/ops/worker_host.rs
index c64e86c1c..20ffb8eb7 100644
--- a/cli/ops/worker_host.rs
+++ b/cli/ops/worker_host.rs
@@ -69,7 +69,7 @@ struct CreateWorkerArgs {
fn op_create_worker(
state: &ThreadSafeState,
args: Value,
- _data: Option<PinnedBuf>,
+ _data: Option<ZeroCopyBuf>,
) -> Result<JsonOp, ErrBox> {
let args: CreateWorkerArgs = serde_json::from_value(args)?;
@@ -180,7 +180,7 @@ struct WorkerArgs {
fn op_host_get_worker_loaded(
state: &ThreadSafeState,
args: Value,
- _data: Option<PinnedBuf>,
+ _data: Option<ZeroCopyBuf>,
) -> Result<JsonOp, ErrBox> {
let args: WorkerArgs = serde_json::from_value(args)?;
let id = args.id as u32;
@@ -198,7 +198,7 @@ fn op_host_get_worker_loaded(
fn op_host_poll_worker(
state: &ThreadSafeState,
args: Value,
- _data: Option<PinnedBuf>,
+ _data: Option<ZeroCopyBuf>,
) -> Result<JsonOp, ErrBox> {
let args: WorkerArgs = serde_json::from_value(args)?;
let id = args.id as u32;
@@ -226,7 +226,7 @@ fn op_host_poll_worker(
fn op_host_close_worker(
state: &ThreadSafeState,
args: Value,
- _data: Option<PinnedBuf>,
+ _data: Option<ZeroCopyBuf>,
) -> Result<JsonOp, ErrBox> {
let args: WorkerArgs = serde_json::from_value(args)?;
let id = args.id as u32;
@@ -249,7 +249,7 @@ fn op_host_close_worker(
fn op_host_resume_worker(
state: &ThreadSafeState,
args: Value,
- _data: Option<PinnedBuf>,
+ _data: Option<ZeroCopyBuf>,
) -> Result<JsonOp, ErrBox> {
let args: WorkerArgs = serde_json::from_value(args)?;
let id = args.id as u32;
@@ -270,7 +270,7 @@ struct HostGetMessageArgs {
fn op_host_get_message(
state: &ThreadSafeState,
args: Value,
- _data: Option<PinnedBuf>,
+ _data: Option<ZeroCopyBuf>,
) -> Result<JsonOp, ErrBox> {
let args: HostGetMessageArgs = serde_json::from_value(args)?;
let state_ = state.clone();
@@ -297,7 +297,7 @@ struct HostPostMessageArgs {
fn op_host_post_message(
state: &ThreadSafeState,
args: Value,
- data: Option<PinnedBuf>,
+ data: Option<ZeroCopyBuf>,
) -> Result<JsonOp, ErrBox> {
let args: HostPostMessageArgs = serde_json::from_value(args)?;
let id = args.id as u32;
@@ -317,7 +317,7 @@ fn op_host_post_message(
fn op_metrics(
state: &ThreadSafeState,
_args: Value,
- _zero_copy: Option<PinnedBuf>,
+ _zero_copy: Option<ZeroCopyBuf>,
) -> Result<JsonOp, ErrBox> {
let m = &state.metrics;
diff --git a/cli/state.rs b/cli/state.rs
index c07b3d5d0..6f3f0a4c7 100644
--- a/cli/state.rs
+++ b/cli/state.rs
@@ -15,8 +15,8 @@ use deno_core::ErrBox;
use deno_core::Loader;
use deno_core::ModuleSpecifier;
use deno_core::Op;
-use deno_core::PinnedBuf;
use deno_core::ResourceTable;
+use deno_core::ZeroCopyBuf;
use futures::channel::mpsc;
use futures::future::FutureExt;
use futures::future::TryFutureExt;
@@ -83,13 +83,13 @@ impl ThreadSafeState {
pub fn core_op<D>(
&self,
dispatcher: D,
- ) -> impl Fn(&[u8], Option<PinnedBuf>) -> CoreOp
+ ) -> impl Fn(&[u8], Option<ZeroCopyBuf>) -> CoreOp
where
- D: Fn(&[u8], Option<PinnedBuf>) -> CoreOp,
+ D: Fn(&[u8], Option<ZeroCopyBuf>) -> CoreOp,
{
let state = self.clone();
- move |control: &[u8], zero_copy: Option<PinnedBuf>| -> CoreOp {
+ move |control: &[u8], zero_copy: Option<ZeroCopyBuf>| -> CoreOp {
let bytes_sent_control = control.len();
let bytes_sent_zero_copy =
zero_copy.as_ref().map(|b| b.len()).unwrap_or(0);
@@ -126,13 +126,13 @@ impl ThreadSafeState {
pub fn stateful_minimal_op<D>(
&self,
dispatcher: D,
- ) -> impl Fn(i32, Option<PinnedBuf>) -> Pin<Box<MinimalOp>>
+ ) -> impl Fn(i32, Option<ZeroCopyBuf>) -> Pin<Box<MinimalOp>>
where
- D: Fn(&ThreadSafeState, i32, Option<PinnedBuf>) -> Pin<Box<MinimalOp>>,
+ D: Fn(&ThreadSafeState, i32, Option<ZeroCopyBuf>) -> Pin<Box<MinimalOp>>,
{
let state = self.clone();
- move |rid: i32, zero_copy: Option<PinnedBuf>| -> Pin<Box<MinimalOp>> {
+ move |rid: i32, zero_copy: Option<ZeroCopyBuf>| -> Pin<Box<MinimalOp>> {
dispatcher(&state, rid, zero_copy)
}
}
@@ -145,15 +145,19 @@ impl ThreadSafeState {
pub fn stateful_op<D>(
&self,
dispatcher: D,
- ) -> impl Fn(Value, Option<PinnedBuf>) -> Result<JsonOp, ErrBox>
+ ) -> impl Fn(Value, Option<ZeroCopyBuf>) -> Result<JsonOp, ErrBox>
where
- D: Fn(&ThreadSafeState, Value, Option<PinnedBuf>) -> Result<JsonOp, ErrBox>,
+ D: Fn(
+ &ThreadSafeState,
+ Value,
+ Option<ZeroCopyBuf>,
+ ) -> Result<JsonOp, ErrBox>,
{
let state = self.clone();
- move |args: Value, zero_copy: Option<PinnedBuf>| -> Result<JsonOp, ErrBox> {
- dispatcher(&state, args, zero_copy)
- }
+ move |args: Value,
+ zero_copy: Option<ZeroCopyBuf>|
+ -> Result<JsonOp, ErrBox> { dispatcher(&state, args, zero_copy) }
}
}
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-02 09:56:10 +0000