Skip to content
This repository was archived by the owner on Jul 9, 2025. It is now read-only.

Commit 1e1bec8

Browse files
committed
Bug 1849874 - Update from packed_simd_2 to packed_simd. r=supply-chain-reviewers,glandium
Differential Revision: https://phabricator.services.mozilla.com/D186716
1 parent d5f701c commit 1e1bec8

File tree

228 files changed

+514
-172
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

228 files changed

+514
-172
lines changed

.cargo/config.in

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,9 +55,9 @@ git = "https://github.com/hsivonen/chardetng_c"
5555
rev = "ed8a4c6f900a90d4dbc1d64b856e61490a1c3570"
5656
replace-with = "vendored-sources"
5757

58-
[source."git+https://github.com/hsivonen/packed_simd?rev=412f9a0aa556611de021bde89dee8fefe6e0fbbd"]
58+
[source."git+https://github.com/hsivonen/packed_simd?rev=e588ceb568878e1a3156ea9ce551d5b63ef0cdc4"]
5959
git = "https://github.com/hsivonen/packed_simd"
60-
rev = "412f9a0aa556611de021bde89dee8fefe6e0fbbd"
60+
rev = "e588ceb568878e1a3156ea9ce551d5b63ef0cdc4"
6161
replace-with = "vendored-sources"
6262

6363
[source."git+https://github.com/jfkthame/mapped_hyph.git?rev=c7651a0cffff41996ad13c44f689bd9cd2192c01"]

Cargo.lock

