diff options
| author | Michael Goulet <michael@errs.io> | 2023-11-24 07:29:14 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-11-24 07:29:14 -0800 |
| commit | 592ee1224503f80b1439ae14d330e44730df2462 (patch) | |
| tree | 5388e5da527fce8ce0703f0fe03de45b375446c2 | |
| parent | b5d336ffaecd5cb1de34f1a62df08f8db5dd233f (diff) | |
| parent | 0626de439df0b9bb4e751a92375fdb764c0ee91e (diff) | |
| download | rust-592ee1224503f80b1439ae14d330e44730df2462.tar.gz rust-592ee1224503f80b1439ae14d330e44730df2462.zip | |
Rollup merge of #118246 - fee1-dead-contrib:rm-hack, r=compiler-errors
Remove a hack for effects Fallback was implemented in #115727, which addresses the inference errors mentioned in the comments.
| -rw-r--r-- | compiler/rustc_hir_typeck/src/expr.rs | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/compiler/rustc_hir_typeck/src/expr.rs b/compiler/rustc_hir_typeck/src/expr.rs index a9f67f984da..6d4bd981b7b 100644 --- a/compiler/rustc_hir_typeck/src/expr.rs +++ b/compiler/rustc_hir_typeck/src/expr.rs @@ -526,14 +526,9 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> { _ => self.instantiate_value_path(segs, opt_ty, res, expr.span, expr.hir_id).0, }; - if let ty::FnDef(did, callee_args) = *ty.kind() { + if let ty::FnDef(did, _) = *ty.kind() { let fn_sig = ty.fn_sig(tcx); - // HACK: whenever we get a FnDef in a non-const context, enforce effects to get the - // default `host = true` to avoid inference errors later. - if tcx.hir().body_const_context(self.body_id).is_none() { - self.enforce_context_effects(expr.hir_id, qpath.span(), did, callee_args); - } if tcx.fn_sig(did).skip_binder().abi() == RustIntrinsic && tcx.item_name(did) == sym::transmute { |