about summary refs log tree commit diff
path: root/src/test/run-fail
diff options
context:
space:
mode:
authorNiko Matsakis <niko@alum.mit.edu>2012-04-30 10:37:58 -0700
committerNiko Matsakis <niko@alum.mit.edu>2012-04-30 19:53:02 -0700
commit2db4259b3531e0cfa1f6df2ff95e30a4c871a105 (patch)
tree192b8d969e34bd1390bd769e17d68b2e9c57e77e /src/test/run-fail
parent079c3b02a86aa73d0d070876612ed889dc187354 (diff)
downloadrust-2db4259b3531e0cfa1f6df2ff95e30a4c871a105.tar.gz
rust-2db4259b3531e0cfa1f6df2ff95e30a4c871a105.zip
Stop inferring bot/static when types/regions are unconstrained.
Also, some other changes that came up along the way:
- add a 'blk' region for the current block.
- detect unused type/region variables.
Diffstat (limited to 'src/test/run-fail')
-rw-r--r--src/test/run-fail/bug-811.rs2
-rw-r--r--src/test/run-fail/issue-1763.rs14
-rw-r--r--src/test/run-fail/result-get-fail.rs2
3 files changed, 2 insertions, 16 deletions
diff --git a/src/test/run-fail/bug-811.rs b/src/test/run-fail/bug-811.rs
index 62206f93994..a7d360ff8fc 100644
--- a/src/test/run-fail/bug-811.rs
+++ b/src/test/run-fail/bug-811.rs
@@ -4,7 +4,7 @@ fn test00_start(ch: chan_t<int>, message: int) { send(ch, copy message); }
 type task_id = int;
 type port_id = int;
 
-type chan_t<T: send> = {task: task_id, port: port_id};
+enum chan_t<T: send> = {task: task_id, port: port_id};
 
 fn send<T: send>(ch: chan_t<T>, -data: T) { fail; }
 
diff --git a/src/test/run-fail/issue-1763.rs b/src/test/run-fail/issue-1763.rs
deleted file mode 100644
index 36ea0d961b7..00000000000
--- a/src/test/run-fail/issue-1763.rs
+++ /dev/null
@@ -1,14 +0,0 @@
-// Issue #1763 - infer types correctly
-// error-pattern:explicit failure
-
-type actor<T> = {
-    unused: bool
-};
-
-fn act2<T>() -> actor<T> {
-    fail;
-}
-
-fn main() {
-    let a: actor<int> = act2();
-}
diff --git a/src/test/run-fail/result-get-fail.rs b/src/test/run-fail/result-get-fail.rs
index 3b8e693e969..6f614258bcb 100644
--- a/src/test/run-fail/result-get-fail.rs
+++ b/src/test/run-fail/result-get-fail.rs
@@ -1,4 +1,4 @@
 // error-pattern:get called on error result: "kitty"
 fn main() {
-  log(error, result::get(result::err("kitty")));
+  log(error, result::get(result::err::<int,str>("kitty")));
 }
\ No newline at end of file