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

Moved note after error to reduce confusion when the pair appears in the
middle of other errors. Closes #13279.

1 files changed, 4 insertions, 3 deletions

diff --git a/src/doc/guide.md b/src/doc/guide.md
index dc9608563e1..ab480745b68 100644
--- a/src/doc/guide.md
+++ b/src/doc/guide.md
@@ -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