---

yaml
---
r: 44797
b: refs/heads/master
c: 061a223
h: refs/heads/master
i:
  44795: 5ef44a1
v: v3

Author: bors

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 5ae9b2949fd632f20ccc8afe30e273c0aa5b665b
+refs/heads/master: 061a2237230d3abcdb30ecb8987e5de17e67a58e
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: a6d9689399d091c3265f00434a69c551a61c28dc
 refs/heads/try: ef355f6332f83371e4acf04fc4eb940ab41d78d3

trunk/src/librustc/middle/check_match.rs

@@ -101,7 +101,11 @@ pub fn check_expr(cx: @MatchCheckCtxt, ex: @expr, &&s: (), v: visit::vt<()>) {
           _ => { /* We assume only enum types can be uninhabited */ }
        }
        let arms = vec::concat(arms.filter_mapped(unguarded_pat));
-       check_exhaustive(cx, ex.span, arms);
+       if arms.is_empty() {
+           cx.tcx.sess.span_err(ex.span, ~"non-exhaustive patterns");
+       } else {
+           check_exhaustive(cx, ex.span, arms);
+       }
      }
      _ => ()
     }

trunk/src/libstd/sha1.rs

@@ -251,11 +251,7 @@ pub fn sha1() -> Sha1 {
             let rr = mk_result(self);
             let mut s = ~"";
             for vec::each(rr) |b| {
-                let hex = uint::to_str_radix(*b as uint, 16u);
-                if hex.len() == 1 {
-                    s += "0";
-                }
-                s += hex;
+                s += uint::to_str_radix(*b as uint, 16u);
             }
             return s;
         }
@@ -287,7 +283,6 @@ mod tests {
             struct Test {
                 input: ~str,
                 output: ~[u8],
-                output_str: ~str,
             }
 
             fn a_million_letter_a() -> ~str {
@@ -311,7 +306,6 @@ mod tests {
                         0x78u8, 0x50u8, 0xC2u8, 0x6Cu8,
                         0x9Cu8, 0xD0u8, 0xD8u8, 0x9Du8,
                     ],
-                    output_str: ~"a9993e364706816aba3e25717850c26c9cd0d89d"
                 },
                 Test {
                     input:
@@ -324,7 +318,6 @@ mod tests {
                         0xF9u8, 0x51u8, 0x29u8, 0xE5u8,
                         0xE5u8, 0x46u8, 0x70u8, 0xF1u8,
                     ],
-                    output_str: ~"84983e441c3bd26ebaae4aa1f95129e5e54670f1"
                 },
                 Test {
                     input: a_million_letter_a(),
@@ -335,7 +328,6 @@ mod tests {
                         0xDBu8, 0xADu8, 0x27u8, 0x31u8,
                         0x65u8, 0x34u8, 0x01u8, 0x6Fu8,
                     ],
-                    output_str: ~"34aa973cd4c4daa4f61eeb2bdbad27316534016f"
                 },
             ];
             // Examples from wikipedia
@@ -350,7 +342,6 @@ mod tests {
                         0xbbu8, 0x76u8, 0xe7u8, 0x39u8,
                         0x1bu8, 0x93u8, 0xebu8, 0x12u8,
                     ],
-                    output_str: ~"2fd4e1c67a2d28fced849ee1bb76e7391b93eb12",
                 },
                 Test {
                     input: ~"The quick brown fox jumps over the lazy cog",
@@ -361,7 +352,6 @@ mod tests {
                         0x0bu8, 0xd1u8, 0x7du8, 0x9bu8,
                         0x10u8, 0x0du8, 0xb4u8, 0xb3u8,
                     ],
-                    output_str: ~"de9f2c7fd25e1b3afad3e85a0bd17d9b100db4b3",
                 },
             ];
             let tests = fips_180_1_tests + wikipedia_tests;
@@ -383,11 +373,6 @@ mod tests {
                 sh.input_str(t.input);
                 let out = sh.result();
                 check_vec_eq(t.output, out);
-
-                let out_str = sh.result_str();
-                assert(out_str.len() == 40);
-                assert(out_str == t.output_str);
-
                 sh.reset();
             }
 
@@ -404,11 +389,6 @@ mod tests {
                 }
                 let out = sh.result();
                 check_vec_eq(t.output, out);
-
-                let out_str = sh.result_str();
-                assert(out_str.len() == 40);
-                assert(out_str == t.output_str);
-
                 sh.reset();
             }
         }