Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rollup of 5 pull requests #130483

Merged
merged 79 commits into from
Sep 17, 2024
Merged

Rollup of 5 pull requests #130483

merged 79 commits into from
Sep 17, 2024

Commits on Aug 28, 2024

  1. add new_cyclic_in for rc

    Matthew Giordano committed Aug 28, 2024
    Configuration menu
    Copy the full SHA
    13e36cf View commit details
    Browse the repository at this point in the history

Commits on Aug 29, 2024

  1. fix fmt

    Matthew Giordano committed Aug 29, 2024
    Configuration menu
    Copy the full SHA
    21cb847 View commit details
    Browse the repository at this point in the history
  2. fix new_cyclic_in for rc

    Matthew Giordano committed Aug 29, 2024
    Configuration menu
    Copy the full SHA
    4abb8e2 View commit details
    Browse the repository at this point in the history
  3. improve comments

    Matthew Giordano committed Aug 29, 2024
    Configuration menu
    Copy the full SHA
    2383cc9 View commit details
    Browse the repository at this point in the history
  4. add new_cyclic_in for Arc

    Matthew Giordano committed Aug 29, 2024
    Configuration menu
    Copy the full SHA
    68169d3 View commit details
    Browse the repository at this point in the history

Commits on Sep 6, 2024

  1. remove the Clone requirement

    Matthew Giordano committed Sep 6, 2024
    Configuration menu
    Copy the full SHA
    97df334 View commit details
    Browse the repository at this point in the history
  2. Remove duplicate impl

    Matthew Giordano committed Sep 6, 2024
    Configuration menu
    Copy the full SHA
    550e55f View commit details
    Browse the repository at this point in the history

Commits on Sep 7, 2024

  1. Configuration menu
    Copy the full SHA
    4db9c01 View commit details
    Browse the repository at this point in the history

Commits on Sep 9, 2024

  1. detect when pthread_rwlock_t is moved

    For some implementations of pthreads, the address of pthread_rwlock_t
    (or its fields) is used to identify the lock. That means that if the
    contents of a pthread_rwlock_t are moved in memory, effectively a new
    lock object is created, which is completely independted from the
    original. Thus we want to detect when when such objects are moved and
    show an error.
    Mandragorian committed Sep 9, 2024
    Configuration menu
    Copy the full SHA
    ff28977 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    1185eb0 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    d4eeb31 View commit details
    Browse the repository at this point in the history
  4. Auto merge of rust-lang#3867 - DeSevilla:rename-fd, r=RalfJung

    Renamed variable and fixed comments referring to renamed FileDescriptor
    
    Fixes rust-lang#3808, does not change any functionality
    bors committed Sep 9, 2024
    Configuration menu
    Copy the full SHA
    e6604ea View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    797ddd2 View commit details
    Browse the repository at this point in the history
  6. Auto merge of rust-lang#3871 - Mandragorian:detect_rwlock_move, r=Ral…

    …fJung
    
    detect when pthread_rwlock_t is moved
    
    For some implementations of pthreads, the address of pthread_rwlock_t (or its fields) is used to identify the lock. That means that if the contents of a pthread_rwlock_t are moved in memory, effectively a new lock object is created, which is completely independted from the original. Thus we want to detect when when such objects are moved and show an error.
    
    see also rust-lang#3749 for more context
    bors committed Sep 9, 2024
    Configuration menu
    Copy the full SHA
    0aa3fd4 View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    51dbed2 View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    218057c View commit details
    Browse the repository at this point in the history
  9. Auto merge of rust-lang#3874 - RalfJung:sync, r=RalfJung

    a bit of refactoring in "sync"
    
    - Use `Box<dyn Any>` to keep the "extra data" local to the module implementing the primitive
    - Pass around places, not pointers
    
    Cc `@Mandragorian` -- sorry I couldn't resist and did the `Any` thing ;)
    bors committed Sep 9, 2024
    Configuration menu
    Copy the full SHA
    0225309 View commit details
    Browse the repository at this point in the history

Commits on Sep 10, 2024

  1. Configuration menu
    Copy the full SHA
    0d12c58 View commit details
    Browse the repository at this point in the history
  2. Merge from rustc

    RalfJung committed Sep 10, 2024
    Configuration menu
    Copy the full SHA
    c78cd65 View commit details
    Browse the repository at this point in the history
  3. fmt

    RalfJung committed Sep 10, 2024
    Configuration menu
    Copy the full SHA
    6e70bd4 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    79d4cc9 View commit details
    Browse the repository at this point in the history

