---

yaml
---
r: 95216
b: refs/heads/dist-snap
c: 3b26bb9
h: refs/heads/master
v: v3

Author: dwrensha

[refs]

@@ -6,7 +6,7 @@ refs/heads/try: c274a6888410ce3e357e014568b43310ed787d36
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c
-refs/heads/dist-snap: acf9783879dca0db0721c10ac79c9078f2dec425
+refs/heads/dist-snap: 3b26bb9022e057084f357bafbcda39cab4cda55f
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
 refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0

branches/dist-snap/src/libextra/time.rs

@@ -600,6 +600,8 @@ pub fn strptime(s: &str, format: &str) -> Result<Tm, ~str> {
               None => Err(~"Invalid day of week")
             }
           }
+          //'X' {}
+          //'x' {}
           'Y' => {
             match match_digits(s, pos, 4u, false) {
               Some(item) => {

branches/dist-snap/src/librustc/middle/typeck/check/mod.rs

@@ -3054,8 +3054,7 @@ pub fn check_block_with_expected(fcx: @mut FnCtxt,
             },
           Some(e) => {
             if any_bot && !warned {
-                fcx.ccx.tcx.sess.add_lint(unreachable_code, e.id, e.span,
-                                          ~"unreachable expression");
+                fcx.ccx.tcx.sess.span_warn(e.span, "unreachable expression");
             }
             check_expr_with_opt_hint(fcx, e, expected);
               let ety = fcx.expr_ty(e);

branches/dist-snap/src/librustc/middle/typeck/check/regionmanip.rs

@@ -32,10 +32,6 @@ pub fn replace_bound_regions_in_fn_sig(
 {
     let mut all_tys = ty::tys_in_fn_sig(fn_sig);
 
-    for &self_ty in opt_self_ty.iter() {
-        all_tys.push(self_ty);
-    }
-
     for &t in opt_self_ty.iter() { all_tys.push(t) }
 
     debug2!("replace_bound_regions_in_fn_sig(self_ty={:?}, fn_sig={}, \

branches/dist-snap/src/test/compile-fail/issue-2149.rs

@@ -16,7 +16,8 @@ impl<A> vec_monad<A> for ~[A] {
     fn bind<B>(&self, f: &fn(A) -> ~[B]) {
         let mut r = fail2!();
         for elt in self.iter() { r = r + f(*elt); }
-        //~^ ERROR the type of this value must be known
+        //~^ WARNING unreachable expression
+        //~^^ ERROR the type of this value must be known
    }
 }
 fn main() {