From cdde06ea97ad7ef9718cc0896ab3989f11188da2 Mon Sep 17 00:00:00 2001
From: Jeffrey Seyfried <jeffrey.seyfried@gmail.com>
Date: Sun, 28 Aug 2016 11:18:58 +0000
Subject: [PATCH] Fix merge conflicts.

---
 src/librustc_typeck/check/intrinsic.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/librustc_typeck/check/intrinsic.rs b/src/librustc_typeck/check/intrinsic.rs
index ed3e645eeeb..d26de9b2a6c 100644
--- a/src/librustc_typeck/check/intrinsic.rs
+++ b/src/librustc_typeck/check/intrinsic.rs
@@ -52,7 +52,7 @@ fn equate_intrinsic_type<'a, 'tcx>(ccx: &CrateCtxt<'a, 'tcx>,
     let i_n_tps = i_ty.generics.types.len();
     if i_n_tps != n_tps {
         let span = match it.node {
-            hir::ForeignItemFn(_, ref generics) => generics.span().unwrap_or(it.span),
+            hir::ForeignItemFn(_, ref generics) => generics.span,
             hir::ForeignItemStatic(_, _) => it.span
         };