don't panic on extern with just multiple quotes in the name#147413
Merged
bors merged 1 commit intorust-lang:masterfrom Oct 7, 2025
Merged
don't panic on extern with just multiple quotes in the name#147413bors merged 1 commit intorust-lang:masterfrom
bors merged 1 commit intorust-lang:masterfrom
Conversation
fmease
requested changes
Oct 6, 2025
| /// If called on an empty ident, or with name just single quotes, returns an empty ident which is invalid. | ||
| /// Creating empty ident will trigger debug assertions. | ||
| /// Use `without_first_quote_checked` instead if not certain this will return valid ident. | ||
| pub fn without_first_quote(self) -> Ident { |
Member
There was a problem hiding this comment.
This function is called “without first quote”, it's meant to only remove the first quote. Good catch regarding trim_start_matches (I hope nobody in the compiler is "relying" on this behavior); so please replace it with strip_prefix if possible (see suggestion below)
compiler/rustc_span/src/symbol.rs
Outdated
| /// Creating empty ident will trigger debug assertions. | ||
| /// Use `without_first_quote_checked` instead if not certain this will return valid ident. | ||
| pub fn without_first_quote(self) -> Ident { | ||
| Ident::new(Symbol::intern(self.as_str().trim_start_matches('\'')), self.span) |
Member
There was a problem hiding this comment.
Suggested change
| Ident::new(Symbol::intern(self.as_str().trim_start_matches('\'')), self.span) | |
| self.as_str().strip_prefix('\'').map_or(self, |name| Ident::new(Symbol::intern(name), self.span)) |
similarly for the newly introduced function if it's even needed (I've only skimmed this PR).
Member
Author
There was a problem hiding this comment.
Yes, you're right I forgot that the function is without_first_quote. Let's verify that this doesn't introduce any weird regression as you mentioned though.
c8d0983 to
cb06d91
Compare
Member
Author
|
Now the |
Member
|
CI should be sufficient, it runs most tests we're interested in for this sort of change. |
fmease
approved these changes
Oct 6, 2025
Member
|
Thanks for catching this! r? fmease @bors r+ rollup |
Collaborator
matthiaskrgr
added a commit
to matthiaskrgr/rust
that referenced
this pull request
Oct 7, 2025
…, r=fmease don't panic on extern with just multiple quotes in the name Continues rust-lang#147377. That PR fixed ICE when the extern name was a single quote `"'"`, but multiple quotes like `"''"` cause the same problem. I had a random revelation that the trimming can remove more than one quote. r? `@nnethercote`
This was referenced Oct 7, 2025
bors
added a commit
that referenced
this pull request
Oct 7, 2025
Rollup of 7 pull requests Successful merges: - #145495 (Use declarative macro for `#[derive(TryFromU32)]`) - #147165 (test: Subtract code_offset from width for ui_testing) - #147354 (Fix wrong span for hightlight for duplicated diff lines) - #147395 (Improve diagnostics: update note and add help message) - #147396 (Fluent tidy improvements) - #147407 (Update books) - #147413 (don't panic on extern with just multiple quotes in the name) r? `@ghost` `@rustbot` modify labels: rollup
rust-timer
added a commit
that referenced
this pull request
Oct 7, 2025
Rollup merge of #147413 - karolzwolak:extern-multiple-quotes, r=fmease don't panic on extern with just multiple quotes in the name Continues #147377. That PR fixed ICE when the extern name was a single quote `"'"`, but multiple quotes like `"''"` cause the same problem. I had a random revelation that the trimming can remove more than one quote. r? ``@nnethercote``
github-actions bot
pushed a commit
to rust-lang/miri
that referenced
this pull request
Oct 8, 2025
Rollup of 7 pull requests Successful merges: - rust-lang/rust#145495 (Use declarative macro for `#[derive(TryFromU32)]`) - rust-lang/rust#147165 (test: Subtract code_offset from width for ui_testing) - rust-lang/rust#147354 (Fix wrong span for hightlight for duplicated diff lines) - rust-lang/rust#147395 (Improve diagnostics: update note and add help message) - rust-lang/rust#147396 (Fluent tidy improvements) - rust-lang/rust#147407 (Update books) - rust-lang/rust#147413 (don't panic on extern with just multiple quotes in the name) r? `@ghost` `@rustbot` modify labels: rollup
flip1995
pushed a commit
to flip1995/rust-clippy
that referenced
this pull request
Oct 18, 2025
Rollup of 7 pull requests Successful merges: - rust-lang/rust#145495 (Use declarative macro for `#[derive(TryFromU32)]`) - rust-lang/rust#147165 (test: Subtract code_offset from width for ui_testing) - rust-lang/rust#147354 (Fix wrong span for hightlight for duplicated diff lines) - rust-lang/rust#147395 (Improve diagnostics: update note and add help message) - rust-lang/rust#147396 (Fluent tidy improvements) - rust-lang/rust#147407 (Update books) - rust-lang/rust#147413 (don't panic on extern with just multiple quotes in the name) r? `@ghost` `@rustbot` modify labels: rollup
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Continues #147377.
That PR fixed ICE when the extern name was a single quote
"'", but multiple quotes like"''"cause the same problem.I had a random revelation that the trimming can remove more than one quote.
r? @nnethercote