Remove the no_force query attribute
#69475
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
|
LGTM at a glance, r? @michaelwoerister |
|
☔ The latest upstream changes (presumably #69247) made this pull request unmergeable. Please resolve the merge conflicts. |
|
☔ The latest upstream changes (presumably #69614) made this pull request unmergeable. Please resolve the merge conflicts. |
| @@ -400,6 +376,8 @@ trait DepNodeParams<'tcx>: fmt::Debug { | |||
| fn to_debug_str(&self, _: TyCtxt<'tcx>) -> String { | |||
| format!("{:?}", self) | |||
| } | |||
|
|
|||
| fn recover(tcx: TyCtxt<'tcx>, dep_node: &DepNode) -> Option<Self>; | |||
There was a problem hiding this comment.
Please add a comment like:
/// This method tries to recover the query key from the given `DepNode`,
/// something which is needed when forcing `DepNode`s during red-green
/// evaluation. The query system will only call this method if
/// `CAN_RECONSTRUCT_QUERY_KEY` is `true`.
/// It is always valid to return `None` here, in which case incremental
/// compilation will treat the query as having changed.
|
@bors r=michaelwoerister |
|
📌 Commit 2f12009 has been approved by |
|
🌲 The tree is currently closed for pull requests below priority 1000, this pull request will be tested once the tree is reopened |
bors
added
S-waiting-on-bors
Centril
added a commit
to Centril/rust
that referenced
this pull request
Mar 9, 2020
Remove the `no_force` query attribute This removes the `no_force` query attribute and instead uses the `DepNodeParams` trait to find out if a query can be forced. Also the `analysis` query is moved to the query macro. r? @eddyb
bors
added a commit
that referenced
this pull request
Mar 9, 2020
Rollup of 6 pull requests Successful merges: - #69475 (Remove the `no_force` query attribute) - #69514 (Remove spotlight) - #69677 (rustc_metadata: Give decoder access to whole crate store) - #69714 (Make PlaceRef take just one lifetime) - #69799 (Allow ZSTs in `AllocRef`) - #69836 (Check if output is immediate value) Failed merges: r? @ghost
bors
added a commit
that referenced
this pull request
Mar 10, 2020
Rollup of 10 pull requests Successful merges: - #69475 (Remove the `no_force` query attribute) - #69514 (Remove spotlight) - #69677 (rustc_metadata: Give decoder access to whole crate store) - #69714 (Make PlaceRef take just one lifetime) - #69799 (Allow ZSTs in `AllocRef`) - #69817 (test(patterns): add patterns feature tests to borrowck test suite) - #69836 (Check if output is immediate value) - #69847 (clean up E0393 explanation) - #69861 (Add note about localization to std::fmt docs) - #69877 (Vec::new is const stable in 1.39 not 1.32) Failed merges: r? @ghost
# for free
to join this conversation on GitHub.
Already have an account?
# 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.
This removes the
no_forcequery attribute and instead uses theDepNodeParamstrait to find out if a query can be forced.Also the
analysisquery is moved to the query macro.r? @eddyb