From 585ec1218f8cdc191f2e733beb2e6c7a230ac85c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bartek=20Iwa=C5=84czuk?= <biwanczuk@gmail.com>
Date: Thu, 15 Dec 2022 16:26:10 +0100
Subject: Revert "feat(ops): Fast zero copy string arguments (#16777)" (#17063)

This reverts commit 9b2b8df927ac23cfa99016a684179f2a3198ba2e.

Closes https://github.com/dsherret/ts-morph/issues/1372
Closes https://github.com/denoland/deno/issues/16979
---
 ext/url/00_url.js |  8 ++++----
 ext/url/lib.rs    | 19 ++++++++++---------
 2 files changed, 14 insertions(+), 13 deletions(-)

(limited to 'ext/url')

diff --git a/ext/url/00_url.js b/ext/url/00_url.js
index 754c647b1..5479cb59c 100644
--- a/ext/url/00_url.js
+++ b/ext/url/00_url.js
@@ -56,12 +56,12 @@
   function opUrlParse(href, maybeBase) {
     let status;
     if (maybeBase === undefined) {
-      status = ops.op_url_parse(href, componentsBuf);
+      status = ops.op_url_parse(href, componentsBuf.buffer);
     } else {
-      status = ops.op_url_parse_with_base(
+      status = core.ops.op_url_parse_with_base(
         href,
         maybeBase,
-        componentsBuf,
+        componentsBuf.buffer,
       );
     }
     return getSerialization(status, href);
@@ -71,7 +71,7 @@
     if (status === 0) {
       return href;
     } else if (status === 1) {
-      return ops.op_url_get_serialization();
+      return core.ops.op_url_get_serialization();
     } else {
       throw new TypeError("Invalid URL");
     }
diff --git a/ext/url/lib.rs b/ext/url/lib.rs
index 01014ccd3..ac668207f 100644
--- a/ext/url/lib.rs
+++ b/ext/url/lib.rs
@@ -41,11 +41,11 @@ pub fn init() -> Extension {
 #[op]
 pub fn op_url_parse_with_base(
   state: &mut OpState,
-  href: &str,
-  base_href: &str,
-  buf: &mut [u32],
+  href: String,
+  base_href: String,
+  buf: &mut [u8],
 ) -> u32 {
-  let base_url = match Url::parse(base_href) {
+  let base_url = match Url::parse(&base_href) {
     Ok(url) => url,
     Err(_) => return ParseStatus::Err as u32,
   };
@@ -67,8 +67,8 @@ pub fn op_url_get_serialization(state: &mut OpState) -> String {
 }
 
 /// Parse `href` without a `base_url`. Fills the out `buf` with URL components.
-#[op(fast)]
-pub fn op_url_parse(state: &mut OpState, href: &str, buf: &mut [u32]) -> u32 {
+#[op]
+pub fn op_url_parse(state: &mut OpState, href: String, buf: &mut [u8]) -> u32 {
   parse_url(state, href, None, buf)
 }
 
@@ -99,14 +99,15 @@ pub fn op_url_parse(state: &mut OpState, href: &str, buf: &mut [u32]) -> u32 {
 #[inline]
 fn parse_url(
   state: &mut OpState,
-  href: &str,
+  href: String,
   base_href: Option<&Url>,
-  buf: &mut [u32],
+  buf: &mut [u8],
 ) -> u32 {
-  match Url::options().base_url(base_href).parse(href) {
+  match Url::options().base_url(base_href).parse(&href) {
     Ok(url) => {
       let inner_url = quirks::internal_components(&url);
 
+      let buf: &mut [u32] = as_u32_slice(buf);
       buf[0] = inner_url.scheme_end;
       buf[1] = inner_url.username_end;
       buf[2] = inner_url.host_start;
-- 
cgit v1.2.3