diff options
| author | Graydon Hoare <[email protected]> | 2010-06-29 12:06:18 -0700 |
|---|---|---|
| committer | Graydon Hoare <[email protected]> | 2010-06-29 12:06:18 -0700 |
| commit | 17c293bbaa76c71a1a969c933b58608e40f28712 (patch) | |
| tree | 6405dcf0f421cbdd78b5409a1412458fe260b666 /src | |
| parent | Fix underlying failure to signal errors when dep'ing. (diff) | |
| parent | Work-around and un-XFAIL generic-obj.rs test. The problem uncovered in the o... (diff) | |
| download | rust-17c293bbaa76c71a1a969c933b58608e40f28712.tar.xz rust-17c293bbaa76c71a1a969c933b58608e40f28712.zip | |
Merge branch 'master' of [email protected]:graydon/rust
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile | 1 | ||||
| -rw-r--r-- | src/test/run-pass/generic-obj.rs | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/src/Makefile b/src/Makefile index 5a72afde..31da01b1 100644 --- 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 \ diff --git a/src/test/run-pass/generic-obj.rs b/src/test/run-pass/generic-obj.rs index 414aaff4..1ff7d180 100644 --- 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() { |