Perform more validation on CoercePointee

[dingxiangfei2009]

A series patch complementary to #136107

r? @ghost

[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)

info: removing rustup binaries info: rustup is uninstalled ##[group]Image checksum input mingw-check-tidy # We use the ghcr base image because ghcr doesn't have a rate limit # and the mingw-check-tidy job doesn't cache docker images in CI. FROM ghcr.io/rust-lang/ubuntu:22.04 ARG DEBIAN_FRONTEND=noninteractive RUN apt-get update && apt-get install -y --no-install-recommends \ g++ \ make \ --- 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. # 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,cpp # 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 2.714 Building wheels for collected packages: reuse #12 2.715 Building wheel for reuse (pyproject.toml): started #12 2.922 Building wheel for reuse (pyproject.toml): finished with status 'done' #12 2.923 Created wheel for reuse: filename=reuse-4.0.3-cp310-cp310-manylinux_2_35_x86_64.whl size=132719 sha256=be6760d5849de4a58bbe52b85ca57a55f2b32b518b17029a5ad2e530db0d4303 #12 2.923 Stored in directory: /tmp/pip-ephem-wheel-cache-5nhhjudy/wheels/3d/8d/0a/e0fc6aba4494b28a967ab5eaf951c121d9c677958714e34532 #12 2.926 Installing collected packages: boolean-py, binaryornot, tomlkit, reuse, python-debian, markupsafe, license-expression, jinja2, chardet, attrs #12 3.321 Successfully installed attrs-23.2.0 binaryornot-0.4.4 boolean-py-4.0 chardet-5.2.0 jinja2-3.1.4 license-expression-30.3.0 markupsafe-2.1.5 python-debian-0.1.49 reuse-4.0.3 tomlkit-0.13.0 #12 3.321 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 #12 3.848 Collecting virtualenv #12 3.848 Collecting virtualenv #12 3.933 Downloading virtualenv-20.29.1-py3-none-any.whl (4.3 MB) #12 4.069 ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━ 4.3/4.3 MB 32.3 MB/s eta 0:00:00 #12 4.123 Collecting platformdirs<5,>=3.9.1 #12 4.143 Downloading platformdirs-4.3.6-py3-none-any.whl (18 kB) #12 4.179 Collecting filelock<4,>=3.12.2 #12 4.216 Collecting distlib<1,>=0.3.7 #12 4.236 Downloading distlib-0.3.9-py2.py3-none-any.whl (468 kB) #12 4.244 ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━ 469.0/469.0 KB 84.4 MB/s eta 0:00:00 #12 4.244 ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━ 469.0/469.0 KB 84.4 MB/s eta 0:00:00 #12 4.326 Installing collected packages: distlib, platformdirs, filelock, virtualenv #12 4.507 Successfully installed distlib-0.3.9 filelock-3.17.0 platformdirs-4.3.6 virtualenv-20.29.1 #12 DONE 4.6s #13 [7/8] COPY host-x86_64/mingw-check/validate-toolstate.sh /scripts/ #13 DONE 0.0s --- DirectMap4k: 135104 kB DirectMap2M: 6156288 kB DirectMap1G: 12582912 kB ##[endgroup] Executing TIDY_PRINT_DIFF=1 python2.7 ../x.py test --stage 0 src/tools/tidy tidyselftest --extra-checks=py,cpp + TIDY_PRINT_DIFF=1 python2.7 ../x.py test --stage 0 src/tools/tidy tidyselftest --extra-checks=py,cpp Finished `dev` profile [unoptimized] target(s) in 0.05s ##[endgroup] WARN: currently no CI rustc builds have rustc debug assertions enabled. Please either set `rust.debug-assertions` to `false` if you want to use download CI rustc or set `rust.download-rustc` to `false`. downloading https://static.rust-lang.org/dist/2025-02-08/rustfmt-nightly-x86_64-unknown-linux-gnu.tar.xz --- fmt check Diff in /checkout/compiler/rustc_hir_analysis/src/coherence/builtin.rs:1078: } for (did, impls) in dups { - infos.insert(did, ty::CoercePointeeInfo::Duplicated { - impls: tcx.arena.alloc_from_iter(impls), + infos.insert( + did, + did, + ty::CoercePointeeInfo::Duplicated { impls: tcx.arena.alloc_from_iter(impls) }, } tcx.arena.alloc(infos) fmt: checked 5836 files 

[bors]

☔ The latest upstream changes (presumably #136593) made this pull request unmergeable. Please resolve the merge conflicts.