s/const_effect/host_effect

rust-lang · Dec 9, 2023 · 7467c3a · 7467c3a
1 parent f1bf874
commit 7467c3a
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 9 deletions.
diff --git a/compiler/rustc_const_eval/src/transform/check_consts/qualifs.rs b/compiler/rustc_const_eval/src/transform/check_consts/qualifs.rs
@@ -172,7 +172,7 @@ impl Qualif for NeedsNonConstDrop {
  destruct_def_id,
  [
  ty::GenericArg::from(ty),
- ty::GenericArg::from(cx.tcx.expected_const_effect_param_for_body(cx.def_id())),
+ ty::GenericArg::from(cx.tcx.expected_host_effect_param_for_body(cx.def_id())),
  ],
  ),
  );

diff --git a/compiler/rustc_hir_typeck/src/callee.rs b/compiler/rustc_hir_typeck/src/callee.rs
@@ -780,7 +780,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
  let generics = tcx.generics_of(callee_did);
  let Some(host_effect_index) = generics.host_effect_index else { return };
 
- let effect = tcx.expected_const_effect_param_for_body(self.body_id);
+ let effect = tcx.expected_host_effect_param_for_body(self.body_id);
 
  trace!(?effect, ?generics, ?callee_args);
 

diff --git a/compiler/rustc_middle/src/ty/util.rs b/compiler/rustc_middle/src/ty/util.rs
@@ -782,7 +782,7 @@ impl<'tcx> TyCtxt<'tcx> {
  || self.extern_crate(key.as_def_id()).is_some_and(|e| e.is_direct())
  }
 
- pub fn expected_const_effect_param_for_body(self, def_id: LocalDefId) -> ty::Const<'tcx> {
+ pub fn expected_host_effect_param_for_body(self, def_id: LocalDefId) -> ty::Const<'tcx> {
  // FIXME(effects): This is suspicious and should probably not be done,
  // especially now that we enforce host effects and then properly handle
  // effect vars during fallback.
@@ -817,7 +817,7 @@ impl<'tcx> TyCtxt<'tcx> {
  }
 
  /// Constructs generic args for an item, optionally appending a const effect param type
- pub fn with_opt_const_effect_param(
+ pub fn with_opt_host_effect_param(
  self,
  caller_def_id: LocalDefId,
  callee_def_id: DefId,
@@ -826,9 +826,10 @@ impl<'tcx> TyCtxt<'tcx> {
  let generics = self.generics_of(callee_def_id);
  assert_eq!(generics.parent, None);
 
- let opt_const_param = generics.host_effect_index.is_some().then(|| {
- ty::GenericArg::from(self.expected_const_effect_param_for_body(caller_def_id))
- });
+ let opt_const_param = generics
+ .host_effect_index
+ .is_some()
+ .then(|| ty::GenericArg::from(self.expected_host_effect_param_for_body(caller_def_id)));
 
  self.mk_args_from_iter(args.into_iter().map(|arg| arg.into()).chain(opt_const_param))
  }

diff --git a/compiler/rustc_mir_build/src/build/matches/test.rs b/compiler/rustc_mir_build/src/build/matches/test.rs
@@ -500,7 +500,7 @@ impl<'a, 'tcx> Builder<'a, 'tcx> {
  self.tcx,
  eq_def_id,
  sym::eq,
- self.tcx.with_opt_const_effect_param(self.def_id, eq_def_id, [ty, ty]),
+ self.tcx.with_opt_host_effect_param(self.def_id, eq_def_id, [ty, ty]),
  );
 
  let bool_ty = self.tcx.types.bool;

diff --git a/compiler/rustc_mir_build/src/thir/pattern/const_to_pat.rs b/compiler/rustc_mir_build/src/thir/pattern/const_to_pat.rs
@@ -272,7 +272,7 @@ impl<'tcx> ConstToPat<'tcx> {
  ty::TraitRef::new(
  tcx,
  partial_eq_trait_id,
- tcx.with_opt_const_effect_param(
+ tcx.with_opt_host_effect_param(
  tcx.hir().enclosing_body_owner(self.id),
  partial_eq_trait_id,
  [ty, ty],