Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove the no_force query attribute #69475

Merged
merged 4 commits into from
Mar 10, 2020
Merged

Remove the no_force query attribute #69475

merged 4 commits into from
Mar 10, 2020

Conversation

Zoxc
Copy link
Contributor

@Zoxc Zoxc commented Feb 26, 2020

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

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Feb 26, 2020
@eddyb
Copy link
Member

eddyb commented Feb 26, 2020

LGTM at a glance, r? @michaelwoerister

@bors
Copy link
Contributor

bors commented Mar 3, 2020

☔ The latest upstream changes (presumably #69247) made this pull request unmergeable. Please resolve the merge conflicts.

@bors
Copy link
Contributor

bors commented Mar 6, 2020

☔ The latest upstream changes (presumably #69614) made this pull request unmergeable. Please resolve the merge conflicts.

Copy link
Member

@michaelwoerister michaelwoerister left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good. Nice clean up.

r=me with the documentation added as mentioned below.

@@ -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>;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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.

@Zoxc
Copy link
Contributor Author

Zoxc commented Mar 9, 2020

@bors r=michaelwoerister

@bors
Copy link
Contributor

bors commented Mar 9, 2020

📌 Commit 2f12009 has been approved by michaelwoerister

@bors
Copy link
Contributor

bors commented Mar 9, 2020

🌲 The tree is currently closed for pull requests below priority 1000, this pull request will be tested once the tree is reopened

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Mar 9, 2020
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
@bors bors merged commit 5b08aad into rust-lang:master Mar 10, 2020
@Zoxc Zoxc deleted the no-no-force branch March 10, 2020 10:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants