aboutsummaryrefslogtreecommitdiff
path: root/src/Makefile
diff options
context:
space:
mode:
authorGraydon Hoare <[email protected]>2010-08-23 18:19:42 -0700
committerGraydon Hoare <[email protected]>2010-08-23 18:19:42 -0700
commit6e3a77c3a3b32aa6fabad895492c2b24739fedba (patch)
tree5e92169975465400c1f617c39fcbacf9bffab706 /src/Makefile
parentWarn when the value of "spawn" is unused, as it's useless (diff)
parentModified parser to handle alt type andadded a few tests (diff)
downloadrust-6e3a77c3a3b32aa6fabad895492c2b24739fedba.tar.xz
rust-6e3a77c3a3b32aa6fabad895492c2b24739fedba.zip
Merge remote branch 'tohava/master'
Conflicts: src/boot/fe/ast.ml
Diffstat (limited to 'src/Makefile')
-rw-r--r--src/Makefile1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/Makefile b/src/Makefile
index a01bf9ce..76e11272 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -371,6 +371,7 @@ self: $(CFG_COMPILER)
# of inter-task shutdown races introduced with notification proxies.
TASK_XFAILS := test/run-pass/acyclic-unwind.rs \
+ test/run-pass/alt-type-simple.rs \
test/run-pass/basic.rs \
test/run-pass/clone-with-exterior.rs \
test/run-pass/comm.rs \