Rollup of 6 pull requests

[matthiaskrgr]

Successful merges:

• NVPTX: Avoid PassMode::Direct for args in C abi #117671 (NVPTX: Avoid PassMode::Direct for args in C abi)
• Add an intrinsic for ptr::metadata #124251 (Add an intrinsic for ptr::metadata)
• Migrate run-make/allow-warnings-cmdline-stability to rmake.rs #125573 (Migrate run-make/allow-warnings-cmdline-stability to rmake.rs)
• Add a "Setup Python" action for github-hosted runners and remove unnecessary CUSTOM_MINGW environment variable #125590 (Add a "Setup Python" action for github-hosted runners and remove unnecessary CUSTOM_MINGW environment variable)
• Make ProofTreeBuilder actually generic over Interner #125598 (Make ProofTreeBuilder actually generic over Interner)
• rustfmt fixes #125637 (rustfmt fixes)

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

[matthiaskrgr]

@bors r+ rollup=never p=6

[bors]

📌 Commit 2c7d9ce has been approved by matthiaskrgr

It is now in the queue for this repository.

[bors]

⌛ Testing commit 2c7d9ce with merge 767e12b...

[rust-log-analyzer]

The job mingw-check-tidy failed! Check out the build log: (web) (plain)

Click to see the possible cause of the failure (guessed by this bot)

Prepare all required actions
Getting action download info
Download action repository 'msys2/[email protected]' (SHA:cc11e9188b693c2b100158c3322424c4cc1dadea)
Download action repository 'actions/checkout@v4' (SHA:a5ac7e51b41094c92402da3b24376905380afc29)
Download action repository 'actions/setup-python@v5' (SHA:82c7e631bb3cdc910f68e0081d67478d79c6982d)
Download action repository 'actions/upload-artifact@v4' (SHA:65462800fd760344b1a7b4382951275a0abb4808)
Complete job name: PR - mingw-check-tidy
git config --global core.autocrlf false
shell: /usr/bin/bash --noprofile --norc -e -o pipefail {0}
---
COPY scripts/sccache.sh /scripts/
RUN sh /scripts/sccache.sh

COPY host-x86_64/mingw-check/reuse-requirements.txt /tmp/
RUN pip3 install --no-deps --no-cache-dir --require-hashes -r /tmp/reuse-requirements.txt \
    && pip3 install virtualenv
COPY host-x86_64/mingw-check/validate-toolstate.sh /scripts/
COPY host-x86_64/mingw-check/validate-error-codes.sh /scripts/

# NOTE: intentionally uses python2 for x.py so we can test it still works.
# NOTE: intentionally uses python2 for x.py so we can test it still works.
# validate-toolstate only runs in our CI, so it's ok for it to only support python3.
ENV SCRIPT TIDY_PRINT_DIFF=1 python2.7 ../x.py test \
           --stage 0 src/tools/tidy tidyselftest --extra-checks=py:lint
# This file is autogenerated by pip-compile with Python 3.10
# by the following command:
#
#    pip-compile --allow-unsafe --generate-hashes reuse-requirements.in
---

#12 [5/8] COPY host-x86_64/mingw-check/reuse-requirements.txt /tmp/
#12 DONE 0.0s

