Skip to content

Rollup of 4 pull requests#156088

Merged
rust-bors[bot] merged 10 commits intorust-lang:mainfrom
JonathanBrouwer:rollup-qdmx6JQ
May 2, 2026
Merged

Rollup of 4 pull requests#156088
rust-bors[bot] merged 10 commits intorust-lang:mainfrom
JonathanBrouwer:rollup-qdmx6JQ

Conversation

@JonathanBrouwer
Copy link
Copy Markdown
Contributor

Successful merges:

r? @ghost

Create a similar rollup

danieljofficial and others added 10 commits May 1, 2026 14:20
Previously when adding a suggestion for using `Cow::into_owned()`
instead of `ToOwned::to_owned()`, the compiler would just convert the
methods `Span` into a `String` and do checks on that `String`. This PR
adds an extra guard to that suggestion by checking if the method is
`sym::to_owned_method`.
Add extra symbol check for `.to_owned()`

Follow up of rust-lang#154646

Previously when adding a suggestion for using `Cow::into_owned()` instead of `ToOwned::to_owned()`, the compiler would just convert the methods `Span` into a `String` and do checks on that `String`. This PR adds an extra guard to that suggestion by checking if the method is `sym::to_owned_method`.

r? @davidtwco since you added the review to the previous PR
…ted-consts, r=Kivooeo

Move tests associated consts

r? @Kivooeo moved tests into associated-consts
…gxiangfei2009

Do not depend on typeck to borrow-check inline consts.

Instead fetch the type from the inline-const's MIR, which comes from exactly the same typeck information.
…tes, r=JonathanBrouwer

Move tests attributes

I moved some attribute tests out of the issues folder into the attribute folder, please find time to review
@rust-bors rust-bors Bot added the rollup A PR which is a rollup label May 2, 2026
@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-clippy Relevant to the Clippy team. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels May 2, 2026
@JonathanBrouwer
Copy link
Copy Markdown
Contributor Author

@bors r+ rollup=never p=5

@rust-bors
Copy link
Copy Markdown
Contributor

rust-bors Bot commented May 2, 2026

📌 Commit dd3cb25 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 May 2, 2026
@JonathanBrouwer
Copy link
Copy Markdown
Contributor Author

Deliberately excluded the 2 failed merges in #156078

@rust-bors

This comment has been minimized.

@rust-bors rust-bors Bot added merged-by-bors This PR was explicitly merged by bors. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels May 2, 2026
@rust-bors
Copy link
Copy Markdown
Contributor

rust-bors Bot commented May 2, 2026

☀️ Test successful - CI
Approved by: JonathanBrouwer
Duration: 3h 10m 59s
Pushing 3d5dfdc to main...

@rust-bors rust-bors Bot merged commit 3d5dfdc into rust-lang:main May 2, 2026
12 checks passed
@rustbot rustbot added this to the 1.97.0 milestone May 2, 2026
@rust-timer
Copy link
Copy Markdown
Collaborator

📌 Perf builds for each rolled up PR:

PR# Message Perf Build Sha
#156045 Move tests associated consts 67dcc1346a25f41c6d30169b8074f031c4bc6a0c (link)
#156064 Do not depend on typeck to borrow-check inline consts. f319d040d7f383e3206bdad2229bbc94b3d5ae9e (link)
#156074 Add extra symbol check for .to_owned() b6b58b8f328ec33fcc418ed8c8fdead0df84a2f4 (link)
#156083 Move tests attributes 08d53a9f9fd759332a20ab1e7bd5a365e59652c3 (link)

previous master: 696d5929af

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

github-actions Bot commented May 2, 2026

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 696d592 (parent) -> 3d5dfdc (this PR)

Test differences

Show 50 test diffs

