rollup merge of #20708: aturon/new-int-modules

Conflicts: src/libserialize/lib.rs
2015-01-07 17:18:01 -08:00 · 2015-01-07 17:18:01 -08:00 · dd38f46d71
commit dd38f46d71
parent b21a0cee19 321d9ddff2
35 changed files with 130 additions and 416 deletions
--- a/src/test/compile-fail/mut-pattern-mismatched.rs
+++ b/src/test/compile-fail/mut-pattern-mismatched.rs
@ -13,7 +13,7 @@ fn main() {

    // (separate lines to ensure the spans are accurate)

-    // SNAP 340ac04 uncomment this after the next snapshot
+    // SNAP 9e4e524 uncomment this after the next snapshot
    // NOTE(stage0) just in case tidy doesn't check snap's in tests
    // let &_ // ~ ERROR expected `&mut isize`, found `&_`
    //    = foo;