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.

Sign up for GitHub

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

Jump to bottom

fix confusing diagnostic for reserved ## #133487

Merged
merged 1 commit into from
Nov 28, 2024
Merged

fix confusing diagnostic for reserved ## #133487

merged 1 commit into from
Nov 28, 2024

Conversation

pitaj
Copy link
Contributor

@pitaj pitaj commented Nov 26, 2024

Closes #131615

@rustbot
Copy link
Collaborator

rustbot commented Nov 26, 2024

r? @fee1-dead

rustbot has assigned @fee1-dead.
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

@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 Nov 26, 2024
@pitaj pitaj added A-diagnostics Area: Messages for errors, warnings, and lints A-edition-2024 Area: The 2024 edition labels Nov 26, 2024
@traviscross
Copy link
Contributor

cc @ehuss

ehuss
ehuss approved these changes Nov 26, 2024
View reviewed changes
Copy link
Contributor

@ehuss ehuss left a comment

Choose a reason for hiding this comment

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

LGTM! Thanks!

@fee1-dead
Copy link
Member

@bors r+ rollup

@bors
Copy link
Contributor

bors commented Nov 28, 2024

📌 Commit 44f4f67 has been approved by fee1-dead

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 Nov 28, 2024
@GuillaumeGomez GuillaumeGomez mentioned this pull request Nov 28, 2024
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Nov 28, 2024
@bors
Auto merge of rust-lang#133568 - GuillaumeGomez:rollup-js22ovb, r=Gui…
9b4d7c6 
…llaumeGomez

Rollup of 7 pull requests

Successful merges:

 - rust-lang#133358 (Don't type error if we fail to coerce `Pin<T>` because it doesnt contain a ref)
 - rust-lang#133422 (Fix clobber_abi in RV32E and RV64E inline assembly)
 - rust-lang#133452 (Support predicate registers (clobber-only) in Hexagon inline assembly)
 - rust-lang#133463 (Fix handling of x18 in AArch64 inline assembly on ohos/trusty or with -Zfixed-x18)
 - rust-lang#133487 (fix confusing diagnostic for reserved `##`)
 - rust-lang#133557 (Small doc fixes in `rustc_codegen_ssa`)
 - rust-lang#133560 (Trim extra space in 'repeated `mut`' diagnostic)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit ca71c8f into rust-lang:master Nov 28, 2024
6 checks passed
@rustbot rustbot added this to the 1.85.0 milestone Nov 28, 2024
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Nov 28, 2024
@rust-timer
Unrolled build for rust-lang#133487
856773b 
Rollup merge of rust-lang#133487 - pitaj:reserve-guarded-strings, r=fee1-dead

fix confusing diagnostic for reserved `##`

Closes rust-lang#131615
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ehuss ehuss ehuss approved these changes

Assignees

@fee1-dead fee1-dead

Labels
A-diagnostics Area: Messages for errors, warnings, and lints A-edition-2024 Area: The 2024 edition 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
Milestone
1.85.0
Development

Successfully merging this pull request may close these issues.

2024: Reserved ## diagnostic is confusing
6 participants
@pitaj @rustbot @traviscross @fee1-dead @bors @ehuss