Commits on Sep 11, 2024

  1. Preparing for merge from rustc

    The Miri Cronjob Bot committed Sep 11, 2024
    Configuration menu
    Copy the full SHA
    4712e57 View commit details
    Browse the repository at this point in the history
  2. Merge from rustc

    The Miri Cronjob Bot committed Sep 11, 2024
    Configuration menu
    Copy the full SHA
    19fa141 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    7e6ce60 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    59835ae View commit details
    Browse the repository at this point in the history

Commits on Sep 12, 2024

  1. Preparing for merge from rustc

    The Miri Cronjob Bot committed Sep 12, 2024
    Configuration menu
    Copy the full SHA
    2f09cac View commit details
    Browse the repository at this point in the history
  2. Merge from rustc

    The Miri Cronjob Bot committed Sep 12, 2024
    Configuration menu
    Copy the full SHA
    93ef7cd View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    5fc0865 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    157dd83 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    e4d0ae9 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    b7c7a45 View commit details
    Browse the repository at this point in the history
  7. Auto merge of rust-lang#3880 - RalfJung:sync, r=RalfJung

    add non-portable linux pthread initializers to layout sanity check
    
    Also, turns out we can enable all pthread tests on Solarish.
    bors committed Sep 12, 2024
    Configuration menu
    Copy the full SHA
    9621058 View commit details
    Browse the repository at this point in the history

Commits on Sep 13, 2024

  1. Configuration menu
    Copy the full SHA
    dd01ee7 View commit details
    Browse the repository at this point in the history
  2. Auto merge of rust-lang#3883 - RalfJung:miri-run-dep, r=RalfJung

    smoke-test './miri run --dep'
    
    I don't actually know if this works on Windows.^^
    bors committed Sep 13, 2024
    Configuration menu
    Copy the full SHA
    d5ad772 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    03f14f0 View commit details
    Browse the repository at this point in the history
  4. Auto merge of rust-lang#3881 - RalfJung:miri-run, r=RalfJung

    ./miri run: directly run binary instead of using 'cargo run'
    
    This avoids re-building miri without dev dependencies, so it makes `./miri run` a lot faster if `./miri test` was already executed before.
    bors committed Sep 13, 2024
    Configuration menu
    Copy the full SHA
    20862e4 View commit details
    Browse the repository at this point in the history

Commits on Sep 14, 2024

  1. Preparing for merge from rustc

    The Miri Cronjob Bot committed Sep 14, 2024
    Configuration menu
    Copy the full SHA
    9bab91f View commit details
    Browse the repository at this point in the history
  2. Merge from rustc

    The Miri Cronjob Bot committed Sep 14, 2024
    Configuration menu
    Copy the full SHA
    94d4991 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    583f358 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    b6dea9e View commit details
    Browse the repository at this point in the history
  5. Auto merge of rust-lang#3884 - Mandragorian:detect_cond_move, r=RalfJung

    detect when pthread_cond_t is moved
    
    Closes rust-lang#3749
    bors committed Sep 14, 2024
    Configuration menu
    Copy the full SHA
    8c4f055 View commit details
    Browse the repository at this point in the history

Commits on Sep 15, 2024

  1. unix/sync: cleanup

    RalfJung committed Sep 15, 2024
    Configuration menu
    Copy the full SHA
    efdc01b View commit details
    Browse the repository at this point in the history
  2. pthread: add FreeBSD, remove PTHREAD_MUTEX_NORMAL_FLAG hack

    On FreeBSD, DEFAULT maps to ERRORCK. This clashes with the existing PTHREAD_MUTEX_NORMAL_FLAG:
    hack so we replace it by a different hack that works better cross-platform.
    
    Also fix a case of "accidental early UB" in a UB test -- pthread_mutexattr_t must be initialized.
    RalfJung committed Sep 15, 2024
    Configuration menu
    Copy the full SHA
    4000027 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    2cdf5f7 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    2ed9188 View commit details
    Browse the repository at this point in the history
  5. Auto merge of rust-lang#3886 - RalfJung:freebsd-pthread, r=RalfJung

    support pthread primitives on FreeBSD
    
    Fixes rust-lang/miri#3571: makes out pthread implementation support FreeBSD.
    
    FreeBSD sets PHTREAD_MUTEX_DEFAULT == PHTREAD_MUTEX_ERRORCK, so the logic for handling "default vs explicitly set mutex kind" had to be adjusted.
    
    The rest is just some general cleanup of the pthread logic, and I realized that we can enable the std::sync tests on Solarish.
    bors committed Sep 15, 2024
    Configuration menu
    Copy the full SHA
    75921d2 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    cb445d0 View commit details
    Browse the repository at this point in the history
  7. add Android pthread support

    RalfJung committed Sep 15, 2024
    Configuration menu
    Copy the full SHA
    8ee38bf View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    f394c6c View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    5f3bec4 View commit details
    Browse the repository at this point in the history
  10. Auto merge of rust-lang#3889 - RalfJung:android-pthread, r=RalfJung

    add Android pthread support
    
    Also extend what we test on Solarish / FreeBSD, turns out a few more things are working.
    bors committed Sep 15, 2024
    Configuration menu
    Copy the full SHA
    7d8ee71 View commit details
    Browse the repository at this point in the history

