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.

Sign up for GitHub

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

Jump to bottom

Rollup of 6 pull requests #114627

Closed
wants to merge 13 commits into from
Closed

Rollup of 6 pull requests #114627

wants to merge 13 commits into from

Conversation

Dylan-DPC
Copy link
Member

Successful merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

aDotInTheVoid and others added 13 commits April 18, 2023 13:42
@aDotInTheVoid
rustdoc-json: Add tests for field ordering.
3242b4f
@aDotInTheVoid
rustdoc-json: Add tests for variant ordering.
006903e
@Sword-Destiny
add aarch64-unknown-teeos target
72dd53c 
Signed-off-by: 袁浩 <[email protected]>
@fee1-dead
Migrate a trait selection error to use diagnostic translation
1ca4bc9
@bvanjoi
fix: not insert missing lifetime for ConstParamTy
078b942
@pietroalbini
prevent constant rebuilds of rustc-main (and thus everything else)
da00356
@lqd
remove llvm-wrapper include to silence deprecation warning
bcf7bfc 
Includes of `include/llvm/Support/Host.h` now emit a deprecated warning:
`warning: This header is deprecated, please use llvm/TargetParser/Host.h`.
@Dylan-DPC
Rollup merge of rust-lang#110435 - aDotInTheVoid:rdj-field-ordering, …
806b1cd 
…r=GuillaumeGomez

rustdoc-json: Add test for field ordering.

