OpenE2K/rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix merge conflicts.

Browse Source
This commit is contained in:
Jeffrey Seyfried 2016-08-28 11:18:58 +00:00
parent 663caa9ddf
commit cdde06ea97
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/librustc_typeck/check/intrinsic.rs
View File

@ -52,7 +52,7 @@ fn equate_intrinsic_type<'a, 'tcx>(ccx: &CrateCtxt<'a, 'tcx>,
let i_n_tps = i_ty.generics.types.len(); let i_n_tps = i_ty.generics.types.len();
if i_n_tps != n_tps { if i_n_tps != n_tps {
let span = match it.node { 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 hir::ForeignItemStatic(_, _) => it.span
}; };