---

yaml
---
r: 22695
b: refs/heads/master
c: 8868b22
h: refs/heads/master
i:
  22693: 7f77092
  22691: ebf07f5
  22687: 0e67732
v: v3

Author: graydon

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: a63e0e47f0d4fa6b79365c645d6c284de234e2d0
+refs/heads/master: 8868b222c32c5093c6066771ad2aaddc6a22da88
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: cd6f24f9d14ac90d167386a56e7a6ac1f0318195
 refs/heads/try: ffbe0e0e00374358b789b0037bcb3a577cd218be

trunk/src/rustc/middle/typeck/check.rs

@@ -1699,7 +1699,7 @@ fn check_expr_with_unifier(fcx: @fn_ctxt,
         };
 
         let struct_type = ty::subst(tcx, substitutions, raw_type);
-        
+
         // Look up the class fields and build up a map.
         let class_fields = ty::lookup_class_fields(tcx, class_id);
         let class_field_map = str_hash();

trunk/src/test/run-pass/c-stack-returning-int64.rs

@@ -9,11 +9,11 @@ extern mod libc {
 }
 
 fn atol(s: ~str) -> int {
-    ret str::as_buf(s, { |x| libc::atol(x) });
+    ret str::as_buf(s, { |x, _len| libc::atol(x) });
 }
 
 fn atoll(s: ~str) -> i64 {
-    ret str::as_buf(s, { |x| libc::atoll(x) });
+    ret str::as_buf(s, { |x, _len| libc::atoll(x) });
 }
 
 fn main() {