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 3 pull requests #125839

Closed
wants to merge 7 commits into from
Closed

Conversation

jhpratt
Copy link
Member

@jhpratt jhpratt commented Jun 1, 2024

Successful merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

GuillaumeGomez and others added 7 commits May 30, 2024 16:44
… `const_binary_heap_new_in` for `BinaryHeap::new_in`
Stablize `const_binary_heap_constructor`

This pr aims to stablize `const_binary_heap_constructor`.

`BinaryHeap::new` is able to be stablized, but `BinaryHeap::new_in` is not. Because the latter depends on `Vec::new_in` which is unstable.

The `const_binary_heap_constructor` feature contains the two functions, and I want to split this feature now. This pr creates `const_binary_heap_new_in` feature for `BinaryHeap::new_in` and stablizes `const_binary_heap_constructor` (now this original feature only contains one function).
…ylib, r=jieyouxu

Migrate run make cdylib

Part of rust-lang#121876.

r? ``@jieyouxu``
…t, r=jieyouxu

Refactor `--print=check-cfg` test

*as asked in rust-lang#125818 (comment)

r? ``@jieyouxu``
@rustbot rustbot added 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-libs Relevant to the library team, which will review and decide on the PR/issue. rollup A PR which is a rollup labels Jun 1, 2024
@jhpratt
Copy link
Member Author

jhpratt commented Jun 1, 2024

@bors r+ rollup=never p=3

@bors
Copy link
Contributor

bors commented Jun 1, 2024

📌 Commit 48ad35d has been approved by jhpratt

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 1, 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)
Download action repository 'msys2/setup-msys2@v2.22.0' (SHA:cc11e9188b693c2b100158c3322424c4cc1dadea)
Download action repository 'actions/checkout@v4' (SHA:a5ac7e51b41094c92402da3b24376905380afc29)
Download action repository 'actions/setup-python@v5' (SHA:82c7e631bb3cdc910f68e0081d67478d79c6982d)
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
---

#9 [3/8] COPY scripts/sccache.sh /scripts/
#9 CACHED

#10 [6/8] RUN pip3 install --no-deps --no-cache-dir --require-hashes -r /tmp/reuse-requirements.txt     && pip3 install virtualenv

#11 [2/8] RUN apt-get update && apt-get install -y --no-install-recommends   g++   make   ninja-build   file   curl   ca-certificates   python2.7   python3   python3-pip   python3-pkg-resources   git   cmake   sudo   gdb   xz-utils   libssl-dev   pkg-config   mingw-w64   && rm -rf /var/lib/apt/lists/*
#11 CACHED

---
DirectMap4k:      188352 kB
DirectMap2M:     6103040 kB
DirectMap1G:    12582912 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/20be84a7e62af0a623af4bfb75df6d30cb39d6d0/rust-dev-nightly-x86_64-unknown-linux-gnu.tar.xz
extracting /checkout/obj/build/cache/llvm-20be84a7e62af0a623af4bfb75df6d30cb39d6d0-true/rust-dev-nightly-x86_64-unknown-linux-gnu.tar.xz to /checkout/obj/build/x86_64-unknown-linux-gnu/ci-llvm
---
    Finished `release` profile [optimized] target(s) in 25.00s
