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

Remove opt_remap_env_constness from rustc_query_impl #100243

Merged
merged 2 commits into from
Aug 16, 2022
Merged

Remove opt_remap_env_constness from rustc_query_impl #100243

merged 2 commits into from
Aug 16, 2022

Conversation

kckeiks
Copy link
Contributor

@kckeiks kckeiks commented Aug 7, 2022

1st task off #96524.

r? @cjgillot

@rustbot rustbot added the T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. label Aug 7, 2022
@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Aug 7, 2022
@kckeiks
Copy link
Contributor Author

kckeiks commented Aug 7, 2022

This macro is used here in rustc_query_impl so it has to be imported if its definition is removed from the crate.

@cjgillot
Copy link
Contributor

cjgillot commented Aug 7, 2022

Can uses of this macro be removed from here too?
Normally, rustc_middle::ty::query is responsible for calling it.
Could you check that it does so everywhere? Maybe replace the contents of the macro inside rustc_query_impl by an assertion?

@cjgillot cjgillot 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 Aug 7, 2022
@kckeiks
Remove opt_remap_env_constness from rustc_query_impl
ffb925c 
Signed-off-by: Miguel Guarniz <mi9uel9@gmail.com>
@kckeiks kckeiks force-pushed the remove-macros-in-query-system branch from c1697d6 to baaf927 Compare August 15, 2022 18:36
@kckeiks
Copy link
Contributor Author

kckeiks commented Aug 15, 2022

@rustbot label -S-waiting-on-author +S-waiting-on-review

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Aug 15, 2022
@kckeiks
Remove usages of opt_remap_env_constness
3a37f0b 
Signed-off-by: Miguel Guarniz <mi9uel9@gmail.com>
@kckeiks kckeiks force-pushed the remove-macros-in-query-system branch from baaf927 to 3a37f0b Compare August 16, 2022 01:26
@cjgillot
Copy link
Contributor

@bors r+

@bors
Copy link
Contributor

bors commented Aug 16, 2022

📌 Commit 3a37f0b has been approved by cjgillot

It is now in the queue for this repository.

@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 Aug 16, 2022
@TaKO8Ki TaKO8Ki mentioned this pull request Aug 16, 2022
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Aug 16, 2022
@bors
Auto merge of rust-lang#100644 - TaKO8Ki:rollup-n0o6a1t, r=TaKO8Ki
86c6ebe 
Rollup of 4 pull requests

Successful merges:

 - rust-lang#100243 (Remove opt_remap_env_constness from rustc_query_impl)
 - rust-lang#100625 (Add `IpDisplayBuffer` helper struct.)
 - rust-lang#100629 (Use `merged_ty` method instead of rewriting it every time)
 - rust-lang#100630 (rustdoc JSON: Fix ICE with `pub extern crate self as <self_crate_name>`)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit e6d4792 into rust-lang:master Aug 16, 2022
@rustbot rustbot added this to the 1.65.0 milestone Aug 16, 2022
@bjorn3 bjorn3 mentioned this pull request Aug 17, 2022
Closed
6 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@cjgillot cjgillot

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.65.0
Development

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