Skip to content

Make span_suggestions always verbose#154605

Merged
rust-bors[bot] merged 1 commit intorust-lang:mainfrom
estebank:attr-suggest
Apr 16, 2026
Merged

Make span_suggestions always verbose#154605
rust-bors[bot] merged 1 commit intorust-lang:mainfrom
estebank:attr-suggest

Conversation

@estebank
Copy link
Copy Markdown
Contributor

@estebank estebank commented Mar 30, 2026

View all comments

span_suggestions is to provide mutually exclusive suggestions. When it was introduced, we made its behavior be that if a single suggestion is given to it, we present the suggestion inline, otherwise in patch format. Changing this to make all of its uses be verbose, as that is closer in intent of output.

@rustbot
Copy link
Copy Markdown
Collaborator

rustbot commented Mar 30, 2026

Some changes occurred in tests/ui/sanitizer

cc @rcvalle

@rustbot rustbot added PG-exploit-mitigations Project group: Exploit mitigations S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Mar 30, 2026
@rustbot
Copy link
Copy Markdown
Collaborator

rustbot commented Mar 30, 2026

r? @jieyouxu

rustbot has assigned @jieyouxu.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

Why was this reviewer chosen?

The reviewer was selected based on:

  • Owners of files modified in this PR: compiler
  • compiler expanded to 69 candidates
  • Random selection from 13 candidates

@rust-log-analyzer

This comment has been minimized.

Copy link
Copy Markdown
Member

@jieyouxu jieyouxu left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Makes sense to me, thanks.

One minor reservation I had while looking at the diffs is when the suggested snippet has placeholders, but then I still liked the verbose outline version over inline help (which is really hard to read IMO).

You can r=me after fixing CI.
@rustbot author

View changes since this review

@rustbot rustbot 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-review Status: Awaiting review from the assignee but also interested parties. labels Apr 1, 2026
@rustbot
Copy link
Copy Markdown
Collaborator

rustbot commented Apr 1, 2026

Reminder, once the PR becomes ready for a review, use @rustbot ready.

@estebank
Copy link
Copy Markdown
Contributor Author

estebank commented Apr 1, 2026

One minor reservation I had while looking at the diffs is when the suggested snippet has placeholders

I saw the same thing and I'm looking at improving the suggestions to be more targeted for cases like those and rely on the "suggestion for full replacement" only as a fallback.

@rustbot
Copy link
Copy Markdown
Collaborator

rustbot commented Apr 2, 2026

Some changes occurred in src/tools/clippy

cc @rust-lang/clippy

@rustbot rustbot added the T-clippy Relevant to the Clippy team. label Apr 2, 2026
@estebank
Copy link
Copy Markdown
Contributor Author

estebank commented Apr 3, 2026

@bors r=jieyouxu

@rust-bors
Copy link
Copy Markdown
Contributor

rust-bors bot commented Apr 3, 2026

📌 Commit 88d6404 has been approved by jieyouxu

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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Apr 3, 2026
@rust-bors rust-bors bot added the S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. label Apr 3, 2026
@rust-bors

This comment has been minimized.

@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 Apr 3, 2026
rust-bors bot pushed a commit that referenced this pull request Apr 3, 2026
Rollup of 6 pull requests

Successful merges:

 - #154696 (rustdoc_missing_doc_code_examples: lint on macro_rules macros)
 - #154698 (Improve workings of the `desc` query modifier and custom query cycle handlers)
 - #154713 (Stop compiling when we get resolving crate failure)
 - #154736 (Add a regression test for the duplicated `crate` keyword in path suggestions)
 - #154739 (ci: update upload-artifact action to v7)
 - #154741 (Enforce `#![warn(unreachable_pub)]` in compiletest source)

Failed merges:

 - #154605 (Make `span_suggestions` always verbose)
@rustbot

This comment has been minimized.

@rust-bors

This comment has been minimized.

@jieyouxu
Copy link
Copy Markdown
Member

(Very conflict-prone)
@bors p=5

@jieyouxu
Copy link
Copy Markdown
Member

