3 files changed, 49 insertions, 52 deletions

diff --git a/cli/ops/bench.rs b/cli/ops/bench.rs
index 513ecc0d1..7bd3f988a 100644
--- a/cli/ops/bench.rs
+++ b/cli/ops/bench.rs
@@ -7,7 +7,6 @@ use std::time;
 use deno_core::error::generic_error;
 use deno_core::error::AnyError;
 use deno_core::op;
-use deno_core::Extension;
 use deno_core::ModuleSpecifier;
 use deno_core::OpState;
 use deno_runtime::permissions::create_child_permissions;
@@ -22,25 +21,24 @@ use crate::tools::bench::BenchDescription;
 use crate::tools::bench::BenchEvent;
 use crate::tools::test::TestFilter;
 
-pub fn init(
-  sender: UnboundedSender<BenchEvent>,
-  filter: TestFilter,
-) -> Extension {
-  Extension::builder("deno_bench")
-    .ops(vec![
-      op_pledge_test_permissions::decl(),
-      op_restore_test_permissions::decl(),
-      op_get_bench_origin::decl(),
-      op_register_bench::decl(),
-      op_dispatch_bench_event::decl(),
-      op_bench_now::decl(),
-    ])
-    .state(move |state| {
-      state.put(sender.clone());
-      state.put(filter.clone());
-    })
-    .build()
-}
+deno_core::extension!(deno_bench,
+  ops = [
+    op_pledge_test_permissions,
+    op_restore_test_permissions,
+    op_get_bench_origin,
+    op_register_bench,
+    op_dispatch_bench_event,
+    op_bench_now,
+  ],
+  config = {
+    sender: UnboundedSender<BenchEvent>,
+    filter: TestFilter,
+  },
+  state = |state, sender, filter| {
+    state.put(sender);
+    state.put(filter);
+  },
+);
 
 #[derive(Clone)]
 struct PermissionsHolder(Uuid, PermissionsContainer);
diff --git a/cli/ops/mod.rs b/cli/ops/mod.rs
index 53f74ad1f..562aa8649 100644
--- a/cli/ops/mod.rs
+++ b/cli/ops/mod.rs
@@ -10,17 +10,18 @@ pub mod bench;
 pub mod testing;
 
 pub fn cli_exts(ps: ProcState) -> Vec<Extension> {
-  vec![init_proc_state(ps)]
+  vec![deno_cli::init_ops(ps)]
 }
 
-fn init_proc_state(ps: ProcState) -> Extension {
-  Extension::builder("deno_cli")
-    .ops(vec![op_npm_process_state::decl()])
-    .state(move |state| {
-      state.put(ps.clone());
-    })
-    .build()
-}
+deno_core::extension!(deno_cli,
+  ops = [op_npm_process_state],
+  config = {
+    ps: ProcState,
+  },
+  state = |state, ps| {
+    state.put(ps);
+  },
+);
 
 #[op]
 fn op_npm_process_state(state: &mut OpState) -> Result<String, AnyError> {
diff --git a/cli/ops/testing.rs b/cli/ops/testing.rs
index 9170e9400..f32e96147 100644
--- a/cli/ops/testing.rs
+++ b/cli/ops/testing.rs
@@ -12,7 +12,6 @@ use crate::tools::test::TestStepDescription;
 use deno_core::error::generic_error;
 use deno_core::error::AnyError;
 use deno_core::op;
-use deno_core::Extension;
 use deno_core::ModuleSpecifier;
 use deno_core::OpState;
 use deno_runtime::permissions::create_child_permissions;
@@ -25,28 +24,27 @@ use std::sync::atomic::AtomicUsize;
 use std::sync::atomic::Ordering;
 use uuid::Uuid;
 
-pub fn init(
-  sender: TestEventSender,
-  fail_fast_tracker: FailFastTracker,
-  filter: TestFilter,
-) -> Extension {
-  Extension::builder("deno_test")
-    .ops(vec![
-      op_pledge_test_permissions::decl(),
-      op_restore_test_permissions::decl(),
-      op_get_test_origin::decl(),
-      op_register_test::decl(),
-      op_register_test_step::decl(),
-      op_dispatch_test_event::decl(),
-      op_tests_should_stop::decl(),
-    ])
-    .state(move |state| {
-      state.put(sender.clone());
-      state.put(fail_fast_tracker.clone());
-      state.put(filter.clone());
-    })
-    .build()
-}
+deno_core::extension!(deno_test,
+  ops = [
+    op_pledge_test_permissions,
+    op_restore_test_permissions,
+    op_get_test_origin,
+    op_register_test,
+    op_register_test_step,
+    op_dispatch_test_event,
+    op_tests_should_stop,
+  ],
+  config = {
+    sender: TestEventSender,
+    fail_fast_tracker: FailFastTracker,
+    filter: TestFilter,
+  },
+  state = |state, sender, fail_fast_tracker, filter| {
+    state.put(sender);
+    state.put(fail_fast_tracker);
+    state.put(filter);
+  },
+);
 
 #[derive(Clone)]
 struct PermissionsHolder(Uuid, PermissionsContainer);