108 lines
2.4 KiB
Diff
108 lines
2.4 KiB
Diff
diff --git a/Cargo.lock b/Cargo.lock
|
|
index 8c97711..cdd179b 100644
|
|
--- a/Cargo.lock
|
|
+++ b/Cargo.lock
|
|
@@ -1917,6 +1917,7 @@ checksum = "75030f3c4f45dafd7586dd6780965a8c7e8e285a5ecb86713e63a79c5b2766f3"
|
|
dependencies = [
|
|
"any_all_workaround",
|
|
"cfg-if",
|
|
+ "rustversion",
|
|
]
|
|
|
|
[[package]]
|
|
diff --git a/third_party/rust/encoding_rs/Cargo.toml b/third_party/rust/encoding_rs/Cargo.toml
|
|
index 2adac35..0239315 100644
|
|
--- a/third_party/rust/encoding_rs/Cargo.toml
|
|
+++ b/third_party/rust/encoding_rs/Cargo.toml
|
|
@@ -16,6 +16,7 @@ name = "encoding_rs"
|
|
version = "0.8.35"
|
|
authors = ["Henri Sivonen <[email protected]>"]
|
|
build = false
|
|
+autolib = false
|
|
autobins = false
|
|
autoexamples = false
|
|
autotests = false
|
|
@@ -39,33 +40,6 @@ categories = [
|
|
license = "(Apache-2.0 OR MIT) AND BSD-3-Clause"
|
|
repository = "https://github.com/hsivonen/encoding_rs"
|
|
|
|
-[profile.release]
|
|
-lto = true
|
|
-
|
|
-[lib]
|
|
-name = "encoding_rs"
|
|
-path = "src/lib.rs"
|
|
-
|
|
-[dependencies.any_all_workaround]
|
|
-version = "0.1.0"
|
|
-optional = true
|
|
-
|
|
-[dependencies.cfg-if]
|
|
-version = "1.0"
|
|
-
|
|
-[dependencies.serde]
|
|
-version = "1.0"
|
|
-optional = true
|
|
-
|
|
-[dev-dependencies.bincode]
|
|
-version = "1.0"
|
|
-
|
|
-[dev-dependencies.serde_derive]
|
|
-version = "1.0"
|
|
-
|
|
-[dev-dependencies.serde_json]
|
|
-version = "1.0"
|
|
-
|
|
[features]
|
|
alloc = []
|
|
default = ["alloc"]
|
|
@@ -84,4 +58,34 @@ fast-legacy-encode = [
|
|
less-slow-big5-hanzi-encode = []
|
|
less-slow-gb-hanzi-encode = []
|
|
less-slow-kanji-encode = []
|
|
-simd-accel = ["any_all_workaround"]
|
|
+simd-accel = [
|
|
+ "any_all_workaround",
|
|
+ "rustversion",
|
|
+]
|
|
+
|
|
+[lib]
|
|
+name = "encoding_rs"
|
|
+path = "src/lib.rs"
|
|
+
|
|
+[dependencies]
|
|
+cfg-if = "1.0"
|
|
+
|
|
+[dependencies.any_all_workaround]
|
|
+version = "0.1.0"
|
|
+optional = true
|
|
+
|
|
+[dependencies.rustversion]
|
|
+version = "1.0.19"
|
|
+optional = true
|
|
+
|
|
+[dependencies.serde]
|
|
+version = "1.0"
|
|
+optional = true
|
|
+
|
|
+[dev-dependencies]
|
|
+bincode = "1.0"
|
|
+serde_derive = "1.0"
|
|
+serde_json = "1.0"
|
|
+
|
|
+[profile.release]
|
|
+lto = true
|
|
diff --git a/third_party/rust/encoding_rs/src/x_user_defined.rs b/third_party/rust/encoding_rs/src/x_user_defined.rs
|
|
index 7af7d5e..2d24c9c 100644
|
|
--- a/third_party/rust/encoding_rs/src/x_user_defined.rs
|
|
+++ b/third_party/rust/encoding_rs/src/x_user_defined.rs
|
|
@@ -16,6 +16,8 @@ cfg_if! {
|
|
use simd_funcs::*;
|
|
use core::simd::u16x8;
|
|
use core::simd::cmp::SimdPartialOrd;
|
|
+ #[rustversion::since(1.95)]
|
|
+ use core::simd::Select;
|
|
|
|
#[inline(always)]
|
|
fn shift_upper(unpacked: u16x8) -> u16x8 {
|