squiid/rust
1
0
Fork 0
Code Issues Pull requests Projects Activity

auto merge of #15431 : iliekturtles/rust/13279-error-msg-order, r=pcwalton

Browse source 
Moved note after error to reduce confusion when the pair appears in the
middle of other errors. Closes #13279.
This commit is contained in:
bors 2014-07-05 18:11:43 +00:00
commit c8b2a3167b
2 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/doc/guide.md
View file

@ -895,13 +895,14 @@ fn add_one(x: int) -> int {
We would get an error:
```{ignore,notrust}
note: consider removing this semicolon:
x + 1;
^
error: not all control paths return a value
fn add_one(x: int) -> int {
x + 1;
}
note: consider removing this semicolon:
x + 1;
^
```
Remember our earlier discussions about semicolons and `()`? Our function claims

4
src/librustc/middle/liveness.rs
View file

@ -1458,6 +1458,8 @@ impl<'a> Liveness<'a> {
},
_ => false
};
self.ir.tcx.sess.span_err(
sp, "not all control paths return a value");
if ends_with_stmt {
let last_stmt = body.stmts.last().unwrap();
let original_span = original_sp(last_stmt.span, sp);
@ -1469,8 +1471,6 @@ impl<'a> Liveness<'a> {
self.ir.tcx.sess.span_note(
span_semicolon, "consider removing this semicolon:");
}
self.ir.tcx.sess.span_err(
sp, "not all control paths return a value");
}
}
}