Rebased and improved errors

2021-12-29 16:29:14 +08:00
parent b5235ea732
commit 6d6314f878
9 changed files with 40 additions and 20 deletions
--- a/compiler/rustc_const_eval/src/util/call_kind.rs
+++ b/compiler/rustc_const_eval/src/util/call_kind.rs
@@ -71,9 +71,7 @@ pub fn call_kind<'tcx>(
        AssocItemContainer::TraitContainer(trait_did) => Some(trait_did),
    });

-    let fn_call = (!from_hir_call)
-        .then(|| parent)
-        .flatten()
+    let fn_call = parent
        .and_then(|p| tcx.lang_items().group(LangItemGroup::Fn).iter().find(|did| **did == p));

    let operator = (!from_hir_call)