Fix lifetime on LocalInternedString::get function #59227
Merged
Conversation
This file contains 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
| panic!("`{:?}` is not a valid identifier", string) | ||
| } | ||
| if is_raw { | ||
| let normalized_sym = Symbol::intern(string); | ||
| let normalized_sym = sym.interned(); |
There was a problem hiding this comment.
Re-interning here was intentional (to get rid of possible gensyms before checking).
There was a problem hiding this comment.
Hence the interned call.
| @@ -2160,9 +2160,11 @@ impl<'a> Parser<'a> { | |||
| suffix, | |||
| ) = self.token { | |||
| let suffix = suffix.and_then(|s| { | |||
| let s = s.as_str().get(); | |||
| if ["f32", "f64"].contains(&s) { | |||
There was a problem hiding this comment.
Hm, shouldn't this keep working with non-static lifetime?
Also, a typo "f64f64" below.
There was a problem hiding this comment.
No, the LocalInternedString is dropped in the first statement here.
There was a problem hiding this comment.
I assume this is going to ruin the fn ident_str API in #58899 then.
Treating an attribute name as &str (including matching on it, calling contains) is a common operation, so returning Option<LocalInternedString> instead and mapping on it every time would be a serious usability hit.
There was a problem hiding this comment.
Yeah. fn ident_str won't work. We should really use symbols for attribute names instead of comparing strings all the time.
There was a problem hiding this comment.
True, the issue is just that a lot of existing code across rustc uses strings.
eddyb
reviewed
Mar 16, 2019
| @@ -515,7 +515,7 @@ impl LocalInternedString { | |||
| } | |||
| } | |||
|
|
|||
| pub fn get(&self) -> &'static str { | |||
| pub fn get(&self) -> &str { | |||
There was a problem hiding this comment.
Please add a comment and maybe an ui-fulldeps test, to ensure this doesn't happen again?
And maybe self.string should be *const str instead.
There was a problem hiding this comment.
I made this use unsafe code. That should prevent people from modifying this without reading comments.
|
☔ The latest upstream changes (presumably #58899) made this pull request unmergeable. Please resolve the merge conflicts. |
bors
added
the
S-waiting-on-author
|
r? @eddyb |
|
The job Click to expand the log.I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact |
|
Thanks for fixing this, @Zoxc. It's certainly an interesting lesson for me in the potential non-local effects of |
eddyb
reviewed
Mar 21, 2019
src/libsyntax_pos/symbol.rs
Outdated
| } | ||
| } | ||
|
|
||
| impl<T: std::ops::Deref<Target = str>> std::cmp::PartialEq<T> for LocalInternedString { | ||
| fn eq(&self, other: &T) -> bool { | ||
| self.string == other.deref() | ||
| self.get() == other.deref() |
There was a problem hiding this comment.
IMO one should write *other rather than .deref().
eddyb
reviewed
Mar 21, 2019
src/libsyntax_pos/symbol.rs
Outdated
| @@ -530,37 +536,37 @@ where | |||
| str: std::convert::AsRef<U> | |||
| { | |||
| fn as_ref(&self) -> &U { | |||
| self.string.as_ref() | |||
| self.get().as_ref() | |||
| } | |||
| } | |||
|
|
|||
| impl<T: std::ops::Deref<Target = str>> std::cmp::PartialEq<T> for LocalInternedString { | |||
There was a problem hiding this comment.
Actually, isn't AsRef<str> common practice in these sort of situations?
eddyb
reviewed
Mar 21, 2019
src/libsyntax_pos/symbol.rs
Outdated
| } | ||
| } | ||
|
|
||
| impl std::cmp::PartialEq<LocalInternedString> for String { | ||
| fn eq(&self, other: &LocalInternedString) -> bool { | ||
| self == other.string | ||
| self == other.get() | ||
| } | ||
| } | ||
|
|
||
| impl<'a> std::cmp::PartialEq<LocalInternedString> for &'a String { |
There was a problem hiding this comment.
There are too many of these, maybe a macro should be used (which can do *other == *self, I think).
|
r=me with nits fixed (if at all, they're kind of inconsequential) |
eddyb
reviewed
Mar 22, 2019
src/libsyntax_pos/symbol.rs
Outdated
| @@ -510,18 +510,24 @@ fn with_interner<T, F: FnOnce(&mut Interner) -> T>(f: F) -> T { | |||
| // by creating a new thread right after constructing the interner. | |||
| #[derive(Clone, Copy, Hash, PartialOrd, Eq, Ord)] | |||
| pub struct LocalInternedString { | |||
| string: &'static str, | |||
| string: *const str, | |||
There was a problem hiding this comment.
I just realized this should probably be NonNull<str>.
|
The job Click to expand the log.I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact |
|
Ping from triage, @Zoxc |
eddyb
reviewed
Mar 30, 2019
src/libsyntax_pos/symbol.rs
Outdated
| @@ -514,18 +515,24 @@ fn with_interner<T, F: FnOnce(&mut Interner) -> T>(f: F) -> T { | |||
| // by creating a new thread right after constructing the interner. | |||
| #[derive(Clone, Copy, Hash, PartialOrd, Eq, Ord)] | |||
There was a problem hiding this comment.
Argh, all the derives are now wrong...
There was a problem hiding this comment.
I just changed this back to &'static str.
|
The job Click to expand the log.I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact |
|
@bors r+ |
|
📌 Commit 5ea959d has been approved by |
|
🌲 The tree is currently closed for pull requests below priority 15, this pull request will be tested once the tree is reopened |
bors
added
S-waiting-on-bors
cramertj
added a commit
to cramertj/rust
that referenced
this pull request
Apr 11, 2019
Fix lifetime on LocalInternedString::get function cc @eddyb @nnethercote
bors
added a commit
that referenced
this pull request
Apr 11, 2019
Fix lifetime on LocalInternedString::get function cc @eddyb @nnethercote
|
☀️ Test successful - checks-travis, status-appveyor |
This was referenced Apr 12, 2019
|
📣 Toolstate changed by #59227! Tested on commit cd8b437. 💔 clippy-driver on windows: test-pass → build-fail (cc @Manishearth @llogiq @mcarton @oli-obk @phansch, @rust-lang/infra). |
rust-highfive
added a commit
to rust-lang-nursery/rust-toolstate
that referenced
this pull request
Apr 12, 2019
Tested on commit rust-lang/rust@cd8b437. Direct link to PR: <rust-lang/rust#59227> 💔 clippy-driver on windows: test-pass → build-fail (cc @Manishearth @llogiq @mcarton @oli-obk @phansch, @rust-lang/infra). 💔 clippy-driver on linux: test-pass → build-fail (cc @Manishearth @llogiq @mcarton @oli-obk @phansch, @rust-lang/infra). 💔 miri on windows: test-fail → build-fail (cc @oli-obk @RalfJung @eddyb, @rust-lang/infra). 💔 miri on linux: test-fail → build-fail (cc @oli-obk @RalfJung @eddyb, @rust-lang/infra). 💔 rls on windows: test-pass → build-fail (cc @nrc @Xanewok, @rust-lang/infra). 💔 rls on linux: test-pass → build-fail (cc @nrc @Xanewok, @rust-lang/infra).
This was referenced Apr 12, 2019
bors
added a commit
to rust-lang/rust-clippy
that referenced
this pull request
Apr 12, 2019
Rustup cc rust-lang/rust#59227 (comment) This fix is obsolet once rust-lang/rust#59779 and #3926 is merged.
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.
cc @eddyb @nnethercote