Remove some usage of DUMMY_HIR_ID
#71069
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
|
r? @davidtwco (rust_highfive has picked a reviewer for you, use r? to override) |
rust-highfive
added
the
S-waiting-on-review
|
cc @eddyb |
eddyb
reviewed
Apr 12, 2020
| cause: ObligationCause::misc(span, hir::DUMMY_HIR_ID), | ||
| cause: ObligationCause::misc(span, hir::CRATE_HIR_ID), |
There was a problem hiding this comment.
cc @nikomatsakis Is this a good way to encode this?
There was a problem hiding this comment.
Oh this is what ObligationCause::dummy does, heh.
There was a problem hiding this comment.
Yes, i just "copied" what was done in dummy
eddyb
approved these changes
Apr 12, 2020
|
@bors r+ Thanks! |
|
📌 Commit 8f5605a71ad2d2c74b3b3120fbbe193561dca9bc has been approved by |
bors
added
S-waiting-on-bors
|
@bors rollup |
|
@bors r- in case @marmeladema wants to add more commits to it, it's not like it's high up in the queue |
bors
added
S-waiting-on-author
marmeladema
force-pushed
the
dummy-hir-id-obligation-clause
branch
from
8f5605a to
71d99b3
Compare
marmeladema
changed the title
DUMMY_HIR_ID in calls to ObligationClause::miscDUMMY_HIR_ID
Use `ObligationClause::dummy()` when appropriate or replace `hir::DUMMY_HIR_ID` by `hir::CRATE_HIR_ID`, as used in `ObligationClause::dummy()`.
marmeladema
force-pushed
the
dummy-hir-id-obligation-clause
branch
from
71d99b3 to
0634789
Compare
eddyb
reviewed
Apr 12, 2020
Comment on lines
-363
to
+362
| self.check_inline(DUMMY_HIR_ID, attr, &stmt.span, Target::Statement); | ||
| self.check_inline(l.hir_id, attr, &stmt.span, Target::Statement); |
There was a problem hiding this comment.
Heh this is a bugfix (#[allow] & friends will now work correctly).
eddyb
approved these changes
Apr 12, 2020
|
@bors r+ |
|
📌 Commit 0634789 has been approved by |
bors
added
S-waiting-on-bors
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Apr 12, 2020
Rollup of 4 pull requests Successful merges: - rust-lang#67766 (Fix warning for unused variables in or pattern (issue rust-lang#67691)) - rust-lang#71013 (Pass the `PlaceElem::Index` local to `visit_local`) - rust-lang#71064 (fix issue 69130) - rust-lang#71069 (Remove some usage of `DUMMY_HIR_ID`) Failed merges: r? @ghost
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.
Use
ObligationClause::dummy()when appropriate or replacehir::DUMMY_HIR_IDbyhir::CRATE_HIR_ID, as used inObligationClause::dummy().