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

Insert whitespace to avoid ident concatenation in suggestion #106540

Merged
merged 1 commit into from
Jan 29, 2023

Conversation

lowr
Copy link
Contributor

@lowr lowr commented Jan 6, 2023

This PR tweaks the suggestion of removing misplaced parentheses around trait bounds so as to avoid concatenating two identifiers. Although subtle, this should make outputs less surprising especially when applying the MachineApplicable suggestions automatically.

@rustbot
Copy link
Collaborator

rustbot commented Jan 6, 2023

r? @wesleywiser

(rustbot has picked a reviewer for you, use r? to override)

@rustbot rustbot added 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 Jan 6, 2023
@Noratrieb
Copy link
Member

For reference, here's the current broken suggestion:

error: incorrect braces around trait bounds
 --> src/lib.rs:1:25
  |
1 | fn foo2_no_space(_: &dyn(Drop + AsRef<str>)) {}
  |                         ^                 ^
  |
help: remove the parentheses
  |
1 - fn foo2_no_space(_: &dyn(Drop + AsRef<str>)) {}
1 + fn foo2_no_space(_: &dynDrop + AsRef<str>) {}
  |

@cjgillot
Copy link
Contributor

Thanks for the PR @lowr. Could you please rebase atop current master? I'll approve it.

@lowr lowr force-pushed the patch/remove-paren-whitespace branch from 0bbe3a4 to 807ebac Compare January 29, 2023 12:41
@lowr
Copy link
Contributor Author

lowr commented Jan 29, 2023

@cjgillot Done!

@cjgillot
Copy link
Contributor

@bors r+ rollup

@bors
Copy link
Collaborator

bors commented Jan 29, 2023

📌 Commit 807ebac has been approved by cjgillot

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 Jan 29, 2023
bors added a commit to rust-lang-ci/rust that referenced this pull request Jan 29, 2023
…iaskrgr

Rollup of 11 pull requests

Successful merges:

 - rust-lang#96763 (Fix maintainer validation message)
 - rust-lang#106540 (Insert whitespace to avoid ident concatenation in suggestion)
 - rust-lang#106763 (print why a test was ignored if its the only test specified)
 - rust-lang#106769 (libtest: Print why a test was ignored if it's the only test specified.)
 - rust-lang#106798 (Implement `signum` with `Ord`)
 - rust-lang#107006 (Output tree representation on thir-tree)
 - rust-lang#107078 (Update wording of invalid_doc_attributes docs.)
 - rust-lang#107169 (Pass `--locked` to the x test tidy call)
 - rust-lang#107431 (docs: remove colon from time header)
 - rust-lang#107432 (rustdoc: remove unused class `has-srclink`)
 - rust-lang#107448 (When stamp doesn't exist, should say Error, and print path to stamp file)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 8691602 into rust-lang:master Jan 29, 2023
@rustbot rustbot added this to the 1.69.0 milestone Jan 29, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. 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