Merge branch 'master' of git@github.com:graydon/rust

2010-06-29 12:06:18 -07:00 · 2010-06-29 12:06:18 -07:00 · 17c293bbaa
parent ffdcd67c25 0d6aaec493
commit 17c293bbaa
2 changed files with 1 additions and 2 deletions
--- a/src/Makefile
+++ b/src/Makefile
@ -325,7 +325,6 @@ TEST_XFAILS_X86 :=  test/run-pass/mlist-cycle.rs \
                    test/run-pass/vec-slice.rs \
                    test/run-pass/fn-lval.rs \
                    test/run-pass/generic-fn-infer.rs \
-                    test/run-pass/generic-obj.rs \
                    test/run-pass/generic-recursive-tag.rs \
                    test/run-pass/mutable-alias-vec.rs \
                    test/run-pass/mutable-vec-drop.rs \
--- a/src/test/run-pass/generic-obj.rs
+++ b/src/test/run-pass/generic-obj.rs
@ -11,7 +11,7 @@ obj buf[T](tup(T,T,T) data) {
    }
  }

-  fn take(T t) {}
+  fn take(&T t) {}
 }

 fn main() {