From 5841021f071f7e6393e3ee510c4e02f44cb0fbee Mon Sep 17 00:00:00 2001
From: gaurikholkar <f2013002@goa.bits-pilani.ac.in>
Date: Wed, 28 Jun 2017 12:18:21 -0700
Subject: [PATCH] conflict fixes

---
 src/librustc/infer/error_reporting/named_anon_conflict.rs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/librustc/infer/error_reporting/named_anon_conflict.rs b/src/librustc/infer/error_reporting/named_anon_conflict.rs
index cdfb57c86f9..21f8a04be0a 100644
--- a/src/librustc/infer/error_reporting/named_anon_conflict.rs
+++ b/src/librustc/infer/error_reporting/named_anon_conflict.rs
@@ -107,7 +107,8 @@ pub fn try_report_named_anon_conflict(&self, error: &RegionResolutionError<'tcx>
         // FIXME(#42703) - Need to handle certain cases here.
         let ret_ty = self.tcx.type_of(scope_def_id);
         match ret_ty.sty {
-            ty::TyFnDef(_, _, sig) => {
+            ty::TyFnDef(_, _) => {
+                let sig = ret_ty.fn_sig(self.tcx);
                 let late_bound_regions = self.tcx
                     .collect_referenced_late_bound_regions(&sig.output());
                 if late_bound_regions.iter().any(|r| *r == br) {