split NormalizesTo out of Projection 2

[lcnr]

see https://hackmd.io/ktEL8knTSYmtdfrMMnA-Hg, second attempt at #112658

fixesrust-lang/trait-system-refactor-initiative#1

r? @compiler-errors

[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 'actions/checkout@v4' (SHA:8ade135a41bc03ea155e62e844d188df1ea18608)
Download action repository 'actions/upload-artifact@v3' (SHA:a8a3f3ad30e3422c9c7b888a15615d19a852ae32)
Complete job name: PR - mingw-check-tidy
git config --global core.autocrlf false
shell: /usr/bin/bash --noprofile --norc -e -o pipefail {0}
---
GITHUB_ENV=/home/runner/work/_temp/_runner_file_commands/set_env_d8d44fc6-7d96-47c3-9eba-ed5d3ab847f7
GITHUB_EVENT_NAME=pull_request
GITHUB_EVENT_PATH=/home/runner/work/_temp/_github_workflow/event.json
GITHUB_GRAPHQL_URL=https://api.github.com/graphql
GITHUB_HEAD_REF=normalizes-to-projection-split-2
GITHUB_JOB=pr
GITHUB_PATH=/home/runner/work/_temp/_runner_file_commands/add_path_d8d44fc6-7d96-47c3-9eba-ed5d3ab847f7
GITHUB_REF=refs/pull/116262/merge
GITHUB_REF_NAME=116262/merge
GITHUB_REF_PROTECTED=false
---
Removing intermediate container 4efd7a98a332
---> 2b3e9599da5f
Step 6/10 : COPY host-x86_64/mingw-check/reuse-requirements.txt /tmp/
---> b1fcffe93a83
Step 7/10 : RUN pip3 install --no-deps --no-cache-dir --require-hashes -r /tmp/reuse-requirements.txt && pip3 install virtualenv
Collecting binaryornot==0.4.4
Downloading binaryornot-0.4.4-py2.py3-none-any.whl (9.0 kB)
Collecting boolean-py==4.0
Downloading boolean.py-4.0-py3-none-any.whl (25 kB)
---
Building wheels for collected packages: reuse
Building wheel for reuse (pyproject.toml): started
Building wheel for reuse (pyproject.toml): finished with status 'done'
Created wheel for reuse: filename=reuse-1.1.0-cp310-cp310-manylinux_2_35_x86_64.whl size=180117 sha256=2196c9034bf565528bbb1ee6dad4f753eb813f58822363e6b768f09c73e4d4ff
Stored in directory: /tmp/pip-ephem-wheel-cache-d_lfnde_/wheels/c2/3c/b9/1120c2ab4bd82694f7e6f0537dc5b9a085c13e2c69a8d0c76d
Installing collected packages: boolean-py, binaryornot, setuptools, reuse, python-debian, markupsafe, license-expression, jinja2, chardet
Attempting uninstall: setuptools
Found existing installation: setuptools 59.6.0
Not uninstalling setuptools at /usr/lib/python3/dist-packages, outside environment /usr
Not uninstalling setuptools at /usr/lib/python3/dist-packages, outside environment /usr
Can't uninstall 'setuptools'. No files were found to uninstall.
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
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
Collecting virtualenv
Downloading virtualenv-20.24.5-py3-none-any.whl (3.7 MB)
━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━ 3.7/3.7 MB 19.5 MB/s eta 0:00:00
Collecting platformdirs<4,>=3.9.1
Downloading platformdirs-3.11.0-py3-none-any.whl (17 kB)
Collecting filelock<4,>=3.12.2
Downloading filelock-3.12.4-py3-none-any.whl (11 kB)
Collecting distlib<1,>=0.3.7
Downloading distlib-0.3.7-py2.py3-none-any.whl (468 kB)
━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━ 468.9/468.9 KB 47.2 MB/s eta 0:00:00
Installing collected packages: distlib, platformdirs, filelock, virtualenv
Successfully installed distlib-0.3.7 filelock-3.12.4 platformdirs-3.11.0 virtualenv-20.24.5
Removing intermediate container dffd76ae59d1
---> 05191370e8c0
Step 8/10 : COPY host-x86_64/mingw-check/validate-toolstate.sh /scripts/
---> cc92fa238893
---> cc92fa238893
Step 9/10 : COPY host-x86_64/mingw-check/validate-error-codes.sh /scripts/
---> c4084db33a8c
Step 10/10 : ENV SCRIPT TIDY_PRINT_DIFF=1 python2.7 ../x.py test --stage 0 src/tools/tidy tidyselftest --extra-checks=py:lint
Removing intermediate container 16fba7eb143c
---> afb21cd6e207
Successfully built afb21cd6e207
Successfully tagged rust-ci:latest
Successfully tagged rust-ci:latest
##[endgroup]
Built container sha256:afb21cd6e2074981b543902ef8996081831000f09ae63dc60c3cea3c5ce10365
Uploading finished image sha256:afb21cd6e2074981b543902ef8996081831000f09ae63dc60c3cea3c5ce10365 to https://ci-caches.rust-lang.org/docker/8849b25aebb63c7041ab10114da59fac9c6c89ff409673e53f6251b7e63c69daeaca7298d30885d05004ab27b231421908523f297222d07a53450f37e4691d72
IMAGE CREATED CREATED BY SIZE COMMENT
afb21cd6e207 1 second ago /bin/sh -c #(nop) ENV SCRIPT=TIDY_PRINT_DIF… 0B cc92fa238893 2 seconds ago /bin/sh -c #(nop) COPY file:078ea1d11e7b7cda… 367B 05191370e8c0 3 seconds ago |1 DEBIAN_FRONTEND=noninteractive /bin/sh -c… 23.9MB b1fcffe93a83 10 seconds ago /bin/sh -c #(nop) COPY file:ac591dd6bc5afa66… 5.33kB 2b3e9599da5f 12 seconds ago |1 DEBIAN_FRONTEND=noninteractive /bin/sh -c… 23.1MB ---
<missing> 6 weeks ago /bin/sh -c #(nop) LABEL org.opencontainers.… 0B <missing> 6 weeks ago /bin/sh -c #(nop) ARG LAUNCHPAD_BUILD_ARCH 0B <missing> 6 weeks ago /bin/sh -c #(nop) ARG RELEASE 0B <botocore.awsrequest.AWSRequest object at 0x7f693713f490>
gzip: stdout: Broken pipe
xargs: docker: terminated by signal 13
https://ci-caches.rust-lang.org/docker/8849b25aebb63c7041ab10114da59fac9c6c89ff409673e53f6251b7e63c69daeaca7298d30885d05004ab27b231421908523f297222d07a53450f37e4691d72
sha256:afb21cd6e2074981b543902ef8996081831000f09ae63dc60c3cea3c5ce10365
---
DirectMap4k: 262080 kB
DirectMap2M: 9175040 kB
DirectMap1G: 9437184 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 [unoptimized] target(s) in 0.03s
##[endgroup]
downloading https://ci-artifacts.rust-lang.org/rustc-builds-alt/5ead7452e55fc00421fbbda34f570a1673422368/rust-dev-nightly-x86_64-unknown-linux-gnu.tar.xz
extracting /checkout/obj/build/cache/llvm-5ead7452e55fc00421fbbda34f570a1673422368-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 [optimized] target(s) in 29.69s
##[endgroup]
fmt check
##[error]Diff in /checkout/compiler/rustc_trait_selection/src/solve/normalizes_to.rs at line 71:
) -> QueryResult<'tcx> {
if let Some(normalized_const) = self.try_const_eval_resolve(
goal.param_env,
- ty::UnevaluatedConst::new(
- goal.predicate.alias.def_id,
- goal.predicate.alias.args,
- ),
+ ty::UnevaluatedConst::new(goal.predicate.alias.def_id, goal.predicate.alias.args),
self.tcx()
.type_of(goal.predicate.alias.def_id)
.no_bound_vars()
##[error]Diff in /checkout/compiler/rustc_trait_selection/src/solve/normalizes_to.rs at line 223:
//
// And then map these args to the args of the defining impl of `Assoc`, going
// from `[u32, u64]` to `[u32, i32, u64]`.
- let impl_args_with_gat = goal.predicate.alias.args.rebase_onto(
- tcx,
- goal_trait_ref.def_id,
- impl_args,
+ let impl_args_with_gat =
+ let impl_args_with_gat =
+ goal.predicate.alias.args.rebase_onto(tcx, goal_trait_ref.def_id, impl_args);
let args = ecx.translate_args(
goal.param_env,
impl_def_id,
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_trait_selection/src/solve/eval_ctxt/select.rs" "/checkout/compiler/rustc_trait_selection/src/solve/opaques.rs" "/checkout/compiler/rustc_trait_selection/src/solve/inherent_projection.rs" "/checkout/compiler/rustc_trait_selection/src/solve/normalizes_to.rs" "/checkout/compiler/rustc_trait_selection/src/solve/search_graph/mod.rs" "/checkout/compiler/rustc_trait_selection/src/solve/fulfill.rs" "/checkout/compiler/rustc_trait_selection/src/solve/eval_ctxt.rs" "/checkout/compiler/rustc_trait_selection/src/solve/eval_ctxt/probe.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: Mon Oct 2 18:37:16 UTC 2023
network time: Mon, 02 Oct 2023 18:37:16 GMT
##[error]Process completed with exit code 1.
Post job cleanup.

[bors]

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

[compiler-errors]

@rustbot author

[rustbot]

Could not assign reviewer from: compiler-errors.
User(s) compiler-errors are either the PR author, already assigned, or on vacation, and there are no other candidates.
Use r? to specify someone else to assign.

[lcnr]

closing in favor of #118725