@bors rollup=iffy (or maybe never)

`span_suggestions` is to provide mutually exclusive suggestions. When it was introduced, we made its behavior be that if a single suggestion is given to it, we present the suggestion inline, otherwise in patch format. Changing this to make all of its uses be verbose, as that is closer in intent of output.
@rustbot
Copy link
Copy Markdown
Collaborator

rustbot commented Apr 15, 2026

This PR was rebased onto a different main commit. Here's a range-diff highlighting what actually changed.

Rebasing is a normal part of keeping PRs up to date, so no action is needed—this note is just to help reviewers.

@estebank
Copy link
Copy Markdown
Contributor Author

@bors r=jieyouxu rollup=never

@rust-bors
Copy link
Copy Markdown
Contributor

rust-bors bot commented Apr 15, 2026

📌 Commit b849e10 has been approved by jieyouxu

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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Apr 15, 2026
@rust-bors

This comment has been minimized.

rust-bors bot pushed a commit that referenced this pull request Apr 16, 2026
Make `span_suggestions` always verbose

`span_suggestions` is to provide mutually exclusive suggestions. When it was introduced, we made its behavior be that if a single suggestion is given to it, we present the suggestion inline, otherwise in patch format. Changing this to make all of its uses be verbose, as that is closer in intent of output.
@rust-log-analyzer
Copy link
Copy Markdown
Collaborator

The job dist-x86_64-mingw failed! Check out the build log: (web) (plain enhanced) (plain)

Click to see the possible cause of the failure (guessed by this bot)

@rust-bors rust-bors bot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Apr 16, 2026
@rust-bors
Copy link
Copy Markdown
Contributor

rust-bors bot commented Apr 16, 2026

💔 Test for 7e37fca failed: CI. Failed job:

@jieyouxu
Copy link
Copy Markdown
Member

The hosted runner lost communication with the server. Anything in your workflow that terminates the runner process, starves it for CPU/Memory, or blocks its network access can cause this error.

@bors retry p=1 (conflict-prone)

@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 Apr 16, 2026
@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 Apr 16, 2026
@rust-bors
Copy link
Copy Markdown
Contributor

rust-bors bot commented Apr 16, 2026

☀️ Test successful - CI
Approved by: jieyouxu
Duration: 3h 27m 58s
Pushing 18b439f to main...

@rust-bors rust-bors bot merged commit 18b439f into rust-lang:main Apr 16, 2026
12 checks passed
@rustbot rustbot added this to the 1.97.0 milestone Apr 16, 2026
@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 e8e4541 (parent) -> 18b439f (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 18b439f84ec0b087283bac3356a1eeac53c60c5e --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-various-1: 58m 48s -> 1h 16m (+29.3%)
  2. x86_64-msvc-ext3: 1h 55m -> 1h 30m (-21.8%)
  3. pr-check-1: 34m 49s -> 27m 45s (-20.3%)
  4. x86_64-gnu-gcc: 1h 10m -> 58m 9s (-17.5%)
  5. dist-x86_64-musl: 2h 6m -> 1h 45m (-16.6%)
  6. x86_64-msvc-ext2: 1h 48m -> 2h 6m (+15.9%)
  7. dist-aarch64-msvc: 1h 37m -> 1h 52m (+15.2%)
  8. i686-msvc-1: 2h 50m -> 3h 14m (+14.2%)
  9. x86_64-rust-for-linux: 55m 31s -> 47m 39s (-14.2%)
  10. aarch64-apple: 2h 33m -> 2h 54m (+14.0%)
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 (18b439f): comparison URL.

Overall result: ❌ regressions - 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.3% [0.3%, 0.3%] 1
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) - - 0

Max RSS (memory usage)

Results (primary 3.9%, secondary 0.9%)

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

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

Cycles

Results (secondary 0.7%)

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

Binary size

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

Bootstrap: 490.756s -> 492.463s (0.35%)
Artifact size: 394.16 MiB -> 394.15 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. PG-exploit-mitigations Project group: Exploit mitigations 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.

5 participants