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 5 pull requests #126691

Merged
merged 10 commits into from
Jun 19, 2024
Merged

Conversation

fee1-dead
Copy link
Member

Successful merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

fmease and others added 10 commits June 19, 2024 09:19
Previously these caused cycles when printing the result
…es-attrs, r=fee1-dead

Remove now NOP attrs `#[rustc_dump{,_env}_program_clauses]`

Likely NOP since rust-lang#113303.

r? `@fee1-dead`
Allow tracing through item_bounds query invocations on opaques

Previously these caused cycles when printing the result of the query.
…h726

Change a `DefineOpaqueTypes::No` to `Yes` in diagnostics code

Explanation in comments of the function.

r? ```@compiler-errors```

cc rust-lang#116652
…eGomez

Rework doc-test attribute documentation example

This PR change the doc-test attribute documentation example to prefer a more neutral example `deny(dead_code)`, instead of `deny(warnings)`, which is less susceptible to breakage across Rust version.

r? ```@GuillaumeGomez```
…ibc-staticlib-args, r=Kobzol

Migrate `run-make/glibc-staticlib-args` to `rmake.rs`

Part of rust-lang#121876.

r? ``@jieyouxu``
@rustbot rustbot added A-query-system Area: The rustc query system (https://rustc-dev-guide.rust-lang.org/query.html) A-run-make Area: port run-make Makefiles to rmake.rs A-testsuite Area: The testsuite used to check the correctness of rustc S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. rollup A PR which is a rollup labels Jun 19, 2024
@fee1-dead
Copy link
Member Author

@bors r+ rollup=never p=5

@bors
Copy link
Contributor

bors commented Jun 19, 2024

📌 Commit 9e8a7a8 has been approved by fee1-dead

It is now in the queue for this repository.

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jun 19, 2024
@rust-log-analyzer
Copy link
Collaborator

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)
Getting action download info
Download action repository 'msys2/[email protected]' (SHA:cc11e9188b693c2b100158c3322424c4cc1dadea)
Download action repository 'actions/checkout@v4' (SHA:692973e3d937129bcbf40652eb9f2f61becf3332)
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.412   Downloading binaryornot-0.4.4-py2.py3-none-any.whl (9.0 kB)
#13 0.423 Collecting boolean-py==4.0
#13 0.426   Downloading boolean.py-4.0-py3-none-any.whl (25 kB)
#13 0.436 Collecting chardet==5.1.0
---
#13 3.391 Building wheels for collected packages: reuse
#13 3.392   Building wheel for reuse (pyproject.toml): started
#13 3.713   Building wheel for reuse (pyproject.toml): finished with status 'done'
#13 3.714   Created wheel for reuse: filename=reuse-1.1.0-cp310-cp310-manylinux_2_35_x86_64.whl size=181117 sha256=f5f58750481f69515c2c0d1d503daf565e2565c370d07fc6aeb95fe3498b4269
#13 3.714   Stored in directory: /tmp/pip-ephem-wheel-cache-wj55h70u/wheels/c2/3c/b9/1120c2ab4bd82694f7e6f0537dc5b9a085c13e2c69a8d0c76d
#13 3.717 Installing collected packages: boolean-py, binaryornot, setuptools, reuse, python-debian, markupsafe, license-expression, jinja2, chardet
#13 3.739   Attempting uninstall: setuptools
#13 3.740     Found existing installation: setuptools 59.6.0
#13 3.741     Not uninstalling setuptools at /usr/lib/python3/dist-packages, outside environment /usr
#13 3.741     Not uninstalling setuptools at /usr/lib/python3/dist-packages, outside environment /usr
#13 3.742     Can't uninstall 'setuptools'. No files were found to uninstall.
#13 4.400 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.400 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.896 Collecting virtualenv
#13 4.934   Downloading virtualenv-20.26.2-py3-none-any.whl (3.9 MB)
#13 4.992      ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━ 3.9/3.9 MB 70.7 MB/s eta 0:00:00
#13 5.028 Collecting distlib<1,>=0.3.7
#13 5.034   Downloading distlib-0.3.8-py2.py3-none-any.whl (468 kB)
#13 5.040      ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━ 468.9/468.9 KB 121.3 MB/s eta 0:00:00
#13 5.068 Collecting platformdirs<5,>=3.9.1
#13 5.071   Downloading platformdirs-4.2.2-py3-none-any.whl (18 kB)
#13 5.103 Collecting filelock<4,>=3.12.2
#13 5.110   Downloading filelock-3.15.2-py3-none-any.whl (15 kB)
#13 5.197 Installing collected packages: distlib, platformdirs, filelock, virtualenv
#13 5.364 Successfully installed distlib-0.3.8 filelock-3.15.2 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:      221120 kB
DirectMap2M:     7118848 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/3186d17d56f9803b739a2c0aabd23aafd8791485/rust-dev-nightly-x86_64-unknown-linux-gnu.tar.xz
extracting /checkout/obj/build/cache/llvm-3186d17d56f9803b739a2c0aabd23aafd8791485-true/rust-dev-nightly-x86_64-unknown-linux-gnu.tar.xz to /checkout/obj/build/x86_64-unknown-linux-gnu/ci-llvm
---
fmt check
fmt: checked 5115 files
tidy check
tidy: Skipping binary file check, read-only filesystem
removing old virtual environment
creating virtual environment at '/checkout/obj/build/venv' using 'python3.10'
tidy error: failed to create venv at '/checkout/obj/build/venv' using python3.10: Exception ignored in: <function BaseFileLock.__del__ at 0x7ff35b0c1360>
Traceback (most recent call last):
  File "/usr/local/lib/python3.10/dist-packages/filelock/_api.py", line 388, in __del__
    self.release(force=True)
  File "/usr/local/lib/python3.10/dist-packages/virtualenv/util/lock.py", line 34, in release
    with self.thread_safe:
