aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorGraydon Hoare <[email protected]>2011-01-17 16:03:38 -0800
committerGraydon Hoare <[email protected]>2011-01-17 16:03:38 -0800
commit156e1b363fb7058c7bd734c5664b8f467b1afcd5 (patch)
tree9ee522617a2d33f00bf750958bd9b64f9d67c8e3 /src
parentFix a couple bugs in parametric returns. (diff)
downloadrust-156e1b363fb7058c7bd734c5664b8f467b1afcd5.tar.xz
rust-156e1b363fb7058c7bd734c5664b8f467b1afcd5.zip
Make legal and un-XFAIL generic-fn-infer.rs (on both compilers).
Diffstat (limited to 'src')
-rw-r--r--src/Makefile2
-rw-r--r--src/test/run-pass/generic-fn-infer.rs2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/Makefile b/src/Makefile
index 9da0590a..6d3b5f1d 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -391,7 +391,6 @@ TEST_XFAILS_BOOT := $(TASK_XFAILS) \
test/run-pass/obj-as.rs \
test/run-pass/vec-slice.rs \
test/run-pass/fn-lval.rs \
- test/run-pass/generic-fn-infer.rs \
test/run-pass/generic-recursive-tag.rs \
test/run-pass/iter-ret.rs \
test/run-pass/lib-io.rs \
@@ -439,6 +438,7 @@ TEST_XFAILS_RUSTC := $(filter-out \
drop-bind-thunk-args.rs \
drop-on-ret.rs \
fact.rs \
+ generic-fn-infer.rs \
hello.rs \
int.rs \
i32-sub.rs \
diff --git a/src/test/run-pass/generic-fn-infer.rs b/src/test/run-pass/generic-fn-infer.rs
index e24cf845..4398670f 100644
--- a/src/test/run-pass/generic-fn-infer.rs
+++ b/src/test/run-pass/generic-fn-infer.rs
@@ -2,7 +2,7 @@
// Issue #45: infer type parameters in function applications
-fn id[T](T x) -> T {
+fn id[T](&T x) -> T {
ret x;
}