#13 [6/8] RUN pip3 install --no-deps --no-cache-dir --require-hashes -r /tmp/reuse-requirements.txt     && pip3 install virtualenv
#13 0.406   Downloading binaryornot-0.4.4-py2.py3-none-any.whl (9.0 kB)
#13 0.417 Collecting boolean-py==4.0
#13 0.420   Downloading boolean.py-4.0-py3-none-any.whl (25 kB)
#13 0.433 Collecting chardet==5.1.0
---
#13 3.378 Building wheels for collected packages: reuse
#13 3.379   Building wheel for reuse (pyproject.toml): started
#13 3.702   Building wheel for reuse (pyproject.toml): finished with status 'done'
#13 3.703   Created wheel for reuse: filename=reuse-1.1.0-cp310-cp310-manylinux_2_35_x86_64.whl size=181117 sha256=f5f58750481f69515c2c0d1d503daf565e2565c370d07fc6aeb95fe3498b4269
#13 3.703   Stored in directory: /tmp/pip-ephem-wheel-cache-u3aqthnd/wheels/c2/3c/b9/1120c2ab4bd82694f7e6f0537dc5b9a085c13e2c69a8d0c76d
#13 3.706 Installing collected packages: boolean-py, binaryornot, setuptools, reuse, python-debian, markupsafe, license-expression, jinja2, chardet
#13 3.727   Attempting uninstall: setuptools
#13 3.728     Found existing installation: setuptools 59.6.0
#13 3.729     Not uninstalling setuptools at /usr/lib/python3/dist-packages, outside environment /usr
#13 3.729     Not uninstalling setuptools at /usr/lib/python3/dist-packages, outside environment /usr
#13 3.729     Can't uninstall 'setuptools'. No files were found to uninstall.
#13 4.395 Successfully installed binaryornot-0.4.4 boolean-py-4.0 chardet-5.1.0 jinja2-3.1.2 license-expression-30.0.0 markupsafe-2.1.1 python-debian-0.1.49 reuse-1.1.0 setuptools-66.0.0
#13 4.395 WARNING: Running pip as the 'root' user can result in broken permissions and conflicting behaviour with the system package manager. It is recommended to use a virtual environment instead: https://pip.pypa.io/warnings/venv
#13 4.908 Collecting virtualenv
#13 4.946   Downloading virtualenv-20.26.2-py3-none-any.whl (3.9 MB)
#13 4.998      ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━ 3.9/3.9 MB 77.7 MB/s eta 0:00:00
#13 5.047 Collecting platformdirs<5,>=3.9.1
#13 5.050   Downloading platformdirs-4.2.2-py3-none-any.whl (18 kB)
#13 5.080 Collecting filelock<4,>=3.12.2
#13 5.083   Downloading filelock-3.14.0-py3-none-any.whl (12 kB)
#13 5.099 Collecting distlib<1,>=0.3.7
#13 5.102   Downloading distlib-0.3.8-py2.py3-none-any.whl (468 kB)
#13 5.107      ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━ 468.9/468.9 KB 118.6 MB/s eta 0:00:00
#13 5.192 Installing collected packages: distlib, platformdirs, filelock, virtualenv
#13 5.355 Successfully installed distlib-0.3.8 filelock-3.14.0 platformdirs-4.2.2 virtualenv-20.26.2
#13 DONE 5.4s

#14 [7/8] COPY host-x86_64/mingw-check/validate-toolstate.sh /scripts/
#14 DONE 0.0s
---
DirectMap4k:      188352 kB
DirectMap2M:     7151616 kB
DirectMap1G:    11534336 kB
##[endgroup]
Executing TIDY_PRINT_DIFF=1 python2.7 ../x.py test            --stage 0 src/tools/tidy tidyselftest --extra-checks=py:lint
+ TIDY_PRINT_DIFF=1 python2.7 ../x.py test --stage 0 src/tools/tidy tidyselftest --extra-checks=py:lint
    Finished `dev` profile [unoptimized] target(s) in 0.03s
##[endgroup]
downloading https://ci-artifacts.rust-lang.org/rustc-builds-alt/f989d2f62500df1696eb797d8800a705293b43b9/rust-dev-nightly-x86_64-unknown-linux-gnu.tar.xz
extracting /checkout/obj/build/cache/llvm-f989d2f62500df1696eb797d8800a705293b43b9-true/rust-dev-nightly-x86_64-unknown-linux-gnu.tar.xz to /checkout/obj/build/x86_64-unknown-linux-gnu/ci-llvm
---
   Compiling tidy v0.1.0 (/checkout/src/tools/tidy)
    Finished `release` profile [optimized] target(s) in 25.22s
