Skip to content

Commit a23dae0

Browse files
RalfJungRalfJung
authored
Merge pull request #4581 from rust-lang/rustup-2025-09-12
Automatic Rustup
2 parents fc9c59b + 9f486de commit a23dae0

14 files changed

+42
-41
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 17 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -31,21 +31,22 @@ jobs:
3131
os: ubuntu-24.04-arm
3232
multiarch: armhf
3333
gcc_cross: arm-linux-gnueabihf
34-
- host_target: riscv64gc-unknown-linux-gnu
35-
os: ubuntu-latest
36-
multiarch: riscv64
37-
gcc_cross: riscv64-linux-gnu
38-
qemu: true
39-
- host_target: s390x-unknown-linux-gnu
40-
os: ubuntu-latest
41-
multiarch: s390x
42-
gcc_cross: s390x-linux-gnu
43-
qemu: true
44-
- host_target: powerpc64le-unknown-linux-gnu
45-
os: ubuntu-latest
46-
multiarch: ppc64el
47-
gcc_cross: powerpc64le-linux-gnu
48-
qemu: true
34+
# Disabled due to Ubuntu repo trouble
35+
# - host_target: riscv64gc-unknown-linux-gnu
36+
# os: ubuntu-latest
37+
# multiarch: riscv64
38+
# gcc_cross: riscv64-linux-gnu
39+
# qemu: true
40+
# - host_target: s390x-unknown-linux-gnu
41+
# os: ubuntu-latest
42+
# multiarch: s390x
43+
# gcc_cross: s390x-linux-gnu
44+
# qemu: true
45+
# - host_target: powerpc64le-unknown-linux-gnu
46+
# os: ubuntu-latest
47+
# multiarch: ppc64el
48+
# gcc_cross: powerpc64le-linux-gnu
49+
# qemu: true
4950
- host_target: aarch64-apple-darwin
5051
os: macos-latest
5152
- host_target: i686-pc-windows-msvc
@@ -67,7 +68,7 @@ jobs:
6768
- name: install multiarch
6869
if: ${{ matrix.multiarch != '' }}
6970
run: |
70-
# s390x, ppc64el need Ubuntu Ports to be in the mirror list
71+
# s390x, ppc64el, riscv64 need Ubuntu Ports to be in the mirror list
7172
sudo bash -c "echo 'https://ports.ubuntu.com/ priority:4' >> /etc/apt/apt-mirrors.txt"
7273
# Add architecture
7374
sudo dpkg --add-architecture ${{ matrix.multiarch }}

‎rust-version‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
f4665ab8368ad2e8a86d4390ae35c28bdd9561bb
1+
2a9bacf6187685931d52346a0ecff2e52bdc91cc

