diff options
Diffstat (limited to 'ext/url')
-rw-r--r-- | ext/url/00_url.js | 8 | ||||
-rw-r--r-- | ext/url/lib.rs | 19 |
2 files changed, 13 insertions, 14 deletions
diff --git a/ext/url/00_url.js b/ext/url/00_url.js index 5479cb59c..754c647b1 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.buffer); + status = ops.op_url_parse(href, componentsBuf); } else { - status = core.ops.op_url_parse_with_base( + status = ops.op_url_parse_with_base( href, maybeBase, - componentsBuf.buffer, + componentsBuf, ); } return getSerialization(status, href); @@ -71,7 +71,7 @@ if (status === 0) { return href; } else if (status === 1) { - return core.ops.op_url_get_serialization(); + return ops.op_url_get_serialization(); } else { throw new TypeError("Invalid URL"); } diff --git a/ext/url/lib.rs b/ext/url/lib.rs index ac668207f..01014ccd3 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: String, - base_href: String, - buf: &mut [u8], + href: &str, + base_href: &str, + buf: &mut [u32], ) -> 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] -pub fn op_url_parse(state: &mut OpState, href: String, buf: &mut [u8]) -> u32 { +#[op(fast)] +pub fn op_url_parse(state: &mut OpState, href: &str, buf: &mut [u32]) -> u32 { parse_url(state, href, None, buf) } @@ -99,15 +99,14 @@ pub fn op_url_parse(state: &mut OpState, href: String, buf: &mut [u8]) -> u32 { #[inline] fn parse_url( state: &mut OpState, - href: String, + href: &str, base_href: Option<&Url>, - buf: &mut [u8], + buf: &mut [u32], ) -> 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; |