Skip to content

Commit

Permalink
Auto merge of #3711 - saethlin:rustup, r=saethlin
Browse files Browse the repository at this point in the history
Manual Rustup

This bumps us to a rustc commit that doesn't have the chatty `./miri fmt` reported in https://rust-lang.zulipchat.com/#narrow/stream/269128-miri/topic/.22rewriting.20static.22.20printed.20during.20.2E.2Fmiri.20build
  • Loading branch information
bors committed Jun 25, 2024
2 parents b8dffc5 + 062f922 commit 5011017
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion rust-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
d49994b060684af423339b55769439b2f444a7b9
c290e9de32e8ba6a673ef125fde40eadd395d170
6 changes: 3 additions & 3 deletions tests/pass-dep/concurrency/tls_pthread_drop_order.rs
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
//@ignore-target-windows: No pthreads on Windows
//! Test that pthread_key destructors are run in the right order.
//! Note that these are *not* used by actual `thread_local!` on Linux! Those use
//! `thread_local_dtor::register_dtor` from the stdlib instead. In Miri this hits the fallback path
//! in `register_dtor_fallback`, which uses a *single* pthread_key to manage a thread-local list of
//! dtors to call.
//! `destructors::register` from the stdlib instead. In Miri this ends up hitting
//! the fallback path in `guard::key::enable`, which uses a *single* pthread_key
//! to manage a thread-local list of dtors to call.
use std::mem;
use std::ptr;
Expand Down

0 comments on commit 5011017

Please sign in to comment.