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.

Sign up for GitHub

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

Jump to bottom

Only compute DefKind through the query. #98881

Merged
merged 3 commits into from
Jul 6, 2022
Merged

Only compute DefKind through the query. #98881

merged 3 commits into from
Jul 6, 2022

Conversation

cjgillot
Copy link
Contributor

@cjgillot cjgillot commented Jul 4, 2022

No description provided.

@rust-highfive
Copy link
Collaborator

r? @fee1-dead

(rust-highfive has picked a reviewer for you, use r? to override)

@rustbot rustbot added the T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. label Jul 4, 2022
@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jul 4, 2022
fee1-dead
fee1-dead reviewed Jul 4, 2022
View reviewed changes
compiler/rustc_query_impl/src/plumbing.rs Outdated
@@ -291,7 +291,7 @@ macro_rules! define_queries {
// accidentally triggering an infinite query loop.
let def_kind = key.key_as_def_id()
.and_then(|def_id| def_id.as_local())
.and_then(|def_id| tcx.hir().opt_def_kind(def_id));
.map(|def_id| tcx.def_kind(def_id));
Copy link
Member

Choose a reason for hiding this comment

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

Is the comment resolved?

@fee1-dead fee1-dead added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jul 5, 2022
@fee1-dead
Copy link
Member

@bors r+

@bors
Copy link
Contributor

bors commented Jul 6, 2022

📌 Commit 3162986 has been approved by fee1-dead

@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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jul 6, 2022
@Dylan-DPC Dylan-DPC mentioned this pull request Jul 6, 2022
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Jul 6, 2022
@bors
Auto merge of rust-lang#98970 - Dylan-DPC:rollup-j0od37w, r=Dylan-DPC
049308c 
Rollup of 5 pull requests

Successful merges:

 - rust-lang#98881 (Only compute DefKind through the query.)
 - rust-lang#98884 (macros: `LintDiagnostic` derive)
 - rust-lang#98964 (fix typo in function name)
 - rust-lang#98967 (fix typo in note about multiple inaccessible type aliases)
 - rust-lang#98968 (assert Scalar sanity)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 707c0d9 into rust-lang:master Jul 6, 2022
@rustbot rustbot added this to the 1.64.0 milestone Jul 6, 2022
@cjgillot cjgillot deleted the q-def-kind branch July 6, 2022 20:32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@fee1-dead fee1-dead fee1-dead left review comments

Assignees

@fee1-dead fee1-dead

Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue.
Projects
None yet
Milestone
1.64.0
Development

Successfully merging this pull request may close these issues.
5 participants
@cjgillot @rust-highfive @fee1-dead @bors @rustbot