ops -> ops_fn

denoland · mmastrac · Mar 17, 2023 · Mar 14, 2023 · Mar 15, 2023 · Mar 15, 2023
commit 5076f042cfb7ed80d0296929ac1dac3116a67f3b
diff --git a/bench_util/benches/op_baseline.rs b/bench_util/benches/op_baseline.rs
@@ -11,7 +11,7 @@ use deno_core::Extension;
 
 deno_core::ops!(deno_ops, [op_pi_json, op_pi_async, op_nop,]);
 
-deno_core::extension!(bench_setup, ops = deno_ops,);
+deno_core::extension!(bench_setup, ops_fn = deno_ops,);
 
 fn setup() -> Vec<Extension> {
  vec![bench_setup::init_ops()]

diff --git a/cli/build.rs b/cli/build.rs
@@ -121,7 +121,7 @@ mod ts {
  );
 
  deno_core::extension!(deno_tsc,
- ops = deno_ops,
+ ops_fn = deno_ops,
  js = [
  dir "tsc",
  "00_typescript.js",

diff --git a/cli/lsp/tsc.rs b/cli/lsp/tsc.rs
@@ -2838,7 +2838,7 @@ deno_core::ops!(
 );
 
 deno_core::extension!(deno_tsc,
- ops = deno_ops,
+ ops_fn = deno_ops,
  config = {
  performance: Arc<Performance>
  },

diff --git a/cli/ops/bench.rs b/cli/ops/bench.rs
@@ -34,7 +34,7 @@ deno_core::ops!(
 );
 
 deno_core::extension!(deno_bench,
- ops = deno_ops,
+ ops_fn = deno_ops,
  config = {
  sender: UnboundedSender<BenchEvent>,
  filter: TestFilter,

diff --git a/cli/ops/mod.rs b/cli/ops/mod.rs
@@ -16,7 +16,7 @@ pub fn cli_exts(ps: ProcState) -> Vec<Extension> {
 deno_core::ops!(deno_ops, [op_npm_process_state]);
 
 deno_core::extension!(deno_cli,
- ops = deno_ops,
+ ops_fn = deno_ops,
  config = {
  ps: ProcState,
  },

diff --git a/cli/ops/testing.rs b/cli/ops/testing.rs
@@ -38,7 +38,7 @@ deno_core::ops!(
 );
 
 deno_core::extension!(deno_test,
- ops = deno_ops,
+ ops_fn = deno_ops,
  config = {
  sender: TestEventSender,
  fail_fast_tracker: FailFastTracker,

diff --git a/cli/tsc/mod.rs b/cli/tsc/mod.rs
@@ -116,7 +116,7 @@ pub fn get_types_declaration_file_text(unstable: bool) -> String {
 }
 
 fn get_asset_texts_from_new_runtime() -> Result<Vec<AssetText>, AnyError> {
- deno_core::extension!(deno_cli_tsc, ops = deno_ops,);
+ deno_core::extension!(deno_cli_tsc, ops_fn = deno_ops,);
 
  // the assets are stored within the typescript isolate, so take them out of there
  let mut runtime = JsRuntime::new(RuntimeOptions {
@@ -829,7 +829,7 @@ pub fn exec(request: Request) -> Result<Response, AnyError> {
  .collect();
 
  deno_core::extension!(deno_cli_tsc,
- ops = deno_ops,
+ ops_fn = deno_ops,
  config = {
  request: Rc<Request>,
  root_map: HashMap<String, Url>,

diff --git a/core/extensions.rs b/core/extensions.rs
@@ -162,7 +162,7 @@ macro_rules! extension {
  $name:ident,
  $(deps = [ $( $dep:ident ),* ],)?
  $(parameters = [ $( $param:ident : $type:ident ),+ ], )?
- $(ops = $ops_symbol:ident $( < $ops_param:ident > )?,)?
+ $(ops_fn = $ops_symbol:ident $( < $ops_param:ident > )?,)?
  $(esm = [ $( dir $dir_esm:literal , )? $( $esm:literal ),* $(,)? ],)?
  $(js = [ $( dir $dir_js:literal , )? $( $js:literal ),* $(,)? ],)?
  $(config = { $( $config_id:ident : $config_type:ty ),* $(,)? },)?

diff --git a/core/ops_builtin.rs b/core/ops_builtin.rs
@@ -51,7 +51,7 @@ crate::ops_bundle!(
 
 crate::extension!(
  core,
- ops = deno_ops,
+ ops_fn = deno_ops,
  js = ["00_primordials.js", "01_core.js", "02_error.js"],
 );
 

diff --git a/ext/broadcast_channel/lib.rs b/ext/broadcast_channel/lib.rs
@@ -117,7 +117,7 @@ deno_core::ops!(deno_ops,
 deno_core::extension!(deno_broadcast_channel,
  deps = [ deno_webidl, deno_web ],
  parameters = [BC: BroadcastChannel],
- ops = deno_ops<BC>,
+ ops_fn = deno_ops<BC>,
  esm = [ "01_broadcast_channel.js" ],
  config = {
  bc: BC,

diff --git a/ext/cache/lib.rs b/ext/cache/lib.rs
@@ -35,7 +35,7 @@ deno_core::ops!(deno_ops,
 deno_core::extension!(deno_cache,
  deps = [ deno_webidl, deno_web, deno_url, deno_fetch ],
  parameters=[CA: Cache],
- ops = deno_ops<CA>,
+ ops_fn = deno_ops<CA>,
  esm = [ "01_cache.js" ],
  config = {
  maybe_create_cache: Option<CreateCache<CA>>,

diff --git a/ext/crypto/lib.rs b/ext/crypto/lib.rs
@@ -107,7 +107,7 @@ deno_core::ops!(
 
 deno_core::extension!(deno_crypto,
  deps = [ deno_webidl, deno_web ],
- ops = deno_ops,
+ ops_fn = deno_ops,
  esm = [ "00_crypto.js", "01_webidl.js" ],
  config = {
  maybe_seed: Option<u64>,

diff --git a/ext/fetch/lib.rs b/ext/fetch/lib.rs
@@ -102,7 +102,7 @@ deno_core::ops!(deno_ops,
 deno_core::extension!(deno_fetch,
  deps = [ deno_webidl, deno_web, deno_url, deno_console ],
  parameters = [FP: FetchPermissions],
- ops = deno_ops<FP>,
+ ops_fn = deno_ops<FP>,
  esm = [
  "20_headers.js",
  "21_formdata.js",

diff --git a/ext/ffi/lib.rs b/ext/ffi/lib.rs
@@ -115,7 +115,7 @@ deno_core::ops!(deno_ops,
 deno_core::extension!(deno_ffi,
  deps = [ deno_web ],
  parameters = [P: FfiPermissions],
- ops = deno_ops<P>,
+ ops_fn = deno_ops<P>,
  esm = [ "00_ffi.js" ],
  config = {
  unstable: bool,

diff --git a/ext/flash/lib.rs b/ext/flash/lib.rs
@@ -1562,7 +1562,7 @@ deno_core::extension!(deno_flash,
  deno_http
  ],
  parameters = [P: FlashPermissions],
- ops = deno_ops<P>,
+ ops_fn = deno_ops<P>,
  esm = [ "01_http.js" ],
  config = {
  unstable: bool,

diff --git a/ext/napi/lib.rs b/ext/napi/lib.rs
@@ -522,7 +522,7 @@ deno_core::ops!(deno_ops,
 
 deno_core::extension!(deno_napi,
  parameters = [P: NapiPermissions],
- ops = deno_ops<P>,
+ ops_fn = deno_ops<P>,
  state = |state| {
  let (async_work_sender, async_work_receiver) =
  mpsc::unbounded::<PendingNapiAsyncWork>();

diff --git a/ext/url/lib.rs b/ext/url/lib.rs
@@ -32,7 +32,7 @@ deno_core::ops!(
 deno_core::extension!(
  deno_url,
  deps = [deno_webidl],
- ops = deno_ops,
+ ops_fn = deno_ops,
  esm = ["00_url.js", "01_urlpattern.js"],
 );
 

diff --git a/ext/webgpu/lib.rs b/ext/webgpu/lib.rs
@@ -116,7 +116,7 @@ impl Resource for WebGpuQuerySet {
 
 deno_core::extension!(deno_webgpu,
  deps = [ deno_webidl, deno_web ],
- ops = deno_ops,
+ ops_fn = deno_ops,
  esm = [ "01_webgpu.js", "02_idl_types.js" ],
  config = {
  unstable: bool,

diff --git a/ext/webgpu/surface.rs b/ext/webgpu/surface.rs
@@ -22,7 +22,7 @@ deno_core::ops!(
 deno_core::extension!(deno_webgpu_surface,
  deps = [ deno_webidl, deno_web, deno_webgpu ],
  esm = [ "03_surface.js", "04_surface_idl_types.js" ],
- ops = deno_ops,
+ ops_fn = deno_ops,
  config: {
  unstable: bool,
  },

diff --git a/ext/websocket/lib.rs b/ext/websocket/lib.rs
@@ -508,7 +508,7 @@ deno_core::ops!(deno_ops,
 
 deno_core::extension!(deno_websocket,
  parameters = [P: WebSocketPermissions],
- ops = deno_ops<P>,
+ ops_fn = deno_ops<P>,
  esm = [ "01_websocket.js", "02_websocketstream.js" ],
  config = {
  user_agent: String,

diff --git a/ext/webstorage/lib.rs b/ext/webstorage/lib.rs
@@ -34,7 +34,7 @@ deno_core::ops!(
 
 deno_core::extension!(deno_webstorage,
  deps = [ deno_webidl ],
- ops = deno_ops,
+ ops_fn = deno_ops,
  esm = [ "01_webstorage.js" ],
  config = {
  origin_storage_dir: Option<PathBuf>

diff --git a/runtime/ops/fs_events.rs b/runtime/ops/fs_events.rs
@@ -28,7 +28,7 @@ use std::path::PathBuf;
 use std::rc::Rc;
 use tokio::sync::mpsc;
 
-deno_core::extension!(deno_fs_events, ops = deno_ops,);
+deno_core::extension!(deno_fs_events, ops_fn = deno_ops,);
 
 deno_core::ops!(deno_ops, [op_fs_events_open, op_fs_events_poll]);
 

diff --git a/runtime/ops/web_worker.rs b/runtime/ops/web_worker.rs
@@ -27,7 +27,7 @@ deno_core::ops!(
  ]
 );
 
-deno_core::extension!(deno_web_worker, ops = deno_ops,);
+deno_core::extension!(deno_web_worker, ops_fn = deno_ops,);
 
 #[op]
 fn op_worker_post_message(