[tbb-commits] [tor-browser] 20/73: Bug 1783784 - Update packed_simd_2 to 0.3.8.

This is an automated email from the git hooks/post-receive script.

richard pushed a commit to branch geckoview-102.3.0esr-12.0-1 in repository tor-browser.

commit ada04eb9b82531a41553b6ffc2ba3194c70fdc45 Author: Mike Hommey mh+mozilla@glandium.org AuthorDate: Wed Aug 24 06:58:59 2022 +0000

Bug 1783784 - Update packed_simd_2 to 0.3.8.

Differential Revision: https://phabricator.services.mozilla.com/D154063 --- .cargo/config.in | 2 +- Cargo.lock | 5 +- Cargo.toml | 2 +- .../rust/packed_simd_2/.cargo-checksum.json | 2 +- third_party/rust/packed_simd_2/Cargo.toml | 5 +- third_party/rust/packed_simd_2/README.md | 2 +- third_party/rust/packed_simd_2/build.rs | 5 ++ third_party/rust/packed_simd_2/src/api.rs | 4 +- third_party/rust/packed_simd_2/src/codegen.rs | 50 +++++------ .../rust/packed_simd_2/src/codegen/bit_manip.rs | 4 +- third_party/rust/packed_simd_2/src/codegen/llvm.rs | 98 +++++++++++----------- third_party/rust/packed_simd_2/src/codegen/math.rs | 2 +- .../rust/packed_simd_2/src/codegen/math/float.rs | 28 +++---- .../packed_simd_2/src/codegen/math/float/abs.rs | 2 +- .../packed_simd_2/src/codegen/math/float/cos.rs | 2 +- .../packed_simd_2/src/codegen/math/float/cos_pi.rs | 2 +- .../packed_simd_2/src/codegen/math/float/exp.rs | 2 +- .../packed_simd_2/src/codegen/math/float/ln.rs | 2 +- .../src/codegen/math/float/mul_add.rs | 2 +- .../src/codegen/math/float/mul_adde.rs | 2 +- .../packed_simd_2/src/codegen/math/float/powf.rs | 2 +- .../packed_simd_2/src/codegen/math/float/sin.rs | 2 +- .../src/codegen/math/float/sin_cos_pi.rs | 2 +- .../packed_simd_2/src/codegen/math/float/sin_pi.rs | 2 +- .../packed_simd_2/src/codegen/math/float/sqrt.rs | 2 +- .../packed_simd_2/src/codegen/math/float/sqrte.rs | 2 +- .../packed_simd_2/src/codegen/pointer_sized_int.rs | 24 +++--- .../rust/packed_simd_2/src/codegen/reductions.rs | 2 +- .../packed_simd_2/src/codegen/reductions/mask.rs | 4 +- .../rust/packed_simd_2/src/codegen/swap_bytes.rs | 4 +- third_party/rust/packed_simd_2/src/codegen/vPtr.rs | 2 +- third_party/rust/packed_simd_2/src/lib.rs | 7 +- third_party/rust/packed_simd_2/src/testing.rs | 2 +- 33 files changed, 144 insertions(+), 136 deletions(-)

diff --git a/.cargo/config.in b/.cargo/config.in index a6e396b29f764..2e5bad6fed2c6 100644 --- a/.cargo/config.in +++ b/.cargo/config.in @@ -70,7 +70,7 @@ rev = "746743227485a83123784df0c53227ab466612ed" [source."https://github.com/hsivonen/packed_simd"] git = "https://github.com/hsivonen/packed_simd" replace-with = "vendored-sources" -rev = "c149d0a519bf878567c7630096737669ec2ff15f" +rev = "f38664024b29d44c506431eada7c112629bb1aa9"