##[endgroup]
fmt check
##[error]Diff in /checkout/compiler/rustc_codegen_cranelift/src/base.rs at line 623:
                         UnOp::Not => {
                             let val = operand.load_scalar(fx);
-                            ty::Bool => {
-                            ty::Bool => {
-                                let res = fx.bcx.ins().icmp_imm(IntCC::Equal, val, 0);
-                                CValue::by_val(res, layout)
+                                ty::Bool => {
+                                    let res = fx.bcx.ins().icmp_imm(IntCC::Equal, val, 0);
+                                    CValue::by_val(res, layout)
+                                }
+                                ty::Uint(_) | ty::Int(_) => {
+                                    CValue::by_val(fx.bcx.ins().bnot(val), layout)
+                                }
+                                _ => unreachable!("un op Not for {:?}", layout.ty),
                             }
-                            ty::Uint(_) | ty::Int(_) => {
-                                CValue::by_val(fx.bcx.ins().bnot(val), layout)
-                            }
-                            _ => unreachable!("un op Not for {:?}", layout.ty),
                         }
                         UnOp::Neg => {
                             let val = operand.load_scalar(fx);
                             let val = operand.load_scalar(fx);
##[error]Diff in /checkout/compiler/rustc_codegen_cranelift/src/base.rs at line 638:
                             match layout.ty.kind() {
-                            ty::Int(_) => CValue::by_val(fx.bcx.ins().ineg(val), layout),
-                            ty::Float(_) => CValue::by_val(fx.bcx.ins().fneg(val), layout),
-                            _ => unreachable!("un op Neg for {:?}", layout.ty),
+                                ty::Int(_) => CValue::by_val(fx.bcx.ins().ineg(val), layout),
+                                ty::Float(_) => CValue::by_val(fx.bcx.ins().fneg(val), layout),
+                                _ => unreachable!("un op Neg for {:?}", layout.ty),
                         }
                         }
                         UnOp::PtrMetadata => match layout.abi {
Running `"/checkout/obj/build/x86_64-unknown-linux-gnu/rustfmt/bin/rustfmt" "--config-path" "/checkout" "--edition" "2021" "--unstable-features" "--skip-children" "--check" "/checkout/compiler/rustc_mir_build/src/build/expr/as_rvalue.rs" "/checkout/compiler/rustc_mir_build/src/build/expr/as_place.rs" "/checkout/compiler/rustc_mir_build/src/build/expr/as_temp.rs" "/checkout/compiler/rustc_mir_build/src/build/expr/stmt.rs" "/checkout/compiler/rustc_mir_build/src/build/expr/as_operand.rs" "/checkout/compiler/rustc_mir_build/src/build/expr/category.rs" "/checkout/compiler/rustc_mir_build/src/errors.rs" "/checkout/compiler/rustc_mir_build/src/lints.rs" "/checkout/compiler/rustc_codegen_cranelift/src/pretty_clif.rs" "/checkout/compiler/rustc_codegen_cranelift/src/linkage.rs" "/checkout/compiler/rustc_codegen_cranelift/src/abi/mod.rs" "/checkout/compiler/rustc_codegen_cranelift/src/abi/comments.rs" "/checkout/compiler/rustc_codegen_cranelift/src/abi/returning.rs" "/checkout/compiler/rustc_codegen_cranelift/src/abi/pass_mode.rs" "/checkout/compiler/rustc_codegen_cranelift/src/cast.rs" "/checkout/compiler/rustc_codegen_cranelift/src/lib.rs" "/checkout/compiler/rustc_codegen_cranelift/src/trap.rs" "/checkout/compiler/rustc_codegen_cranelift/src/main_shim.rs" "/checkout/compiler/rustc_codegen_cranelift/src/toolchain.rs" "/checkout/compiler/rustc_codegen_cranelift/src/num.rs" "/checkout/compiler/rustc_codegen_cranelift/src/global_asm.rs" "/checkout/compiler/rustc_codegen_cranelift/src/inline_asm.rs" "/checkout/compiler/rustc_codegen_cranelift/src/constant.rs" "/checkout/compiler/rustc_privacy/src/lib.rs" "/checkout/compiler/rustc_privacy/src/errors.rs" "/checkout/compiler/rustc_codegen_cranelift/src/debuginfo/mod.rs" "/checkout/compiler/rustc_codegen_cranelift/src/debuginfo/line_info.rs" "/checkout/compiler/rustc_codegen_cranelift/src/debuginfo/emit.rs" "/checkout/compiler/rustc_codegen_cranelift/src/debuginfo/unwind.rs" "/checkout/compiler/rustc_codegen_cranelift/src/debuginfo/types.rs" "/checkout/compiler/rustc_codegen_cranelift/src/debuginfo/object.rs" "/checkout/compiler/rustc_codegen_cranelift/src/compiler_builtins.rs" "/checkout/compiler/rustc_codegen_cranelift/src/codegen_i128.rs" "/checkout/compiler/rustc_codegen_cranelift/src/vtable.rs" "/checkout/compiler/rustc_codegen_cranelift/src/analyze.rs" "/checkout/compiler/rustc_codegen_cranelift/src/pointer.rs" "/checkout/compiler/rustc_codegen_cranelift/src/common.rs" "/checkout/compiler/rustc_codegen_cranelift/src/discriminant.rs" "/checkout/compiler/rustc_codegen_cranelift/src/concurrency_limiter.rs" "/checkout/compiler/rustc_codegen_cranelift/src/driver/mod.rs" "/checkout/compiler/rustc_codegen_cranelift/src/driver/jit.rs" "/checkout/compiler/rustc_codegen_cranelift/src/driver/aot.rs" "/checkout/compiler/rustc_codegen_cranelift/src/archive.rs" "/checkout/compiler/rustc_codegen_cranelift/src/unsize.rs" "/checkout/compiler/rustc_codegen_cranelift/src/base.rs" "/checkout/compiler/rustc_codegen_cranelift/src/value_and_place.rs" "/checkout/compiler/rustc_expand/src/module.rs" "/checkout/compiler/rustc_expand/src/lib.rs" "/checkout/compiler/rustc_expand/src/proc_macro.rs" "/checkout/compiler/rustc_codegen_cranelift/src/intrinsics/mod.rs" "/checkout/compiler/rustc_codegen_cranelift/src/intrinsics/llvm_x86.rs" "/checkout/compiler/rustc_codegen_cranelift/src/intrinsics/llvm.rs" "/checkout/compiler/rustc_codegen_cranelift/src/intrinsics/simd.rs" "/checkout/compiler/rustc_codegen_cranelift/src/intrinsics/llvm_aarch64.rs" "/checkout/compiler/rustc_codegen_cranelift/src/config.rs" "/checkout/compiler/rustc_codegen_cranelift/src/allocator.rs" "/checkout/compiler/rustc_codegen_cranelift/src/optimize/mod.rs" "/checkout/compiler/rustc_codegen_cranelift/src/optimize/peephole.rs" "/checkout/compiler/rustc_expand/src/mbe/macro_rules.rs" "/checkout/compiler/rustc_expand/src/mbe/macro_parser.rs" "/checkout/compiler/rustc_expand/src/mbe/metavar_expr.rs" "/checkout/compiler/rustc_expand/src/mbe/diagnostics.rs" "/checkout/compiler/rustc_expand/src/mbe/macro_check.rs" "/checkout/compiler/rustc_mir_build/src/build/expr/as_constant.rs"` failed.
If you're running `tidy`, try again with `--bless`. Or, if you just want to format code, run `./x.py fmt` instead.
  local time: Tue May 28 15:59:12 UTC 2024
  network time: Tue, 28 May 2024 15:59:12 GMT
##[error]Process completed with exit code 1.
Post job cleanup.

[rust-log-analyzer]

The job aarch64-gnu failed! Check out the build log: (web) (plain)

Click to see the possible cause of the failure (guessed by this bot)

Prepare all required actions
Getting action download info
Download action repository 'msys2/[email protected]' (SHA:cc11e9188b693c2b100158c3322424c4cc1dadea)
Download action repository 'actions/checkout@v4' (SHA:a5ac7e51b41094c92402da3b24376905380afc29)
Download action repository 'actions/setup-python@v5' (SHA:82c7e631bb3cdc910f68e0081d67478d79c6982d)
Complete job name: auto - aarch64-gnu
##[group]Run git config --global core.autocrlf false
git config --global core.autocrlf false
shell: /usr/bin/bash --noprofile --norc -e -o pipefail {0}
---
##[endgroup]
[TIMING] core::build_steps::tool::ToolBuild { compiler: Compiler { stage: 0, host: aarch64-unknown-linux-gnu }, target: aarch64-unknown-linux-gnu, tool: "tidy", path: "src/tools/tidy", mode: ToolBootstrap, source_type: InTree, extra_features: [], allow_features: "" } -- 22.664
[TIMING] core::build_steps::tool::Tidy { compiler: Compiler { stage: 0, host: aarch64-unknown-linux-gnu }, target: aarch64-unknown-linux-gnu } -- 0.003
fmt check
##[error]Diff in /checkout/compiler/rustc_codegen_cranelift/src/base.rs at line 623:
                         UnOp::Not => {
                             let val = operand.load_scalar(fx);
-                            ty::Bool => {
-                            ty::Bool => {
-                                let res = fx.bcx.ins().icmp_imm(IntCC::Equal, val, 0);
-                                CValue::by_val(res, layout)
+                                ty::Bool => {
+                                    let res = fx.bcx.ins().icmp_imm(IntCC::Equal, val, 0);
+                                    CValue::by_val(res, layout)
+                                }
+                                ty::Uint(_) | ty::Int(_) => {
+                                    CValue::by_val(fx.bcx.ins().bnot(val), layout)
+                                }
+                                _ => unreachable!("un op Not for {:?}", layout.ty),
                             }
-                            ty::Uint(_) | ty::Int(_) => {
-                                CValue::by_val(fx.bcx.ins().bnot(val), layout)
-                            }
-                            _ => unreachable!("un op Not for {:?}", layout.ty),
                         }
                         UnOp::Neg => {
                             let val = operand.load_scalar(fx);
                             let val = operand.load_scalar(fx);
##[error]Diff in /checkout/compiler/rustc_codegen_cranelift/src/base.rs at line 638:
                             match layout.ty.kind() {
-                            ty::Int(_) => CValue::by_val(fx.bcx.ins().ineg(val), layout),
-                            ty::Float(_) => CValue::by_val(fx.bcx.ins().fneg(val), layout),
-                            _ => unreachable!("un op Neg for {:?}", layout.ty),
+                                ty::Int(_) => CValue::by_val(fx.bcx.ins().ineg(val), layout),
+                                ty::Float(_) => CValue::by_val(fx.bcx.ins().fneg(val), layout),
+                                _ => unreachable!("un op Neg for {:?}", layout.ty),
                         }
                         }
                         UnOp::PtrMetadata => match layout.abi {
Running `"/checkout/obj/build/aarch64-unknown-linux-gnu/rustfmt/bin/rustfmt" "--config-path" "/checkout" "--edition" "2021" "--unstable-features" "--skip-children" "--check" "/checkout/compiler/rustc_codegen_cranelift/src/pointer.rs" "/checkout/compiler/rustc_codegen_cranelift/src/toolchain.rs" "/checkout/compiler/rustc_codegen_cranelift/src/driver/jit.rs" "/checkout/compiler/rustc_codegen_cranelift/src/driver/mod.rs" "/checkout/compiler/rustc_codegen_cranelift/src/driver/aot.rs" "/checkout/compiler/rustc_codegen_cranelift/src/lib.rs" "/checkout/compiler/rustc_codegen_cranelift/src/compiler_builtins.rs" "/checkout/compiler/rustc_codegen_cranelift/src/config.rs" "/checkout/compiler/rustc_codegen_cranelift/src/unsize.rs" "/checkout/compiler/rustc_codegen_cranelift/src/abi/pass_mode.rs" "/checkout/compiler/rustc_codegen_cranelift/src/abi/comments.rs" "/checkout/compiler/rustc_codegen_cranelift/src/abi/mod.rs" "/checkout/compiler/rustc_codegen_cranelift/src/abi/returning.rs" "/checkout/compiler/rustc_codegen_cranelift/src/value_and_place.rs" "/checkout/compiler/rustc_codegen_cranelift/src/base.rs" "/checkout/compiler/rustc_codegen_cranelift/src/allocator.rs" "/checkout/compiler/rustc_codegen_cranelift/src/codegen_i128.rs" "/checkout/compiler/rustc_codegen_cranelift/src/main_shim.rs" "/checkout/compiler/rustc_codegen_cranelift/src/vtable.rs" "/checkout/compiler/rustc_codegen_cranelift/src/common.rs" "/checkout/compiler/rustc_codegen_cranelift/src/global_asm.rs" "/checkout/compiler/rustc_codegen_cranelift/src/debuginfo/unwind.rs" "/checkout/compiler/rustc_codegen_cranelift/src/debuginfo/types.rs" "/checkout/compiler/rustc_codegen_cranelift/src/debuginfo/line_info.rs" "/checkout/compiler/rustc_codegen_cranelift/src/debuginfo/object.rs" "/checkout/compiler/rustc_codegen_cranelift/src/debuginfo/mod.rs" "/checkout/compiler/rustc_codegen_cranelift/src/debuginfo/emit.rs" "/checkout/compiler/rustc_codegen_cranelift/src/constant.rs" "/checkout/compiler/rustc_codegen_cranelift/src/trap.rs" "/checkout/compiler/rustc_codegen_cranelift/src/intrinsics/llvm.rs" "/checkout/compiler/rustc_codegen_cranelift/src/intrinsics/mod.rs" "/checkout/compiler/rustc_codegen_cranelift/src/intrinsics/llvm_aarch64.rs" "/checkout/compiler/rustc_codegen_cranelift/src/intrinsics/llvm_x86.rs" "/checkout/compiler/rustc_codegen_cranelift/src/intrinsics/simd.rs" "/checkout/compiler/rustc_codegen_cranelift/src/discriminant.rs" "/checkout/compiler/rustc_codegen_cranelift/src/optimize/peephole.rs" "/checkout/compiler/rustc_codegen_cranelift/src/optimize/mod.rs" "/checkout/compiler/rustc_codegen_cranelift/src/analyze.rs" "/checkout/compiler/rustc_codegen_cranelift/src/linkage.rs" "/checkout/compiler/rustc_codegen_cranelift/src/pretty_clif.rs" "/checkout/compiler/rustc_codegen_cranelift/src/inline_asm.rs" "/checkout/compiler/rustc_mir_transform/src/add_subtyping_projections.rs" "/checkout/compiler/rustc_mir_transform/src/inline.rs" "/checkout/compiler/rustc_mir_transform/src/deduplicate_blocks.rs" "/checkout/compiler/rustc_mir_transform/src/dest_prop.rs" "/checkout/compiler/rustc_mir_transform/src/coroutine.rs" "/checkout/compiler/rustc_mir_transform/src/ffi_unwind_calls.rs" "/checkout/compiler/rustc_mir_transform/src/check_const_item_mutation.rs" "/checkout/compiler/rustc_mir_transform/src/add_retag.rs" "/checkout/compiler/rustc_mir_transform/src/lib.rs" "/checkout/compiler/rustc_mir_transform/src/nrvo.rs" "/checkout/compiler/rustc_mir_transform/src/early_otherwise_branch.rs" "/checkout/compiler/rustc_mir_transform/src/promote_consts.rs" "/checkout/compiler/rustc_mir_transform/src/dead_store_elimination.rs" "/checkout/compiler/rustc_mir_transform/src/simplify.rs" "/checkout/compiler/rustc_mir_transform/src/gvn.rs" "/checkout/compiler/rustc_mir_transform/src/sroa.rs" "/checkout/compiler/rustc_mir_transform/src/shim.rs" "/checkout/compiler/rustc_mir_transform/src/prettify.rs" "/checkout/compiler/rustc_mir_transform/src/unreachable_enum_branching.rs" "/checkout/compiler/rustc_mir_transform/src/dataflow_const_prop.rs" "/checkout/compiler/rustc_mir_transform/src/cost_checker.rs" "/checkout/compiler/rustc_mir_transform/src/const_debuginfo.rs" "/checkout/compiler/rustc_codegen_cranelift/src/cast.rs"` failed.
If you're running `tidy`, try again with `--bless`. Or, if you just want to format code, run `./x.py fmt` instead.
  local time: Tue May 28 16:02:22 UTC 2024
  network time: Tue, 28 May 2024 16:02:22 GMT
##[error]Process completed with exit code 1.
Post job cleanup.

[bors]

💔 Test failed - checks-actions