diff options
| author | bors <bors@rust-lang.org> | 2020-07-31 14:21:18 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2020-07-31 14:21:18 +0000 |
| commit | d068a6103e8b834820e26d72830ae7c668049b5c (patch) | |
| tree | 76270eea100819a9fee609bdd13f0f62145a6141 /src/librustc_middle/ty/instance.rs | |
| parent | c367798cfd3817ca6ae908ce675d1d99242af148 (diff) | |
| parent | fcd1712627e21618228057396d3b62e039c21544 (diff) | |
| download | rust-d068a6103e8b834820e26d72830ae7c668049b5c.tar.gz rust-d068a6103e8b834820e26d72830ae7c668049b5c.zip | |
Auto merge of #74958 - Mark-Simulacrum:stable-next, r=pnkfelix
[stable] 1.45.2 release This is intended to fix the stable breakage noted in #74954, but does *not* close that issue -- there remains investigation and likely nightly/beta fixes need to be issued as well. r? @pnkfelix
Diffstat (limited to 'src/librustc_middle/ty/instance.rs')
| -rw-r--r-- | src/librustc_middle/ty/instance.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/librustc_middle/ty/instance.rs b/src/librustc_middle/ty/instance.rs index 1ce079821a2..b3083fa3b37 100644 --- a/src/librustc_middle/ty/instance.rs +++ b/src/librustc_middle/ty/instance.rs @@ -345,7 +345,7 @@ impl<'tcx> Instance<'tcx> { debug!(" => associated item with unsizeable self: Self"); Some(Instance { def: InstanceDef::VtableShim(def_id), substs }) } else { - Instance::resolve(tcx, param_env, def_id, substs).ok().flatten() + Instance::resolve_for_fn_ptr(tcx, param_env, def_id, substs) } } |