rust
rust copied to clipboard
more eagerly instantiate binders
The old solver sometimes incorrectly used sub, change it to explicitly instantiate binders and use eq instead. While doing so I also moved the instantiation before the normalize calls. This caused some observable changes, will explain these inline. This PR therefore requires a crater run and an FCP.
r? types
@bors try
:hourglass: Trying commit c010b64b34f27fc0ab608ec10ed8e71c76b2b4b1 with merge 7675b9564bf1b2a0b7cc140f496ade0ac3c572ec...
Test changes overall look fine, other than gluon_salsa that I have to think more about.
Haven't really reviewed the code changes, but I'll do that soonish, since we have to wait for process anyways.
@bors try
:hourglass: Trying commit 23e69c00c3a33374654bac4751bea0ee17702719 with merge 21bc403d557a2516df70ea80fb19b94177beede5...
:sunny: Try build successful - checks-actions
Build commit: 21bc403d557a2516df70ea80fb19b94177beede5 (21bc403d557a2516df70ea80fb19b94177beede5)
@rust-timer build 21bc403d557a2516df70ea80fb19b94177beede5
@craterbot check
Queued 21bc403d557a2516df70ea80fb19b94177beede5 with parent 5431404b87967c69438ea1e698edbe96505f0798, future comparison URL. There are currently 2 preceding artifacts in the queue. It will probably take at least ~3.4 hours until the benchmark run finishes.
:ok_hand: Experiment pr-119849 created and queued.
:robot: Automatically detected try build 21bc403d557a2516df70ea80fb19b94177beede5
:mag: You can check out the queue and this experiment's details.
:information_source: Crater is a tool to run experiments across parts of the Rust ecosystem. Learn more
Finished benchmarking commit (21bc403d557a2516df70ea80fb19b94177beede5): comparison URL.
Overall result: ❌✅ regressions and improvements - ACTION NEEDED
Benchmarking this pull request likely means that it is perf-sensitive, so we're automatically marking it as not fit for rolling up. While you can manually mark this PR as fit for rollup, we strongly recommend not doing so since this PR may lead to changes in compiler perf.
Next Steps: If you can justify the regressions found in this try perf run, please indicate this with @rustbot label: +perf-regression-triaged along with sufficient written justification. If you cannot justify the regressions please fix the regressions and do another perf run. If the next run shows neutral or positive results, the label will be automatically removed.
@bors rollup=never @rustbot label: -S-waiting-on-perf +perf-regression
Instruction count
This is a highly reliable metric that was used to determine the overall result at the top of this comment.
| mean | range | count | |
|---|---|---|---|
| Regressions ❌ (primary) |
0.5% | [0.2%, 0.9%] | 13 |
| Regressions ❌ (secondary) |
1.2% | [0.3%, 1.5%] | 7 |
| Improvements ✅ (primary) |
- | - | 0 |
| Improvements ✅ (secondary) |
-2.1% | [-2.5%, -1.8%] | 6 |
| All ❌✅ (primary) | 0.5% | [0.2%, 0.9%] | 13 |
Max RSS (memory usage)
Results
This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.
| mean | range | count | |
|---|---|---|---|
| Regressions ❌ (primary) |
1.3% | [1.3%, 1.3%] | 2 |
| Regressions ❌ (secondary) |
- | - | 0 |
| Improvements ✅ (primary) |
- | - | 0 |
| Improvements ✅ (secondary) |
-3.3% | [-3.3%, -3.3%] | 1 |
| All ❌✅ (primary) | 1.3% | [1.3%, 1.3%] | 2 |
Cycles
Results
This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.
| mean | range | count | |
|---|---|---|---|
| Regressions ❌ (primary) |
- | - | 0 |
| Regressions ❌ (secondary) |
1.7% | [1.7%, 1.7%] | 1 |
| Improvements ✅ (primary) |
- | - | 0 |
| Improvements ✅ (secondary) |
- | - | 0 |
| All ❌✅ (primary) | - | - | 0 |
Binary size
This benchmark run did not return any relevant results for this metric.
Bootstrap: 666.39s -> 665.793s (-0.09%) Artifact size: 308.38 MiB -> 308.37 MiB (-0.00%)
:construction: Experiment pr-119849 is now running
:information_source: Crater is a tool to run experiments across parts of the Rust ecosystem. Learn more
:tada: Experiment pr-119849 is completed!
:bar_chart: 1539 regressed and 5 fixed (407280 total)
:newspaper: Open the full report.
:warning: If you notice any spurious failure please add them to the blacklist! :information_source: Crater is a tool to run experiments across parts of the Rust ecosystem. Learn more
@craterbot check p=1 crates=https://crater-reports.s3.amazonaws.com/pr-119849/retry-regressed-list.txt
:ok_hand: Experiment pr-119849-1 created and queued.
:robot: Automatically detected try build 21bc403d557a2516df70ea80fb19b94177beede5
:mag: You can check out the queue and this experiment's details.
:information_source: Crater is a tool to run experiments across parts of the Rust ecosystem. Learn more
minimized from https://crates.io/crates/ark-ec, this is not higher ranked, so it may actually be caused by the changes in https://github.com/rust-lang/rust/pull/119849#discussion_r1448795042
trait Pairing: Sized {
type G1: CurveGroup<Prepared = Self::G1Prepared> + Into<Self::G1Prepared>;
type G1Prepared;
fn pairing<P: Into<Self::G1Prepared>>(p: P) {}
}
trait CurveGroup: Into<Self::Prepared> {
type Prepared;
fn generator() -> Self;
}
fn generator<P: Pairing>() {
let g1 = P::G1::generator();
P::pairing(g1.into())
}
fn main() {}
@craterbot abort
@bors try
:wastebasket: Experiment pr-119849-1 deleted!
:information_source: Crater is a tool to run experiments across parts of the Rust ecosystem. Learn more
:hourglass: Trying commit ad44c7265928590852a03e8c0152d4cc7414177f with merge 947a2fc2ef41dae813f085cf0a7d4523dd588b4c...
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:b4ffde65f46336ab88eb53be808477a3936bae11)
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_b89fa900-06a3-486c-a414-609fb2f31f81
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=eagerly-instantiate-binders
GITHUB_JOB=pr
GITHUB_PATH=/home/runner/work/_temp/_runner_file_commands/add_path_b89fa900-06a3-486c-a414-609fb2f31f81
GITHUB_REF=refs/pull/119849/merge
GITHUB_REF_NAME=119849/merge
GITHUB_REF_PROTECTED=false
---
Removing intermediate container 80442e7dbc17
---> 6695dfd750dc
Step 6/10 : COPY host-x86_64/mingw-check/reuse-requirements.txt /tmp/
---> ac340d6e8914
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=180123 sha256=f323ccf11d14c5b11f6d5e70edb46e391f4b49a5df5c7d922224477ad8ee15c5
Stored in directory: /tmp/pip-ephem-wheel-cache-g6l6mgqf/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
---
Downloading virtualenv-20.25.0-py3-none-any.whl (3.8 MB)
━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━ 3.8/3.8 MB 19.0 MB/s eta 0:00:00
Collecting filelock<4,>=3.12.2
Downloading filelock-3.13.1-py3-none-any.whl (11 kB)
Collecting distlib<1,>=0.3.7
Downloading distlib-0.3.8-py2.py3-none-any.whl (468 kB)
━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━ 468.9/468.9 KB 46.0 MB/s eta 0:00:00
Collecting platformdirs<5,>=3.9.1
Downloading platformdirs-4.1.0-py3-none-any.whl (17 kB)
Installing collected packages: distlib, platformdirs, filelock, virtualenv
Successfully installed distlib-0.3.8 filelock-3.13.1 platformdirs-4.1.0 virtualenv-20.25.0
Removing intermediate container f88f1b7ff7a7
---> 9d70c872e444
Step 8/10 : COPY host-x86_64/mingw-check/validate-toolstate.sh /scripts/
---> ee8b76b2708e
---> ee8b76b2708e
Step 9/10 : COPY host-x86_64/mingw-check/validate-error-codes.sh /scripts/
---> 0e4e2f163f7d
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 8c01d091a49e
---> 9c70efd1b537
Successfully built 9c70efd1b537
Successfully tagged rust-ci:latest
Successfully tagged rust-ci:latest
##[endgroup]
Built container sha256:9c70efd1b537e2c8689f41105a1783c0b097805b3e84e35d12220cc279ba48f6
Uploading finished image sha256:9c70efd1b537e2c8689f41105a1783c0b097805b3e84e35d12220cc279ba48f6 to https://ci-caches.rust-lang.org/docker/139141a603ff222e98d20ef66f0e4eaedfc4b373e41d302ecff577f90ee0c6cf0cab092d18a8f6a073c88b362b9a680d3b2b6e5c828faaf25d1b853eabb78b1a
IMAGE CREATED CREATED BY SIZE COMMENT
9c70efd1b537 1 second ago /bin/sh -c #(nop) ENV SCRIPT=TIDY_PRINT_DIF… 0B
ee8b76b2708e 2 seconds ago /bin/sh -c #(nop) COPY file:078ea1d11e7b7cda… 367B
9d70c872e444 3 seconds ago |1 DEBIAN_FRONTEND=noninteractive /bin/sh -c… 23.9MB
ac340d6e8914 10 seconds ago /bin/sh -c #(nop) COPY file:ac591dd6bc5afa66… 5.33kB
6695dfd750dc 11 seconds ago |1 DEBIAN_FRONTEND=noninteractive /bin/sh -c… 23.1MB
---
<missing> 6 days ago /bin/sh -c #(nop) LABEL org.opencontainers.… 0B
<missing> 6 days ago /bin/sh -c #(nop) ARG LAUNCHPAD_BUILD_ARCH 0B
<missing> 6 days ago /bin/sh -c #(nop) ARG RELEASE 0B
<botocore.awsrequest.AWSRequest object at 0x7f710bbf7550>
gzip: stdout: Broken pipe
xargs: docker: terminated by signal 13
https://ci-caches.rust-lang.org/docker/139141a603ff222e98d20ef66f0e4eaedfc4b373e41d302ecff577f90ee0c6cf0cab092d18a8f6a073c88b362b9a680d3b2b6e5c828faaf25d1b853eabb78b1a
sha256:9c70efd1b537e2c8689f41105a1783c0b097805b3e84e35d12220cc279ba48f6
---
DirectMap4k: 174016 kB
DirectMap2M: 8214528 kB
DirectMap1G: 10485760 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/c485ee71477a29041895c47cc441b364670f3772/rust-dev-nightly-x86_64-unknown-linux-gnu.tar.xz
extracting /checkout/obj/build/cache/llvm-c485ee71477a29041895c47cc441b364670f3772-true/rust-dev-nightly-x86_64-unknown-linux-gnu.tar.xz to /checkout/obj/build/x86_64-unknown-linux-gnu/ci-llvm
---
##[endgroup]
fmt check
tidy check
tidy: Skipping binary file check, read-only filesystem
tidy error: /checkout/tests/ui/associated-type-bounds/dedup-normalized-1.rs: too many trailing newlines (3)
removing old virtual environment
creating virtual environment at '/checkout/obj/build/venv' using 'python3.10'
Requirement already satisfied: pip in ./build/venv/lib/python3.10/site-packages (23.3.1)
Collecting pip
Downloading pip-23.3.2-py3-none-any.whl.metadata (3.5 kB)
Downloading pip-23.3.2-py3-none-any.whl (2.1 MB)
Installing collected packages: pip
Attempting uninstall: pip
Found existing installation: pip 23.3.1
Uninstalling pip-23.3.1:
Uninstalling pip-23.3.1:
Successfully uninstalled pip-23.3.1
Successfully installed pip-23.3.2
Collecting black==23.3.0 (from -r /checkout/src/tools/tidy/config/requirements.txt (line 7))
━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━ 1.7/1.7 MB 4.9 MB/s eta 0:00:00
━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━ 1.7/1.7 MB 4.9 MB/s eta 0:00:00
Collecting click==8.1.3 (from -r /checkout/src/tools/tidy/config/requirements.txt (line 34))
Downloading click-8.1.3-py3-none-any.whl (96 kB)
Collecting importlib-metadata==6.7.0 (from -r /checkout/src/tools/tidy/config/requirements.txt (line 38))
Downloading importlib_metadata-6.7.0-py3-none-any.whl (22 kB)
Downloading importlib_metadata-6.7.0-py3-none-any.whl (22 kB)
Collecting mypy-extensions==1.0.0 (from -r /checkout/src/tools/tidy/config/requirements.txt (line 42))
Downloading mypy_extensions-1.0.0-py3-none-any.whl (4.7 kB)
Collecting packaging==23.1 (from -r /checkout/src/tools/tidy/config/requirements.txt (line 46))
Downloading packaging-23.1-py3-none-any.whl (48 kB)
Collecting pathspec==0.11.1 (from -r /checkout/src/tools/tidy/config/requirements.txt (line 50))
Downloading pathspec-0.11.1-py3-none-any.whl (29 kB)
Downloading pathspec-0.11.1-py3-none-any.whl (29 kB)
Collecting platformdirs==3.6.0 (from -r /checkout/src/tools/tidy/config/requirements.txt (line 54))
Downloading platformdirs-3.6.0-py3-none-any.whl (16 kB)
Collecting ruff==0.0.272 (from -r /checkout/src/tools/tidy/config/requirements.txt (line 58))
Downloading ruff-0.0.272-py3-none-manylinux_2_17_x86_64.manylinux2014_x86_64.whl (5.9 MB)
Collecting tomli==2.0.1 (from -r /checkout/src/tools/tidy/config/requirements.txt (line 77))
Downloading tomli-2.0.1-py3-none-any.whl (12 kB)
Collecting typed-ast==1.5.4 (from -r /checkout/src/tools/tidy/config/requirements.txt (line 81))
Downloading typed_ast-1.5.4-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl (877 kB)
Downloading typed_ast-1.5.4-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl (877 kB)
━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━ 877.7/877.7 kB 56.4 MB/s eta 0:00:00
Collecting typing-extensions==4.6.3 (from -r /checkout/src/tools/tidy/config/requirements.txt (line 107))
Downloading typing_extensions-4.6.3-py3-none-any.whl (31 kB)
Collecting zipp==3.15.0 (from -r /checkout/src/tools/tidy/config/requirements.txt (line 114))
Downloading zipp-3.15.0-py3-none-any.whl (6.8 kB)
Installing collected packages: zipp, typing-extensions, typed-ast, tomli, ruff, platformdirs, pathspec, packaging, mypy-extensions, click, importlib-metadata, black
Successfully installed black-23.3.0 click-8.1.3 importlib-metadata-6.7.0 mypy-extensions-1.0.0 packaging-23.1 pathspec-0.11.1 platformdirs-3.6.0 ruff-0.0.272 tomli-2.0.1 typed-ast-1.5.4 typing-extensions-4.6.3 zipp-3.15.0
some tidy checks failed
Build completed unsuccessfully in 0:01:03
local time: Thu Jan 18 13:52:25 UTC 2024
network time: Thu, 18 Jan 2024 13:52:25 GMT
:umbrella: The latest upstream changes (presumably #118553) made this pull request unmergeable. Please resolve the merge conflicts.
@craterbot end=ad44c7265928590852a03e8c0152d4cc7414177f p=1 crates=https://crater-reports.s3.amazonaws.com/pr-119849/retry-regressed-list.txt
:rotating_light: Error: experiment 'pr-119849-1' not found
:sos: If you have any trouble with Crater please ping @rust-lang/infra!
:information_source: Crater is a tool to run experiments across parts of the Rust ecosystem. Learn more
@craterbot check p=1 crates=https://crater-reports.s3.amazonaws.com/pr-119849/retry-regressed-list.txt
:ok_hand: Experiment pr-119849-1 created and queued.
:robot: Automatically detected try build 21bc403d557a2516df70ea80fb19b94177beede5
:warning: Try build based on commit 23e69c00c3a33374654bac4751bea0ee17702719, but latest commit is 910f0aa3baf856b620aa282f2cfcbade52e59de7. Did you forget to make a new try build?
:mag: You can check out the queue and this experiment's details.
:information_source: Crater is a tool to run experiments across parts of the Rust ecosystem. Learn more
@craterbot abort
:wastebasket: Experiment pr-119849-1 deleted!
:information_source: Crater is a tool to run experiments across parts of the Rust ecosystem. Learn more
@bors try
:hourglass: Trying commit f91e6f237824cc1add8cad310650537ca0210016 with merge d09c7205ff47571cec0c9444e568a0020bb083db...
:sunny: Try build successful - checks-actions
Build commit: d09c7205ff47571cec0c9444e568a0020bb083db (d09c7205ff47571cec0c9444e568a0020bb083db)
@craterbot check p=1 crates=https://crater-reports.s3.amazonaws.com/pr-119849/retry-regressed-list.txt