Skip to content

Conversation

jhpratt
Copy link
Member

@jhpratt jhpratt commented Sep 13, 2025

Successful merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

rs-sac and others added 11 commits August 27, 2025 11:34
With this macro we only need to enumerate every variant once. This saves
a lot of duplication already between the definition, the `FromStr` impl
and the `ToJson` impl.

It also enables us to do further things with it like JSON schema
generation.
This schema is helpful for people writing custom target spec JSON. It
can provide autocomplete in the editor, and also serves as documentation
when there are documentation comments on the structs, as `schemars` will
put them in the schema.
…youxu,davidtwco

Add --print target-spec-json-schema

This schema is helpful for people writing custom target spec JSON. It can provide autocomplete in the editor, and also serves as documentation when there are documentation comments on the structs, as `schemars` will put them in the schema.

I was motivated to do this because I saw someone write their own version of this schema by hand, so demand for this clearly exists. It's not a lot of effort to implement, so I thought it would make sense.

MCP: rust-lang/compiler-team#905

I think it would also be useful to put this in the sysroot in `etc` so people can link it directly in their editors.

I would have loved to add a test that validates the JSON schema against the spec JSON of every builtin target, but I don't want to do it as the JSON schema validation crates have incredible amounts of dependencies because JSON schema supports a ton of random features. I don't want to add that, even as a dev dependency.
Stabilize BTree{Map,Set}::extract_if

Tracking issue: rust-lang#70530
FCP completed: rust-lang#70530 (comment)
Closes: rust-lang#70530
…r=jieyouxu

