Skip to content

Commit 2becacf

Browse files
authored
Rollup merge of #143261 - compiler-errors:explicit-pred, r=oli-obk
Feed `explicit_predicates_of` instead of `predicates_of` Tiny nitpick, just avoiding needing to mark the `predicates_of` query as feedable since it's derived from `explicit_predicates_of`.
2 parents 2ce579d + ef4f719 commit 2becacf

File tree

3 files changed

+1
-3
lines changed

3 files changed

+1
-3
lines changed

compiler/rustc_macros/src/query.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -413,7 +413,6 @@ pub(super) fn rustc_queries(input: TokenStream) -> TokenStream {
413413
"Query {name} cannot be both `feedable` and `eval_always`."
414414
);
415415
feedable_queries.extend(quote! {
416-
#(#doc_comments)*
417416
[#attribute_stream] fn #name(#arg) #result,
418417
});
419418
}

compiler/rustc_middle/src/query/mod.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -440,7 +440,6 @@ rustc_queries! {
440440
query predicates_of(key: DefId) -> ty::GenericPredicates<'tcx> {
441441
desc { |tcx| "computing predicates of `{}`", tcx.def_path_str(key) }
442442
cache_on_disk_if { key.is_local() }
443-
feedable
444443
}
445444

446445
query opaque_types_defined_by(

compiler/rustc_mir_transform/src/coroutine/by_move_body.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -239,7 +239,7 @@ pub(crate) fn coroutine_by_move_body_def_id<'tcx>(
239239
body_def.explicit_predicates_of(tcx.explicit_predicates_of(coroutine_def_id));
240240
body_def.generics_of(tcx.generics_of(coroutine_def_id).clone());
241241
body_def.param_env(tcx.param_env(coroutine_def_id));
242-
body_def.predicates_of(tcx.predicates_of(coroutine_def_id));
242+
body_def.explicit_predicates_of(tcx.explicit_predicates_of(coroutine_def_id));
243243

244244
// The type of the coroutine is the `by_move_coroutine_ty`.
245245
body_def.type_of(ty::EarlyBinder::bind(by_move_coroutine_ty));

0 commit comments

Comments
 (0)