Stage 1

  • [ui] tests/ui/associated-consts/assoc-const-and-type-same-name.rs: [missing] -> pass (J1)
  • [ui] tests/ui/associated-consts/assoc-const-in-array-initializer.rs: [missing] -> pass (J1)
  • [ui] tests/ui/associated-consts/assoc-const-in-array-size.rs: [missing] -> pass (J1)
  • [ui] tests/ui/associated-consts/assoc-const-in-static-array-size.rs: [missing] -> pass (J1)
  • [ui] tests/ui/associated-consts/assoc-const-through-assoc-type-path.rs: [missing] -> pass (J1)
  • [ui] tests/ui/associated-consts/no-assoc-item-bytes-on-usize.rs: [missing] -> pass (J1)
  • [ui] tests/ui/associated-consts/trait-const-with-phantom-data-lifetime.rs: [missing] -> pass (J1)
  • [ui] tests/ui/attributes/attribute-on-wrong-item-inline-repr.rs: [missing] -> pass (J1)
  • [ui] tests/ui/attributes/cfg-attr-feature-gate-and-rustc-dummy.rs: [missing] -> pass (J1)
  • [ui] tests/ui/attributes/inline-attribute-on-closure.rs: [missing] -> pass (J1)
  • [ui] tests/ui/attributes/no-mangle-on-const-error.rs: [missing] -> pass (J1)
  • [ui] tests/ui/issues/issue-24434.rs: pass -> [missing] (J1)
  • [ui] tests/ui/issues/issue-24947.rs: pass -> [missing] (J1)
  • [ui] tests/ui/issues/issue-25145.rs: pass -> [missing] (J1)
  • [ui] tests/ui/issues/issue-28586.rs: pass -> [missing] (J1)
  • [ui] tests/ui/issues/issue-31267-additional.rs: pass -> [missing] (J1)
  • [ui] tests/ui/issues/issue-34780.rs: pass -> [missing] (J1)
  • [ui] tests/ui/issues/issue-42956.rs: pass -> [missing] (J1)
  • [ui] tests/ui/issues/issue-43988.rs: pass -> [missing] (J1)
  • [ui] tests/ui/issues/issue-44247.rs: pass -> [missing] (J1)
  • [ui] tests/ui/issues/issue-45562.rs: pass -> [missing] (J1)
  • [ui] tests/ui/issues/issue-49632.rs: pass -> [missing] (J1)

Stage 2

  • [ui] tests/ui/associated-consts/assoc-const-and-type-same-name.rs: [missing] -> pass (J0)
  • [ui] tests/ui/associated-consts/assoc-const-in-array-initializer.rs: [missing] -> pass (J0)
  • [ui] tests/ui/associated-consts/assoc-const-in-array-size.rs: [missing] -> pass (J0)
  • [ui] tests/ui/associated-consts/assoc-const-in-static-array-size.rs: [missing] -> pass (J0)
  • [ui] tests/ui/associated-consts/assoc-const-through-assoc-type-path.rs: [missing] -> pass (J0)
  • [ui] tests/ui/associated-consts/no-assoc-item-bytes-on-usize.rs: [missing] -> pass (J0)
  • [ui] tests/ui/associated-consts/trait-const-with-phantom-data-lifetime.rs: [missing] -> pass (J0)
  • [ui] tests/ui/attributes/attribute-on-wrong-item-inline-repr.rs: [missing] -> pass (J0)
  • [ui] tests/ui/attributes/cfg-attr-feature-gate-and-rustc-dummy.rs: [missing] -> pass (J0)
  • [ui] tests/ui/attributes/inline-attribute-on-closure.rs: [missing] -> pass (J0)
  • [ui] tests/ui/attributes/no-mangle-on-const-error.rs: [missing] -> pass (J0)
  • [ui] tests/ui/issues/issue-24434.rs: pass -> [missing] (J0)
  • [ui] tests/ui/issues/issue-24947.rs: pass -> [missing] (J0)
  • [ui] tests/ui/issues/issue-25145.rs: pass -> [missing] (J0)
  • [ui] tests/ui/issues/issue-28586.rs: pass -> [missing] (J0)
  • [ui] tests/ui/issues/issue-31267-additional.rs: pass -> [missing] (J0)
  • [ui] tests/ui/issues/issue-34780.rs: pass -> [missing] (J0)
  • [ui] tests/ui/issues/issue-42956.rs: pass -> [missing] (J0)
  • [ui] tests/ui/issues/issue-43988.rs: pass -> [missing] (J0)
  • [ui] tests/ui/issues/issue-44247.rs: pass -> [missing] (J0)
  • [ui] tests/ui/issues/issue-45562.rs: pass -> [missing] (J0)
  • [ui] tests/ui/issues/issue-49632.rs: pass -> [missing] (J0)