Rehome 30 `tests/ui/issues/` tests to other subdirectories under `tests/ui/` [rust-lang#3 of Batch #2]

Part of rust-lang#133895

Methodology:

1. Refer to the previously written `tests/ui/SUMMARY.md`
2. Find an appropriate category for the test, using the original issue thread and the test contents.
3. Add the issue URL at the bottom (not at the top, as that would mess up stderr line numbers)
4. Rename the tests to make their purpose clearer

Inspired by the methodology that `@Kivooeo` was using.

r? `@jieyouxu`
…jieyouxu

bootstrap: rustdoc-js tests can now be filtered by js files

Before, a command like `./x test tests/rustdoc-js/path-ordering.js` would succeed, but run no tests, since the names of the tests are based on the `.rs` file.  This is a bit confusing, as the `rustdoc-js-std` test suite only has `.js` files, and thus those are the files you filter on.  Now, `./x test tests/rustdoc-js/path-ordering.js` will be treated as an alias for `./x test tests/rustdoc-js/path-ordering.rs`.  This is fairly simple as each `rustdoc-js` test has 2 files, 1 js file and one rust file, each with an identical base filename, so all we need to do is swap the extension.

r? `@Kobzol`
Fix panic and incorrectly suggested examples in `format_args` macro.

Follow up on rust-lang#146123
Fixes: rust-lang#146446
r? `@estebank`
@rustbot rustbot added A-run-make Area: port run-make Makefiles to rmake.rs A-testsuite Area: The testsuite used to check the correctness of rustc A-tidy Area: The tidy tool 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-libs Relevant to the library team, which will review and decide on the PR/issue. rollup A PR which is a rollup labels Sep 13, 2025
@jhpratt
Copy link
Member Author

jhpratt commented Sep 13, 2025

@bors r+ rollup=never p=5

@bors
Copy link
Collaborator

bors commented Sep 13, 2025

📌 Commit c4539b2 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 Sep 13, 2025
@bors
Copy link
Collaborator

bors commented Sep 13, 2025

⌛ Testing commit c4539b2 with merge b50f345...

@bors
Copy link
Collaborator

bors commented Sep 13, 2025

☀️ Test successful - checks-actions
Approved by: jhpratt
Pushing b50f345 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Sep 13, 2025
@bors bors merged commit b50f345 into rust-lang:master Sep 13, 2025
11 checks passed
@rustbot rustbot added this to the 1.91.0 milestone Sep 13, 2025
@rust-timer
Copy link
Collaborator

📌 Perf builds for each rolled up PR:

PR# Message Perf Build Sha
#144498 Add --print target-spec-json-schema 9ef9e18cdb39c4726115277b7859b6ef1f208498 (link)
#145471 Stabilize BTree{Map,Set}::extract_if efcd2405c647f826b68e6b8af044eb2ca8538e5a (link)
#145896 Rehome 30 tests/ui/issues/ tests to other subdirectories … b0f4c4c7d39106a063bd09ef3c95c3ba0a97782b (link)
#146450 bootstrap: rustdoc-js tests can now be filtered by js files 8c5f49045d0d66e11c3fdc45ccf7f36948997ddc (link)
#146456 Fix panic and incorrectly suggested examples in `format_arg… 530e8deac01ad62934cd1e490862f690b2337cf8 (link)

previous master: 064cc81354

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

Copy link
Contributor

What is this? This is an experimental post-merge analysis report that shows differences in test outcomes between the merged PR and its parent PR.

Comparing 064cc81 (parent) -> b50f345 (this PR)

Test differences

Show 278 test diffs

Stage 1

  • [ui] tests/ui/abi/invalid-self-parameter-type-56806.rs: [missing] -> pass (J0)
  • [ui] tests/ui/associated-consts/traits-associated-consts-ice-56870.rs: [missing] -> pass (J0)
  • [ui] tests/ui/associated-types/duplicate-associated-type-resolution-59326.rs: [missing] -> pass (J0)
  • [ui] tests/ui/associated-types/impl-trait-member-type-resolution-57399.rs: [missing] -> pass (J0)
  • [ui] tests/ui/binop/function-comparison-errors-59488.rs: [missing] -> pass (J0)
  • [ui] tests/ui/box/boxed-value-matching-57741.rs: [missing] -> pass (J0)
  • [ui] tests/ui/box/dereferencing-boxed-enum-in-match-57741.rs: [missing] -> pass (J0)
  • [ui] tests/ui/closures/generic-typed-nested-closures-59494.rs: [missing] -> pass (J0)
  • [ui] tests/ui/coherence/trait-implementation-coherence-check-57162.rs: [missing] -> pass (J0)
  • [ui] tests/ui/consts/oncecell-const-init-57781.rs: [missing] -> pass (J0)
  • [ui] tests/ui/debuginfo/impl-copy-function-debuginfo-58463.rs: [missing] -> pass (J0)
  • [ui] tests/ui/generics/generic-associated-type-deref-target-56237.rs: [missing] -> pass (J0)
  • [ui] tests/ui/higher-ranked/hrtb-associated-type-leak-check-55731.rs: [missing] -> pass (J0)
  • [ui] tests/ui/infinite/mutually-recursive-infinite-types-57271.rs: [missing] -> pass (J0)
  • [ui] tests/ui/issues/issue-55587.rs: pass -> [missing] (J0)
  • [ui] tests/ui/issues/issue-55731.rs: pass -> [missing] (J0)
  • [ui] tests/ui/issues/issue-56128.rs: pass -> [missing] (J0)
  • [ui] tests/ui/issues/issue-56175.rs: pass -> [missing] (J0)
  • [ui] tests/ui/issues/issue-56199.rs: pass -> [missing] (J0)
  • [ui] tests/ui/issues/issue-56229.rs: pass -> [missing] (J0)
  • [ui] tests/ui/issues/issue-56870.rs: pass -> [missing] (J0)
  • [ui] tests/ui/issues/issue-56943.rs: pass -> [missing] (J0)
  • [ui] tests/ui/issues/issue-57156.rs: pass -> [missing] (J0)
  • [ui] tests/ui/issues/issue-57162.rs: pass -> [missing] (J0)
  • [ui] tests/ui/issues/issue-57198-pass.rs: pass -> [missing] (J0)
  • [ui] tests/ui/issues/issue-57271.rs: pass -> [missing] (J0)
  • [ui] tests/ui/issues/issue-57399-self-return-impl-trait.rs: pass -> [missing] (J0)
  • [ui] tests/ui/issues/issue-57741-dereference-boxed-value/issue-57741.rs: pass -> [missing] (J0)
  • [ui] tests/ui/issues/issue-57781.rs: pass -> [missing] (J0)
  • [ui] tests/ui/issues/issue-57924.rs: pass -> [missing] (J0)
  • [ui] tests/ui/issues/issue-58212.rs: pass -> [missing] (J0)
  • [ui] tests/ui/issues/issue-58375-monomorphize-default-impls.rs: pass -> [missing] (J0)
  • [ui] tests/ui/issues/issue-58712.rs: pass -> [missing] (J0)
  • [ui] tests/ui/issues/issue-58734.rs: pass -> [missing] (J0)
  • [ui] tests/ui/issues/issue-59020.rs: pass -> [missing] (J0)
  • [ui] tests/ui/issues/issue-59326.rs: pass -> [missing] (J0)
  • [ui] tests/ui/issues/issue-59494.rs: pass -> [missing] (J0)
  • [ui] tests/ui/issues/issue-59756.rs: ignore (ignored always ((rustfix needs multiple suggestions))) -> [missing] (J0)
  • [ui] tests/ui/keyword/raw-identifier-for-function-57198.rs: [missing] -> pass (J0)
  • [ui] tests/ui/mismatched_types/type-mismatch-in-extern-crate-56943.rs: [missing] -> pass (J0)
  • [ui] tests/ui/modules/pub-use-handling-in-modules-56128.rs: [missing] -> pass (J0)
  • [ui] tests/ui/resolve/missing-type-in-scope-58712.rs: [missing] -> pass (J0)
  • [ui] tests/ui/std/park-timeout-wakeup-59020.rs: [missing] -> pass (J0)
  • [ui] tests/ui/structs/invalid-self-constructor-56835.rs: [missing] -> pass (J0)
  • [ui] tests/ui/trait-bounds/negative-bound-not-supported-58857.rs: [missing] -> pass (J0)
  • [ui] tests/ui/traits/trait-object-lifetime-bounds-57156.rs: [missing] -> pass (J0)
  • [ui] tests/ui/traits/trait-objects-with-supertraits-56229.rs: [missing] -> pass (J0)
  • [ui] tests/ui/typeck/self-constructor-type-args-not-allowed-57924.rs: [missing] -> pass (J0)
  • [ui] tests/ui/typeck/self-constructor-type-error-56199.rs: [missing] -> pass (J0)

Stage 2

  • [ui] tests/ui/abi/invalid-self-parameter-type-56806.rs: [missing] -> pass (J1)
  • [ui] tests/ui/associated-consts/traits-associated-consts-ice-56870.rs: [missing] -> pass (J1)
  • [ui] tests/ui/associated-types/duplicate-associated-type-resolution-59326.rs: [missing] -> pass (J1)
  • [ui] tests/ui/associated-types/impl-trait-member-type-resolution-57399.rs: [missing] -> pass (J1)
  • [ui] tests/ui/binop/function-comparison-errors-59488.rs: [missing] -> pass (J1)
  • [ui] tests/ui/box/boxed-value-matching-57741.rs: [missing] -> pass (J1)
  • [ui] tests/ui/closures/generic-typed-nested-closures-59494.rs: [missing] -> pass (J1)
  • [ui] tests/ui/codegen/mono-item-collector-default-impl-58375.rs: [missing] -> pass (J1)
  • [ui] tests/ui/consts/oncecell-const-init-57781.rs: [missing] -> pass (J1)
  • [ui] tests/ui/debuginfo/impl-copy-function-debuginfo-58463.rs: [missing] -> pass (J1)
  • [ui] tests/ui/generics/generic-associated-type-deref-target-56237.rs: [missing] -> pass (J1)
  • [ui] tests/ui/higher-ranked/hrtb-associated-type-leak-check-55731.rs: [missing] -> pass (J1)
  • [ui] tests/ui/imports/private-types-suggested-without-extern-crate-56175.rs: [missing] -> pass (J1)
  • [ui] tests/ui/infinite/mutually-recursive-infinite-types-57271.rs: [missing] -> pass (J1)
  • [ui] tests/ui/issues/issue-55587.rs: pass -> [missing] (J1)
  • [ui] tests/ui/issues/issue-55731.rs: pass -> [missing] (J1)
  • [ui] tests/ui/issues/issue-56175.rs: pass -> [missing] (J1)
  • [ui] tests/ui/issues/issue-56199.rs: pass -> [missing] (J1)
  • [ui] tests/ui/issues/issue-56237.rs: pass -> [missing] (J1)
  • [ui] tests/ui/issues/issue-56806.rs: pass -> [missing] (J1)
  • [ui] tests/ui/issues/issue-56835.rs: pass -> [missing] (J1)
  • [ui] tests/ui/issues/issue-56870.rs: pass -> [missing] (J1)
  • [ui] tests/ui/issues/issue-56943.rs: pass -> [missing] (J1)
  • [ui] tests/ui/issues/issue-57162.rs: pass -> [missing] (J1)
  • [ui] tests/ui/issues/issue-57271.rs: pass -> [missing] (J1)
  • [ui] tests/ui/issues/issue-57399-self-return-impl-trait.rs: pass -> [missing] (J1)
  • [ui] tests/ui/issues/issue-57741-dereference-boxed-value/issue-57741-1.rs: pass -> [missing] (J1)
  • [ui] tests/ui/issues/issue-57741-dereference-boxed-value/issue-57741.rs: pass -> [missing] (J1)
  • [ui] tests/ui/issues/issue-57781.rs: pass -> [missing] (J1)
  • [ui] tests/ui/issues/issue-57924.rs: pass -> [missing] (J1)
  • [ui] tests/ui/issues/issue-58212.rs: pass -> [missing] (J1)
  • [ui] tests/ui/issues/issue-58375-monomorphize-default-impls.rs: pass -> [missing] (J1)
  • [ui] tests/ui/issues/issue-58463.rs: pass -> [missing] (J1)
  • [ui] tests/ui/issues/issue-58712.rs: pass -> [missing] (J1)
  • [ui] tests/ui/issues/issue-58734.rs: pass -> [missing] (J1)
  • [ui] tests/ui/issues/issue-59020.rs: pass -> [missing] (J1)
  • [ui] tests/ui/issues/issue-59326.rs: pass -> [missing] (J1)
  • [ui] tests/ui/issues/issue-59494.rs: pass -> [missing] (J1)
  • [ui] tests/ui/issues/issue-59756.rs: ignore (ignored always ((rustfix needs multiple suggestions))) -> [missing] (J1)
  • [ui] tests/ui/keyword/raw-identifier-for-function-57198.rs: [missing] -> pass (J1)
  • [ui] tests/ui/mismatched_types/type-mismatch-in-extern-crate-56943.rs: [missing] -> pass (J1)
  • [ui] tests/ui/modules/pub-use-handling-in-modules-56128.rs: [missing] -> pass (J1)
  • [ui] tests/ui/parser/invalid-variable-definition-55587.rs: [missing] -> pass (J1)
  • [ui] tests/ui/resolve/missing-type-in-scope-58712.rs: [missing] -> pass (J1)
  • [ui] tests/ui/std/park-timeout-wakeup-59020.rs: [missing] -> pass (J1)
  • [ui] tests/ui/structs/invalid-self-constructor-56835.rs: [missing] -> pass (J1)
  • [ui] tests/ui/trait-bounds/negative-bound-not-supported-58857.rs: [missing] -> pass (J1)
  • [ui] tests/ui/traits/generic-trait-impl-aliased-array-58212.rs: [missing] -> pass (J1)
  • [ui] tests/ui/traits/trait-object-lifetime-bounds-57156.rs: [missing] -> pass (J1)
  • [ui] tests/ui/traits/trait-objects-with-supertraits-56229.rs: [missing] -> pass (J1)
  • [ui] tests/ui/typeck/self-constructor-type-args-not-allowed-57924.rs: [missing] -> pass (J1)

(and 24 additional test diffs)

Additionally, 154 doctest diffs were found. These are ignored, as they are noisy.

Job group index

Test dashboard

Run

cargo run --manifest-path src/ci/citool/Cargo.toml -- \
    test-dashboard b50f345a2f3f49764024cabc30ef99e15c0240f7 --output-dir test-dashboard

And then open test-dashboard/index.html in your browser to see an overview of all executed tests.

Job duration changes

  1. pr-check-1: 1414.9s -> 1722.7s (21.8%)
  2. aarch64-gnu-llvm-19-2: 2153.2s -> 2578.4s (19.7%)
  3. i686-gnu-nopt-1: 7187.8s -> 8095.2s (12.6%)
  4. pr-check-2: 2154.2s -> 2426.1s (12.6%)
  5. i686-gnu-2: 5441.8s -> 6096.0s (12.0%)
  6. test-various: 4328.7s -> 4762.3s (10.0%)
  7. x86_64-gnu-distcheck: 6665.9s -> 7291.4s (9.4%)
  8. x86_64-gnu-llvm-19: 2392.4s -> 2616.0s (9.3%)
  9. x86_64-gnu-stable: 6913.7s -> 7551.8s (9.2%)
  10. x86_64-gnu-aux: 6237.7s -> 6791.3s (8.9%)
How to interpret the job duration changes?

Job durations can vary a lot, based on the actual runner instance
that executed the job, system noise, invalidated caches, etc. The table above is provided
mostly for t-infra members, for simpler debugging of potential CI slow-downs.

@rust-timer
Copy link
Collaborator

Finished benchmarking commit (b50f345): comparison URL.

Overall result: ❌✅ regressions and improvements - no action needed

@rustbot label: -perf-regression

Instruction count

Our most reliable metric. Used to determine the overall result above. However, even this metric can be noisy.

mean range count
Regressions ❌
(primary)
- - 0
Regressions ❌
(secondary)
0.0% [0.0%, 0.0%] 1
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
-0.1% [-0.2%, -0.1%] 2
All ❌✅ (primary) - - 0

Max RSS (memory usage)

Results (secondary -4.3%)

A less reliable metric. May be of interest, but not used to determine the overall result above.

mean range count
Regressions ❌
(primary)
- - 0
Regressions ❌
(secondary)
3.0% [3.0%, 3.0%] 1
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
-5.1% [-5.6%, -4.4%] 9
All ❌✅ (primary) - - 0

Cycles

Results (secondary 1.0%)

A less reliable metric. May be of interest, but not used to determine the overall result above.

mean range count
Regressions ❌
(primary)
- - 0
Regressions ❌
(secondary)
3.8% [2.3%, 5.8%] 4
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
-2.7% [-3.5%, -1.8%] 3
All ❌✅ (primary) - - 0

Binary size

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

Bootstrap: 468.794s -> 471.696s (0.62%)
Artifact size: 388.08 MiB -> 390.21 MiB (0.55%)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-run-make Area: port run-make Makefiles to rmake.rs A-testsuite Area: The testsuite used to check the correctness of rustc A-tidy Area: The tidy tool 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. 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.

9 participants