nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-11-01 23:12:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix build failure of rustfmt

Browse Source
This commit is contained in:
bishtpawan 2020-10-20 23:13:21 +05:30
parent cb2462c53f
commit fa094044a9
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
compiler/rustc_mir_build/src/lints.rs
View File

@ -71,11 +71,12 @@ impl<'mir, 'tcx> Search<'mir, 'tcx> {
let func_ty = func.ty(body, tcx);
if let ty::FnDef(callee, substs) = *func_ty.kind() {
let normalized_substs = tcx.normalize_erasing_regions(param_env, substs);
let (callee, call_substs) =
if let Ok(Some(instance)) = Instance::resolve(tcx, param_env, callee, substs) {
if let Ok(Some(instance)) = Instance::resolve(tcx, param_env, callee, normalized_substs) {
(instance.def_id(), instance.substs)
} else {
(callee, substs)
(callee, normalized_substs)
};
// FIXME(#57965): Make this work across function boundaries