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 7 pull requests #138653

Merged
merged 15 commits into from
Mar 19, 2025
Merged

Rollup of 7 pull requests #138653

merged 15 commits into from
Mar 19, 2025

Conversation

matthiaskrgr
Copy link
Member

Successful merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

RalfJung and others added 15 commits March 4, 2025 08:44
Co-authored-by: Predrag Gruevski <obi1kenobi82@gmail.com>
…youxu

Leave a breadcrumb towards bootstrap config documentation in `bootstrap.toml`

I was curious as to the possible bootstrap options I can put in config.toml, but had some trouble figuring it out. There is no obvious documentation in `config.toml` (obviously), the documentation in src/bootstrap/defaults is *nice*, but also rather sparse, by design.
I had to dive into the parsing code, and stuble upon [a very helpful doc comment](https://github.com/rust-lang/rust/blob/30f168ef811aec63124eac677e14699baa9395bd/src/bootstrap/src/core/config/config.rs#L181) there to realize that `config.example.toml` *exists*, and that it does, indeed, answer all of my questions.

So I figured it might be worth making this journey a bit easier for future contributors and add mention the `config.example.toml` directly in `config.toml`.

Now, since rust-lang#137081 is in-flight which would rename `config(.example)?.toml` to `bootstrap(.example)?.toml`, I figure it's better to wait until that one lands, and submit the "new", "correct" filename upfront, instead of landing `config.toml` now and updating it to `boostrap.toml` later.

`@rustbot` blocked rust-lang#137081
…rmit, r=tgross35

Implement `read_buf` for Hermit

Following hermit-os/kernel#1606, it is now safe to implement `Read::read_buf` for file descriptors on Hermit.

cc ```@mkroening```
…laumeGomez

rustdoc-json: Add tests for `#[repr(...)]`

Works towards rust-lang#137645 and rust-lang#81359

Based on rust-lang#138018, but with only the test changes. CC ```@obi1kenobi```

r? ```@GuillaumeGomez```
…ler-errors

Extract `for_each_immediate_subpat` from THIR pattern visitors

This is extracted from some larger changes I've been working on, trying to introduce a “THIR pattern id” to refer to THIR pattern nodes without a direct reference.

The future of those changes is somewhat uncertain, due to some [proposed changes involving upvar inference](https://rust-lang.zulipchat.com/#narrow/channel/131828-t-compiler/topic/upvar.20inference.20on.20THIR.3F). So I'm taking my preparatory changes that make sense on their own, and extracting them into one or more independent PRs.

---

This particular patch takes two different functions that were both matching on `PatKind` to traverse subpatterns, and extracts the core match into a single helper function.
Unvacation myself

Feeling better now.

r? ghost
…rcote

Add `#[cfg(test)]` for Transition in dfa in `rustc_transmute`

`Transition` is only used in the `Transitions::insert` in test after rust-lang#137776

Detected by rust-lang#128637
@rustbot rustbot added A-meta Area: Issues & PRs about the rust-lang/rust repository itself A-rustdoc-json Area: Rustdoc JSON backend O-hermit Operating System: Hermit 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. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. rollup A PR which is a rollup labels Mar 18, 2025
@matthiaskrgr
Copy link
Member Author

@bors r+ rollup=never p=5

@bors
Copy link
Contributor

bors commented Mar 18, 2025

📌 Commit f364f3e has been approved by matthiaskrgr

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 Mar 18, 2025
@bors
Copy link
Contributor

bors commented Mar 18, 2025

⌛ Testing commit f364f3e with merge cd7e8c5...

bors added a commit to rust-lang-ci/rust that referenced this pull request Mar 18, 2025
…iaskrgr

Rollup of 7 pull requests

Successful merges:

 - rust-lang#136320 (exit: document interaction with C)
 - rust-lang#138080 (Leave a breadcrumb towards bootstrap config documentation in `bootstrap.toml`)
 - rust-lang#138301 (Implement `read_buf` for Hermit)
 - rust-lang#138569 (rustdoc-json: Add tests for `#[repr(...)]`)
 - rust-lang#138635 (Extract `for_each_immediate_subpat` from THIR pattern visitors)
 - rust-lang#138642 (Unvacation myself)
 - rust-lang#138644 (Add `#[cfg(test)]` for Transition in dfa in `rustc_transmute`)

r? `@ghost`
`@rustbot` modify labels: rollup
@Kobzol
Copy link
Contributor

Kobzol commented Mar 18, 2025

@rustbot ping fuchsia

The Fuchsia job seems to be broken (#138653 (comment)), could you please take a look? Thanks!

@rustbot
Copy link
Collaborator

rustbot commented Mar 18, 2025

Hey friends of Fuchsia! This issue could use some guidance on how this should be
resolved/implemented on Fuchsia. Could one of you weigh in?

cc @erickt @Nashenas88 @P1n3appl3

@Nashenas88
Copy link
Contributor

Nashenas88 commented Mar 18, 2025

This looks very similar to #138661 (comment) but with a different git submodule missing files.

jiri reporting local directories with changes:

[16:41:21.062] WARN: Projects with local changes and/or not on JIRI_HEAD:
third_party/pyyaml (third_party/pyyaml/src): (Has changes)
third_party/android/device/generic/goldfish-opengl (third_party/android/device/generic/goldfish-opengl): (Has changes)
third_party/shac-project/generic-checks (third_party/shac-project/generic-checks/src): (Has changes)
third_party/pylibs/autoflake (third_party/pylibs/autoflake/src): (Has changes)
third_party/android/platform/system/tools/aidl (third_party/android/platform/system/tools/aidl): (Has changes)
third_party/fuchsia-infra-bazel-rules (third_party/fuchsia-infra-bazel-rules/src): (Has changes)

one of which is missing files:

ninja: Entering directory `/checkout/obj/fuchsia/out/default'
ninja: error: '../../third_party/android/platform/system/tools/aidl/aidl_checkapi.cpp', needed by 'host_x64/obj/third_party/android/platform/system/tools/aidl/aidl_gen.aidl_checkapi.cpp.o', missing and no known rule to make it

@erickt
Copy link
Contributor

erickt commented Mar 19, 2025

I put together #138683 to see if caching the checkouts avoids the googlesource.com rate limits.

@RalfJung
Copy link
Member

Issue for tracking the Fuchsia problem: #138691

@matthiaskrgr
Copy link
Member Author

@bors p=101

@bors
Copy link
Contributor

bors commented Mar 19, 2025

⌛ Testing commit f364f3e with merge c4b38a5...

This was referenced Mar 19, 2025
@bors
Copy link
Contributor

bors commented Mar 19, 2025

☀️ Test successful - checks-actions
Approved by: matthiaskrgr
Pushing c4b38a5 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Mar 19, 2025
@bors bors merged commit c4b38a5 into rust-lang:master Mar 19, 2025
7 checks passed
@rustbot rustbot added this to the 1.87.0 milestone Mar 19, 2025
Copy link

This is an experimental post-merge analysis report. You can ignore it.

Post-merge report
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 1370611 (parent) -> c4b38a5 (this PR)

Test differences

Show 24 test diffs
  • [rustdoc-json] tests/rustdoc-json/attrs/repr_align.rs (stage 2): [missing] -> pass (J0)
  • [rustdoc-json] tests/rustdoc-json/attrs/repr_c.rs (stage 2): [missing] -> pass (J0)
  • [rustdoc-json] tests/rustdoc-json/attrs/repr_combination.rs (stage 2): [missing] -> pass (J0)
  • [rustdoc-json] tests/rustdoc-json/attrs/repr_int_enum.rs (stage 2): [missing] -> pass (J0)
  • [rustdoc-json] tests/rustdoc-json/attrs/repr_packed.rs (stage 2): [missing] -> pass (J0)
  • [rustdoc-json] tests/rustdoc-json/attrs/repr_transparent.rs (stage 2): [missing] -> pass (J0)
  • [rustdoc-json] tests/rustdoc-json/attrs/repr_align.rs (stage 1): [missing] -> pass (J1)
  • [rustdoc-json] tests/rustdoc-json/attrs/repr_c.rs (stage 1): [missing] -> pass (J1)
  • [rustdoc-json] tests/rustdoc-json/attrs/repr_combination.rs (stage 1): [missing] -> pass (J1)
  • [rustdoc-json] tests/rustdoc-json/attrs/repr_int_enum.rs (stage 1): [missing] -> pass (J1)
  • [rustdoc-json] tests/rustdoc-json/attrs/repr_packed.rs (stage 1): [missing] -> pass (J1)
  • [rustdoc-json] tests/rustdoc-json/attrs/repr_transparent.rs (stage 1): [missing] -> pass (J1)

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

Job group index

  • J0: aarch64-apple, aarch64-gnu, i686-gnu-1, i686-gnu-nopt-1, i686-msvc-1, x86_64-apple-1, x86_64-gnu, x86_64-gnu-llvm-18-1, x86_64-gnu-llvm-18-2, x86_64-gnu-llvm-19-1, x86_64-gnu-llvm-19-2, x86_64-gnu-nopt, x86_64-gnu-stable, x86_64-mingw-1, x86_64-msvc-1
  • J1: x86_64-gnu-llvm-18-3, x86_64-gnu-llvm-19-3

@oli-obk
Copy link
Contributor

oli-obk commented Mar 19, 2025

@bors treeclosed-

@rust-timer
Copy link
Collaborator

Finished benchmarking commit (c4b38a5): comparison URL.

Overall result: ❌ regressions - no action needed

@rustbot label: -perf-regression

Instruction count

This is the most reliable metric that we have; it was used to determine the overall result at the top of this comment. However, even this metric can sometimes exhibit noise.

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

Max RSS (memory usage)

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

Cycles

Results (secondary 2.8%)

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

Binary size

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

Bootstrap: 775.384s -> 776.901s (0.20%)
Artifact size: 365.09 MiB -> 365.07 MiB (-0.01%)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-meta Area: Issues & PRs about the rust-lang/rust repository itself A-rustdoc-json Area: Rustdoc JSON backend merged-by-bors This PR was explicitly merged by bors. O-fuchsia Operating system: Fuchsia O-hermit Operating System: Hermit 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. T-rustdoc Relevant to the rustdoc 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