Lines changed: 7 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@ cose = { git = "https://github.com/franziskuskiefer/cose-rust", rev = "43c22248d
190190
firefox-on-glean = { path = "toolkit/components/glean/api" }
191191
icu_testdata = { path = "intl/icu_testdata" }
192192
libudev-sys = { path = "dom/webauthn/libudev-sys" }
193-
packed_simd = { package = "packed_simd_2", git = "https://github.com/hsivonen/packed_simd", rev = "412f9a0aa556611de021bde89dee8fefe6e0fbbd" }
193+
packed_simd = { git = "https://github.com/hsivonen/packed_simd", rev = "e588ceb568878e1a3156ea9ce551d5b63ef0cdc4" }
194194
midir = { git = "https://github.com/mozilla/midir.git", rev = "519e651241e867af3391db08f9ae6400bc023e18" }
195195
# Avoid the dependency on chrono
196196
minidump-writer = { git = "https://github.com/rust-minidump/minidump-writer.git", rev = "a15bd5cab6a3de251c0c23264be14b977c0af09c" }

config/makefiles/rust.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -249,7 +249,7 @@ endif
249249
ifndef RUSTC_BOOTSTRAP
250250
RUSTC_BOOTSTRAP := mozglue_static,qcms
251251
ifdef MOZ_RUST_SIMD
252-
RUSTC_BOOTSTRAP := $(RUSTC_BOOTSTRAP),encoding_rs,packed_simd_2
252+
RUSTC_BOOTSTRAP := $(RUSTC_BOOTSTRAP),encoding_rs,packed_simd
253253
endif
254254
export RUSTC_BOOTSTRAP
255255
endif

supply-chain/audits.toml

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -161,6 +161,14 @@ start = "2019-03-04"
161161
end = "2024-05-05"
162162
notes = "Lina developed this crate as Mozilla staff."
163163

164+
[[wildcard-audits.encoding_rs]]
165+
who = "Henri Sivonen <hsivonen@hsivonen.fi>"
166+
criteria = "safe-to-deploy"
167+
user-id = 4484 # Henri Sivonen (hsivonen)
168+
start = "2019-02-26"
169+
end = "2024-08-28"
170+
notes = "I, Henri Sivonen, wrote encoding_rs for Gecko and have reviewed contributions by others. There are two caveats to the certification: 1) The crate does things that are documented to be UB but that do not appear to actually be UB due to integer types differing from the general rule; https://github.com/hsivonen/encoding_rs/issues/79 . 2) It would be prudent to re-review the code that reinterprets buffers of integers as SIMD vectors; see https://github.com/hsivonen/encoding_rs/issues/87 ."
171+
164172
[[wildcard-audits.etagere]]
165173
who = "Nicolas Silva <nical@fastmail.com>"
166174
criteria = "safe-to-deploy"
@@ -2432,6 +2440,18 @@ who = "Mike Hommey <mh+mozilla@glandium.org>"
24322440
criteria = "safe-to-deploy"
24332441
delta = "6.3.0 -> 6.4.1"
24342442

2443+
[[audits.packed_simd]]
2444+
who = "Henri Sivonen <hsivonen@hsivonen.fi>"
2445+
criteria = "safe-to-deploy"
2446+
delta = "0.3.8 -> 0.3.9"
2447+
notes = "The update from 0.3.8 to 0.3.9 makes mechanical changes to accommodate renaming, compiler updates, and CI service updates."
2448+
2449+
[[audits.packed_simd]]
2450+
who = "Henri Sivonen <hsivonen@hsivonen.fi>"
2451+
criteria = "safe-to-deploy"
2452+
delta = "0.3.9 -> 0.3.9@git:e588ceb568878e1a3156ea9ce551d5b63ef0cdc4"
2453+
notes = "The patch on top of crates.io version 0.3.9 merely deletes code for a feature that Firefox does not use."
2454+
24352455
[[audits.packed_simd_2]]
24362456
who = "Mike Hommey <mh+mozilla@glandium.org>"
24372457
criteria = "safe-to-deploy"

supply-chain/config.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ audit-as-crates-io = false
155155
audit-as-crates-io = true
156156
notes = "wgpu-core pins this crate."
157157

158-
[policy.packed_simd_2]
158+
[policy.packed_simd]
159159
audit-as-crates-io = true
160160
notes = "Based on upstream, see bug 1719674."
161161

@@ -655,8 +655,8 @@ criteria = "safe-to-deploy"
655655
version = "0.4.1"
656656
criteria = "safe-to-deploy"
657657

658-
[[exemptions.packed_simd_2]]
659-
version = "0.3.7"
658+
[[exemptions.packed_simd]]
659+
version = "0.3.8"
660660
criteria = "safe-to-deploy"
661661

662662
[[exemptions.phf]]

supply-chain/imports.lock

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -176,6 +176,13 @@ user-id = 3618
176176
user-login = "dtolnay"
177177
user-name = "David Tolnay"
178178

179+
[[publisher.encoding_rs]]
180+
version = "0.8.33"
181+
when = "2023-08-23"
182+
user-id = 4484
183+
user-login = "hsivonen"
184+
user-name = "Henri Sivonen"
185+
179186
[[publisher.etagere]]
180187
version = "0.2.7"
181188
when = "2022-05-04"

third_party/rust/encoding_rs/.cargo-checksum.json

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

third_party/rust/encoding_rs/Cargo.toml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
[package]
1313
edition = "2018"
1414
name = "encoding_rs"
15-
version = "0.8.32"
15+
version = "0.8.33"
1616
authors = ["Henri Sivonen <hsivonen@hsivonen.fi>"]
1717
description = "A Gecko-oriented implementation of the Encoding Standard"
1818
homepage = "https://docs.rs/encoding_rs/"
@@ -40,9 +40,8 @@ lto = true
4040
version = "1.0"
4141

4242
[dependencies.packed_simd]
43-
version = "0.3.4"
43+
version = "0.3.9"
4444
optional = true
45-
package = "packed_simd_2"
4645

4746
[dependencies.serde]
4847
version = "1.0"

third_party/rust/encoding_rs/README.md

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ There are currently these optional cargo features:
167167

168168
### `simd-accel`
169169

170-
Enables SIMD acceleration using the nightly-dependent `packed_simd_2` crate.
170+
Enables SIMD acceleration using the nightly-dependent `packed_simd` crate.
171171

172172
This is an opt-in feature, because enabling this feature _opts out_ of Rust's
173173
guarantees of future compilers compiling old code (aka. "stability story").
@@ -188,7 +188,7 @@ feature.
188188
_Note!_ If you are compiling for a target that does not have 128-bit SIMD
189189
enabled as part of the target definition and you are enabling 128-bit SIMD
190190
using `-C target_feature`, you need to enable the `core_arch` Cargo feature
191-
for `packed_simd_2` to compile a crates.io snapshot of `core_arch` instead of
191+
for `packed_simd` to compile a crates.io snapshot of `core_arch` instead of
192192
using the standard-library copy of `core::arch`, because the `core::arch`
193193
module of the pre-compiled standard library has been compiled with the
194194
assumption that the CPU doesn't have 128-bit SIMD. At present this applies
@@ -450,6 +450,10 @@ To regenerate the generated code:
450450

451451
## Release Notes
452452

453+
### 0.8.33
454+
455+
* Use `packed_simd` instead of `packed_simd_2` again now that updates are back under the `packed_simd` name. Only affects the `simd-accel` optional nightly feature.
456+
453457
### 0.8.32
454458

455459
* Removed `build.rs`. (This removal should resolve false positives reported by some antivirus products. This may break some build configurations that have opted out of Rust's guarantees against future build breakage.)

0 commit comments

Comments
 (0)