---

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

Author: nikomatsakis

[refs]

@@ -6,7 +6,7 @@ refs/heads/try: d324a424d8f84b1eb049b12cf34182bda91b0024
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: d0c6ce338884ee21843f4b40bf6bf18d222ce5df
-refs/heads/incoming: b043349833f079e98e3d3a5e0917cd218c2f2021
+refs/heads/incoming: e9ac7489b5032b4a922a0df1dd611471260b31ef
 refs/heads/dist-snap: 2f32a1581f522e524009138b33b1c7049ced668d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/incoming/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);

branches/incoming/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