---

yaml
---
r: 23566
b: refs/heads/master
c: e9ac748
h: refs/heads/master
v: v3

Author: nikomatsakis

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: b043349833f079e98e3d3a5e0917cd218c2f2021
+refs/heads/master: e9ac7489b5032b4a922a0df1dd611471260b31ef
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: cd6f24f9d14ac90d167386a56e7a6ac1f0318195
 refs/heads/try: ffbe0e0e00374358b789b0037bcb3a577cd218be

trunk/src/libstd/test.rs

@@ -106,6 +106,7 @@ fn run_tests_console(opts: test_opts,
                      tests: ~[test_desc]) -> bool {
 
     fn callback(event: testevent, st: console_test_state) {
+        debug!("callback(event=%?)", event);
         match event {
           te_filtered(filtered_tests) => {
             st.total = vec::len(filtered_tests);

trunk/src/rt/miniz.cpp

@@ -391,7 +391,7 @@ typedef unsigned char mz_validate_uint64[sizeof(mz_uint64)==8 ? 1 : -1];
 #ifdef _MSC_VER
   #define MZ_FORCEINLINE __forceinline
 #elif defined(__GNUC__)
-  #define MZ_FORCEINLINE inline __attribute__((__always_inline__))
+  #define MZ_FORCEINLINE __attribute__((__always_inline__))
 #else
   #define MZ_FORCEINLINE
 #endif