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

Correctly handle AdjustNeverToAny in try_find_coercion_lub

Browse Source
This commit is contained in:
Andrew Cann 2016-08-03 13:10:39 +08:00
parent 69e27614c6
commit f019a92b77
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/librustc_typeck/check/coercion.rs
View File

@ -746,6 +746,7 @@ impl<'a, 'gcx, 'tcx> FnCtxt<'a, 'gcx, 'tcx> {
}
_ => false
},
Some(&AdjustNeverToAny(_)) => true,
Some(_) => false,
None => true
};
@ -781,7 +782,12 @@ impl<'a, 'gcx, 'tcx> FnCtxt<'a, 'gcx, 'tcx> {
Ok((ty, adjustment)) => {
if !adjustment.is_identity() {
for expr in exprs() {
self.write_adjustment(expr.id, adjustment);
let previous = self.tables.borrow().adjustments.get(&expr.id).cloned();
if let Some(AdjustNeverToAny(_)) = previous {
self.write_adjustment(expr.id, AdjustNeverToAny(ty));
} else {
self.write_adjustment(expr.id, adjustment);
}
}
}
Ok(ty)