Skip to content

Conversation

jdonszelmann
Copy link
Contributor

r? estebank

tiny diagnostic fix, mostly we were using the wrong method on the context so I added a new method that is right for the situation

@rustbot rustbot added A-attributes Area: Attributes (`#[…]`, `#![…]`) 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 Sep 16, 2025
@jdonszelmann jdonszelmann force-pushed the bug-proc-macro-derive-diags branch from ca8d53a to 665024c Compare September 18, 2025 00:56
@rustbot

This comment has been minimized.

@jdonszelmann jdonszelmann force-pushed the bug-proc-macro-derive-diags branch from 665024c to 5319b5e Compare September 18, 2025 00:59
@rustbot
Copy link
Collaborator

rustbot commented Sep 18, 2025

rust-analyzer is developed in its own repository. If possible, consider making this change to rust-lang/rust-analyzer instead.

cc @rust-lang/rust-analyzer

These commits modify the Cargo.lock file. Unintentional changes to Cargo.lock can be introduced when switching branches and rebasing PRs.

If this was unintentional then you should revert the changes before this PR is merged.
Otherwise, you can ignore this comment.

Some changes occurred in diagnostic error codes

cc @GuillaumeGomez

@rustbot rustbot added the T-rust-analyzer Relevant to the rust-analyzer team, which will review and decide on the PR/issue. label Sep 18, 2025
@jdonszelmann jdonszelmann force-pushed the bug-proc-macro-derive-diags branch from 5319b5e to 548489e Compare September 18, 2025 15:50
Copy link
Member

@GuillaumeGomez GuillaumeGomez left a comment

Choose a reason for hiding this comment

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

Error code changes look good to me, thanks! Gonna let estebank handle the rest. :)

View changes since this review

@bors
Copy link
Collaborator

bors commented Sep 22, 2025

☔ The latest upstream changes (presumably #146862) made this pull request unmergeable. Please resolve the merge conflicts.

@jdonszelmann jdonszelmann force-pushed the bug-proc-macro-derive-diags branch from 548489e to 2985abf Compare September 22, 2025 04:41
@rustbot

This comment has been minimized.

@bors
Copy link
Collaborator

bors commented Sep 25, 2025

☔ The latest upstream changes (presumably #147019) made this pull request unmergeable. Please resolve the merge conflicts.

@jdonszelmann jdonszelmann force-pushed the bug-proc-macro-derive-diags branch from 2985abf to 94efefb Compare September 27, 2025 15:27
@rustbot

This comment has been minimized.

@rust-log-analyzer

This comment has been minimized.

@jdonszelmann
Copy link
Contributor Author

r? compiler

@rustbot rustbot assigned nnethercote and unassigned estebank Sep 28, 2025
@jdonszelmann jdonszelmann force-pushed the bug-proc-macro-derive-diags branch from 94efefb to 088afec Compare September 28, 2025 13:30
@rustbot
Copy link
Collaborator

rustbot commented Sep 28, 2025

This PR was rebased onto a different master 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.

@jdonszelmann
Copy link
Contributor Author

oh actually @rustbot blocked on #146652

@rustbot rustbot added S-blocked Status: Blocked on something else such as an RFC or other implementation work. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Sep 28, 2025
@rust-log-analyzer
Copy link
Collaborator

The job aarch64-gnu-llvm-20-1 failed! Check out the build log: (web) (plain enhanced) (plain)

Click to see the possible cause of the failure (guessed by this bot)
   Compiling rustc_attr_parsing v0.0.0 (/checkout/compiler/rustc_attr_parsing)
error: unused import: `LimitInvalid`
 --> compiler/rustc_attr_parsing/src/attributes/crate_level.rs:2:61
  |
2 | use crate::session_diagnostics::{FeatureExpectedSingleWord, LimitInvalid};
  |                                                             ^^^^^^^^^^^^
  |
  = note: `-D unused-imports` implied by `-D warnings`
  = help: to override `-D warnings` add `#[allow(unused_imports)]`

pub fn foo1(input: TokenStream) -> TokenStream { input }
pub fn foo1(input: TokenStream) -> TokenStream {
input
}
Copy link
Contributor

Choose a reason for hiding this comment

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

Can you undo the reformatting of this file? Files within tests/ui/ aren't auto-formatted, and it's just churn that obscures the actual change in this commit.

@nnethercote
Copy link
Contributor

r=me once #146652 merges and with the reformatting undone.

@bors delegate=jdonszelmann

@bors
Copy link
Collaborator

bors commented Sep 28, 2025

✌️ @jdonszelmann, you can now approve this pull request!

If @nnethercote told you to "r=me" after making some further change, please make that change, then do @bors r=@nnethercote

@bors
Copy link
Collaborator

bors commented Oct 5, 2025

☔ The latest upstream changes (presumably #147345) made this pull request unmergeable. Please resolve the merge conflicts.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-attributes Area: Attributes (`#[…]`, `#![…]`) S-blocked Status: Blocked on something else such as an RFC or other implementation work. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-rust-analyzer Relevant to the rust-analyzer 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