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

Change arena_cache to not alter the declared query result #107758

Merged
merged 1 commit into from
Feb 8, 2023

Conversation

Zoxc
Copy link
Contributor

@Zoxc Zoxc commented Feb 7, 2023

This makes the return types a bit clearer, limiting arena_cache's effect to just the computation side. It also makes it easier to potentially remove arena_cache.

r? @cjgillot

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Feb 7, 2023
@cjgillot
Copy link
Contributor

cjgillot commented Feb 7, 2023

This is just syntax changes and type aliases, should not cause any perf effect.
@bors r+ rollup

@bors
Copy link
Contributor

bors commented Feb 7, 2023

📌 Commit 94f67e0 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 Feb 7, 2023
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Feb 8, 2023
Change `arena_cache` to not alter the declared query result

This makes the return types a bit clearer, limiting `arena_cache`'s effect to just the computation side. It also makes it easier to potentially remove `arena_cache`.

r? `@cjgillot`
@matthiaskrgr
Copy link
Member

@bors r-
https://github.com/rust-lang/rust/actions/runs/4121278862/jobs/7116811482

    Checking rustc_codegen_ssa v0.0.0 (/checkout/compiler/rustc_codegen_ssa)
    Checking rustc_resolve v0.0.0 (/checkout/compiler/rustc_resolve)
error[E0308]: mismatched types
   --> compiler/rustc_codegen_ssa/src/back/symbol_export.rs:442:48
    |
442 |     providers.upstream_monomorphizations_for = upstream_monomorphizations_for_provider;
    |                                                ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ expected reference, found enum `Option`
    |
    = note: expected fn pointer `for<'tcx> fn(TyCtxt<'tcx>, DefId) -> &'tcx Option<&'tcx HashMap<&'tcx rustc_middle::ty::List<rustc_middle::ty::GenericArg<'tcx>>, CrateNum, BuildHasherDefault<FxHasher>>>`
                  found fn item `for<'a> fn(TyCtxt<'a>, DefId) -> Option<&'a HashMap<..., ..., ...>> {upstream_monomorphizations_for_provider}`

@bors bors 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-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Feb 8, 2023
@Zoxc
Copy link
Contributor Author

Zoxc commented Feb 8, 2023

Rebased and fixed the error.

@cjgillot
Copy link
Contributor

cjgillot commented Feb 8, 2023

@bors r+

@bors
Copy link
Contributor

bors commented Feb 8, 2023

📌 Commit a0b96fd 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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Feb 8, 2023
Dylan-DPC added a commit to Dylan-DPC/rust that referenced this pull request Feb 8, 2023
Change `arena_cache` to not alter the declared query result

This makes the return types a bit clearer, limiting `arena_cache`'s effect to just the computation side. It also makes it easier to potentially remove `arena_cache`.

r? `@cjgillot`
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Feb 8, 2023
Change `arena_cache` to not alter the declared query result

This makes the return types a bit clearer, limiting `arena_cache`'s effect to just the computation side. It also makes it easier to potentially remove `arena_cache`.

r? ``@cjgillot``
bors added a commit to rust-lang-ci/rust that referenced this pull request Feb 8, 2023
…iaskrgr

Rollup of 8 pull requests

Successful merges:

 - rust-lang#105641 (Implement cursors for BTreeMap)
 - rust-lang#107271 (Treat Drop as a rmw operation)
 - rust-lang#107710 (Update strip-ansi-escapes and vte)
 - rust-lang#107758 (Change `arena_cache` to not alter the declared query result)
 - rust-lang#107777 (Make `derive_const` derive properly const-if-const impls)
 - rust-lang#107780 (Rename `replace_bound_vars_with_*` to `instantiate_binder_with_*`)
 - rust-lang#107793 (Add missing tracking issue for `RawOsError`)
 - rust-lang#107807 (Fix small debug typo)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit abc2203 into rust-lang:master Feb 8, 2023
@rustbot rustbot added this to the 1.69.0 milestone Feb 8, 2023
@Zoxc Zoxc deleted the arena-enref branch February 14, 2023 12:12
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. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants