---

yaml
---
r: 97662
b: refs/heads/snap-stage3
c: c74c854
h: refs/heads/master
v: v3

Author: fhahn

[refs]

@@ -1,7 +1,7 @@
 ---
 refs/heads/master: 0da105a8b7b6b1e0568e8ff20f6ff4b13cc7ecc2
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
-refs/heads/snap-stage3: b97ace2f6b361f10541586e69371f4924ce967c6
+refs/heads/snap-stage3: c74c854adc83eb311aef722e64c0af81ea09f1a1
 refs/heads/try: c274a6888410ce3e357e014568b43310ed787d36
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

branches/snap-stage3/src/librustc/middle/liveness.rs

@@ -439,7 +439,7 @@ fn visit_fn(v: &mut LivenessVisitor,
 
     // check for various error conditions
     lsets.visit_block(body, ());
-    lsets.check_ret(id, sp, fk, entry_ln);
+    lsets.check_ret(id, sp, fk, entry_ln, body);
     lsets.warn_about_unused_args(decl, entry_ln);
 }
 
@@ -1575,7 +1575,8 @@ impl Liveness {
                      id: NodeId,
                      sp: Span,
                      _fk: &FnKind,
-                     entry_ln: LiveNode) {
+                     entry_ln: LiveNode,
+                     body: &Block) {
         if self.live_on_entry(entry_ln, self.s.no_ret_var).is_some() {
             // if no_ret_var is live, then we fall off the end of the
             // function without any kind of return expression:
@@ -1588,9 +1589,30 @@ impl Liveness {
                 self.tcx.sess.span_err(
                     sp, "some control paths may return");
             } else {
+                let ends_with_stmt = match body.expr {
+                    None if body.stmts.len() > 0 =>
+                        match body.stmts.last().node {
+                            StmtSemi(e, _) => {
+                                let t_stmt = ty::expr_ty(self.tcx, e);
+                                ty::get(t_stmt).sty == ty::get(t_ret).sty
+                            },
+                            _ => false
+                        },
+                    _ => false
+                };
+                if ends_with_stmt {
+                    let last_stmt = body.stmts.last();
+                    let span_semicolon = Span {
+                        lo: last_stmt.span.hi,
+                        hi: last_stmt.span.hi,
+                        expn_info: last_stmt.span.expn_info
+                    };
+                    self.tcx.sess.span_note(
+                        span_semicolon, "consider removing this semicolon:");
+                }
                 self.tcx.sess.span_err(
                     sp, "not all control paths return a value");
-            }
+           }
         }
     }
 

branches/snap-stage3/src/librustc/middle/ty.rs

@@ -810,23 +810,23 @@ impl Vid for TyVid {
 }
 
 impl ToStr for TyVid {
-    fn to_str(&self) -> ~str { format!("<generic \\#{}>", self.to_uint()) }
+    fn to_str(&self) -> ~str { format!("<V{}>", self.to_uint()) }
 }
 
 impl Vid for IntVid {
     fn to_uint(&self) -> uint { let IntVid(v) = *self; v }
 }
 
 impl ToStr for IntVid {
-    fn to_str(&self) -> ~str { format!("<generic integer \\#{}>", self.to_uint()) }
+    fn to_str(&self) -> ~str { format!("<VI{}>", self.to_uint()) }
 }
 
 impl Vid for FloatVid {
     fn to_uint(&self) -> uint { let FloatVid(v) = *self; v }
 }
 
 impl ToStr for FloatVid {
-    fn to_str(&self) -> ~str { format!("<generic float \\#{}>", self.to_uint()) }
+    fn to_str(&self) -> ~str { format!("<VF{}>", self.to_uint()) }
 }
 
 impl Vid for RegionVid {

branches/snap-stage3/src/test/compile-fail/issue-3680.rs

@@ -10,6 +10,6 @@
 
 fn main() {
     match None {
-        Err(_) => () //~ ERROR mismatched types: expected `std::option::Option<<generic #1>>` but found `std::result::Result<<generic #2>,<generic #3>>`
+        Err(_) => () //~ ERROR mismatched types: expected `std::option::Option<<V1>>` but found `std::result::Result<<V2>,<V3>>`
     }
 }

branches/snap-stage3/src/test/compile-fail/issue-4968.rs

@@ -12,5 +12,5 @@
 
 static A: (int,int) = (4,2);
 fn main() {
-    match 42 { A => () } //~ ERROR mismatched types: expected `<generic integer #0>` but found `(int,int)` (expected integral variable but found tuple)
+    match 42 { A => () } //~ ERROR mismatched types: expected `<VI0>` but found `(int,int)` (expected integral variable but found tuple)
 }

branches/snap-stage3/src/test/compile-fail/liveness-return-last-stmt-semi.rs

@@ -0,0 +1,30 @@
+// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
+// file at the top-level directory of this distribution and at
+// http://rust-lang.org/COPYRIGHT.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+//
+// regression test for #8005
+
+#[feature(macro_rules)];
+
+macro_rules! test ( () => { fn foo() -> int { 1i; } } ) //~ ERROR  not all control paths return a value
+                                             //~^ NOTE consider removing this semicolon
+
+fn no_return() -> int {} //~ ERROR  not all control paths return a value
+
+fn bar(x: u32) -> u32 { //~ ERROR  not all control paths return a value
+    x * 2; //~ NOTE consider removing this semicolon
+}
+
+fn baz(x: u64) -> u32 { //~ ERROR  not all control paths return a value
+    x * 2;
+}
+
+fn main() {
+    test!();
+}