AttributeError: '_CountedFileLock' object has no attribute 'thread_safe'
Exception ignored in: <function BaseFileLock.__del__ at 0x7ff35b0c1360>
Traceback (most recent call last):
  File "/usr/local/lib/python3.10/dist-packages/filelock/_api.py", line 388, in __del__
    self.release(force=True)
  File "/usr/local/lib/python3.10/dist-packages/virtualenv/util/lock.py", line 34, in release
    with self.thread_safe:
AttributeError: '_CountedFileLock' object has no attribute 'thread_safe'
Exception ignored in: <function BaseFileLock.__del__ at 0x7ff35b0c1360>
Traceback (most recent call last):
  File "/usr/local/lib/python3.10/dist-packages/filelock/_api.py", line 388, in __del__
    self.release(force=True)
  File "/usr/local/lib/python3.10/dist-packages/virtualenv/util/lock.py", line 34, in release
    with self.thread_safe:
AttributeError: '_CountedFileLock' object has no attribute 'thread_safe'
some tidy checks failed
Build completed unsuccessfully in 0:01:03
  local time: Wed Jun 19 14:56:16 UTC 2024
  network time: Wed, 19 Jun 2024 14:56:16 GMT

@bors
Copy link
Contributor

bors commented Jun 19, 2024

⌛ Testing commit 9e8a7a8 with merge 5c8459f...

@bors
Copy link
Contributor

bors commented Jun 19, 2024

☀️ Test successful - checks-actions
Approved by: fee1-dead
Pushing 5c8459f to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Jun 19, 2024
@bors bors merged commit 5c8459f into rust-lang:master Jun 19, 2024
7 checks passed
@rustbot rustbot added this to the 1.81.0 milestone Jun 19, 2024
@rust-timer
Copy link
Collaborator

📌 Perf builds for each rolled up PR:

PR# Message Perf Build Sha
#126668 Remove now NOP attrs #[rustc_dump{,_env}_program_clauses] ce5b1c98469b5a4f52f155b0d37ef8c677f145f9 (link)
#126674 Allow tracing through item_bounds query invocations on opaq… 34023abe0d46f9a50794413fc03fd5970ebda1aa (link)
#126675 Change a DefineOpaqueTypes::No to Yes in diagnostics co… dad963b4f9274e3562cb053010887531bc416113 (link)
#126681 Rework doc-test attribute documentation example f316a69690efab5997812070425b745048fb1469 (link)
#126684 Migrate run-make/glibc-staticlib-args to rmake.rs f89f3357a2f4faba1338b8f1c31af302d72b96e2 (link)

previous master: 894f7a4ba6

In the case of a perf regression, run the following command for each PR you suspect might be the cause: @rust-timer build $SHA

@rust-timer
Copy link
Collaborator

Finished benchmarking commit (5c8459f): comparison URL.

Overall result: no relevant changes - no action needed

@rustbot label: -perf-regression

Instruction count

This benchmark run did not return any relevant results for this metric.

Max RSS (memory usage)

Results (primary 1.7%, secondary 5.4%)

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.7% [1.7%, 1.7%] 1
Regressions ❌
(secondary)
5.4% [5.4%, 5.4%] 1
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) 1.7% [1.7%, 1.7%] 1

Cycles

Results (secondary 0.2%)

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)
2.4% [2.4%, 2.4%] 1
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
-2.0% [-2.0%, -2.0%] 1
All ❌✅ (primary) - - 0

Binary size

This benchmark run did not return any relevant results for this metric.

Bootstrap: 690.539s -> 691.194s (0.09%)
Artifact size: 323.81 MiB -> 323.71 MiB (-0.03%)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-query-system Area: The rustc query system (https://rustc-dev-guide.rust-lang.org/query.html) A-run-make Area: port run-make Makefiles to rmake.rs A-testsuite Area: The testsuite used to check the correctness of rustc merged-by-bors This PR was explicitly merged by bors. rollup A PR which is a rollup S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) T-compiler Relevant to the compiler team, which will review and decide on the PR/issue.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

9 participants