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

make "invalid fragment specifier" translatable #121067

Merged
merged 2 commits into from
Feb 18, 2024

Conversation

tshepang
Copy link
Member

No description provided.

@rustbot
Copy link
Collaborator

rustbot commented Feb 14, 2024

r? @michaelwoerister

rustbot has assigned @michaelwoerister.
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 Feb 14, 2024
sess.dcx().emit_err(
errors::InvalidFragmentSpecifier {
span,
name: frag.name.to_string(),
Copy link
Member

@fmease fmease Feb 14, 2024

Choose a reason for hiding this comment

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

Could you pass Ident directly here (and ofc update InvalidFragmentSpecifier)?

Suggested change
name: frag.name.to_string(),
name: frag,

This way, we would properly print invalid fragment specifier `r#async` instead of invalid fragment specifier `async` for:

macro_rules! m { ($x:r#async) => {} }

(and avoid an allocation but that doesn't really matter since we're in the error path)

@fmease fmease assigned fmease and unassigned michaelwoerister Feb 14, 2024
tshepang added a commit to tshepang/rust that referenced this pull request Feb 15, 2024
@tshepang
Copy link
Member Author

this would still display async, but I could have misunderstood

Copy link
Member

@fmease fmease left a comment

Choose a reason for hiding this comment

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

Thanks! Could you squash the commits into one?

@fmease
Copy link
Member

fmease commented Feb 16, 2024

this would still display async, but I could have misunderstood

Did you test that with rustc +stage1? In this case, it would default to Rust 2015 in which async isn't a keyword, so yeah it would still get displayed as async. If you try Rust 2021 however for example (--edition=2021) it should get displayed as r#async.

Maybe if would've been a better example since it's not edition-dependent.

@tshepang
Copy link
Member Author

tshepang commented Feb 16, 2024

I used an existing test to check, and I see using r#if gives me what you say should happen. Let me add the missing test.

Copy link
Member

Choose a reason for hiding this comment

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

We already have tests for invalid fragment specifiers, e.g., tests/ui/macros/macro-invalid-fragment-spec.rs. Actually instead of modifying this old test file, could you just remove it in favor of the new one you just added. I like your test file way better. After that, we're good to go!

Also replaces an incomplete test
@fmease
Copy link
Member

fmease commented Feb 18, 2024

Thanks!
@bors r+ rollup

@bors
Copy link
Contributor

bors commented Feb 18, 2024

📌 Commit e3859d2 has been approved by fmease

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 Feb 18, 2024
CKingX added a commit to CKingX/rust that referenced this pull request Feb 18, 2024
… r=fmease

make "invalid fragment specifier" translatable
GuillaumeGomez added a commit to GuillaumeGomez/rust that referenced this pull request Feb 18, 2024
… r=fmease

make "invalid fragment specifier" translatable
bors added a commit to rust-lang-ci/rust that referenced this pull request Feb 18, 2024
…llaumeGomez

Rollup of 5 pull requests

Successful merges:

 - rust-lang#121067 (make "invalid fragment specifier" translatable)
 - rust-lang#121079 (distribute tool documentations and avoid file conflicts on `x install`)
 - rust-lang#121230 (Extend Level API)
 - rust-lang#121241 (Implement `NonZero` traits generically.)
 - rust-lang#121247 (Add help to `hir_analysis_unrecognized_intrinsic_function`)

r? `@ghost`
`@rustbot` modify labels: rollup
bors added a commit to rust-lang-ci/rust that referenced this pull request Feb 18, 2024
…iaskrgr

Rollup of 7 pull requests

Successful merges:

 - rust-lang#118569 (Move `OsStr::slice_encoded_bytes` validation to platform modules)
 - rust-lang#121067 (make "invalid fragment specifier" translatable)
 - rust-lang#121224 (Remove unnecessary unit binding)
 - rust-lang#121247 (Add help to `hir_analysis_unrecognized_intrinsic_function`)
 - rust-lang#121257 (remove extraneous text from example config)
 - rust-lang#121260 (Remove const_prop.rs)
 - rust-lang#121266 (Add uncontroversial syscall doc aliases to std docs)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit ddf6c6d into rust-lang:master Feb 18, 2024
11 checks passed
@rustbot rustbot added this to the 1.78.0 milestone Feb 18, 2024
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Feb 18, 2024
Rollup merge of rust-lang#121067 - tshepang:make-expand-translatable, r=fmease

make "invalid fragment specifier" translatable
Noratrieb pushed a commit to Noratrieb/rust that referenced this pull request Feb 18, 2024
…iaskrgr

Rollup of 7 pull requests

Successful merges:

 - rust-lang#118569 (Move `OsStr::slice_encoded_bytes` validation to platform modules)
 - rust-lang#121067 (make "invalid fragment specifier" translatable)
 - rust-lang#121224 (Remove unnecessary unit binding)
 - rust-lang#121247 (Add help to `hir_analysis_unrecognized_intrinsic_function`)
 - rust-lang#121257 (remove extraneous text from example config)
 - rust-lang#121260 (Remove const_prop.rs)
 - rust-lang#121266 (Add uncontroversial syscall doc aliases to std docs)

r? `@ghost`
`@rustbot` modify labels: rollup
@tshepang tshepang deleted the make-expand-translatable branch February 19, 2024 03:32
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.

5 participants