Commits on Sep 16, 2024

  1. Preparing for merge from rustc

    The Miri Cronjob Bot committed Sep 16, 2024
    Configuration menu
    Copy the full SHA
    ffcaa7f View commit details
    Browse the repository at this point in the history
  2. Merge from rustc

    The Miri Cronjob Bot committed Sep 16, 2024
    Configuration menu
    Copy the full SHA
    4d824fd View commit details
    Browse the repository at this point in the history
  3. fmt

    The Miri Cronjob Bot committed Sep 16, 2024
    Configuration menu
    Copy the full SHA
    1692d12 View commit details
    Browse the repository at this point in the history
  4. fix clippy lints

    RalfJung committed Sep 16, 2024
    Configuration menu
    Copy the full SHA
    5b8a18f View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    a0f57d8 View commit details
    Browse the repository at this point in the history
  6. Bump ui test

    oli-obk committed Sep 16, 2024
    Configuration menu
    Copy the full SHA
    9f9f198 View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    987702f View commit details
    Browse the repository at this point in the history
  8. Fix run --dep

    oli-obk committed Sep 16, 2024
    Configuration menu
    Copy the full SHA
    4dabcc3 View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    e04dc62 View commit details
    Browse the repository at this point in the history
  10. Configuration menu
    Copy the full SHA
    1b25298 View commit details
    Browse the repository at this point in the history

Commits on Sep 17, 2024

  1. Revert "Rollup merge of rust-lang#129749 - krasimirgg:llvm-20-lto, r=…

    …nikic"
    
    This reverts commit 8c7a7e3, reversing
    changes made to a00bd75.
    tmandry committed Sep 17, 2024
    Configuration menu
    Copy the full SHA
    472fef6 View commit details
    Browse the repository at this point in the history
  2. Update library/alloc/src/sync.rs

    Co-authored-by: David Tolnay <[email protected]>
    matthewpipie and dtolnay authored Sep 17, 2024
    Configuration menu
    Copy the full SHA
    6750f04 View commit details
    Browse the repository at this point in the history
  3. Preparing for merge from rustc

    The Miri Cronjob Bot committed Sep 17, 2024
    Configuration menu
    Copy the full SHA
    540b4da View commit details
    Browse the repository at this point in the history
  4. Merge from rustc

    The Miri Cronjob Bot committed Sep 17, 2024
    Configuration menu
    Copy the full SHA
    48440b1 View commit details
    Browse the repository at this point in the history
  5. fmt

    The Miri Cronjob Bot committed Sep 17, 2024
    Configuration menu
    Copy the full SHA
    c5f5cfc View commit details
    Browse the repository at this point in the history
  6. Auto merge of rust-lang#3866 - rust-lang:ui_test_26_1, r=oli-obk

    Bump ui test to 0.26
    
    lots of issues fixed and various improvements
    
    🤞 that it works this time around
    bors committed Sep 17, 2024
    Configuration menu
    Copy the full SHA
    f6ae3cb View commit details
    Browse the repository at this point in the history
  7. Auto merge of rust-lang#3893 - rust-lang:autolabel, r=RalfJung

    Automatically add/remove labels when github review (requests) are used
    bors committed Sep 17, 2024
    Configuration menu
    Copy the full SHA
    9c3a392 View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    d0f4a52 View commit details
    Browse the repository at this point in the history
  9. Tokio ICE fix: Changed the type of EpollEventInterest::epfd from i32 …

    …to WeakFileDescriptionRef
    tiif committed Sep 17, 2024
    Configuration menu
    Copy the full SHA
    143710f View commit details
    Browse the repository at this point in the history
  10. Auto merge of rust-lang#3891 - tiif:tokiotest, r=RalfJung

    Fix tokio test ICE
    
    Fixes rust-lang#3858
    
    It turned out that the issue mentioned [here](rust-lang/miri#3858 (comment)) is the exact cause of ICE.
    So in this PR, I changed the type of ``EpollEventInterest::epfd`` from ``i32`` to ``WeakFileDescriptionRef``.
    bors committed Sep 17, 2024
    Configuration menu
    Copy the full SHA
    b880024 View commit details
    Browse the repository at this point in the history
  11. update lockfile

    RalfJung committed Sep 17, 2024
    Configuration menu
    Copy the full SHA
    ba86cf8 View commit details
    Browse the repository at this point in the history
  12. Configuration menu
    Copy the full SHA
    0a25324 View commit details
    Browse the repository at this point in the history
  13. fluent_macro: fix diagnostics for fluent parse failures

    This line number calculation was both wrong and unnecessary.
    Xiretza committed Sep 17, 2024
    Configuration menu
    Copy the full SHA
    5b3bde9 View commit details
    Browse the repository at this point in the history
  14. Rollup merge of rust-lang#129477 - Xiretza:fix-fluent-diagnostics, r=…

    …compiler-errors
    
    Fix fluent diagnostics
    
    This line number calculation was both wrong and unnecessary.
    matthiaskrgr authored Sep 17, 2024
    Configuration menu
    Copy the full SHA
    8b36ecb View commit details
    Browse the repository at this point in the history
  15. Rollup merge of rust-lang#129674 - matthewpipie:rc-arc-new-cyclic-in,…

    … r=dtolnay
    
    Add new_cyclic_in for Rc and Arc
    
    Currently, new_cyclic_in does not exist for Rc and Arc. This is an oversight according to rust-lang/wg-allocators#132.
    
    This PR adds new_cyclic_in for Rc and Arc. The implementation is almost the exact same as new_cyclic with some small differences to make it allocator-specific. new_cyclic's implementation has been replaced with a call to `new_cyclic_in(data_fn, Global)`.
    
    Remaining questions:
    * ~~Is requiring Allocator to be Clone OK? According to rust-lang/wg-allocators#88, Allocators should be cheap to clone. I'm just hesitant to add unnecessary constraints, though I don't see an obvious workaround for this function since many called functions in new_cyclic_in expect an owned Allocator. I see Allocator.by_ref() as an option, but that doesn't work on when creating Weak { ptr: init_ptr, alloc: alloc.clone() }, because the type of Weak then becomes Weak<T, &A> which is incompatible.~~ Fixed, thank you `@zakarumych!` This PR no longer requires the allocator to be Clone.
    * Currently, new_cyclic_in's documentation is almost entirely copy-pasted from new_cyclic, with minor tweaks to make it more accurate (e.g. Rc<T> -> Rc<T, A>). The example section is removed to mitigate redundancy and instead redirects to cyclic_in. Is this appropriate?
    * ~~The comments in new_cyclic_in (and much of the implementation) are also copy-pasted from new_cyclic. Would it be better to make a helper method new_cyclic_in_internal that both functions call, with either Global or the custom allocator? I'm not sure if that's even possible, since the internal method would have to return Arc<T, Global> and I don't know if it's possible to "downcast" that to an Arc<T>. Maybe transmute would work here?~~ Done, thanks `@zakarumych`
    * Arc::new_cyclic is #[inline], but Rc::new_cyclic is not. Which is preferred?
    * nit: does it matter where in the impl block new_cyclic_in is defined?
    matthiaskrgr authored Sep 17, 2024
    Configuration menu
    Copy the full SHA
    f6fd305 View commit details
    Browse the repository at this point in the history
  16. Rollup merge of rust-lang#130452 - randomPoison:trusty-update-maintai…

    …ners, r=ehuss
    
    Update Trusty target maintainers
    
    Remove Stephen Crane from the list of Trusty target maintainers and add Andrei Homescu (`@ahomescu)` and Chris Wailes.
    matthiaskrgr authored Sep 17, 2024
    Configuration menu
    Copy the full SHA
    084e93a View commit details
    Browse the repository at this point in the history
  17. Rollup merge of rust-lang#130467 - RalfJung:miri-sync, r=RalfJung

    Miri subtree update
    
    r? `@ghost`
    matthiaskrgr authored Sep 17, 2024
    Configuration menu
    Copy the full SHA
    9087312 View commit details
    Browse the repository at this point in the history
  18. Rollup merge of rust-lang#130477 - tmandry:revert-llvm-20-lto, r=tmandry

    Revert rust-lang#129749 to fix segfault in LLVM
    
    This reverts commit 8c7a7e3, reversing changes made to a00bd75.
    
    Reported in rust-lang#129749 (comment). `@nikic's` theory is that the LLVM API changed in a way that makes it impossible to use concurrently from multiple threads (llvm/llvm-project#106427 (comment)). I pinged `@krasimirgg` who was fine with reverting.
    
    r? `@rust-lang/wg-llvm`
    matthiaskrgr authored Sep 17, 2024
    Configuration menu
    Copy the full SHA
    f8090dd View commit details
    Browse the repository at this point in the history