fix: escape keywords used as names in earlier editions #13034
Merged
Conversation
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
|
I wanted to add a test, but I couldn't figure out how (I manually tested and confirmed #13030 is resolved with the patch). I even doubt if it's possible for the time being. Ideally we want to test something like this in nameres tests: //- /main.rs crate:main deps:liba edition:2015
#[macro_use]
extern crate liba;
use liba::try;
//- /lib.rs crate:liba edition:2018
#[macro_export]
macro_rules! r#try { () => {} }but we cannot, because it seems we unconditionally parse |
lowr
force-pushed
the
fix/regression-from-12993
branch
from
8f740d7 to
6e341fe
Compare
Veykril
reviewed
Aug 16, 2022
|
@bors d+ |
|
@bors delegate+ |
|
✌️ @lowr can now approve this pull request |
lowr
force-pushed
the
fix/regression-from-12993
branch
from
6e341fe to
a3409c3
Compare
|
@bors r+ |
|
☀️ Test successful - checks-actions |
bors
added a commit
that referenced
this pull request
Feb 14, 2023
fix: Search raw identifiers without prefix When we find references/usages of a raw identifier, we should disregard `r#` prefix because there are keywords one can use without the prefix in earlier editions (see #13034; this bug is actually fallout from the PR). `name`, the text we're searching for, has already been stripped of the prefix, but the text of nodes we compare it to hasn't been. The second commit is strictly refactoring, I can remove it if it's not much of value.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Fixes #13030
There are keywords in Rust 2018+ that you can use as names without escaping when your crate is in Rust 2015 e.g. "try". We need to be consistent on how to keep track of the names regardless of how they are actually written in each crate. This patch attempts at it by taking such names into account and storing them uniformly in their escaped form.