Additionally, 6 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 3d5dfdc29f0e3ba6e0d31d1cd39bf2beac4ce4b4 --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. dist-x86_64-msvc-alt: 2h 7m -> 2h 43m (+28.9%)
  2. dist-apple-various: 1h 58m -> 1h 24m (-28.4%)
  3. x86_64-gnu-llvm-21: 59m 41s -> 1h 16m (+27.4%)
  4. dist-arm-linux-musl: 1h 17m -> 1h 38m (+26.1%)
  5. x86_64-msvc-ext1: 2h 18m -> 1h 42m (-25.6%)
  6. x86_64-gnu-llvm-22-2: 1h 38m -> 1h 16m (-21.8%)
  7. aarch64-apple: 2h 26m -> 2h 58m (+21.4%)
  8. pr-check-1: 33m 30s -> 26m 49s (-19.9%)
  9. x86_64-gnu-distcheck: 1h 53m -> 2h 13m (+17.5%)
  10. dist-x86_64-netbsd: 1h 22m -> 1h 9m (-16.7%)
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-log-analyzer
Copy link
Copy Markdown
Collaborator

A job failed! Check out the build log: (web) (plain enhanced) (plain)

Click to see the possible cause of the failure (guessed by this bot)
   Compiling glob-match v0.2.1
   Compiling diff v0.1.13
   Compiling citool v0.1.0 (/home/runner/work/rust/rust/src/ci/citool)
    Finished `release` profile [optimized] target(s) in 43.26s
     Running `target/release/citool post-merge-report 696d5929af3a236d9b5f8918572f14a8cfe0394c 3d5dfdc29f0e3ba6e0d31d1cd39bf2beac4ce4b4`
Downloading metrics of job aarch64-gnu
Downloading metrics of job aarch64-gnu-debug
Downloading metrics of job arm-android
Downloading metrics of job armhf-gnu
Downloading metrics of job dist-aarch64-linux
Downloading metrics of job dist-android
Downloading metrics of job dist-arm-linux-gnueabi
---
Downloading metrics of job x86_64-gnu-llvm-21
Downloading metrics of job aarch64-gnu-llvm-21-1
Downloading metrics of job aarch64-gnu-llvm-21-2
<details>
<summary>What is this?</summary>
This is an experimental post-merge analysis report that shows differences in test outcomes between the merged PR and its parent PR.
</details>


Comparing 696d5929af3a236d9b5f8918572f14a8cfe0394c (parent) -> 3d5dfdc29f0e3ba6e0d31d1cd39bf2beac4ce4b4 (this PR)

# Test differences
<details>
<summary>Show 50 test diffs
</summary>

