const_generics: assert resolve hack causes an error #79236
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
rust-highfive
added
the
S-waiting-on-review
eddyb
reviewed
Nov 20, 2020
compiler/rustc_resolve/src/lib.rs
Outdated
Comment on lines
2642
to
2643
| } else { | ||
| self.session.delay_span_bug(span, CG_BUG_STR); |
There was a problem hiding this comment.
You don't need this in an else, delay_span_bug will early exit if an error has already been emitted.
(same for the other case)
There was a problem hiding this comment.
i personally prefer delay span in an else branch if the other branch "obviously" emits an error.
That's just a stylistic preference though. Changed it.
lcnr
force-pushed
the
mcg-resolve-dsb
branch
from
16e8287 to
34ea5d0
Compare
eddyb
approved these changes
Nov 23, 2020
|
@bors r+ |
|
📌 Commit c85af74 has been approved by |
bors
added
S-waiting-on-bors
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Nov 23, 2020
…as-schievink Rollup of 10 pull requests Successful merges: - rust-lang#76829 (stabilize const_int_pow) - rust-lang#79080 (MIR visitor: Don't treat debuginfo field access as a use of the struct) - rust-lang#79236 (const_generics: assert resolve hack causes an error) - rust-lang#79287 (Allow using generic trait methods in `const fn`) - rust-lang#79324 (Use Option::and_then instead of open-coding it) - rust-lang#79325 (Reduce boilerplate with the `?` operator) - rust-lang#79330 (Fix typo in comment) - rust-lang#79333 (doc typo) - rust-lang#79337 (Use Option::map instead of open coding it) - rust-lang#79343 (Add my (`@flip1995)` work mail to the mailmap) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
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.
prevent the min_const_generics
HACKs in resolve from triggering a fallback path which successfully compiles so that we don't have to worry about future compat issues when removing itr? @eddyb cc @varkor