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 8 pull requests #121836

Closed
wants to merge 19 commits into from

Commits on Oct 25, 2023

  1. Convert Unix{Datagram,Stream}::{set_}passcred() to per-OS traits

    These methods are the pre-stabilized API for obtaining peer credentials
    from an `AF_UNIX` socket, part of the `unix_socket_ancillary_data` feature.
    
    Their current behavior is to get/set one of the `SO_PASSCRED` (Linux),
    `LOCAL_CREDS_PERSISTENT` (FreeBSD), or `LOCAL_CREDS` (NetBSD) socket
    options. On other targets the `{set_}passcred()` methods do not exist.
    
    There are two problems with this approach:
    
    1. Having public methods only exist for certain targets isn't permitted
       in a stable `std` API.
    
    2. These options have generally similar purposes, but they are non-POSIX
       and their details can differ in subtle and surprising ways (such as
       whether they continue to be set after the next call to `recvmsg()`).
    
    Splitting into OS-specific extension traits is the preferred solution to
    both problems.
    jmillikin committed Oct 25, 2023
    Configuration menu
    Copy the full SHA
    bea6f37 View commit details
    Browse the repository at this point in the history

Commits on Feb 26, 2024

  1. Add arm64ec-pc-windows-msvc target

    Introduces the `arm64ec-pc-windows-msvc` target for building Arm64EC ("Emulation Compatible") binaries for Windows.
    
    For more information about Arm64EC see <https://learn.microsoft.com/en-us/windows/arm/arm64ec>.
    
    Tier 3 policy:
    
    > A tier 3 target must have a designated developer or developers (the "target maintainers") on record to be CCed when issues arise regarding the target. (The mechanism to track and CC such developers may evolve over time.)
    
    I will be the maintainer for this target.
    
    > Targets must use naming consistent with any existing targets; for instance, a target for the same CPU or OS as an existing Rust target should use the same name for that CPU or OS. Targets should normally use the same names and naming conventions as used elsewhere in the broader ecosystem beyond Rust (such as in other toolchains), unless they have a very good reason to diverge. Changing the name of a target can be highly disruptive, especially once the target reaches a higher tier, so getting the name right is important even for a tier 3 target.
    
    Target uses the `arm64ec` architecture to match LLVM and MSVC, and the `-pc-windows-msvc` suffix to indicate that it targets Windows via the MSVC environment.
    
    > Target names should not introduce undue confusion or ambiguity unless absolutely necessary to maintain ecosystem compatibility. For example, if the name of the target makes people extremely likely to form incorrect beliefs about what it targets, the name should be changed or augmented to disambiguate it.
    
    Target name exactly specifies the type of code that will be produced.
    
    > If possible, use only letters, numbers, dashes and underscores for the name. Periods (.) are known to cause issues in Cargo.
    
    Done.
    
    > Tier 3 targets may have unusual requirements to build or use, but must not create legal issues or impose onerous legal terms for the Rust project or for Rust developers or users.
    
    > The target must not introduce license incompatibilities.
    
    Uses the same dependencies, requirements and licensing as the other `*-pc-windows-msvc` targets.
    
    > Anything added to the Rust repository must be under the standard Rust license (MIT OR Apache-2.0).
    
    Understood.
    
    > The target must not cause the Rust tools or libraries built for any other host (even when supporting cross-compilation to the target) to depend on any new dependency less permissive than the Rust licensing policy. This applies whether the dependency is a Rust crate that would require adding new license exceptions (as specified by the tidy tool in the rust-lang/rust repository), or whether the dependency is a native library or binary. In other words, the introduction of the target must not cause a user installing or running a version of Rust or the Rust tools to be subject to any new license requirements.
    
    > Compiling, linking, and emitting functional binaries, libraries, or other code for the target (whether hosted on the target itself or cross-compiling from another target) must not depend on proprietary (non-FOSS) libraries. Host tools built for the target itself may depend on the ordinary runtime libraries supplied by the platform and commonly used by other applications built for the target, but those libraries must not be required for code generation for the target; cross-compilation to the target must not require such libraries at all. For instance, rustc built for the target may depend on a common proprietary C runtime library or console output library, but must not depend on a proprietary code generation library or code optimization library. Rust's license permits such combinations, but the Rust project has no interest in maintaining such combinations within the scope of Rust itself, even at tier 3.
    
    > "onerous" here is an intentionally subjective term. At a minimum, "onerous" legal/licensing terms include but are not limited to: non-disclosure requirements, non-compete requirements, contributor license agreements (CLAs) or equivalent, "non-commercial"/"research-only"/etc terms, requirements conditional on the employer or employment of any particular Rust developers, revocable terms, any requirements that create liability for the Rust project or its developers or users, or any requirements that adversely affect the livelihood or prospects of the Rust project or its developers or users.
    
    Uses the same dependencies, requirements and licensing as the other `*-pc-windows-msvc` targets.
    
    > Neither this policy nor any decisions made regarding targets shall create any binding agreement or estoppel by any party. If any member of an approving Rust team serves as one of the maintainers of a target, or has any legal or employment requirement (explicit or implicit) that might affect their decisions regarding a target, they must recuse themselves from any approval decisions regarding the target's tier status, though they may otherwise participate in discussions.
    
    > This requirement does not prevent part or all of this policy from being cited in an explicit contract or work agreement (e.g. to implement or maintain support for a target). This requirement exists to ensure that a developer or team responsible for reviewing and approving a target does not face any legal threats or obligations that would prevent them from freely exercising their judgment in such approval, even if such judgment involves subjective matters or goes beyond the letter of these requirements.
    
    Understood, I am not a member of the Rust team.
    
    > Tier 3 targets should attempt to implement as much of the standard libraries as possible and appropriate (core for most targets, alloc for targets that can support dynamic memory allocation, std for targets with an operating system or equivalent layer of system-provided functionality), but may leave some code unimplemented (either unavailable or stubbed out as appropriate), whether because the target makes it impossible to implement or challenging to implement. The authors of pull requests are not obligated to avoid calling any portions of the standard library on the basis of a tier 3 target not implementing those portions.
    
    Both `core` and `alloc` are supported.
    
    Support for `std` dependends on making changes to the standard library, `stdarch` and `backtrace` which cannot be done yet as the bootstrapping compiler raises a warning ("unexpected `cfg` condition value") for `target_arch = "arm64ec"`.
    
    > The target must provide documentation for the Rust community explaining how to build for the target, using cross-compilation if possible. If the target supports running binaries, or running tests (even if they do not pass), the documentation must explain how to run such binaries or tests for the target, using emulation if possible or dedicated hardware if necessary.
    
    Documentation is provided in src/doc/rustc/src/platform-support/arm64ec-pc-windows-msvc.md
    
    > Tier 3 targets must not impose burden on the authors of pull requests, or other developers in the community, to maintain the target. In particular, do not post comments (automated or manual) on a PR that derail or suggest a block on the PR based on a tier 3 target. Do not send automated messages or notifications (via any medium, including via @) to a PR author or others involved with a PR regarding a tier 3 target, unless they have opted into such messages.
    
    > Backlinks such as those generated by the issue/PR tracker when linking to an issue or PR are not considered a violation of this policy, within reason. However, such messages (even on a separate repository) must not generate notifications to anyone involved with a PR who has not requested such notifications.
    
    > Patches adding or updating tier 3 targets must not break any existing tier 2 or tier 1 target, and must not knowingly break another tier 3 target without approval of either the compiler team or the maintainers of the other tier 3 target.
    
    > In particular, this may come up when working on closely related targets, such as variations of the same architecture with different features. Avoid introducing unconditional uses of features that another variation of the target may not have; use conditional compilation or runtime detection, as appropriate, to let each target run code supported by that target.
    
    Understood.
    dpaoliello committed Feb 26, 2024
    Configuration menu
    Copy the full SHA
    ee61f09 View commit details
    Browse the repository at this point in the history