##[endgroup]
fmt check
fmt: checked 4527 files
##[error]Diff in /checkout/tests/run-make/cdylib/rmake.rs at line 19:
     rustc().input("foo.rs").run();
 
     if is_msvc() {
-        cc().input("foo.c")
-            .arg(tmp_dir().join("foo.dll.lib"))
-            .out_exe("foo")
-            .run();
+        cc().input("foo.c").arg(tmp_dir().join("foo.dll.lib")).out_exe("foo").run();
     } else {
         cc().input("foo.c")
             .arg("-lfoo")
fmt error: Running `"/checkout/obj/build/x86_64-unknown-linux-gnu/rustfmt/bin/rustfmt" "--config-path" "/checkout" "--edition" "2021" "--unstable-features" "--skip-children" "--check" "/checkout/tests/codegen/ascii-char.rs" "/checkout/tests/codegen/float_math.rs" "/checkout/tests/codegen/mir-aggregate-no-alloca.rs" "/checkout/tests/codegen/cdylib-external-inline-fns.rs" "/checkout/tests/codegen/ehcontguard_disabled.rs" "/checkout/tests/codegen/avr/avr-func-addrspace.rs" "/checkout/tests/codegen/overaligned-constant.rs" "/checkout/tests/codegen/cfguard-nochecks.rs" "/checkout/tests/codegen/unwind-extern-exports.rs" "/checkout/tests/codegen/lifetime_start_end.rs" "/checkout/tests/codegen/set-discriminant-invalid.rs" "/checkout/tests/codegen/vecdeque-drain.rs" "/checkout/tests/codegen/call-metadata.rs" "/checkout/tests/coverage-run-rustdoc/auxiliary/doctest_crate.rs" "/checkout/tests/coverage-run-rustdoc/doctest.rs" "/checkout/tests/run-make/c-unwind-abi-catch-panic/main.rs" "/checkout/tests/run-make/print-native-static-libs/bar.rs" "/checkout/tests/run-make/print-native-static-libs/rmake.rs" "/checkout/tests/run-make/print-native-static-libs/foo.rs" "/checkout/tests/run-make/repr128-dwarf/rmake.rs" "/checkout/tests/run-make/repr128-dwarf/main.rs" "/checkout/tests/run-make/extern-fn-mangle/test.rs" "/checkout/tests/run-make/artifact-incr-cache-no-obj/lib.rs" "/checkout/tests/run-make/artifact-incr-cache-no-obj/rmake.rs" "/checkout/tests/run-make/duplicate-output-flavors/foo.rs" "/checkout/tests/run-make/same-lib-two-locations-no-panic/bar.rs" "/checkout/tests/run-make/same-lib-two-locations-no-panic/rmake.rs" "/checkout/tests/run-make/same-lib-two-locations-no-panic/foo.rs" "/checkout/tests/run-make/static-unwinding/lib.rs" "/checkout/tests/run-make/static-unwinding/rmake.rs" "/checkout/tests/run-make/static-unwinding/main.rs" "/checkout/tests/run-make/sepcomp-separate/foo.rs" "/checkout/tests/run-make/missing-crate-dependency/crateC.rs" "/checkout/tests/run-make/missing-crate-dependency/crateB.rs" "/checkout/tests/run-make/missing-crate-dependency/crateA.rs" "/checkout/tests/run-make/rustdoc-verify-output-files/rmake.rs" "/checkout/tests/run-make/rustdoc-verify-output-files/src/lib.rs" "/checkout/tests/run-make/no-builtins-attribute/no_builtins.rs" "/checkout/tests/run-make/no-builtins-attribute/main.rs" "/checkout/tests/run-make/const_fn_mir/main.rs" "/checkout/tests/run-make/pass-linker-flags-flavor/empty.rs" "/checkout/tests/run-make/pass-linker-flags-flavor/attribute.rs" "/checkout/tests/run-make/foreign-exceptions/foo.rs" "/checkout/tests/run-make/dep-info-spaces/lib.rs" "/checkout/tests/run-make/dep-info-spaces/bar.rs" "/checkout/tests/run-make/dep-info-spaces/foo foo.rs" "/checkout/tests/run-make/pdb-alt-path/main.rs" "/checkout/tests/run-make/lto-dylib-dep/a_dylib.rs" "/checkout/tests/run-make/lto-dylib-dep/main.rs" "/checkout/tests/run-make/cdylib/bar.rs" "/checkout/tests/run-make/cdylib/rmake.rs" "/checkout/tests/run-make/cdylib/foo.rs" "/checkout/tests/run-make/CURRENT_RUSTC_VERSION/rmake.rs" "/checkout/tests/run-make/CURRENT_RUSTC_VERSION/main.rs" "/checkout/tests/run-make/CURRENT_RUSTC_VERSION/stable.rs" "/checkout/tests/run-make/stdin-rustc/rmake.rs" "/checkout/tests/run-make/issue-15460/bar.rs" "/checkout/tests/run-make/issue-15460/foo.rs" "/checkout/tests/run-make/rustdoc-error-lines/input.rs" "/checkout/tests/run-make/rustdoc-error-lines/rmake.rs" "/checkout/tests/run-make/raw-dylib-stdcall-ordinal/lib.rs" "/checkout/tests/run-make/raw-dylib-stdcall-ordinal/driver.rs" "/checkout/tests/run-make/msvc-opt-minsize/foo.rs" "/checkout/tests/codegen/fn-impl-trait-self.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: Sat Jun  1 05:02:06 UTC 2024
  network time: Sat, 01 Jun 2024 05:02:06 GMT
##[error]Process completed with exit code 1.
Post job cleanup.

@jhpratt jhpratt closed this Jun 1, 2024
@jhpratt jhpratt deleted the rollup-qfnh1sn branch June 1, 2024 05:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
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-libs Relevant to the library team, which will review and decide on the PR/issue.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

7 participants