## Stage 1
- `[ui] tests/ui/associated-consts/assoc-const-and-type-same-name.rs`: [missing] -> pass (**J1**)
- `[ui] tests/ui/associated-consts/assoc-const-in-array-initializer.rs`: [missing] -> pass (**J1**)
- `[ui] tests/ui/associated-consts/assoc-const-in-array-size.rs`: [missing] -> pass (**J1**)
- `[ui] tests/ui/associated-consts/assoc-const-in-static-array-size.rs`: [missing] -> pass (**J1**)
- `[ui] tests/ui/associated-consts/assoc-const-through-assoc-type-path.rs`: [missing] -> pass (**J1**)
- `[ui] tests/ui/associated-consts/no-assoc-item-bytes-on-usize.rs`: [missing] -> pass (**J1**)
- `[ui] tests/ui/associated-consts/trait-const-with-phantom-data-lifetime.rs`: [missing] -> pass (**J1**)
- `[ui] tests/ui/attributes/attribute-on-wrong-item-inline-repr.rs`: [missing] -> pass (**J1**)
- `[ui] tests/ui/attributes/cfg-attr-feature-gate-and-rustc-dummy.rs`: [missing] -> pass (**J1**)
- `[ui] tests/ui/attributes/inline-attribute-on-closure.rs`: [missing] -> pass (**J1**)
- `[ui] tests/ui/attributes/no-mangle-on-const-error.rs`: [missing] -> pass (**J1**)
- `[ui] tests/ui/issues/issue-24434.rs`: pass -> [missing] (**J1**)
- `[ui] tests/ui/issues/issue-24947.rs`: pass -> [missing] (**J1**)
- `[ui] tests/ui/issues/issue-25145.rs`: pass -> [missing] (**J1**)
- `[ui] tests/ui/issues/issue-28586.rs`: pass -> [missing] (**J1**)
- `[ui] tests/ui/issues/issue-31267-additional.rs`: pass -> [missing] (**J1**)
- `[ui] tests/ui/issues/issue-34780.rs`: pass -> [missing] (**J1**)
- `[ui] tests/ui/issues/issue-42956.rs`: pass -> [missing] (**J1**)
- `[ui] tests/ui/issues/issue-43988.rs`: pass -> [missing] (**J1**)
- `[ui] tests/ui/issues/issue-44247.rs`: pass -> [missing] (**J1**)
- `[ui] tests/ui/issues/issue-45562.rs`: pass -> [missing] (**J1**)
- `[ui] tests/ui/issues/issue-49632.rs`: pass -> [missing] (**J1**)
## Stage 2
- `[ui] tests/ui/associated-consts/assoc-const-and-type-same-name.rs`: [missing] -> pass (**J0**)
- `[ui] tests/ui/associated-consts/assoc-const-in-array-initializer.rs`: [missing] -> pass (**J0**)
- `[ui] tests/ui/associated-consts/assoc-const-in-array-size.rs`: [missing] -> pass (**J0**)
- `[ui] tests/ui/associated-consts/assoc-const-in-static-array-size.rs`: [missing] -> pass (**J0**)
- `[ui] tests/ui/associated-consts/assoc-const-through-assoc-type-path.rs`: [missing] -> pass (**J0**)
- `[ui] tests/ui/associated-consts/no-assoc-item-bytes-on-usize.rs`: [missing] -> pass (**J0**)
- `[ui] tests/ui/associated-consts/trait-const-with-phantom-data-lifetime.rs`: [missing] -> pass (**J0**)
- `[ui] tests/ui/attributes/attribute-on-wrong-item-inline-repr.rs`: [missing] -> pass (**J0**)
- `[ui] tests/ui/attributes/cfg-attr-feature-gate-and-rustc-dummy.rs`: [missing] -> pass (**J0**)
- `[ui] tests/ui/attributes/inline-attribute-on-closure.rs`: [missing] -> pass (**J0**)
- `[ui] tests/ui/attributes/no-mangle-on-const-error.rs`: [missing] -> pass (**J0**)
- `[ui] tests/ui/issues/issue-24434.rs`: pass -> [missing] (**J0**)
- `[ui] tests/ui/issues/issue-24947.rs`: pass -> [missing] (**J0**)
- `[ui] tests/ui/issues/issue-25145.rs`: pass -> [missing] (**J0**)
- `[ui] tests/ui/issues/issue-28586.rs`: pass -> [missing] (**J0**)
- `[ui] tests/ui/issues/issue-31267-additional.rs`: pass -> [missing] (**J0**)
- `[ui] tests/ui/issues/issue-34780.rs`: pass -> [missing] (**J0**)
- `[ui] tests/ui/issues/issue-42956.rs`: pass -> [missing] (**J0**)
- `[ui] tests/ui/issues/issue-43988.rs`: pass -> [missing] (**J0**)
- `[ui] tests/ui/issues/issue-44247.rs`: pass -> [missing] (**J0**)
- `[ui] tests/ui/issues/issue-45562.rs`: pass -> [missing] (**J0**)
- `[ui] tests/ui/issues/issue-49632.rs`: pass -> [missing] (**J0**)

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

**Job group index**

