diff options
| author | gaurikholkar <f2013002@goa.bits-pilani.ac.in> | 2017-06-28 12:18:21 -0700 |
|---|---|---|
| committer | gaurikholkar <f2013002@goa.bits-pilani.ac.in> | 2017-06-29 06:37:18 -0700 |
| commit | 5841021f071f7e6393e3ee510c4e02f44cb0fbee (patch) | |
| tree | c3ff9bd6183373f5d6ff53c88d03291f140bf854 | |
| parent | e8b8f30373941f1d606d21c741bb136d81c3d082 (diff) | |
| download | rust-5841021f071f7e6393e3ee510c4e02f44cb0fbee.tar.gz rust-5841021f071f7e6393e3ee510c4e02f44cb0fbee.zip | |
conflict fixes
| -rw-r--r-- | src/librustc/infer/error_reporting/named_anon_conflict.rs | 3 |
1 files changed, 2 insertions, 1 deletions
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 @@ impl<'a, 'gcx, 'tcx> InferCtxt<'a, 'gcx, '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) { |