Refactor type_of for constants #70478
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
rust-highfive
added
the
S-waiting-on-review
lcnr
commented
Mar 27, 2020
src/librustc_ast/ast.rs
Outdated
| @@ -194,6 +194,9 @@ pub enum GenericArg { | |||
| /// `'a` in `Foo<'a>` | |||
| Lifetime(Lifetime), | |||
| /// `Bar` in `Foo<Bar>` | |||
| /// | |||
| /// This is also used for const parameters | |||
| /// which are either `()` or a path. | |||
There was a problem hiding this comment.
This is actually not correct rn, as () currently requires braces
varkor
approved these changes
Mar 27, 2020
src/librustc_ast/ast.rs
Outdated
Comment on lines
198
to
199
| /// This is also used for const parameters | ||
| /// which are either `()` or a path. |
There was a problem hiding this comment.
Suggested change
| /// This is also used for const parameters | |
| /// which are either `()` or a path. | |
| /// This is also used for const parameters that are either `()` or a path, | |
| /// since we can't tell until type-checking (or sometimes name | |
| /// resolution), whether they refer to types or consts. This will be | |
| /// converted to consts later if we find out that's what they should have | |
| /// been all along. |
|
@bors r+ rollup |
|
📌 Commit c339b2e has been approved by |
bors
added
S-waiting-on-bors
Centril
added a commit
to Centril/rust
that referenced
this pull request
Mar 27, 2020
Refactor type_of for constants If I have to look at this function for a few hours I want it to at least look good. r? @varkor
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Mar 28, 2020
Rollup of 5 pull requests Successful merges: - rust-lang#70345 (Remove `no_integrated_as` mode.) - rust-lang#70434 (suggest `;` on expr `mac!()` which is good as stmt `mac!()`) - rust-lang#70457 (non-exhastive diagnostic: add note re. scrutinee type) - rust-lang#70478 (Refactor type_of for constants) - rust-lang#70480 (clarify hir_id <-> node_id method names) Failed merges: r? @ghost
16 tasks
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.
If I have to look at this function for a few hours I want it to at least look good.
r? @varkor