‎tests/fail-dep/concurrency/libc_pthread_mutex_deadlock.stderr‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@ LL | assert_eq!(libc::pthread_mutex_lock(lock_copy.0.get() as *mut _
88
= note: inside closure at tests/fail-dep/concurrency/libc_pthread_mutex_deadlock.rs:LL:CC
99

1010
error: the evaluated program deadlocked
11-
--> RUSTLIB/std/src/sys/pal/PLATFORM/thread.rs:LL:CC
11+
--> RUSTLIB/std/src/sys/thread/PLATFORM.rs:LL:CC
1212
|
1313
LL | let ret = unsafe { libc::pthread_join(id, ptr::null_mut()) };
1414
| ^ this thread got stuck here
1515
|
1616
= note: BACKTRACE:
17-
= note: inside `std::sys::pal::PLATFORM::thread::Thread::join` at RUSTLIB/std/src/sys/pal/PLATFORM/thread.rs:LL:CC
17+
= note: inside `std::sys::thread::PLATFORM::Thread::join` at RUSTLIB/std/src/sys/thread/PLATFORM.rs:LL:CC
1818
= note: inside `std::thread::JoinInner::<'_, ()>::join` at RUSTLIB/std/src/thread/mod.rs:LL:CC
1919
= note: inside `std::thread::JoinHandle::<()>::join` at RUSTLIB/std/src/thread/mod.rs:LL:CC
2020
note: inside `main`

‎tests/fail-dep/concurrency/libc_pthread_rwlock_write_read_deadlock.stderr‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@ LL | assert_eq!(libc::pthread_rwlock_wrlock(lock_copy.0.get() as *mu
88
= note: inside closure at tests/fail-dep/concurrency/libc_pthread_rwlock_write_read_deadlock.rs:LL:CC
99

1010
error: the evaluated program deadlocked
11-
--> RUSTLIB/std/src/sys/pal/PLATFORM/thread.rs:LL:CC
11+
--> RUSTLIB/std/src/sys/thread/PLATFORM.rs:LL:CC
1212
|
1313
LL | let ret = unsafe { libc::pthread_join(id, ptr::null_mut()) };
1414
| ^ this thread got stuck here
1515
|
1616
= note: BACKTRACE:
17-
= note: inside `std::sys::pal::PLATFORM::thread::Thread::join` at RUSTLIB/std/src/sys/pal/PLATFORM/thread.rs:LL:CC
17+
= note: inside `std::sys::thread::PLATFORM::Thread::join` at RUSTLIB/std/src/sys/thread/PLATFORM.rs:LL:CC
1818
= note: inside `std::thread::JoinInner::<'_, ()>::join` at RUSTLIB/std/src/thread/mod.rs:LL:CC
1919
= note: inside `std::thread::JoinHandle::<()>::join` at RUSTLIB/std/src/thread/mod.rs:LL:CC
2020
note: inside `main`

‎tests/fail-dep/concurrency/libc_pthread_rwlock_write_write_deadlock.stderr‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@ LL | assert_eq!(libc::pthread_rwlock_wrlock(lock_copy.0.get() as *mu
88
= note: inside closure at tests/fail-dep/concurrency/libc_pthread_rwlock_write_write_deadlock.rs:LL:CC
99

1010
error: the evaluated program deadlocked
11-
--> RUSTLIB/std/src/sys/pal/PLATFORM/thread.rs:LL:CC
11+
--> RUSTLIB/std/src/sys/thread/PLATFORM.rs:LL:CC
1212
|
1313
LL | let ret = unsafe { libc::pthread_join(id, ptr::null_mut()) };
1414
| ^ this thread got stuck here
1515
|
1616
= note: BACKTRACE:
17-
= note: inside `std::sys::pal::PLATFORM::thread::Thread::join` at RUSTLIB/std/src/sys/pal/PLATFORM/thread.rs:LL:CC
17+
= note: inside `std::sys::thread::PLATFORM::Thread::join` at RUSTLIB/std/src/sys/thread/PLATFORM.rs:LL:CC
1818
= note: inside `std::thread::JoinInner::<'_, ()>::join` at RUSTLIB/std/src/thread/mod.rs:LL:CC
1919
= note: inside `std::thread::JoinHandle::<()>::join` at RUSTLIB/std/src/thread/mod.rs:LL:CC
2020
note: inside `main`

‎tests/fail-dep/concurrency/windows_join_detached.stderr‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
error: Undefined Behavior: trying to join a detached thread
2-
--> RUSTLIB/std/src/sys/pal/PLATFORM/thread.rs:LL:CC
2+
--> RUSTLIB/std/src/sys/thread/PLATFORM.rs:LL:CC
33
|
44
LL | let rc = unsafe { c::WaitForSingleObject(self.handle.as_raw_handle(), c::INFINITE) };
55
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Undefined Behavior occurred here
66
|
77
= help: this indicates a bug in the program: it performed an invalid operation, and caused Undefined Behavior
88
= help: see https://doc.rust-lang.org/nightly/reference/behavior-considered-undefined.html for further information
99
= note: BACKTRACE:
10-
= note: inside `std::sys::pal::PLATFORM::thread::Thread::join` at RUSTLIB/std/src/sys/pal/PLATFORM/thread.rs:LL:CC
10+
= note: inside `std::sys::thread::PLATFORM::Thread::join` at RUSTLIB/std/src/sys/thread/PLATFORM.rs:LL:CC
1111
= note: inside `std::thread::JoinInner::<'_, ()>::join` at RUSTLIB/std/src/thread/mod.rs:LL:CC
1212
= note: inside `std::thread::JoinHandle::<()>::join` at RUSTLIB/std/src/thread/mod.rs:LL:CC
1313
note: inside `main`

‎tests/fail-dep/concurrency/windows_join_main.stderr‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,13 @@ LL | assert_eq!(WaitForSingleObject(MAIN_THREAD, INFINITE), WAIT_OBJ
99
= note: this error originates in the macro `assert_eq` (in Nightly builds, run with -Z macro-backtrace for more info)
1010

1111
error: the evaluated program deadlocked
12-
--> RUSTLIB/std/src/sys/pal/PLATFORM/thread.rs:LL:CC
12+
--> RUSTLIB/std/src/sys/thread/PLATFORM.rs:LL:CC
1313
|
1414
LL | let rc = unsafe { c::WaitForSingleObject(self.handle.as_raw_handle(), c::INFINITE) };
1515
| ^ this thread got stuck here
1616
|
1717
= note: BACKTRACE:
18-
= note: inside `std::sys::pal::PLATFORM::thread::Thread::join` at RUSTLIB/std/src/sys/pal/PLATFORM/thread.rs:LL:CC
18+
= note: inside `std::sys::thread::PLATFORM::Thread::join` at RUSTLIB/std/src/sys/thread/PLATFORM.rs:LL:CC
1919
= note: inside `std::thread::JoinInner::<'_, ()>::join` at RUSTLIB/std/src/thread/mod.rs:LL:CC
2020
= note: inside `std::thread::JoinHandle::<()>::join` at RUSTLIB/std/src/thread/mod.rs:LL:CC
2121
note: inside `main`

‎tests/fail-dep/concurrency/windows_join_self.stderr‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@ LL | assert_eq!(WaitForSingleObject(native, INFINITE), WAIT_OBJECT_0
88
= note: inside closure at tests/fail-dep/concurrency/windows_join_self.rs:LL:CC
99

1010
error: the evaluated program deadlocked
11-
--> RUSTLIB/std/src/sys/pal/PLATFORM/thread.rs:LL:CC
11+
--> RUSTLIB/std/src/sys/thread/PLATFORM.rs:LL:CC
1212
|
1313
LL | let rc = unsafe { c::WaitForSingleObject(self.handle.as_raw_handle(), c::INFINITE) };
1414
| ^ this thread got stuck here
1515
|
1616
= note: BACKTRACE:
17-
= note: inside `std::sys::pal::PLATFORM::thread::Thread::join` at RUSTLIB/std/src/sys/pal/PLATFORM/thread.rs:LL:CC
17+
= note: inside `std::sys::thread::PLATFORM::Thread::join` at RUSTLIB/std/src/sys/thread/PLATFORM.rs:LL:CC
1818
= note: inside `std::thread::JoinInner::<'_, ()>::join` at RUSTLIB/std/src/thread/mod.rs:LL:CC
1919
= note: inside `std::thread::JoinHandle::<()>::join` at RUSTLIB/std/src/thread/mod.rs:LL:CC
2020
note: inside `main`

‎tests/fail-dep/libc/eventfd_block_read_twice.stderr‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
error: the evaluated program deadlocked
2-
--> RUSTLIB/std/src/sys/pal/PLATFORM/thread.rs:LL:CC
2+
--> RUSTLIB/std/src/sys/thread/PLATFORM.rs:LL:CC
33
|
44
LL | let ret = unsafe { libc::pthread_join(id, ptr::null_mut()) };
55
| ^ this thread got stuck here
66
|
77
= note: BACKTRACE:
8-
= note: inside `std::sys::pal::PLATFORM::thread::Thread::join` at RUSTLIB/std/src/sys/pal/PLATFORM/thread.rs:LL:CC
8+
= note: inside `std::sys::thread::PLATFORM::Thread::join` at RUSTLIB/std/src/sys/thread/PLATFORM.rs:LL:CC
99
= note: inside `std::thread::JoinInner::<'_, ()>::join` at RUSTLIB/std/src/thread/mod.rs:LL:CC
1010
= note: inside `std::thread::JoinHandle::<()>::join` at RUSTLIB/std/src/thread/mod.rs:LL:CC
1111
note: inside `main`

‎tests/fail-dep/libc/eventfd_block_write_twice.stderr‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
error: the evaluated program deadlocked
2-
--> RUSTLIB/std/src/sys/pal/PLATFORM/thread.rs:LL:CC
2+
--> RUSTLIB/std/src/sys/thread/PLATFORM.rs:LL:CC
33
|
44
LL | let ret = unsafe { libc::pthread_join(id, ptr::null_mut()) };
55
| ^ this thread got stuck here
66
|
77
= note: BACKTRACE:
8-
= note: inside `std::sys::pal::PLATFORM::thread::Thread::join` at RUSTLIB/std/src/sys/pal/PLATFORM/thread.rs:LL:CC
8+
= note: inside `std::sys::thread::PLATFORM::Thread::join` at RUSTLIB/std/src/sys/thread/PLATFORM.rs:LL:CC
99
= note: inside `std::thread::JoinInner::<'_, ()>::join` at RUSTLIB/std/src/thread/mod.rs:LL:CC
1010
= note: inside `std::thread::JoinHandle::<()>::join` at RUSTLIB/std/src/thread/mod.rs:LL:CC
1111
note: inside `main`

0 commit comments

Comments
 (0)