1 files changed, 34 insertions, 54 deletions

diff --git a/ext/web/lib.rs b/ext/web/lib.rs
index f117bfb9d..6c278cbb0 100644
--- a/ext/web/lib.rs
+++ b/ext/web/lib.rs
@@ -9,8 +9,7 @@ use deno_core::error::range_error;
 use deno_core::error::type_error;
 use deno_core::error::AnyError;
 use deno_core::include_js_files;
-use deno_core::op_async;
-use deno_core::op_sync;
+use deno_core::op;
 use deno_core::url::Url;
 use deno_core::ByteString;
 use deno_core::Extension;
@@ -83,58 +82,31 @@ pub fn init<P: TimersPermission + 'static>(
       "15_performance.js",
     ))
     .ops(vec![
-      ("op_base64_decode", op_sync(op_base64_decode)),
-      ("op_base64_encode", op_sync(op_base64_encode)),
-      ("op_base64_atob", op_sync(op_base64_atob)),
-      ("op_base64_btoa", op_sync(op_base64_btoa)),
-      (
-        "op_encoding_normalize_label",
-        op_sync(op_encoding_normalize_label),
-      ),
-      ("op_encoding_new_decoder", op_sync(op_encoding_new_decoder)),
-      ("op_encoding_decode", op_sync(op_encoding_decode)),
-      ("op_encoding_encode_into", op_sync(op_encoding_encode_into)),
-      ("op_blob_create_part", op_sync(op_blob_create_part)),
-      ("op_blob_slice_part", op_sync(op_blob_slice_part)),
-      ("op_blob_read_part", op_async(op_blob_read_part)),
-      ("op_blob_remove_part", op_sync(op_blob_remove_part)),
-      (
-        "op_blob_create_object_url",
-        op_sync(op_blob_create_object_url),
-      ),
-      (
-        "op_blob_revoke_object_url",
-        op_sync(op_blob_revoke_object_url),
-      ),
-      ("op_blob_from_object_url", op_sync(op_blob_from_object_url)),
-      (
-        "op_message_port_create_entangled",
-        op_sync(op_message_port_create_entangled),
-      ),
-      (
-        "op_message_port_post_message",
-        op_sync(op_message_port_post_message),
-      ),
-      (
-        "op_message_port_recv_message",
-        op_async(op_message_port_recv_message),
-      ),
-      (
-        "op_compression_new",
-        op_sync(compression::op_compression_new),
-      ),
-      (
-        "op_compression_write",
-        op_sync(compression::op_compression_write),
-      ),
-      (
-        "op_compression_finish",
-        op_sync(compression::op_compression_finish),
-      ),
-      ("op_now", op_sync(op_now::<P>)),
-      ("op_timer_handle", op_sync(op_timer_handle)),
-      ("op_sleep", op_async(op_sleep)),
-      ("op_sleep_sync", op_sync(op_sleep_sync::<P>)),
+      op_base64_decode::decl(),
+      op_base64_encode::decl(),
+      op_base64_atob::decl(),
+      op_base64_btoa::decl(),
+      op_encoding_normalize_label::decl(),
+      op_encoding_new_decoder::decl(),
+      op_encoding_decode::decl(),
+      op_encoding_encode_into::decl(),
+      op_blob_create_part::decl(),
+      op_blob_slice_part::decl(),
+      op_blob_read_part::decl(),
+      op_blob_remove_part::decl(),
+      op_blob_create_object_url::decl(),
+      op_blob_revoke_object_url::decl(),
+      op_blob_from_object_url::decl(),
+      op_message_port_create_entangled::decl(),
+      op_message_port_post_message::decl(),
+      op_message_port_recv_message::decl(),
+      compression::op_compression_new::decl(),
+      compression::op_compression_write::decl(),
+      compression::op_compression_finish::decl(),
+      op_now::decl::<P>(),
+      op_timer_handle::decl(),
+      op_sleep::decl(),
+      op_sleep_sync::decl::<P>(),
     ])
     .state(move |state| {
       state.put(blob_store.clone());
@@ -147,6 +119,7 @@ pub fn init<P: TimersPermission + 'static>(
     .build()
 }
 
+#[op]
 fn op_base64_decode(
   _: &mut OpState,
   input: String,
@@ -157,6 +130,7 @@ fn op_base64_decode(
   Ok(b64_decode(&input)?.into())
 }
 
+#[op]
 fn op_base64_atob(
   _: &mut OpState,
   s: ByteString,
@@ -210,6 +184,7 @@ fn b64_decode(input: &[u8]) -> Result<Vec<u8>, AnyError> {
   Ok(out)
 }
 
+#[op]
 fn op_base64_encode(
   _: &mut OpState,
   s: ZeroCopyBuf,
@@ -218,6 +193,7 @@ fn op_base64_encode(
   Ok(b64_encode(&s))
 }
 
+#[op]
 fn op_base64_btoa(
   _: &mut OpState,
   s: ByteString,
@@ -240,6 +216,7 @@ struct DecoderOptions {
   fatal: bool,
 }
 
+#[op]
 fn op_encoding_normalize_label(
   _state: &mut OpState,
   label: String,
@@ -255,6 +232,7 @@ fn op_encoding_normalize_label(
   Ok(encoding.name().to_lowercase())
 }
 
+#[op]
 fn op_encoding_new_decoder(
   state: &mut OpState,
   options: DecoderOptions,
@@ -294,6 +272,7 @@ struct DecodeOptions {
   stream: bool,
 }
 
+#[op]
 fn op_encoding_decode(
   state: &mut OpState,
   data: ZeroCopyBuf,
@@ -357,6 +336,7 @@ struct EncodeIntoResult {
   written: usize,
 }
 
+#[op]
 fn op_encoding_encode_into(
   _state: &mut OpState,
   input: String,