diff options
| author | Jeffrey Seyfried <jeffrey.seyfried@gmail.com> | 2016-08-28 11:18:58 +0000 |
|---|---|---|
| committer | Jeffrey Seyfried <jeffrey.seyfried@gmail.com> | 2016-08-29 05:20:42 +0000 |
| commit | cdde06ea97ad7ef9718cc0896ab3989f11188da2 (patch) | |
| tree | 364736a3e4a71fa0cf660d368d61783d8aaf96c3 | |
| parent | 663caa9ddf856c5e3a9612b1ac002c8d0646a3c2 (diff) | |
| download | rust-cdde06ea97ad7ef9718cc0896ab3989f11188da2.tar.gz rust-cdde06ea97ad7ef9718cc0896ab3989f11188da2.zip | |
Fix merge conflicts.
| -rw-r--r-- | src/librustc_typeck/check/intrinsic.rs | 2 |
1 files changed, 1 insertions, 1 deletions
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 }; |