Skip to content

Rollup of 3 pull requests#158015

Merged
rust-bors[bot] merged 6 commits into
rust-lang:mainfrom
JonathanBrouwer:rollup-4hzy2nc
Jun 17, 2026
Merged

Rollup of 3 pull requests#158015
rust-bors[bot] merged 6 commits into
rust-lang:mainfrom
JonathanBrouwer:rollup-4hzy2nc

Conversation

@JonathanBrouwer

Copy link
Copy Markdown
Contributor

Successful merges:

r? @ghost

Create a similar rollup

mejrs and others added 6 commits June 15, 2026 20:59
specifically `needs-llvm-components`
Improve `declare_features!` macro error

I got mildly annoyed when I went to add a new feature, and the fix for this is relatively simple.

Current error:
```
error[E0425]: cannot find value `better_rust` in module `sym`
   --> compiler\rustc_feature\src\unstable.rs:240:16
    |
157 |                 name: sym::$feature,
    |                            -------- due to this macro variable
...
240 |     (internal, better_rust, "2.0.0", None),
    |                ^^^^^^^^^^^ not found in `sym`

For more information about this error, try `rustc --explain E0425`
```

Previous error:
```
error[E0425]: cannot find value `better_rust` in module `sym`
   --> compiler\rustc_feature\src\unstable.rs:240:16
    |
157 |                 name: sym::$feature,
    |                            -------- due to this macro variable
...
240 |     (internal, better_rust, "2.0.0", None),
    |                ^^^^^^^^^^^ not found in `sym`

error[E0531]: cannot find unit struct, unit variant or constant `better_rust` in module `sym`
   --> compiler\rustc_feature\src\unstable.rs:240:16
    |
157 |                 name: sym::$feature,
    |                            -------- due to this macro variable
...
240 |     (internal, better_rust, "2.0.0", None),
    |                ^^^^^^^^^^^ not found in `sym`

Some errors have detailed explanations: E0425, E0531.
```
…jieyouxu

tidy: revisions inherit global directives

specifically `needs-llvm-components`

Based on this function, directives apply to a revision also when the directive is defined "globally".

https://github.com/rust-lang/rust/blob/89a99936d9e76a50e8df622e7242190841fd871b/src/tools/compiletest/src/directives/line.rs#L100-L102

But `tidy` did not take that into account.

I'm not sure how to test this.

r? jieyouxu
…mver, r=marcoieni

renovate: Pin GitHub Action digests to SemVer

Switches the `helpers:pinGitHubActionDigests` preset to `helpers:pinGitHubActionDigestsToSemver`. This resolves floating tags (e.g. `v4`) to a full SemVer version behind the digest and tracks SemVer releases instead of floating tags.

r? @marcoieni
@rust-bors rust-bors Bot added the rollup A PR which is a rollup label Jun 17, 2026
@rustbot rustbot added 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. labels Jun 17, 2026
@JonathanBrouwer

Copy link
Copy Markdown
Contributor Author

@bors r+ rollup=never p=5

@rust-bors

rust-bors Bot commented Jun 17, 2026

Copy link
Copy Markdown
Contributor

📌 Commit dad46eb has been approved by JonathanBrouwer

It is now in the queue for this repository.

@rust-bors rust-bors Bot 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 17, 2026
@rust-bors

This comment has been minimized.

@rust-bors rust-bors Bot added the merged-by-bors This PR was explicitly merged by bors. label Jun 17, 2026
@rust-bors

rust-bors Bot commented Jun 17, 2026

Copy link
Copy Markdown
Contributor

☀️ Test successful - CI
Approved by: JonathanBrouwer
Duration: 3h 22m 37s
Pushing 1162ebd to main...

@rust-bors rust-bors Bot removed the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Jun 17, 2026
@rust-bors rust-bors Bot merged commit 1162ebd into rust-lang:main Jun 17, 2026
14 checks passed
@rustbot rustbot added this to the 1.98.0 milestone Jun 17, 2026
@rust-timer

Copy link
Copy Markdown
Collaborator

📌 Perf builds for each rolled up PR:

PR# Message Perf Build Sha
#157931 Improve declare_features! macro error 3090c9240042ffda06c4d11f7a5dd84a8f4fb37b (link)
#157992 tidy: revisions inherit global directives 3b569586ba68284aab322fc178f2054a40dc6854 (link)
#158010 renovate: Pin GitHub Action digests to SemVer 1d7bfb574279efcaf8966285c52aa861f08034b3 (link)

previous master: 98594f404e

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

@github-actions

Copy link
Copy Markdown
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 98594f4 (parent) -> 1162ebd (this PR)

Test differences

Show 2 test diffs

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

Test dashboard

Run

cargo run --manifest-path src/ci/citool/Cargo.toml -- \
    test-dashboard 1162ebd81da49955aa94ef240cf7bb0bafad3f6a --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. x86_64-msvc-ext3: 1h 53m -> 1h 3m (-44.3%)
  2. armhf-gnu: 1h 13m -> 1h 35m (+29.6%)
  3. pr-check-2: 33m 5s -> 42m 46s (+29.3%)
  4. dist-apple-various: 1h 23m -> 1h 46m (+28.5%)
  5. x86_64-msvc-ext2: 1h 57m -> 1h 25m (-27.2%)
  6. x86_64-gnu: 1h 57m -> 2h 28m (+26.4%)
  7. x86_64-mingw-2: 2h 47m -> 2h 6m (-24.6%)
  8. dist-x86_64-linux-alt: 2h 4m -> 2h 34m (+24.3%)
  9. dist-powerpc-linux: 1h 36m -> 1h 14m (-23.5%)
  10. dist-powerpc64le-linux-gnu: 1h 21m -> 1h 40m (+22.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
Copy Markdown
Collaborator

Finished benchmarking commit (1162ebd): comparison URL.

Overall result: no relevant changes - no action needed

@rustbot label: -perf-regression

Instruction count

This perf run didn't have relevant results for this metric.

Max RSS (memory usage)

Results (secondary 3.9%)

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

Cycles

This perf run didn't have relevant results for this metric.

Binary size

This perf run didn't have relevant results for this metric.

Bootstrap: 523.739s -> 521.352s (-0.46%)
Artifact size: 401.37 MiB -> 401.86 MiB (0.12%)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

A-tidy Area: The tidy tool merged-by-bors This PR was explicitly merged by bors. rollup A PR which is a rollup 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