user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update closure errors to emit context for FnMut

Browse source 
It now handles both FnMut and FnOnce case.
This commit is contained in:
Tommy Ip 2017-06-06 09:06:56 +01:00
parent 9cbb5f9a24
commit 94c808c1d3
1 changed files with 12 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

19
src/librustc/traits/error_reporting.rs
View file

@ -657,13 +657,18 @@ impl<'a, 'gcx, 'tcx> InferCtxt<'a, 'gcx, 'tcx> {
};
if let Some(tables) = infer_tables {
if let Some(&(ty::ClosureKind::FnOnce, Some((span, name)))) =
tables.closure_kinds.get(&node_id)
{
err.span_note(
span,
&format!("closure is `FnOnce` because it moves the \
variable `{}` out of its environment", name));
match tables.closure_kinds.get(&node_id) {
Some(&(ty::ClosureKind::FnOnce, Some((span, name)))) => {
err.span_note(span, &format!(
"closure is `FnOnce` because it moves the \
variable `{}` out of its environment", name));
},
Some(&(ty::ClosureKind::FnMut, Some((span, name)))) => {
err.span_note(span, &format!(
"closure is `FnMut` because it mutates the \
variable `{}` here", name));
},
_ => {}
}
} else {
err.span_note(