[source."https://github.com/hsivonen/chardetng_c"] git = "https://github.com/hsivonen/chardetng_c" diff --git a/Cargo.lock b/Cargo.lock index 0560a3c86be85..ebec60085c0c0 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3812,10 +3812,11 @@ dependencies = [

[[package]] name = "packed_simd_2" -version = "0.3.7" -source = "git+https://github.com/hsivonen/packed_simd?rev=c149d0a519bf878567c7630096737669..." +version = "0.3.8" +source = "git+https://github.com/hsivonen/packed_simd?rev=f38664024b29d44c506431eada7c1126..." dependencies = [ "cfg-if 1.0.0", + "rustc_version", ]

[[package]] diff --git a/Cargo.toml b/Cargo.toml index de7ee7ac7cc1f..f576534bf3f8b 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -113,7 +113,7 @@ chardetng_c = { git = "https://github.com/hsivonen/chardetng_c", rev="ed8a4c6f90 coremidi = { git = "https://github.com/chris-zen/coremidi.git", rev="fc68464b5445caf111e41f643a2e69ccce0b4f83" } fog = { path = "toolkit/components/glean/api" } libudev-sys = { path = "dom/webauthn/libudev-sys" } -packed_simd = { package = "packed_simd_2", git = "https://github.com/hsivonen/packed_simd", rev="c149d0a519bf878567c7630096737669ec2ff15f" } +packed_simd = { package = "packed_simd_2", git = "https://github.com/hsivonen/packed_simd", rev="f38664024b29d44c506431eada7c112629bb1aa9" } midir = { git = "https://github.com/mozilla/midir.git", rev = "4c11f0ffb5d6a10de4aff40a7b81218b33b94e6f" } minidump_writer_linux = { git = "https://github.com/rust-minidump/minidump-writer.git", rev = "75ada456c92a429704691a85e1cb42fef8cafc0d" }

diff --git a/third_party/rust/packed_simd_2/.cargo-checksum.json b/third_party/rust/packed_simd_2/.cargo-checksum.json index 3090b655a160c..079b4c559f5ee 100644 --- a/third_party/rust/packed_simd_2/.cargo-checksum.json +++ b/third_party/rust/packed_simd_2/.cargo-checksum.json @@ -1 +1 @@ -{"files":{".appveyor.yml":"f1ed01850e0d725f9498f52a1a63ddf40702ad6e0bf5b2d7c4c04d76e96794a3",".travis.yml":"30a61a5ec53355fc1f3585e1690280308c2b7961701abc11e8389b235b647178","Cargo.toml":"f85e54e13a05f6e4f27c230ab81430af27b6ff80a1c036bd70c42ea115f89487","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"6485b8ed310d3f0340bf1ad1f47645069ce4069dcc6bb46c7d5c6faf41de1fdb","README.md":"882f8894b333becf490d23c9024a86fd1327c8edea33aa8dbb98dc2f2ddb [...] \ No newline at end of file +{"files":{".appveyor.yml":"f1ed01850e0d725f9498f52a1a63ddf40702ad6e0bf5b2d7c4c04d76e96794a3",".travis.yml":"30a61a5ec53355fc1f3585e1690280308c2b7961701abc11e8389b235b647178","Cargo.toml":"e76b42f3247fccb7174046c499bfaae5430d83cadeb8140259fcae34613483cf","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"6485b8ed310d3f0340bf1ad1f47645069ce4069dcc6bb46c7d5c6faf41de1fdb","README.md":"fa4dd64f66972217d35b7653338c9e2011ccd8f3008ae7c0103272d4287f [...] \ No newline at end of file diff --git a/third_party/rust/packed_simd_2/Cargo.toml b/third_party/rust/packed_simd_2/Cargo.toml index f38706d05002e..49338742dc1ff 100644 --- a/third_party/rust/packed_simd_2/Cargo.toml +++ b/third_party/rust/packed_simd_2/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "packed_simd_2" -version = "0.3.7" +version = "0.3.8" description = "Portable Packed SIMD vectors" documentation = "https://docs.rs/crate/packed_simd/" homepage = "https://github.com/rust-lang/packed_simd" @@ -23,6 +23,9 @@ maintenance = { status = "experimental" } cfg-if = "1.0.0" core_arch = { version = "0.1.5", optional = true }

+[build-dependencies] +rustc_version = "0.2" + [features] default = [] into_bits = [] diff --git a/third_party/rust/packed_simd_2/README.md b/third_party/rust/packed_simd_2/README.md index 41a1512d79fbc..eb3101c33d159 100644 --- a/third_party/rust/packed_simd_2/README.md +++ b/third_party/rust/packed_simd_2/README.md @@ -8,7 +8,7 @@ If you need to continue to use the crate, we have published a "next version" und

Adjust your `[dependencies]` section of `Cargo.toml` to be the following: ```toml -packed_simd = { version = "0.3.6", package = "packed_simd_2" } +packed_simd = { version = "0.3.8", package = "packed_simd_2" } ```

# `Simd<[T; N]>` diff --git a/third_party/rust/packed_simd_2/build.rs b/third_party/rust/packed_simd_2/build.rs index e87298a2de237..afdee9f55b62b 100644 --- a/third_party/rust/packed_simd_2/build.rs +++ b/third_party/rust/packed_simd_2/build.rs @@ -1,6 +1,11 @@ +use rustc_version::{version, Version}; + fn main() { let target = std::env::var("TARGET").expect("TARGET environment variable not defined"); if target.contains("neon") { println!("cargo:rustc-cfg=libcore_neon"); } + if version().unwrap() < Version::parse("1.61.0-alpha").unwrap() { + println!("cargo:rustc-cfg=aarch64_target_feature"); + } } diff --git a/third_party/rust/packed_simd_2/src/api.rs b/third_party/rust/packed_simd_2/src/api.rs index 4e9c4292e06ca..aa1403e6e243d 100644 --- a/third_party/rust/packed_simd_2/src/api.rs +++ b/third_party/rust/packed_simd_2/src/api.rs @@ -2,7 +2,7 @@

#[macro_use] mod bitmask; -crate mod cast; +pub(crate) mod cast; #[macro_use] mod cmp; #[macro_use] @@ -37,7 +37,7 @@ mod swap_bytes; mod bit_manip;

#[cfg(feature = "into_bits")] -crate mod into_bits; +pub(crate) mod into_bits;

macro_rules! impl_i { ([$elem_ty:ident; $elem_n:expr]: $tuple_id:ident, $mask_ty:ident diff --git a/third_party/rust/packed_simd_2/src/codegen.rs b/third_party/rust/packed_simd_2/src/codegen.rs index 9d1517e203d19..8a9e971486d74 100644 --- a/third_party/rust/packed_simd_2/src/codegen.rs +++ b/third_party/rust/packed_simd_2/src/codegen.rs @@ -1,19 +1,19 @@ //! Code-generation utilities

-crate mod bit_manip; -crate mod llvm; -crate mod math; -crate mod reductions; -crate mod shuffle; -crate mod shuffle1_dyn; -crate mod swap_bytes; +pub(crate) mod bit_manip; +pub(crate) mod llvm; +pub(crate) mod math; +pub(crate) mod reductions; +pub(crate) mod shuffle; +pub(crate) mod shuffle1_dyn; +pub(crate) mod swap_bytes;

macro_rules! impl_simd_array { ([$elem_ty:ident; $elem_count:expr]: $tuple_id:ident | $($elem_tys:ident),*) => { #[derive(Copy, Clone)] #[repr(simd)] - pub struct $tuple_id($(crate $elem_tys),*); + pub struct $tuple_id($(pub(crate) $elem_tys),*); //^^^^^^^ leaked through SimdArray

impl crate::sealed::Seal for [$elem_ty; $elem_count] {} @@ -35,28 +35,28 @@ macro_rules! impl_simd_array { } }

-crate mod pointer_sized_int; +pub(crate) mod pointer_sized_int;

-crate mod v16; -crate use self::v16::*; +pub(crate) mod v16; +pub(crate) use self::v16::*;

-crate mod v32; -crate use self::v32::*; +pub(crate) mod v32; +pub(crate) use self::v32::*;

-crate mod v64; -crate use self::v64::*; +pub(crate) mod v64; +pub(crate) use self::v64::*;

-crate mod v128; -crate use self::v128::*; +pub(crate) mod v128; +pub(crate) use self::v128::*;

-crate mod v256; -crate use self::v256::*; +pub(crate) mod v256; +pub(crate) use self::v256::*;

-crate mod v512; -crate use self::v512::*; +pub(crate) mod v512; +pub(crate) use self::v512::*;

-crate mod vSize; -crate use self::vSize::*; +pub(crate) mod vSize; +pub(crate) use self::vSize::*;

-crate mod vPtr; -crate use self::vPtr::*; +pub(crate) mod vPtr; +pub(crate) use self::vPtr::*; diff --git a/third_party/rust/packed_simd_2/src/codegen/bit_manip.rs b/third_party/rust/packed_simd_2/src/codegen/bit_manip.rs index 5986916da4387..32d8d717a0766 100644 --- a/third_party/rust/packed_simd_2/src/codegen/bit_manip.rs +++ b/third_party/rust/packed_simd_2/src/codegen/bit_manip.rs @@ -1,7 +1,7 @@ //! LLVM bit manipulation intrinsics. #[rustfmt::skip]

-use crate::*; +pub(crate) use crate::*;

#[allow(improper_ctypes, dead_code)] extern "C" { @@ -147,7 +147,7 @@ extern "C" { fn ctpop_u128x4(x: u128x4) -> u128x4; }

-crate trait BitManip { +pub(crate) trait BitManip { fn ctpop(self) -> Self; fn ctlz(self) -> Self; fn cttz(self) -> Self; diff --git a/third_party/rust/packed_simd_2/src/codegen/llvm.rs b/third_party/rust/packed_simd_2/src/codegen/llvm.rs index 52b11a95b9172..b4c09849bc4a3 100644 --- a/third_party/rust/packed_simd_2/src/codegen/llvm.rs +++ b/third_party/rust/packed_simd_2/src/codegen/llvm.rs @@ -76,53 +76,53 @@ where }

extern "platform-intrinsic" { - crate fn simd_eq<T, U>(x: T, y: T) -> U; - crate fn simd_ne<T, U>(x: T, y: T) -> U; - crate fn simd_lt<T, U>(x: T, y: T) -> U; - crate fn simd_le<T, U>(x: T, y: T) -> U; - crate fn simd_gt<T, U>(x: T, y: T) -> U; - crate fn simd_ge<T, U>(x: T, y: T) -> U; - - crate fn simd_insert<T, U>(x: T, idx: u32, val: U) -> T; - crate fn simd_extract<T, U>(x: T, idx: u32) -> U; - - crate fn simd_cast<T, U>(x: T) -> U; - - crate fn simd_add<T>(x: T, y: T) -> T; - crate fn simd_sub<T>(x: T, y: T) -> T; - crate fn simd_mul<T>(x: T, y: T) -> T; - crate fn simd_div<T>(x: T, y: T) -> T; - crate fn simd_rem<T>(x: T, y: T) -> T; - crate fn simd_shl<T>(x: T, y: T) -> T; - crate fn simd_shr<T>(x: T, y: T) -> T; - crate fn simd_and<T>(x: T, y: T) -> T; - crate fn simd_or<T>(x: T, y: T) -> T; - crate fn simd_xor<T>(x: T, y: T) -> T; - - crate fn simd_reduce_add_unordered<T, U>(x: T) -> U; - crate fn simd_reduce_mul_unordered<T, U>(x: T) -> U; - crate fn simd_reduce_add_ordered<T, U>(x: T, acc: U) -> U; - crate fn simd_reduce_mul_ordered<T, U>(x: T, acc: U) -> U; - crate fn simd_reduce_min<T, U>(x: T) -> U; - crate fn simd_reduce_max<T, U>(x: T) -> U; - crate fn simd_reduce_min_nanless<T, U>(x: T) -> U; - crate fn simd_reduce_max_nanless<T, U>(x: T) -> U; - crate fn simd_reduce_and<T, U>(x: T) -> U; - crate fn simd_reduce_or<T, U>(x: T) -> U; - crate fn simd_reduce_xor<T, U>(x: T) -> U; - crate fn simd_reduce_all<T>(x: T) -> bool; - crate fn simd_reduce_any<T>(x: T) -> bool; - - crate fn simd_select<M, T>(m: M, a: T, b: T) -> T; - - crate fn simd_fmin<T>(a: T, b: T) -> T; - crate fn simd_fmax<T>(a: T, b: T) -> T; - - crate fn simd_fsqrt<T>(a: T) -> T; - crate fn simd_fma<T>(a: T, b: T, c: T) -> T; - - crate fn simd_gather<T, P, M>(value: T, pointers: P, mask: M) -> T; - crate fn simd_scatter<T, P, M>(value: T, pointers: P, mask: M); - - crate fn simd_bitmask<T, U>(value: T) -> U; + pub(crate) fn simd_eq<T, U>(x: T, y: T) -> U; + pub(crate) fn simd_ne<T, U>(x: T, y: T) -> U; + pub(crate) fn simd_lt<T, U>(x: T, y: T) -> U; + pub(crate) fn simd_le<T, U>(x: T, y: T) -> U; + pub(crate) fn simd_gt<T, U>(x: T, y: T) -> U; + pub(crate) fn simd_ge<T, U>(x: T, y: T) -> U; + + pub(crate) fn simd_insert<T, U>(x: T, idx: u32, val: U) -> T; + pub(crate) fn simd_extract<T, U>(x: T, idx: u32) -> U; + + pub(crate) fn simd_cast<T, U>(x: T) -> U; + + pub(crate) fn simd_add<T>(x: T, y: T) -> T; + pub(crate) fn simd_sub<T>(x: T, y: T) -> T; + pub(crate) fn simd_mul<T>(x: T, y: T) -> T; + pub(crate) fn simd_div<T>(x: T, y: T) -> T; + pub(crate) fn simd_rem<T>(x: T, y: T) -> T; + pub(crate) fn simd_shl<T>(x: T, y: T) -> T; + pub(crate) fn simd_shr<T>(x: T, y: T) -> T; + pub(crate) fn simd_and<T>(x: T, y: T) -> T; + pub(crate) fn simd_or<T>(x: T, y: T) -> T; + pub(crate) fn simd_xor<T>(x: T, y: T) -> T; + + pub(crate) fn simd_reduce_add_unordered<T, U>(x: T) -> U; + pub(crate) fn simd_reduce_mul_unordered<T, U>(x: T) -> U; + pub(crate) fn simd_reduce_add_ordered<T, U>(x: T, acc: U) -> U; + pub(crate) fn simd_reduce_mul_ordered<T, U>(x: T, acc: U) -> U; + pub(crate) fn simd_reduce_min<T, U>(x: T) -> U; + pub(crate) fn simd_reduce_max<T, U>(x: T) -> U; + pub(crate) fn simd_reduce_min_nanless<T, U>(x: T) -> U; + pub(crate) fn simd_reduce_max_nanless<T, U>(x: T) -> U; + pub(crate) fn simd_reduce_and<T, U>(x: T) -> U; + pub(crate) fn simd_reduce_or<T, U>(x: T) -> U; + pub(crate) fn simd_reduce_xor<T, U>(x: T) -> U; + pub(crate) fn simd_reduce_all<T>(x: T) -> bool; + pub(crate) fn simd_reduce_any<T>(x: T) -> bool; + + pub(crate) fn simd_select<M, T>(m: M, a: T, b: T) -> T; + + pub(crate) fn simd_fmin<T>(a: T, b: T) -> T; + pub(crate) fn simd_fmax<T>(a: T, b: T) -> T; + + pub(crate) fn simd_fsqrt<T>(a: T) -> T; + pub(crate) fn simd_fma<T>(a: T, b: T, c: T) -> T; + + pub(crate) fn simd_gather<T, P, M>(value: T, pointers: P, mask: M) -> T; + pub(crate) fn simd_scatter<T, P, M>(value: T, pointers: P, mask: M); + + pub(crate) fn simd_bitmask<T, U>(value: T) -> U; } diff --git a/third_party/rust/packed_simd_2/src/codegen/math.rs b/third_party/rust/packed_simd_2/src/codegen/math.rs index f3997c7f11359..9a0ea7a4e2d24 100644 --- a/third_party/rust/packed_simd_2/src/codegen/math.rs +++ b/third_party/rust/packed_simd_2/src/codegen/math.rs @@ -1,3 +1,3 @@ //! Vertical math operations

-crate mod float; +pub(crate) mod float; diff --git a/third_party/rust/packed_simd_2/src/codegen/math/float.rs b/third_party/rust/packed_simd_2/src/codegen/math/float.rs index 5e89bf6ae6b0c..ffbf18bfe989d 100644 --- a/third_party/rust/packed_simd_2/src/codegen/math/float.rs +++ b/third_party/rust/packed_simd_2/src/codegen/math/float.rs @@ -2,17 +2,17 @@ #![allow(clippy::useless_transmute)]

#[macro_use] -crate mod macros; -crate mod abs; -crate mod cos; -crate mod cos_pi; -crate mod exp; -crate mod ln; -crate mod mul_add; -crate mod mul_adde; -crate mod powf; -crate mod sin; -crate mod sin_cos_pi; -crate mod sin_pi; -crate mod sqrt; -crate mod sqrte; +pub(crate) mod macros; +pub(crate) mod abs; +pub(crate) mod cos; +pub(crate) mod cos_pi; +pub(crate) mod exp; +pub(crate) mod ln; +pub(crate) mod mul_add; +pub(crate) mod mul_adde; +pub(crate) mod powf; +pub(crate) mod sin; +pub(crate) mod sin_cos_pi; +pub(crate) mod sin_pi; +pub(crate) mod sqrt; +pub(crate) mod sqrte; diff --git a/third_party/rust/packed_simd_2/src/codegen/math/float/abs.rs b/third_party/rust/packed_simd_2/src/codegen/math/float/abs.rs index bc4421f61de2d..34aacc25be75a 100644 --- a/third_party/rust/packed_simd_2/src/codegen/math/float/abs.rs +++ b/third_party/rust/packed_simd_2/src/codegen/math/float/abs.rs @@ -5,7 +5,7 @@

use crate::*;

-crate trait Abs { +pub(crate) trait Abs { fn abs(self) -> Self; }

diff --git a/third_party/rust/packed_simd_2/src/codegen/math/float/cos.rs b/third_party/rust/packed_simd_2/src/codegen/math/float/cos.rs index 50f6c16da2555..dec390cb74d46 100644 --- a/third_party/rust/packed_simd_2/src/codegen/math/float/cos.rs +++ b/third_party/rust/packed_simd_2/src/codegen/math/float/cos.rs @@ -5,7 +5,7 @@

use crate::*;

-crate trait Cos { +pub(crate) trait Cos { fn cos(self) -> Self; }

diff --git a/third_party/rust/packed_simd_2/src/codegen/math/float/cos_pi.rs b/third_party/rust/packed_simd_2/src/codegen/math/float/cos_pi.rs index ebff5fd1c7510..e283280ee44b1 100644 --- a/third_party/rust/packed_simd_2/src/codegen/math/float/cos_pi.rs +++ b/third_party/rust/packed_simd_2/src/codegen/math/float/cos_pi.rs @@ -5,7 +5,7 @@

use crate::*;

-crate trait CosPi { +pub(crate) trait CosPi { fn cos_pi(self) -> Self; }

diff --git a/third_party/rust/packed_simd_2/src/codegen/math/float/exp.rs b/third_party/rust/packed_simd_2/src/codegen/math/float/exp.rs index 00d10e9fa6440..a7b20580e3f1e 100644 --- a/third_party/rust/packed_simd_2/src/codegen/math/float/exp.rs +++ b/third_party/rust/packed_simd_2/src/codegen/math/float/exp.rs @@ -5,7 +5,7 @@

use crate::*;

-crate trait Exp { +pub(crate) trait Exp { fn exp(self) -> Self; }

diff --git a/third_party/rust/packed_simd_2/src/codegen/math/float/ln.rs b/third_party/rust/packed_simd_2/src/codegen/math/float/ln.rs index 88a5a6c6c1589..a5e38cb40d1ed 100644 --- a/third_party/rust/packed_simd_2/src/codegen/math/float/ln.rs +++ b/third_party/rust/packed_simd_2/src/codegen/math/float/ln.rs @@ -5,7 +5,7 @@

use crate::*;

-crate trait Ln { +pub(crate) trait Ln { fn ln(self) -> Self; }

diff --git a/third_party/rust/packed_simd_2/src/codegen/math/float/mul_add.rs b/third_party/rust/packed_simd_2/src/codegen/math/float/mul_add.rs index f48a57dc46c69..d37f30fa86140 100644 --- a/third_party/rust/packed_simd_2/src/codegen/math/float/mul_add.rs +++ b/third_party/rust/packed_simd_2/src/codegen/math/float/mul_add.rs @@ -4,7 +4,7 @@ use crate::*;

// FIXME: 64-bit 1 element mul_add

-crate trait MulAdd { +pub(crate) trait MulAdd { fn mul_add(self, y: Self, z: Self) -> Self; }

diff --git a/third_party/rust/packed_simd_2/src/codegen/math/float/mul_adde.rs b/third_party/rust/packed_simd_2/src/codegen/math/float/mul_adde.rs index b030c26ccf465..c0baeacec20be 100644 --- a/third_party/rust/packed_simd_2/src/codegen/math/float/mul_adde.rs +++ b/third_party/rust/packed_simd_2/src/codegen/math/float/mul_adde.rs @@ -3,7 +3,7 @@ use crate::*;

// FIXME: 64-bit 1 element mul_adde

-crate trait MulAddE { +pub(crate) trait MulAddE { fn mul_adde(self, y: Self, z: Self) -> Self; }

diff --git a/third_party/rust/packed_simd_2/src/codegen/math/float/powf.rs b/third_party/rust/packed_simd_2/src/codegen/math/float/powf.rs index bc15067d73a30..89ca52e96d818 100644 --- a/third_party/rust/packed_simd_2/src/codegen/math/float/powf.rs +++ b/third_party/rust/packed_simd_2/src/codegen/math/float/powf.rs @@ -5,7 +5,7 @@

use crate::*;

-crate trait Powf { +pub(crate) trait Powf { fn powf(self, x: Self) -> Self; }

diff --git a/third_party/rust/packed_simd_2/src/codegen/math/float/sin.rs b/third_party/rust/packed_simd_2/src/codegen/math/float/sin.rs index 7b014d07da8d9..d881415909afe 100644 --- a/third_party/rust/packed_simd_2/src/codegen/math/float/sin.rs +++ b/third_party/rust/packed_simd_2/src/codegen/math/float/sin.rs @@ -5,7 +5,7 @@

use crate::*;

-crate trait Sin { +pub(crate) trait Sin { fn sin(self) -> Self; }

diff --git a/third_party/rust/packed_simd_2/src/codegen/math/float/sin_cos_pi.rs b/third_party/rust/packed_simd_2/src/codegen/math/float/sin_cos_pi.rs index 75c2c2c5fbb03..b283d11111fd5 100644 --- a/third_party/rust/packed_simd_2/src/codegen/math/float/sin_cos_pi.rs +++ b/third_party/rust/packed_simd_2/src/codegen/math/float/sin_cos_pi.rs @@ -5,7 +5,7 @@

use crate::*;

-crate trait SinCosPi: Sized { +pub(crate) trait SinCosPi: Sized { type Output; fn sin_cos_pi(self) -> Self::Output; } diff --git a/third_party/rust/packed_simd_2/src/codegen/math/float/sin_pi.rs b/third_party/rust/packed_simd_2/src/codegen/math/float/sin_pi.rs index 72df98c93c91e..0c8f6bb120503 100644 --- a/third_party/rust/packed_simd_2/src/codegen/math/float/sin_pi.rs +++ b/third_party/rust/packed_simd_2/src/codegen/math/float/sin_pi.rs @@ -5,7 +5,7 @@

use crate::*;

-crate trait SinPi { +pub(crate) trait SinPi { fn sin_pi(self) -> Self; }

diff --git a/third_party/rust/packed_simd_2/src/codegen/math/float/sqrt.rs b/third_party/rust/packed_simd_2/src/codegen/math/float/sqrt.rs index 7ce31df626621..67bb0a2a9c594 100644 --- a/third_party/rust/packed_simd_2/src/codegen/math/float/sqrt.rs +++ b/third_party/rust/packed_simd_2/src/codegen/math/float/sqrt.rs @@ -5,7 +5,7 @@

use crate::*;

-crate trait Sqrt { +pub(crate) trait Sqrt { fn sqrt(self) -> Self; }

diff --git a/third_party/rust/packed_simd_2/src/codegen/math/float/sqrte.rs b/third_party/rust/packed_simd_2/src/codegen/math/float/sqrte.rs index c1e379c34241f..58a1de1f400f9 100644 --- a/third_party/rust/packed_simd_2/src/codegen/math/float/sqrte.rs +++ b/third_party/rust/packed_simd_2/src/codegen/math/float/sqrte.rs @@ -6,7 +6,7 @@ use crate::llvm::simd_fsqrt; use crate::*;

-crate trait Sqrte { +pub(crate) trait Sqrte { fn sqrte(self) -> Self; }

diff --git a/third_party/rust/packed_simd_2/src/codegen/pointer_sized_int.rs b/third_party/rust/packed_simd_2/src/codegen/pointer_sized_int.rs index 39f493d3b17f0..55cbc297aaf52 100644 --- a/third_party/rust/packed_simd_2/src/codegen/pointer_sized_int.rs +++ b/third_party/rust/packed_simd_2/src/codegen/pointer_sized_int.rs @@ -4,24 +4,24 @@ use cfg_if::cfg_if;

cfg_if! { if #[cfg(target_pointer_width = "8")] { - crate type isize_ = i8; - crate type usize_ = u8; + pub(crate) type isize_ = i8; + pub(crate) type usize_ = u8; } else if #[cfg(target_pointer_width = "16")] { - crate type isize_ = i16; - crate type usize_ = u16; + pub(crate) type isize_ = i16; + pub(crate) type usize_ = u16; } else if #[cfg(target_pointer_width = "32")] { - crate type isize_ = i32; - crate type usize_ = u32; + pub(crate) type isize_ = i32; + pub(crate) type usize_ = u32;

} else if #[cfg(target_pointer_width = "64")] { - crate type isize_ = i64; - crate type usize_ = u64; + pub(crate) type isize_ = i64; + pub(crate) type usize_ = u64; } else if #[cfg(target_pointer_width = "64")] { - crate type isize_ = i64; - crate type usize_ = u64; + pub(crate) type isize_ = i64; + pub(crate) type usize_ = u64; } else if #[cfg(target_pointer_width = "128")] { - crate type isize_ = i128; - crate type usize_ = u128; + pub(crate) type isize_ = i128; + pub(crate) type usize_ = u128; } else { compile_error!("unsupported target_pointer_width"); } diff --git a/third_party/rust/packed_simd_2/src/codegen/reductions.rs b/third_party/rust/packed_simd_2/src/codegen/reductions.rs index 7be4f5fabbea9..302ca6d88f33d 100644 --- a/third_party/rust/packed_simd_2/src/codegen/reductions.rs +++ b/third_party/rust/packed_simd_2/src/codegen/reductions.rs @@ -1 +1 @@ -crate mod mask; +pub(crate) mod mask; diff --git a/third_party/rust/packed_simd_2/src/codegen/reductions/mask.rs b/third_party/rust/packed_simd_2/src/codegen/reductions/mask.rs index 0aec60969b864..a78bcc5632672 100644 --- a/third_party/rust/packed_simd_2/src/codegen/reductions/mask.rs +++ b/third_party/rust/packed_simd_2/src/codegen/reductions/mask.rs @@ -7,11 +7,11 @@

use crate::*;

-crate trait All: crate::marker::Sized { +pub(crate) trait All: crate::marker::Sized { unsafe fn all(self) -> bool; }

-crate trait Any: crate::marker::Sized { +pub(crate) trait Any: crate::marker::Sized { unsafe fn any(self) -> bool; }

diff --git a/third_party/rust/packed_simd_2/src/codegen/swap_bytes.rs b/third_party/rust/packed_simd_2/src/codegen/swap_bytes.rs index a4435e3c35354..9cf34a3e0401c 100644 --- a/third_party/rust/packed_simd_2/src/codegen/swap_bytes.rs +++ b/third_party/rust/packed_simd_2/src/codegen/swap_bytes.rs @@ -5,7 +5,7 @@

use crate::*;

-crate trait SwapBytes { +pub(crate) trait SwapBytes { fn swap_bytes(self) -> Self; }

@@ -15,7 +15,7 @@ macro_rules! impl_swap_bytes { impl SwapBytes for $id { #[inline] fn swap_bytes(self) -> Self { - unsafe { shuffle!(self, [1, 0]) } + shuffle!(self, [1, 0]) } } )+ diff --git a/third_party/rust/packed_simd_2/src/codegen/vPtr.rs b/third_party/rust/packed_simd_2/src/codegen/vPtr.rs index cf4765538178d..abd3aa877920c 100644 --- a/third_party/rust/packed_simd_2/src/codegen/vPtr.rs +++ b/third_party/rust/packed_simd_2/src/codegen/vPtr.rs @@ -5,7 +5,7 @@ macro_rules! impl_simd_ptr { | $($tys:ty),*) => { #[derive(Copy, Clone)] #[repr(simd)] - pub struct $tuple_id<$ty>($(crate $tys),*); + pub struct $tuple_id<$ty>($(pub(crate) $tys),*); //^^^^^^^ leaked through SimdArray

impl<$ty> crate::sealed::Seal for [$ptr_ty; $elem_count] {} diff --git a/third_party/rust/packed_simd_2/src/lib.rs b/third_party/rust/packed_simd_2/src/lib.rs index 840bae38d6a30..cd8a86805dd59 100644 --- a/third_party/rust/packed_simd_2/src/lib.rs +++ b/third_party/rust/packed_simd_2/src/lib.rs @@ -217,14 +217,13 @@ rustc_attrs, platform_intrinsics, stdsimd, - aarch64_target_feature, arm_target_feature, link_llvm_intrinsics, core_intrinsics, stmt_expr_attributes, - crate_visibility_modifier, custom_inner_attributes, )] +#![cfg_attr(aarch64_target_feature, feature(aarch64_target_feature))] #![allow(non_camel_case_types, non_snake_case, // FIXME: these types are unsound in C FFI already // See https://github.com/rust-lang/rust/issues/53346 @@ -344,6 +343,6 @@ pub use self::codegen::llvm::{ __shuffle_vector8, };

-crate mod llvm { - crate use crate::codegen::llvm::*; +pub(crate) mod llvm { + pub(crate) use crate::codegen::llvm::*; } diff --git a/third_party/rust/packed_simd_2/src/testing.rs b/third_party/rust/packed_simd_2/src/testing.rs index fcbcf9e2ac8eb..6320b28055569 100644 --- a/third_party/rust/packed_simd_2/src/testing.rs +++ b/third_party/rust/packed_simd_2/src/testing.rs @@ -5,4 +5,4 @@ mod macros;

#[cfg(test)] #[macro_use] -crate mod utils; +pub(crate) mod utils;