Inspired by [this on twitter](https://twitter.com/PredragGruevski/status/1647705616650043392), the ordering of fields really matters, so we should test we preserve it through json.

r? rustdoc
@Dylan-DPC
Rollup merge of rust-lang#113480 - Sword-Destiny:master, r=petrochenkov
d57f1fa 
add aarch64-unknown-teeos target

TEEOS is a mini os run in TrustZone, for trusted/security apps. The libc of TEEOS is a part of musl. The kernel of TEEOS is micro kernel.

This MR is to add a target for teeos.

MRs for libc and rust-std are in progress.

Compiler team MCP: [MCP](rust-lang/compiler-team#652)
@Dylan-DPC
Rollup merge of rust-lang#114548 - fee1-dead-contrib:migrate-to-trans…
886eae6 
…, r=davidtwco

Migrate a trait selection error to use diagnostic translation
@Dylan-DPC
Rollup merge of rust-lang#114606 - bvanjoi:fix-113462, r=compiler-errors
50810a5 
fix: not insert missing lifetime for `ConstParamTy`

Fixes rust-lang#113462

We should ignore the missing lifetime, as it's illegal to include a lifetime in a const param.

r? `@compiler-errors`
@Dylan-DPC
Rollup merge of rust-lang#114612 - lqd:east-17-warning, r=nikic
58e651f 
update llvm-wrapper include to silence deprecation warning

Includes of `include/llvm/Support/Host.h` now emit a deprecated warning: `warning: This header is deprecated, please use llvm/TargetParser/Host.h`.

I don't believe we are using this include.

I don't believe we need to bump the `download-ci-llvm` stamp since these warnings are emitted while building the `llvm-wrapper`.

r? `@nikic`
@Dylan-DPC
Rollup merge of rust-lang#114613 - ferrocene:pa-fix-rebuild, r=lqd
a3fb831 
Prevent constant rebuilds of `rustc-main` (and thus everything else)

PR rust-lang#114305 changed bootstrap to run `strip -g` on `librustc_driver.so` and `libllvm.so` on Linux when no debuginfo was requested. Unfortunately, that PR resulted in bootstrap always rebuilding everything starting from stage 1 `rustc-main` (including stage 1 libraries and tests) when invoking bootstrap multiple times.

We noticed this because Ferrocene's CI times increased to between 2x and 3x total execution time, but the regression can also be reproduced locally by running `./x build library/sysroot --stage 1` twice.

The explanation of the problem is in the code comments.

r? `@lqd`
cc `@ozkanonur`
@rustbot rustbot added A-rustdoc-json Area: Rustdoc JSON backend 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. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. rollup A PR which is a rollup labels Aug 8, 2023
@Dylan-DPC
Copy link
Member Author

@bors r+ rollup=never p=5

@bors
Copy link
Contributor

bors commented Aug 8, 2023

📌 Commit a3fb831 has been approved by Dylan-DPC

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 Aug 8, 2023
@rust-log-analyzer
Copy link
Collaborator

The job x86_64-gnu-llvm-15 failed! Check out the build log: (web) (plain)

Click to see the possible cause of the failure (guessed by this bot) 
GITHUB_ENV=/home/runner/work/_temp/_runner_file_commands/set_env_c82dbb7e-7115-4454-b840-e8c5950fef17
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=rollup-08gifio
GITHUB_JOB=pr
GITHUB_PATH=/home/runner/work/_temp/_runner_file_commands/add_path_c82dbb7e-7115-4454-b840-e8c5950fef17
GITHUB_REF=refs/pull/114627/merge
GITHUB_REF_NAME=114627/merge
GITHUB_REF_PROTECTED=false
---
##[endgroup]
Built container sha256:5b49d2220ce0f09a8003218b50ffd8ba4d73e951ed7005ddaf684e25a6132abc
Uploading finished image to https://ci-caches.rust-lang.org/docker/2bcca7776859e4cadc928d5b0475326a46a61958151553d4f5843856969f224dd29cb17625757484fbfc60ad003aadf94c4eed2bc9cdab467e02d68b9cdfc40d

<botocore.awsrequest.AWSRequest object at 0x7f2b26eedc10>
gzip: stdout: Broken pipe
xargs: docker: terminated by signal 13
[CI_JOB_NAME=x86_64-gnu-llvm-15]
[CI_JOB_NAME=x86_64-gnu-llvm-15]
---
##[endgroup]
##[group]Testing stage2 compiletest suite=rustdoc-json mode=rustdoc-json (x86_64-unknown-linux-gnu)

running 120 tests
...............F............F...........................................................  88/120
.........F.....................F
failures:

---- [rustdoc-json] tests/rustdoc-json/enums/field_order.rs stdout ----


error: jsondocck failed!
status: exit status: 1
command: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-tools-bin/jsondocck" "--doc-dir" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/rustdoc-json/enums/field_order" "--template" "/checkout/tests/rustdoc-json/enums/field_order.rs"
stdout: none
--- stderr -------------------------------
Failed check: $.index[*][?(@.name == "Foo")].inner.kind.struct.fields[0] matched to [], but expected String("0:5:1651") on line 31
Failed check: $.index[*][?(@.name == "Foo")].inner.kind.struct.fields[1] matched to [], but expected String("0:6:1652") on line 32
Failed check: $.index[*][?(@.name == "Foo")].inner.kind.struct.fields[2] matched to [], but expected String("0:7:1653") on line 33
Failed check: $.index[*][?(@.name == "Foo")].inner.kind.struct.fields[3] matched to [], but expected String("0:8:1654") on line 34
Failed check: $.index[*][?(@.name == "Foo")].inner.kind.struct.fields[4] matched to [], but expected String("0:9:1655") on line 35
Failed check: $.index[*][?(@.name == "Foo")].inner.kind.struct.fields[5] matched to [], but expected String("0:10:1656") on line 36
Failed check: $.index[*][?(@.name == "Foo")].inner.kind.struct.fields[6] matched to [], but expected String("0:11:1657") on line 37
Failed check: $.index[*][?(@.name == "Foo")].inner.kind.struct.fields[7] matched to [], but expected String("0:12:1658") on line 38
Failed check: $.index[*][?(@.name == "Foo")].inner.kind.struct.fields[8] matched to [], but expected String("0:13:1659") on line 39
Failed check: $.index[*][?(@.name == "Foo")].inner.kind.struct.fields[9] matched to [], but expected String("0:14:1660") on line 40
Error: "Jsondocck failed for /checkout/tests/rustdoc-json/enums/field_order.rs"

Rustdoc Output:
Build completed unsuccessfully in 0:23:25
status: exit status: 0
status: exit status: 0
command: RUSTC_ICE="0" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/bin/rustdoc" "-L" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/lib/rustlib/x86_64-unknown-linux-gnu/lib" "-L" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/rustdoc-json/enums/field_order/auxiliary" "-o" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/rustdoc-json/enums/field_order" "--deny" "warnings" "/checkout/tests/rustdoc-json/enums/field_order.rs" "-A" "internal_features" "--output-format" "json" "-Zunstable-options"
stderr: none


---- [rustdoc-json] tests/rustdoc-json/enums/variant_order.rs stdout ----
---- [rustdoc-json] tests/rustdoc-json/enums/variant_order.rs stdout ----

error: jsondocck failed!
status: exit status: 1
command: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-tools-bin/jsondocck" "--doc-dir" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/rustdoc-json/enums/variant_order" "--template" "/checkout/tests/rustdoc-json/enums/variant_order.rs"
stdout: none
--- stderr -------------------------------
Failed check: $.index[*][?(@.name == "Foo")].inner.variants[0] matched to [], but expected String("0:4:1650") on line 29
Failed check: $.index[*][?(@.name == "Foo")].inner.variants[1] matched to [], but expected String("0:6:1651") on line 30
Failed check: $.index[*][?(@.name == "Foo")].inner.variants[2] matched to [], but expected String("0:8:1652") on line 31
Failed check: $.index[*][?(@.name == "Foo")].inner.variants[3] matched to [], but expected String("0:10:1653") on line 32
Failed check: $.index[*][?(@.name == "Foo")].inner.variants[4] matched to [], but expected String("0:12:1654") on line 33
Failed check: $.index[*][?(@.name == "Foo")].inner.variants[5] matched to [], but expected String("0:14:1655") on line 34
Failed check: $.index[*][?(@.name == "Foo")].inner.variants[6] matched to [], but expected String("0:16:1656") on line 35
Failed check: $.index[*][?(@.name == "Foo")].inner.variants[7] matched to [], but expected String("0:18:1657") on line 36
Failed check: $.index[*][?(@.name == "Foo")].inner.variants[8] matched to [], but expected String("0:20:1658") on line 37
Failed check: $.index[*][?(@.name == "Foo")].inner.variants[9] matched to [], but expected String("0:22:1659") on line 38
Error: "Jsondocck failed for /checkout/tests/rustdoc-json/enums/variant_order.rs"

Rustdoc Output:
status: exit status: 0
status: exit status: 0
command: RUSTC_ICE="0" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/bin/rustdoc" "-L" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/lib/rustlib/x86_64-unknown-linux-gnu/lib" "-L" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/rustdoc-json/enums/variant_order/auxiliary" "-o" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/rustdoc-json/enums/variant_order" "--deny" "warnings" "/checkout/tests/rustdoc-json/enums/variant_order.rs" "-A" "internal_features" "--output-format" "json" "-Zunstable-options"
stderr: none


---- [rustdoc-json] tests/rustdoc-json/structs/field_order.rs stdout ----
---- [rustdoc-json] tests/rustdoc-json/structs/field_order.rs stdout ----

error: jsondocck failed!
status: exit status: 1
command: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-tools-bin/jsondocck" "--doc-dir" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/rustdoc-json/structs/field_order" "--template" "/checkout/tests/rustdoc-json/structs/field_order.rs"
--- stderr -------------------------------
--- stderr -------------------------------
Failed check: $.index[*][?(@.name == "Foo")].inner.kind.plain.fields[0] matched to [], but expected String("0:4:1650") on line 29
Failed check: $.index[*][?(@.name == "Foo")].inner.kind.plain.fields[1] matched to [], but expected String("0:5:1651") on line 30
Failed check: $.index[*][?(@.name == "Foo")].inner.kind.plain.fields[2] matched to [], but expected String("0:6:1652") on line 31
Failed check: $.index[*][?(@.name == "Foo")].inner.kind.plain.fields[3] matched to [], but expected String("0:7:1653") on line 32
Failed check: $.index[*][?(@.name == "Foo")].inner.kind.plain.fields[4] matched to [], but expected String("0:8:1654") on line 33
Failed check: $.index[*][?(@.name == "Foo")].inner.kind.plain.fields[5] matched to [], but expected String("0:9:1655") on line 34
Failed check: $.index[*][?(@.name == "Foo")].inner.kind.plain.fields[6] matched to [], but expected String("0:10:1656") on line 35
Failed check: $.index[*][?(@.name == "Foo")].inner.kind.plain.fields[7] matched to [], but expected String("0:11:1657") on line 36
Failed check: $.index[*][?(@.name == "Foo")].inner.kind.plain.fields[8] matched to [], but expected String("0:12:1658") on line 37
Failed check: $.index[*][?(@.name == "Foo")].inner.kind.plain.fields[9] matched to [], but expected String("0:13:1659") on line 38
Error: "Jsondocck failed for /checkout/tests/rustdoc-json/structs/field_order.rs"

Rustdoc Output:
status: exit status: 0
status: exit status: 0
command: RUSTC_ICE="0" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/bin/rustdoc" "-L" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/lib/rustlib/x86_64-unknown-linux-gnu/lib" "-L" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/rustdoc-json/structs/field_order/auxiliary" "-o" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/rustdoc-json/structs/field_order" "--deny" "warnings" "/checkout/tests/rustdoc-json/structs/field_order.rs" "-A" "internal_features" "--output-format" "json" "-Zunstable-options"
stderr: none


---- [rustdoc-json] tests/rustdoc-json/unions/field_order.rs stdout ----
---- [rustdoc-json] tests/rustdoc-json/unions/field_order.rs stdout ----

error: jsondocck failed!
status: exit status: 1
command: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-tools-bin/jsondocck" "--doc-dir" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/rustdoc-json/unions/field_order" "--template" "/checkout/tests/rustdoc-json/unions/field_order.rs"
stdout: none
--- stderr -------------------------------
Failed check: $.index[*][?(@.name == "Foo")].inner.fields[0] matched to [], but expected String("0:4:1650") on line 29
Failed check: $.index[*][?(@.name == "Foo")].inner.fields[1] matched to [], but expected String("0:5:1651") on line 30
Failed check: $.index[*][?(@.name == "Foo")].inner.fields[2] matched to [], but expected String("0:6:1652") on line 31
Failed check: $.index[*][?(@.name == "Foo")].inner.fields[3] matched to [], but expected String("0:7:1653") on line 32
Failed check: $.index[*][?(@.name == "Foo")].inner.fields[4] matched to [], but expected String("0:8:1654") on line 33
Failed check: $.index[*][?(@.name == "Foo")].inner.fields[5] matched to [], but expected String("0:9:1655") on line 34
Failed check: $.index[*][?(@.name == "Foo")].inner.fields[6] matched to [], but expected String("0:10:1656") on line 35
Failed check: $.index[*][?(@.name == "Foo")].inner.fields[7] matched to [], but expected String("0:11:1657") on line 36
Failed check: $.index[*][?(@.name == "Foo")].inner.fields[8] matched to [], but expected String("0:12:1658") on line 37
Failed check: $.index[*][?(@.name == "Foo")].inner.fields[9] matched to [], but expected String("0:13:1659") on line 38
Error: "Jsondocck failed for /checkout/tests/rustdoc-json/unions/field_order.rs"

Rustdoc Output:
status: exit status: 0
status: exit status: 0
command: RUSTC_ICE="0" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/bin/rustdoc" "-L" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/lib/rustlib/x86_64-unknown-linux-gnu/lib" "-L" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/rustdoc-json/unions/field_order/auxiliary" "-o" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/rustdoc-json/unions/field_order" "--deny" "warnings" "/checkout/tests/rustdoc-json/unions/field_order.rs" "-A" "internal_features" "--output-format" "json" "-Zunstable-options"
stderr: none

@Dylan-DPC
Copy link
Member Author

@bors r-
ci failure

@bors bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Aug 8, 2023
@Dylan-DPC
Copy link
Member Author

meh was spurious

@bors r+

@bors
Copy link
Contributor

bors commented Aug 8, 2023

📌 Commit a3fb831 has been approved by Dylan-DPC

It is now in the queue for this repository.

@bors bors removed the S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. label Aug 8, 2023
@bors bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Aug 8, 2023
@matthiaskrgr matthiaskrgr mentioned this pull request Aug 8, 2023
Merged
@aDotInTheVoid
Copy link
Member

aDotInTheVoid commented Aug 8, 2023 •
edited
Loading

meh was spurious

Not spurious, my rustdoc-json change conflicts with a format change and needs rebasing.

Edit: Wait, maybe not, investigating

Edit: Wasn't suprious. My machine was somehow acting up, but ./x clean made it reproduce CI

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
A-rustdoc-json Area: Rustdoc JSON backend 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. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.