Commits on Feb 28, 2024

  1. Add a new wasm32-wasip1 target to rustc

    This commit adds a new target called `wasm32-wasip1` to rustc.
    This new target is explained in these two MCPs:
    
    * rust-lang/compiler-team#607
    * rust-lang/compiler-team#695
    
    In short, the previous `wasm32-wasi` target is going to be renamed to
    `wasm32-wasip1` to better live alongside the [new
    `wasm32-wasip2` target](rust-lang#119616).
    This new target is added alongside the `wasm32-wasi` target and has the
    exact same definition as the previous target. This PR is effectively a
    rename of `wasm32-wasi` to `wasm32-wasip1`. Note, however, that
    as explained in rust-lang/compiler-team#695 the previous `wasm32-wasi`
    target is not being removed at this time. This change will reach stable
    Rust before even a warning about the rename will be printed. At this
    time this change is just the start where a new target is introduced and
    users can start migrating if they support only Nightly for example.
    alexcrichton committed Feb 28, 2024
    Configuration menu
    Copy the full SHA
    bab4cda View commit details
    Browse the repository at this point in the history
  2. remove Mutex::unlock

    HTGAzureX1212 committed Feb 28, 2024
    Configuration menu
    Copy the full SHA
    a9907b1 View commit details
    Browse the repository at this point in the history

Commits on Feb 29, 2024

  1. Configuration menu
    Copy the full SHA
    4996194 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    3ba50b3 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    cc13f82 View commit details
    Browse the repository at this point in the history
  4. Make the success arms of if lhs || rhs meet up in a separate block

    In the previous code, the success block of `lhs` would jump directly to the
    success block of `rhs`. However, `rhs_success_block` could already contain
    statements that are specific to the RHS, and the direct goto causes them to be
    executed in the LHS success path as well.
    
    This patch therefore creates a fresh block that the LHS and RHS success blocks
    can both jump to.
    Zalathar committed Feb 29, 2024
    Configuration menu
    Copy the full SHA
    a7832b1 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    f11713b View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    19ee457 View commit details
    Browse the repository at this point in the history
  7. CFI: Remove unused typeid_for_fnsig

    Removes unused `typeid_for_fnsig` for simplifying the compiler CFI API.
    rcvalle committed Feb 29, 2024
    Configuration menu
    Copy the full SHA
    7e64163 View commit details
    Browse the repository at this point in the history

Commits on Mar 1, 2024

  1. Rollup merge of rust-lang#117156 - jmillikin:os-unix-socket-ext, r=Am…

    …anieu
    
    Convert `Unix{Datagram,Stream}::{set_}passcred()` to per-OS traits
    
    These methods are the pre-stabilized API for obtaining peer credentials from an `AF_UNIX` socket, part of the `unix_socket_ancillary_data` feature.
    
    Their current behavior is to get/set one of the `SO_PASSCRED` (Linux), `LOCAL_CREDS_PERSISTENT` (FreeBSD), or `LOCAL_CREDS` (NetBSD) socket options. On other targets the `{set_}passcred()` methods do not exist.
    
    There are two problems with this approach:
    
    1. Having public methods only exist for certain targets isn't permitted in a stable `std` API.
    
    2. These options have generally similar purposes, but they are non-POSIX and their details can differ in subtle and surprising ways (such as whether they continue to be set after the next call to `recvmsg()`).
    
    Splitting into OS-specific extension traits is the preferred solution to both problems.
    workingjubilee authored Mar 1, 2024
    Configuration menu
    Copy the full SHA
    f989c9a View commit details
    Browse the repository at this point in the history
  2. Rollup merge of rust-lang#119199 - dpaoliello:arm64ec, r=wesleywiser

    Add arm64ec-pc-windows-msvc target
    
    Introduces the `arm64ec-pc-windows-msvc` target for building Arm64EC ("Emulation Compatible") binaries for Windows.
    
    For more information about Arm64EC see <https://learn.microsoft.com/en-us/windows/arm/arm64ec>.
    
    ## Tier 3 policy:
    
    > A tier 3 target must have a designated developer or developers (the "target maintainers") on record to be CCed when issues arise regarding the target. (The mechanism to track and CC such developers may evolve over time.)
    
    I will be the maintainer for this target.
    
    > Targets must use naming consistent with any existing targets; for instance, a target for the same CPU or OS as an existing Rust target should use the same name for that CPU or OS. Targets should normally use the same names and naming conventions as used elsewhere in the broader ecosystem beyond Rust (such as in other toolchains), unless they have a very good reason to diverge. Changing the name of a target can be highly disruptive, especially once the target reaches a higher tier, so getting the name right is important even for a tier 3 target.
    
    Target uses the `arm64ec` architecture to match LLVM and MSVC, and the `-pc-windows-msvc` suffix to indicate that it targets Windows via the MSVC environment.
    
    > Target names should not introduce undue confusion or ambiguity unless absolutely necessary to maintain ecosystem compatibility. For example, if the name of the target makes people extremely likely to form incorrect beliefs about what it targets, the name should be changed or augmented to disambiguate it.
    
    Target name exactly specifies the type of code that will be produced.
    
    > If possible, use only letters, numbers, dashes and underscores for the name. Periods (.) are known to cause issues in Cargo.
    
    Done.
    
    > Tier 3 targets may have unusual requirements to build or use, but must not create legal issues or impose onerous legal terms for the Rust project or for Rust developers or users.
    
    > The target must not introduce license incompatibilities.
    
    Uses the same dependencies, requirements and licensing as the other `*-pc-windows-msvc` targets.
    
    > Anything added to the Rust repository must be under the standard Rust license (MIT OR Apache-2.0).
    
    Understood.
    
    > The target must not cause the Rust tools or libraries built for any other host (even when supporting cross-compilation to the target) to depend on any new dependency less permissive than the Rust licensing policy. This applies whether the dependency is a Rust crate that would require adding new license exceptions (as specified by the tidy tool in the rust-lang/rust repository), or whether the dependency is a native library or binary. In other words, the introduction of the target must not cause a user installing or running a version of Rust or the Rust tools to be subject to any new license requirements.
    
    > Compiling, linking, and emitting functional binaries, libraries, or other code for the target (whether hosted on the target itself or cross-compiling from another target) must not depend on proprietary (non-FOSS) libraries. Host tools built for the target itself may depend on the ordinary runtime libraries supplied by the platform and commonly used by other applications built for the target, but those libraries must not be required for code generation for the target; cross-compilation to the target must not require such libraries at all. For instance, rustc built for the target may depend on a common proprietary C runtime library or console output library, but must not depend on a proprietary code generation library or code optimization library. Rust's license permits such combinations, but the Rust project has no interest in maintaining such combinations within the scope of Rust itself, even at tier 3.
    
    > "onerous" here is an intentionally subjective term. At a minimum, "onerous" legal/licensing terms include but are not limited to: non-disclosure requirements, non-compete requirements, contributor license agreements (CLAs) or equivalent, "non-commercial"/"research-only"/etc terms, requirements conditional on the employer or employment of any particular Rust developers, revocable terms, any requirements that create liability for the Rust project or its developers or users, or any requirements that adversely affect the livelihood or prospects of the Rust project or its developers or users.
    
    Uses the same dependencies, requirements and licensing as the other `*-pc-windows-msvc` targets.
    
    > Neither this policy nor any decisions made regarding targets shall create any binding agreement or estoppel by any party. If any member of an approving Rust team serves as one of the maintainers of a target, or has any legal or employment requirement (explicit or implicit) that might affect their decisions regarding a target, they must recuse themselves from any approval decisions regarding the target's tier status, though they may otherwise participate in discussions.
    
    > This requirement does not prevent part or all of this policy from being cited in an explicit contract or work agreement (e.g. to implement or maintain support for a target). This requirement exists to ensure that a developer or team responsible for reviewing and approving a target does not face any legal threats or obligations that would prevent them from freely exercising their judgment in such approval, even if such judgment involves subjective matters or goes beyond the letter of these requirements.
    
    Understood, I am not a member of the Rust team.
    
    > Tier 3 targets should attempt to implement as much of the standard libraries as possible and appropriate (core for most targets, alloc for targets that can support dynamic memory allocation, std for targets with an operating system or equivalent layer of system-provided functionality), but may leave some code unimplemented (either unavailable or stubbed out as appropriate), whether because the target makes it impossible to implement or challenging to implement. The authors of pull requests are not obligated to avoid calling any portions of the standard library on the basis of a tier 3 target not implementing those portions.
    
    Both `core` and `alloc` are supported.
    
    Support for `std` depends on making changes to the standard library, `stdarch` and `backtrace` which cannot be done yet as they require fixes coming in LLVM 18.
    
    > The target must provide documentation for the Rust community explaining how to build for the target, using cross-compilation if possible. If the target supports running binaries, or running tests (even if they do not pass), the documentation must explain how to run such binaries or tests for the target, using emulation if possible or dedicated hardware if necessary.
    
    Documentation is provided in src/doc/rustc/src/platform-support/arm64ec-pc-windows-msvc.md
    
    > Tier 3 targets must not impose burden on the authors of pull requests, or other developers in the community, to maintain the target. In particular, do not post comments (automated or manual) on a PR that derail or suggest a block on the PR based on a tier 3 target. Do not send automated messages or notifications (via any medium, including via ``@)`` to a PR author or others involved with a PR regarding a tier 3 target, unless they have opted into such messages.
    
    > Backlinks such as those generated by the issue/PR tracker when linking to an issue or PR are not considered a violation of this policy, within reason. However, such messages (even on a separate repository) must not generate notifications to anyone involved with a PR who has not requested such notifications.
    
    > Patches adding or updating tier 3 targets must not break any existing tier 2 or tier 1 target, and must not knowingly break another tier 3 target without approval of either the compiler team or the maintainers of the other tier 3 target.
    
    > In particular, this may come up when working on closely related targets, such as variations of the same architecture with different features. Avoid introducing unconditional uses of features that another variation of the target may not have; use conditional compilation or runtime detection, as appropriate, to let each target run code supported by that target.
    
    Understood.
    workingjubilee authored Mar 1, 2024
    Configuration menu
    Copy the full SHA
    fa99d91 View commit details
    Browse the repository at this point in the history
  3. Rollup merge of rust-lang#120468 - alexcrichton:start-wasm32-wasi-ren…

    …ame, r=wesleywiser
    
    Add a new `wasm32-wasip1` target to rustc
    
    This commit adds a new target called `wasm32-wasip1` to rustc. This new target is explained in these two MCPs:
    
    * rust-lang/compiler-team#607
    * rust-lang/compiler-team#695
    
    In short, the previous `wasm32-wasi` target is going to be renamed to `wasm32-wasip1` to better live alongside the [new `wasm32-wasip2` target](rust-lang#119616). This new target is added alongside the `wasm32-wasi` target and has the exact same definition as the previous target. This PR is effectively a rename of `wasm32-wasi` to `wasm32-wasip1`. Note, however, that as explained in rust-lang/compiler-team#695 the previous `wasm32-wasi` target is not being removed at this time. This change will reach stable Rust before even a warning about the rename will be printed. At this time this change is just the start where a new target is introduced and users can start migrating if they support only Nightly for example.
    workingjubilee authored Mar 1, 2024
    Configuration menu
    Copy the full SHA
    25fccc3 View commit details
    Browse the repository at this point in the history
  4. Rollup merge of rust-lang#121416 - veera-sivarajan:bugfix-120785, r=n…

    …nethercote
    
    Improve error messages for generics with default parameters
    
    Fixes rust-lang#120785
    
    Issue: Previously, all type parameters with default types were deliberately ignored to simplify error messages. For example, an error message for Box type would display `Box<T>` instead of `Box<T, _>`. But, this resulted in unclear error message when a concrete type was used instead of the default type.
    
    Fix: This PR fixes it by checking if a concrete type is specified after a default type to display the entire type name or the simplified type name.
    workingjubilee authored Mar 1, 2024
    Configuration menu
    Copy the full SHA
    fca99e5 View commit details
    Browse the repository at this point in the history
  5. Rollup merge of rust-lang#121475 - jieyouxu:tidy-stderr-check, r=the8…

    …472,compiler-errors
    
    Add tidy check for .stderr/.stdout files for non-existent test revisions
    
    Closes rust-lang#77498.
    workingjubilee authored Mar 1, 2024
    Configuration menu
    Copy the full SHA
    b4add6e View commit details
    Browse the repository at this point in the history
  6. Rollup merge of rust-lang#121736 - HTGAzureX1212:HTGAzureX1212/remove…

    …-mutex-unlock, r=jhpratt
    
    Remove `Mutex::unlock` Function
    
    As of the completion of the FCP in rust-lang#81872 (comment), it has come to the conclusion to be closed.
    
    This PR removes the function entirely in light of the above.
    
    Closes rust-lang#81872.
    workingjubilee authored Mar 1, 2024
    Configuration menu
    Copy the full SHA
    90f4d9a View commit details
    Browse the repository at this point in the history
  7. Rollup merge of rust-lang#121784 - Zalathar:if-or-converge, r=Nadrieril

    Make the success arms of `if lhs || rhs` meet up in a separate block
    
    Extracted from rust-lang#118305, where this is necessary to avoid introducing a bug when injecting marker statements into the then/else arms.
    
    ---
    
    In the previous code (rust-lang#111752), the success block of `lhs` would jump directly to the success block of `rhs`. However, `rhs_success_block` could already contain statements that are specific to the RHS, and the direct goto causes them to be executed in the LHS success path as well.
    
    This patch therefore creates a fresh block that the LHS and RHS success blocks can both jump to.
    
    ---
    
    I think the reason we currently get away with this is that `rhs_success_block` usually doesn't contain anything other than StorageDead statements for locals used by the RHS, and those statements don't seem to cause problems in the LHS success path (which never makes those locals live).
    
    But if we start adding meaningful statements for branch coverage (or MC/DC coverage), it's important to keep the LHS and RHS blocks separate.
    workingjubilee authored Mar 1, 2024
    Configuration menu
    Copy the full SHA
    985f608 View commit details
    Browse the repository at this point in the history
  8. Rollup merge of rust-lang#121818 - rcvalle:rust-cfi-remove-unused-typ…

    …eid-for-fnsig, r=workingjubilee
    
    CFI: Remove unused `typeid_for_fnsig`
    
    Removes unused `typeid_for_fnsig` for simplifying the compiler CFI API.
    workingjubilee authored Mar 1, 2024
    Configuration menu
    Copy the full SHA
    9017458 View commit details
    Browse the repository at this point in the history