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 4 pull requests #126689

Closed

Conversation

GuillaumeGomez
Copy link
Member

Successful merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

oli-obk and others added 8 commits June 19, 2024 08:47
Previously these caused cycles when printing the result
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
@GuillaumeGomez
Copy link
Member Author

@bors r+ rollup=never p=4

@bors
Copy link
Contributor

bors commented Jun 19, 2024

📌 Commit 2a12f1f has been approved by GuillaumeGomez

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.406   Downloading binaryornot-0.4.4-py2.py3-none-any.whl (9.0 kB)
#13 0.418 Collecting boolean-py==4.0
#13 0.421   Downloading boolean.py-4.0-py3-none-any.whl (25 kB)
#13 0.435 Collecting chardet==5.1.0
---
#13 3.437 Building wheels for collected packages: reuse
#13 3.438   Building wheel for reuse (pyproject.toml): started
#13 3.763   Building wheel for reuse (pyproject.toml): finished with status 'done'
#13 3.764   Created wheel for reuse: filename=reuse-1.1.0-cp310-cp310-manylinux_2_35_x86_64.whl size=181117 sha256=f5f58750481f69515c2c0d1d503daf565e2565c370d07fc6aeb95fe3498b4269
#13 3.765   Stored in directory: /tmp/pip-ephem-wheel-cache-oqarczdp/wheels/c2/3c/b9/1120c2ab4bd82694f7e6f0537dc5b9a085c13e2c69a8d0c76d
#13 3.767 Installing collected packages: boolean-py, binaryornot, setuptools, reuse, python-debian, markupsafe, license-expression, jinja2, chardet
#13 3.789   Attempting uninstall: setuptools
#13 3.789     Found existing installation: setuptools 59.6.0
#13 3.791     Not uninstalling setuptools at /usr/lib/python3/dist-packages, outside environment /usr
#13 3.791     Not uninstalling setuptools at /usr/lib/python3/dist-packages, outside environment /usr
#13 3.791     Can't uninstall 'setuptools'. No files were found to uninstall.
#13 4.456 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.456 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.961 Collecting virtualenv
#13 5.000   Downloading virtualenv-20.26.2-py3-none-any.whl (3.9 MB)
#13 5.055      ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━ 3.9/3.9 MB 74.1 MB/s eta 0:00:00
#13 5.104 Collecting platformdirs<5,>=3.9.1
#13 5.108   Downloading platformdirs-4.2.2-py3-none-any.whl (18 kB)
#13 5.124 Collecting distlib<1,>=0.3.7
#13 5.127   Downloading distlib-0.3.8-py2.py3-none-any.whl (468 kB)
#13 5.165 Collecting filelock<4,>=3.12.2
#13 5.168   Downloading filelock-3.15.2-py3-none-any.whl (15 kB)
#13 5.168   Downloading filelock-3.15.2-py3-none-any.whl (15 kB)
#13 5.254 Installing collected packages: distlib, platformdirs, filelock, virtualenv
#13 5.416 Successfully installed distlib-0.3.8 filelock-3.15.2 platformdirs-4.2.2 virtualenv-20.26.2
#13 DONE 5.5s

#14 [7/8] COPY host-x86_64/mingw-check/validate-toolstate.sh /scripts/
#14 DONE 0.0s
---
DirectMap4k:      219072 kB
DirectMap2M:     9218048 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` profile [unoptimized] target(s) in 0.04s
##[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 0x7f3667e39360>
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 0x7f3667e39360>
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 0x7f3667e39360>
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:04
  local time: Wed Jun 19 14:22:47 UTC 2024
  network time: Wed, 19 Jun 2024 14:22:47 GMT

@GuillaumeGomez
Copy link
Member Author

Seems like CI is broken for now.

@bors r-

@GuillaumeGomez GuillaumeGomez deleted the rollup-yis9r5o branch June 19, 2024 14:24
@Urgau
Copy link
Member

Urgau commented Jun 19, 2024

Seems like CI is broken for now.

cc tox-dev/filelock#337

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 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.

6 participants