Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Remove CrateNum parameter for queries that only work on local crate #85178

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

Merged
merged 19 commits into from
May 17, 2021
Merged

Remove CrateNum parameter for queries that only work on local crate #85178

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
85a14d7
Use () in dependency_formats.
cjgillot May 11, 2021
3a72991
Use () in reachable_set.
cjgillot May 11, 2021
601453a
Use () for HIR queries.
cjgillot May 11, 2021
829a9d3
Use () for entry_fn.
cjgillot May 11, 2021
e9e1900
Use () for plugin_registrar_fn.
cjgillot May 11, 2021
b7bf467
Use () for proc_macro_decls_static.
cjgillot May 11, 2021
9d15abe
Use () for lint_levels.
cjgillot May 11, 2021
75f4f6e
Use () for mir_keys.
cjgillot May 11, 2021
09f205a
Use () for crate_variances.
cjgillot May 11, 2021
3aa6f3e
Use () for inferred_outlives_crate.
cjgillot May 11, 2021
837f3e3
Use () for inherent_impls.
cjgillot May 11, 2021
2c71ad4
Use () for typeck_item_bodies.
cjgillot May 11, 2021
9849327
Use () for privacy.
cjgillot May 11, 2021
437a46d
Use () for lang items.
cjgillot May 11, 2021
7f25b9f
Use () for visible_parent_map.
cjgillot May 11, 2021
4e8d4bd
Use () for all_traits.
cjgillot May 11, 2021
0bde3b1
Use () for codegen queries.
cjgillot May 11, 2021
1fb9cad
Use () for analysis.
cjgillot May 11, 2021
1ebf6d1
Bless tests.
cjgillot May 11, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Use () for crate_variances.
  • Loading branch information
@cjgillot
cjgillot committed May 12, 2021
commit 09f205ac57b2eac47c043e60546cc4a98bcb70cb
2 changes: 1 addition & 1 deletion compiler/rustc_middle/src/query/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -544,7 +544,7 @@ rustc_queries! {
}

/// Gets a map with the variance of every item; use `item_variance` instead.
query crate_variances(_: CrateNum) -> ty::CrateVariancesMap<'tcx> {
query crate_variances(_: ()) -> ty::CrateVariancesMap<'tcx> {
storage(ArenaCacheSelector<'tcx>)
desc { "computing the variances for items in this crate" }
}
Expand Down
7 changes: 3 additions & 4 deletions compiler/rustc_typeck/src/variance/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
use hir::Node;
use rustc_arena::DroplessArena;
use rustc_hir as hir;
use rustc_hir::def_id::{CrateNum, DefId, LOCAL_CRATE};
use rustc_hir::def_id::DefId;
use rustc_middle::ty::query::Providers;
use rustc_middle::ty::{self, CrateVariancesMap, TyCtxt};

Expand All @@ -30,8 +30,7 @@ pub fn provide(providers: &mut Providers) {
*providers = Providers { variances_of, crate_variances, ..*providers };
}

fn crate_variances(tcx: TyCtxt<'_>, crate_num: CrateNum) -> CrateVariancesMap<'_> {
assert_eq!(crate_num, LOCAL_CRATE);
fn crate_variances(tcx: TyCtxt<'_>, (): ()) -> CrateVariancesMap<'_> {
let arena = DroplessArena::default();
let terms_cx = terms::determine_parameters_to_be_inferred(tcx, &arena);
let constraints_cx = constraints::add_constraints_from_crate(terms_cx);
Expand Down Expand Up @@ -79,6 +78,6 @@ fn variances_of(tcx: TyCtxt<'_>, item_def_id: DefId) -> &[ty::Variance] {

// Everything else must be inferred.

let crate_map = tcx.crate_variances(LOCAL_CRATE);
let crate_map = tcx.crate_variances(());
crate_map.variances.get(&item_def_id).copied().unwrap_or(&[])
}