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 #119437

Merged
merged 12 commits into from
Dec 30, 2023
Merged

Rollup of 5 pull requests #119437

merged 12 commits into from
Dec 30, 2023

Commits on Dec 20, 2023

  1. Cleaned up alloc::sync::Weak Clone implementation

    Since both return points (tail and early return) return the same
    expression and the only difference is whether inner is available, the
    code that does the atomic operations and checks on inner was moved into
    the if body and the only return is at the tail. Original comments
    preserved.
    JohnTheCoolingFan committed Dec 20, 2023
    Configuration menu
    Copy the full SHA
    0453d5f View commit details
    Browse the repository at this point in the history

Commits on Dec 28, 2023

  1. fix typo

    Emilgardis authored Dec 28, 2023
    Configuration menu
    Copy the full SHA
    12dd5d1 View commit details
    Browse the repository at this point in the history

Commits on Dec 29, 2023

  1. Primitive docs: fix confusing Send in &T's list

    The two lists in this document describe what traits are implemented on
    references when their underlying `T` also implements them. However,
    while it is true that `T: Send + Sync` implies `&T: Send` (which is
    what the sentence is trying to explain), it is confusing to have `Send`
    in the list because `T: Send` is not needed for that. In particular,
    the "also require" part may be interpreted as "both `T: Send` and
    `T: Sync` are required".
    
    Instead, move `Send` back to where it was before commit 7a47786
    ("Makes docs for references a little less confusing"), i.e. to the `&mut`
    list (where no extra nota is needed, i.e. it fits naturally) and move the
    `Sync` definition/note to the bottom as something independent.
    
    Signed-off-by: Miguel Ojeda <[email protected]>
    ojeda committed Dec 29, 2023
    Configuration menu
    Copy the full SHA
    dd928c8 View commit details
    Browse the repository at this point in the history
  2. bootstrap: bump fd-lock

    Signed-off-by: onur-ozkan <[email protected]>
    onur-ozkan committed Dec 29, 2023
    Configuration menu
    Copy the full SHA
    ca9950d View commit details
    Browse the repository at this point in the history
  3. apply bootstrap lock unconditionally

    Signed-off-by: onur-ozkan <[email protected]>
    onur-ozkan committed Dec 29, 2023
    Configuration menu
    Copy the full SHA
    48309f4 View commit details
    Browse the repository at this point in the history

Commits on Dec 30, 2023

  1. Configuration menu
    Copy the full SHA
    621e241 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    a25e023 View commit details
    Browse the repository at this point in the history
  3. Rollup merge of rust-lang#119158 - JohnTheCoolingFan:arc-weak-clone-p…

    …retty, r=cuviper
    
    Clean up alloc::sync::Weak Clone implementation
    
    Since both return points (tail and early return) return the same expression and the only difference is whether inner is available, the code that does the atomic operations and checks on inner was moved into the if body and the only return is at the tail. Original comments preserved.
    matthiaskrgr authored Dec 30, 2023
    Configuration menu
    Copy the full SHA
    c67ab2e View commit details
    Browse the repository at this point in the history
  4. Rollup merge of rust-lang#119386 - Emilgardis:typo-ipaddr-canonical-d…

    …oc, r=est31
    
    fix typo in `IpAddr::to_canonical`
    matthiaskrgr authored Dec 30, 2023
    Configuration menu
    Copy the full SHA
    b594dfa View commit details
    Browse the repository at this point in the history
  5. Rollup merge of rust-lang#119413 - onur-ozkan:bump-fd-lock, r=Mark-Si…

    …mulacrum
    
    solaris support on bootstrap lock
    
    With yoshuawuyts/fd-lock#48, `fd-lock` now supports Solaris. Therefore we no longer need to conditionally handle the bootstrap locks.
    matthiaskrgr authored Dec 30, 2023
    Configuration menu
    Copy the full SHA
    31aa239 View commit details
    Browse the repository at this point in the history
  6. Rollup merge of rust-lang#119424 - ojeda:send-sync, r=est31

    Primitive docs: fix confusing `Send` in `&T`'s list
    
    The two lists in this document describe what traits are implemented on references when their underlying `T` also implements them. However, while it is true that `T: Send + Sync` implies `&T: Send` (which is what the sentence is trying to explain), it is confusing to have `Send` in the list because `T: Send` is not needed for that. In particular, the "also require" part may be interpreted as "both `T: Send` and `T: Sync` are required".
    
    Instead, move `Send` back to where it was before commit 7a47786 ("Makes docs for references a little less confusing"), i.e. to the `&mut` list (where no extra nota is needed, i.e. it fits naturally) and move the `Sync` definition/note to the bottom as something independent.
    matthiaskrgr authored Dec 30, 2023
    Configuration menu
    Copy the full SHA
    19580d5 View commit details
    Browse the repository at this point in the history
  7. Rollup merge of rust-lang#119425 - Urgau:check-cfg-fix-cargo-diag-bug…

    …, r=Nilstrieb
    
    Fix invalid check-cfg Cargo feature diagnostic help
    
    rust-lang#118213 added specialized diagnostic for Cargo `feature` cfg. However when providing an empty `#[cfg(feature)]` condition the suggestion would suggest adding `feature` as a feature in `Cargo.toml` (wtf!).
    
    This PR removes the invalid logic, which even brings a nice improvement.
    
    ```diff
       --> $DIR/cargo-feature.rs:18:7
        |
     LL | #[cfg(feature)]
    -   |       ^^^^^^^
    +   |       ^^^^^^^- help: specify a config value: `= "bitcode"`
        |
        = note: expected values for `feature` are: `bitcode`
    -   = help: consider defining `feature` as feature in `Cargo.toml`
    ```
    
    The first commit add a test showing the bug and the second commit fixes the bug.
    
    `@rustbot` label +F-check-cfg
    matthiaskrgr authored Dec 30, 2023
    Configuration menu
    Copy the full SHA
    e930ea2 View commit details
    Browse the repository at this point in the history