Skip to content

Commit 32e9416

Browse files
author
The Miri Cronjob Bot
committed
Merge ref 'b56aaec52bc0' from rust-lang/rust
Pull recent changes from https://github.com/rust-lang/rust via Josh. Upstream ref: b56aaec52bc0fa35591a872fb4aac81f606e265c Filtered ref: 12f5e3255df658296af9fc953d8c1ab79ba91ea3 This merge was created using https://github.com/rust-lang/josh-sync.
2 parents 16f7a07 + 781d63c commit 32e9416

File tree

121 files changed

+4642
-10558
lines changed

Some content is hidden

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

121 files changed

+4642
-10558
lines changed

.github/workflows/main.yml

Lines changed: 17 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -255,22 +255,34 @@ jobs:
255255
env:
256256
TARGET: ${{ matrix.target.tuple }}
257257

258-
build-std-detect:
258+
# Check that the generated files agree with the checked-in versions.
259+
check-stdarch-gen:
259260
needs: [style]
260-
name: Build std_detect
261+
name: Check stdarch-gen-{arm, loongarch} output
261262
runs-on: ubuntu-latest
262263
steps:
263264
- uses: actions/checkout@v4
264265
- name: Install Rust
265-
run: rustup update nightly && rustup default nightly
266-
- run: ./ci/build-std-detect.sh
266+
run: rustup update nightly && rustup default nightly && rustup component add rustfmt
267+
- name: Check arm spec
268+
run: |
269+
cargo run --bin=stdarch-gen-arm --release -- crates/stdarch-gen-arm/spec
270+
git diff --exit-code
271+
- name: Check lsx.spec
272+
run: |
273+
cargo run --bin=stdarch-gen-loongarch --release -- crates/stdarch-gen-loongarch/lsx.spec
274+
git diff --exit-code
275+
- name: Check lasx.spec
276+
run: |
277+
cargo run --bin=stdarch-gen-loongarch --release -- crates/stdarch-gen-loongarch/lasx.spec
278+
git diff --exit-code
267279
268280
conclusion:
269281
needs:
270282
- docs
271283
- verify
272284
- test
273-
- build-std-detect
285+
- check-stdarch-gen
274286
runs-on: ubuntu-latest
275287
# We need to ensure this job does *not* get skipped if its dependencies fail,
276288
# because a skipped job is considered a success by GitHub. So we have to

.github/workflows/rustc-pull.yml

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
# Perform a subtree sync (pull) using the josh-sync tool once every few days (or on demand).
2+
name: rustc-pull
3+
4+
on:
5+
workflow_dispatch:
6+
schedule:
7+
# Run at 04:00 UTC every Monday and Thursday
8+
- cron: '0 4 * * 1,4'
9+
10+
jobs:
11+
pull:
12+
if: github.repository == 'rust-lang/stdarch'
13+
uses: rust-lang/josh-sync/.github/workflows/rustc-pull.yml@main
14+
with:
15+
# https://rust-lang.zulipchat.com/#narrow/channel/208962-t-libs.2Fstdarch/topic/Subtree.20sync.20automation/with/528461782
16+
zulip-stream-id: 208962
17+
zulip-bot-email: "stdarch-ci-bot@rust-lang.zulipchat.com"
18+
pr-base-branch: master
19+
branch-name: rustc-pull
20+
secrets:
21+
zulip-api-token: ${{ secrets.ZULIP_API_TOKEN }}
22+
token: ${{ secrets.GITHUB_TOKEN }}

Cargo.lock

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

Cargo.toml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@ members = [
55
"examples",
66
]
77
exclude = [
8-
"crates/wasm-assert-instr-tests"
8+
"crates/wasm-assert-instr-tests",
9+
"rust_programs",
910
]
1011

1112
[profile.release]

README.md

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,8 @@ stdarch - Rust's standard library SIMD components
44
[![Actions Status](https://github.com/rust-lang/stdarch/workflows/CI/badge.svg)](https://github.com/rust-lang/stdarch/actions)
55

66

7-
# Crates
8-
9-
This repository contains two main crates:
10-
11-
* [`core_arch`](crates/core_arch/README.md) implements `core::arch` - Rust's
12-
core library architecture-specific intrinsics, and
7+
This repository contains the [`core_arch`](crates/core_arch/README.md) crate, which implements `core::arch` - Rust's core library architecture-specific intrinsics.
138

14-
* [`std_detect`](crates/std_detect/README.md) implements `std::detect` - Rust's
15-
standard library run-time CPU feature detection.
16-
179
The `std::simd` component now lives in the
1810
[`packed_simd_2`](https://github.com/rust-lang/packed_simd) crate.
1911

ci/build-std-detect.sh

Lines changed: 0 additions & 46 deletions
This file was deleted.

ci/docker/aarch64-unknown-linux-gnu/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ubuntu:25.04
1+
FROM ubuntu:25.10
22
RUN apt-get update && apt-get install -y --no-install-recommends \
33
gcc \
44
g++ \
@@ -10,7 +10,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
1010
qemu-user \
1111
make \
1212
file \
13-
clang-19 \
13+
clang \
1414
lld
1515

1616
ENV CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_LINKER=aarch64-linux-gnu-gcc \

0 commit comments

Comments
 (0)