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 7 pull requests #116923

Merged
merged 15 commits into from Oct 19, 2023
Merged

Rollup of 7 pull requests #116923

merged 15 commits into from Oct 19, 2023

Commits on Oct 15, 2023

  1. Fix podman detection in CI scripts

    When docker-podman compat was set up in a way that causes "docker"
    to be the argv[0] of podman, the previous detection did not work.
    This was for example the case in the compat package from nixpkgs.
    
    This checks the output and should work everywhere.
    Nilstrieb committed Oct 15, 2023
    Configuration menu
    Copy the full SHA
    6ab84b5 View commit details
    Browse the repository at this point in the history

Commits on Oct 16, 2023

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

Commits on Oct 18, 2023

  1. Change my name in mailmap

    blyxyas committed Oct 18, 2023
    Configuration menu
    Copy the full SHA
    54eef16 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    d0b99e3 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    ea73f10 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    8d20182 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    189e6a8 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    bd8b468 View commit details
    Browse the repository at this point in the history

Commits on Oct 19, 2023

  1. Rollup merge of rust-lang#116663 - compiler-errors:resolve-regions, r…

    …=lcnr
    
    Don't ICE when encountering unresolved regions in `fully_resolve`
    
    We can encounter unresolved regions due to unconstrained impl lifetime arguments because `collect_return_position_impl_trait_in_trait_tys` runs before WF actually checks that the impl is well-formed.
    
    Fixes rust-lang#116525
    fmease committed Oct 19, 2023
    Configuration menu
    Copy the full SHA
    2dd1c8f View commit details
    Browse the repository at this point in the history
  2. Rollup merge of rust-lang#116761 - Nilstrieb:podman, r=cuviper

    Fix podman detection in CI scripts
    
    When docker-podman compat was set up in a way that causes "docker" to be the argv[0] of podman, the previous detection did not work. This was for example the case in the compat package from nixpkgs.
    
    This checks the output and should work everywhere.
    
    I tested it locally by executing
    ```sh
    if [[ "$id" != 0 && "$(docker version)" =~ Podman ]]; then
        echo yes
    else
        echo no
    fi
    ```
    which printed `no` before, and `yes` now.
    
    fixes rust-lang#113129
    
    r? cuviper
    fmease committed Oct 19, 2023
    Configuration menu
    Copy the full SHA
    29d9877 View commit details
    Browse the repository at this point in the history
  3. Rollup merge of rust-lang#116795 - DaniPopes:track-caller-option, r=c…

    …uviper
    
    Add `#[track_caller]` to `Option::unwrap_or_else`
    
    Same as rust-lang#116317 but for `Option`.
    
    Closes rust-lang#115302
    fmease committed Oct 19, 2023
    Configuration menu
    Copy the full SHA
    80c9588 View commit details
    Browse the repository at this point in the history
  4. Rollup merge of rust-lang#116829 - fmease:rust-aint-c, r=compiler-errors

    Make `#[repr(Rust)]` incompatible with other (non-modifier) representation hints like `C` and `simd`
    
    Read more about this change here: rust-lang#116829 (comment).
    
    Fixes [after backport] rust-lang#116825.
    fmease committed Oct 19, 2023
    Configuration menu
    Copy the full SHA
    2eb6e5f View commit details
    Browse the repository at this point in the history
  5. Rollup merge of rust-lang#116883 - blyxyas:fix-mailmap, r=Nilstrieb

    Change my name in mailmap
    
    I changed some things about my distro (my GPG key, along with the git username). This PR sets my committer name as `blyxyas` for those commits so that it is the same as my reviewer name in `thanks`.
    fmease committed Oct 19, 2023
    Configuration menu
    Copy the full SHA
    42c7d21 View commit details
    Browse the repository at this point in the history
  6. Rollup merge of rust-lang#116908 - estebank:issue-78206, r=compiler-e…

    …rrors
    
    Tweak wording of type errors involving type params
    
    Fix rust-lang#78206.
    fmease committed Oct 19, 2023
    Configuration menu
    Copy the full SHA
    64ed233 View commit details
    Browse the repository at this point in the history
  7. Rollup merge of rust-lang#116912 - compiler-errors:rustc_type_ir-bike…

    …shedding, r=jackh726
    
    Some renaming nits for `rustc_type_ir`
    
    tl;dr:
    * `ListTy` -> `Tys`
    * `PlaceholderType` -> `PlaceholderTy`
    * `RegionVid` -> `InferRegion`
    * `ListBinderExistentialPredicate` -> `BoundExistentialPredicates`
    * `GenericArgsRef` -> `GenericArgs`
    
    r? jackh726
    fmease committed Oct 19, 2023
    Configuration menu
    Copy the full SHA
    8aa1d71 View commit details
    Browse the repository at this point in the history