diff options
author | Nugine <nugine@foxmail.com> | 2023-01-18 22:35:24 +0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-01-18 20:05:24 +0530 |
commit | 9686a0041911f5a6724c5933de57214bd940baac (patch) | |
tree | 754aecb78e157719215423920c00b4985a5c0ff1 | |
parent | f1b275ed6bd6dd1fc1eda8efa3816998ac0a5471 (diff) |
chore: upgrade base64-simd to 0.8.0 (#17463)
This PR upgrades the `base64-simd` dependency of `deno_web`.
base64-simd v0.8 supports `forgiving_decode` in ["copy"
mode](https://docs.rs/base64-simd/0.8.0/base64_simd/fn.forgiving_decode.html),
["inplace"
mode](https://docs.rs/base64-simd/0.8.0/base64_simd/fn.forgiving_decode_inplace.html)
or ["alloc"
mode](https://docs.rs/base64-simd/0.8.0/base64_simd/fn.forgiving_decode_to_vec.html).
When #17159 resolves, they can be used to reduce unnecessary allocations
and copies.
base64-simd v0.8 also supports AArch64 SIMD out of box.
-rw-r--r-- | Cargo.lock | 26 | ||||
-rw-r--r-- | ext/web/Cargo.toml | 2 | ||||
-rw-r--r-- | ext/web/lib.rs | 15 |
3 files changed, 21 insertions, 22 deletions
diff --git a/Cargo.lock b/Cargo.lock index 57c7cfcfd..96a6b01da 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -239,11 +239,12 @@ checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" [[package]] name = "base64-simd" -version = "0.7.0" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "781dd20c3aff0bd194fe7d2a977dd92f21c173891f3a03b677359e5fa457e5d5" +checksum = "339abbe78e73178762e23bea9dfd08e697eb3f3301cd4be981c0f78ba5859195" dependencies = [ - "simd-abstraction", + "outref", + "vsimd", ] [[package]] @@ -3021,9 +3022,9 @@ dependencies = [ [[package]] name = "outref" -version = "0.1.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f222829ae9293e33a9f5e9f440c6760a3d450a64affe1846486b140db81c1f4" +checksum = "4030760ffd992bef45b0ae3f10ce1aba99e33464c90d14dd7c039884963ddc7a" [[package]] name = "p256" @@ -4011,15 +4012,6 @@ dependencies = [ ] [[package]] -name = "simd-abstraction" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49d3f0728c33eb35102d2489a6a13dbbb510b07864b854e961b9e4b9cd011c61" -dependencies = [ - "outref", -] - -[[package]] name = "siphasher" version = "0.3.10" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -5352,6 +5344,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" [[package]] +name = "vsimd" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c3082ca00d5a5ef149bb8b555a72ae84c9c59f7250f013ac822ac2e49b19c64" + +[[package]] name = "vte" version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" diff --git a/ext/web/Cargo.toml b/ext/web/Cargo.toml index b91013a84..07d3026b5 100644 --- a/ext/web/Cargo.toml +++ b/ext/web/Cargo.toml @@ -15,7 +15,7 @@ path = "lib.rs" [dependencies] async-trait.workspace = true -base64-simd = "0.7" +base64-simd = "0.8" deno_core.workspace = true encoding_rs.workspace = true flate2.workspace = true diff --git a/ext/web/lib.rs b/ext/web/lib.rs index de8984232..92cfcceeb 100644 --- a/ext/web/lib.rs +++ b/ext/web/lib.rs @@ -130,25 +130,27 @@ pub fn init<P: TimersPermission + 'static>( #[op] fn op_base64_decode(input: String) -> Result<ZeroCopyBuf, AnyError> { let mut s = input.into_bytes(); - let decoded_len = forgiving_base64_decode(&mut s)?; + let decoded_len = forgiving_base64_decode_inplace(&mut s)?; s.truncate(decoded_len); Ok(s.into()) } #[op] fn op_base64_atob(mut s: ByteString) -> Result<ByteString, AnyError> { - let decoded_len = forgiving_base64_decode(&mut s)?; + let decoded_len = forgiving_base64_decode_inplace(&mut s)?; s.truncate(decoded_len); Ok(s) } /// See <https://infra.spec.whatwg.org/#forgiving-base64> #[inline] -fn forgiving_base64_decode(input: &mut [u8]) -> Result<usize, AnyError> { +fn forgiving_base64_decode_inplace( + input: &mut [u8], +) -> Result<usize, AnyError> { let error: _ = || DomExceptionInvalidCharacterError::new("Failed to decode base64"); - let decoded = base64_simd::Base64::forgiving_decode_inplace(input) - .map_err(|_| error())?; + let decoded = + base64_simd::forgiving_decode_inplace(input).map_err(|_| error())?; Ok(decoded.len()) } @@ -165,8 +167,7 @@ fn op_base64_btoa(s: ByteString) -> String { /// See <https://infra.spec.whatwg.org/#forgiving-base64> #[inline] fn forgiving_base64_encode(s: &[u8]) -> String { - const BASE64_STANDARD: base64_simd::Base64 = base64_simd::Base64::STANDARD; - BASE64_STANDARD.encode_to_boxed_str(s).into_string() + base64_simd::STANDARD.encode_to_string(s) } #[op] |