Reduce kw::Empty usage, part 1
#137977
Merged
Reduce kw::Empty usage, part 1
#137977
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
rustbot
added
A-compiletest
Contributor
Author
|
Best reviewed one commit at a time. |
Collaborator
|
Some changes occurred to the CTFE / Miri interpreter cc @rust-lang/miri Some changes occurred in src/tools/clippy cc @rust-lang/clippy Some changes occurred in src/tools/compiletest cc @jieyouxu Some changes occurred to the CTFE machinery Some changes occurred to MIR optimizations cc @rust-lang/wg-mir-opt |
nnethercote
force-pushed
the
less-kw-Empty-1
branch
from
292031d to
3ef8935
Compare
jieyouxu
reviewed
Mar 4, 2025
| if proc_res.status.success() || matches!(proc_res.status.code(), Some(1 | 0)) { | ||
| self.fatal(&format!( | ||
| "crashtest no longer crashes/triggers ICE, horray! Please give it a meaningful \ | ||
| "crashtest no longer crashes/triggers ICE, hooray! Please give it a meaningful \ |
Member
There was a problem hiding this comment.
I was like why did this PR get tagged as compiletest. 😆
spastorino
reviewed
Mar 4, 2025
Member
spastorino
left a comment
spastorino
left a comment
There was a problem hiding this comment.
I've left a minor comment r=me doing whatever you feel is better there :).
| | DefKind::AssocTy | ||
| | DefKind::TyParam | ||
| | DefKind::ExternCrate => DefPathData::TypeNs(name.unwrap()), | ||
| | DefKind::ExternCrate => DefPathData::TypeNs(Some(name.unwrap())), |
Member
There was a problem hiding this comment.
why not just name here? I guess you want to make the thing explode if is None?
Contributor
Author
There was a problem hiding this comment.
Yes. At the moment a None name only makes sense for DefKind::AssocTy, so I don't want to accept other combinations that aren't necessary.
Member
|
@bors r+ |
Collaborator
bors
added
S-waiting-on-bors
jhpratt
added a commit
to jhpratt/rust
that referenced
this pull request
Mar 7, 2025
…storino Reduce `kw::Empty` usage, part 1 This PR fixes some confusing `kw::Empty` usage, fixing a crash test along the way. r? `@spastorino`
matthiaskrgr
added a commit
to matthiaskrgr/rust
that referenced
this pull request
Mar 7, 2025
…storino Reduce `kw::Empty` usage, part 1 This PR fixes some confusing `kw::Empty` usage, fixing a crash test along the way. r? ``@spastorino``
Member
bors
added
S-waiting-on-author
It's clearer than using `kw::Empty` to mean `None`.
Currently it relies on special treatment of `kw::Empty`, which is really easy to get wrong. This commit makes the special case clearer in the type system by using `Option`. It's a bit clumsy, but the synthetic name handling itself is a bit clumsy; better to make it explicit than sneak it in. Fixes rust-lang#133426.
nnethercote
force-pushed
the
less-kw-Empty-1
branch
from
3ef8935 to
af92a33
Compare
Contributor
Author
|
I rebased. @bors r=spastorino |
Collaborator
bors
added
S-waiting-on-bors
This was referenced Mar 7, 2025
Merged
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
6 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.
This PR fixes some confusing
kw::Emptyusage, fixing a crash test along the way.r? @spastorino