- **J0**: [aarch64-apple](https://github.com/rust-lang/rust/actions/runs/25254177599#summary-74050846428), [aarch64-gnu](https://github.com/rust-lang/rust/actions/runs/25254177599#summary-74050846333), [aarch64-gnu-llvm-21-1](https://github.com/rust-lang/rust/actions/runs/25254177599#summary-74050846473), [aarch64-msvc-1](https://github.com/rust-lang/rust/actions/runs/25254177599#summary-74050846450), [arm-android](https://github.com/rust-lang/rust/actions/runs/25254177599#summary-74050846329), [armhf-gnu](https://github.com/rust-lang/rust/actions/runs/25254177599#summary-74050846331), [dist-i586-gnu-i586-i686-musl](https://github.com/rust-lang/rust/actions/runs/25254177599#summary-74050846345), [i686-gnu-1](https://github.com/rust-lang/rust/actions/runs/25254177599#summary-74050846433), [i686-gnu-nopt-1](https://github.com/rust-lang/rust/actions/runs/25254177599#summary-74050846395), [i686-msvc-1](https://github.com/rust-lang/rust/actions/runs/25254177599#summary-74050846475), [optional-x86_64-gnu-parallel-frontend](https://github.com/rust-lang/rust/actions/runs/25254177599#summary-74050846409), [test-various](https://github.com/rust-lang/rust/actions/runs/25254177599#summary-74050846399), [x86_64-gnu](https://github.com/rust-lang/rust/actions/runs/25254177599#summary-74050846427), [x86_64-gnu-debug](https://github.com/rust-lang/rust/actions/runs/25254177599#summary-74050846411), [x86_64-gnu-gcc](https://github.com/rust-lang/rust/actions/runs/25254177599#summary-74050861906), [x86_64-gnu-llvm-21](https://github.com/rust-lang/rust/actions/runs/25254177599#summary-74050846474), [x86_64-gnu-llvm-21-2](https://github.com/rust-lang/rust/actions/runs/25254177599#summary-74050846414), [x86_64-gnu-llvm-22-2](https://github.com/rust-lang/rust/actions/runs/25254177599#summary-74050846413), [x86_64-gnu-nopt](https://github.com/rust-lang/rust/actions/runs/25254177599#summary-74050846447), [x86_64-gnu-stable](https://github.com/rust-lang/rust/actions/runs/25254177599#summary-74050846408), [x86_64-mingw-1](https://github.com/rust-lang/rust/actions/runs/25254177599#summary-74050846445), [x86_64-msvc-1](https://github.com/rust-lang/rust/actions/runs/25254177599#summary-74050846436)
- **J1**: [x86_64-gnu-llvm-21-3](https://github.com/rust-lang/rust/actions/runs/25254177599#summary-74050846398), [x86_64-gnu-llvm-22-3](https://github.com/rust-lang/rust/actions/runs/25254177599#summary-74050846435)
</details>

<details>
<summary>Test dashboard</summary>

Run

```bash
cargo run --manifest-path src/ci/citool/Cargo.toml -- \
    test-dashboard 3d5dfdc29f0e3ba6e0d31d1cd39bf2beac4ce4b4 --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. dist-x86_64-msvc-alt: 2h 7m -> 2h 43m (+28.9%)
  2. dist-apple-various: 1h 58m -> 1h 24m (-28.4%)
  3. x86_64-gnu-llvm-21: 59m 41s -> 1h 16m (+27.4%)
  4. dist-arm-linux-musl: 1h 17m -> 1h 38m (+26.1%)
  5. x86_64-msvc-ext1: 2h 18m -> 1h 42m (-25.6%)
  6. x86_64-gnu-llvm-22-2: 1h 38m -> 1h 16m (-21.8%)
  7. aarch64-apple: 2h 26m -> 2h 58m (+21.4%)
  8. pr-check-1: 33m 30s -> 26m 49s (-19.9%)
  9. x86_64-gnu-distcheck: 1h 53m -> 2h 13m (+17.5%)
  10. dist-x86_64-netbsd: 1h 22m -> 1h 9m (-16.7%)
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.

non-200 OK status code: 504 Gateway Timeout body: "{"message": "We couldn't respond to your request in time. Sorry about that. Please try resubmitting your request and contact us if the problem persists."}\r\n"
##[error]Process completed with exit code 1.
Post job cleanup.


</details>

@rust-timer
Copy link
Copy Markdown
Collaborator

Finished benchmarking commit (3d5dfdc): 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 (primary -3.5%, secondary 1.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)
1.9% [0.5%, 5.8%] 5
Improvements ✅
(primary)
-3.5% [-5.4%, -1.6%] 2
Improvements ✅
(secondary)
-1.5% [-1.5%, -1.5%] 1
All ❌✅ (primary) -3.5% [-5.4%, -1.6%] 2

Cycles

Results (primary -3.0%, secondary -0.5%)

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)
0.8% [0.5%, 1.0%] 5
Improvements ✅
(primary)
-3.0% [-3.6%, -2.5%] 4
Improvements ✅
(secondary)
-2.1% [-4.2%, -0.5%] 4
All ❌✅ (primary) -3.0% [-3.6%, -2.5%] 4

Binary size

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

Bootstrap: 482.368s -> 481.836s (-0.11%)
Artifact size: 391.15 MiB -> 391.13 MiB (-0.00%)

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

Labels

merged-by-bors This PR was explicitly merged by bors. rollup A PR which is a rollup T-clippy Relevant to the Clippy team. 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.

7 participants