First pass on splitting stratum and opacity off of effects. WIP.

22 files changed, 42 insertions, 42 deletions

diff --git a/src/test/compile-fail/comm-makes-io.rs b/src/test/compile-fail/comm-makes-io.rs
index 50f87d0c..57a8e6e8 100644
--- a/src/test/compile-fail/comm-makes-io.rs
+++ b/src/test/compile-fail/comm-makes-io.rs
@@ -1,4 +1,4 @@
-// error-pattern: calculated effect is 'io'
+// error-pattern: calculated effect is 'impure'
 
 fn main() {
   let chan[int] c = chan();
diff --git a/src/test/compile-fail/impure-pred.rs b/src/test/compile-fail/impure-pred.rs
index 82d4cf6f..c322850b 100644
--- a/src/test/compile-fail/impure-pred.rs
+++ b/src/test/compile-fail/impure-pred.rs
@@ -5,7 +5,7 @@
 fn f(int a, int b) : lt(a,b) {
 }
 
-io fn lt(int a, int b) -> bool {
+impure fn lt(int a, int b) -> bool {
   let port[int] p = port();
   let chan[int] c = chan(p);
   c <| 10;
diff --git a/src/test/compile-fail/io-infects-caller.rs b/src/test/compile-fail/io-infects-caller.rs
index 2f5f003f..b07f46e6 100644
--- a/src/test/compile-fail/io-infects-caller.rs
+++ b/src/test/compile-fail/io-infects-caller.rs
@@ -1,6 +1,6 @@
-// error-pattern: calculated effect is 'io'
+// error-pattern: calculated effect is 'impure'
 
-io fn foo() {
+impure fn foo() {
   let chan[int] c = chan();
   c <| 10;
 }
diff --git a/src/test/compile-fail/unnecessary-io.rs b/src/test/compile-fail/unnecessary-io.rs
index 45a93798..fb50a54c 100644
--- a/src/test/compile-fail/unnecessary-io.rs
+++ b/src/test/compile-fail/unnecessary-io.rs
@@ -1,4 +1,4 @@
 // error-pattern: calculated effect is ''
-io fn main() {
+impure fn main() {
   log "hi";
 }
\ No newline at end of file
diff --git a/src/test/run-fail/linked-failure.rs b/src/test/run-fail/linked-failure.rs
index 419fa0f3..4990f33c 100644
--- a/src/test/run-fail/linked-failure.rs
+++ b/src/test/run-fail/linked-failure.rs
@@ -6,7 +6,7 @@ fn child() {
   check (1 == 2);
 }
 
-io fn main() {
+impure fn main() {
   let port[int] p = port();
   spawn child();
   let int x;
diff --git a/src/test/run-pass/acyclic-unwind.rs b/src/test/run-pass/acyclic-unwind.rs
index 38de9082..27cffad4 100644
--- a/src/test/run-pass/acyclic-unwind.rs
+++ b/src/test/run-pass/acyclic-unwind.rs
@@ -1,6 +1,6 @@
 // -*- rust -*-
 
-io fn f(chan[int] c)
+impure fn f(chan[int] c)
 {
   type t = tup(int,int,int);
 
@@ -23,7 +23,7 @@ io fn f(chan[int] c)
 }
 
 
-io fn main() {
+impure fn main() {
   let port[int] p = port();
   spawn f(chan(p));
   let int i;
diff --git a/src/test/run-pass/basic-1.rs b/src/test/run-pass/basic-1.rs
index bdd7ee25..f61bf895 100644
--- a/src/test/run-pass/basic-1.rs
+++ b/src/test/run-pass/basic-1.rs
@@ -1,10 +1,10 @@
 // -*- rust -*-
 
-io fn a(chan[int] c) {
+impure fn a(chan[int] c) {
     c <| 10;
 }
 
-io fn main() {
+impure fn main() {
     let port[int] p = port();
     spawn a(chan(p));
     spawn b(chan(p));
@@ -14,7 +14,7 @@ io fn main() {
 //    log "Finished.";
 }
 
-io fn b(chan[int] c) {
+impure fn b(chan[int] c) {
 //    log "task b0";
 //    log "task b1";
 //    log "task b2";
diff --git a/src/test/run-pass/basic-2.rs b/src/test/run-pass/basic-2.rs
index 975a0d4b..d2b2e240 100644
--- a/src/test/run-pass/basic-2.rs
+++ b/src/test/run-pass/basic-2.rs
@@ -1,12 +1,12 @@
 // -*- rust -*-
 
-io fn a(chan[int] c) {
+impure fn a(chan[int] c) {
     log "task a0";
     log "task a1";
     c <| 10;
 }
 
-io fn main() {
+impure fn main() {
     let port[int] p = port();
     spawn a(chan(p));
     spawn b(chan(p));
@@ -16,7 +16,7 @@ io fn main() {
     log "Finished.";
 }
 
-io fn b(chan[int] c) {
+impure fn b(chan[int] c) {
     log "task b0";
     log "task b1";
     log "task b2";
diff --git a/src/test/run-pass/basic.rs b/src/test/run-pass/basic.rs
index 95e4bff8..a92247c9 100644
--- a/src/test/run-pass/basic.rs
+++ b/src/test/run-pass/basic.rs
@@ -1,6 +1,6 @@
 // -*- rust -*-
 
-io fn a(chan[int] c) {
+impure fn a(chan[int] c) {
   if (true) {
     log "task a";
     log "task a";
@@ -22,7 +22,7 @@ fn g(int x, str y) -> int {
   ret z;
 }
 
-io fn main() {
+impure fn main() {
     let int n = 2 + 3 * 7;
     let str s = "hello there";
     let port[int] p = port();
@@ -37,7 +37,7 @@ io fn main() {
     log "children finished, root finishing";
 }
 
-io fn b(chan[int] c) {
+impure fn b(chan[int] c) {
   if (true) {
     log "task b";
     log "task b";
diff --git a/src/test/run-pass/comm.rs b/src/test/run-pass/comm.rs
index 129b3bdc..a6610d57 100644
--- a/src/test/run-pass/comm.rs
+++ b/src/test/run-pass/comm.rs
@@ -1,6 +1,6 @@
 // -*- rust -*-
 
-io fn main() {
+impure fn main() {
   let port[int] p = port();
   spawn child(chan(p));
   let int y;
@@ -10,7 +10,7 @@ io fn main() {
   check (y == 10);
 }
 
-io fn child(chan[int] c) {
+impure fn child(chan[int] c) {
   c <| 10;
 }
 
diff --git a/src/test/run-pass/lazychan.rs b/src/test/run-pass/lazychan.rs
index 9d560bd9..b5bf8872 100644
--- a/src/test/run-pass/lazychan.rs
+++ b/src/test/run-pass/lazychan.rs
@@ -1,6 +1,6 @@
 // -*- rust -*-
 
-io fn main() {
+impure fn main() {
   let port[int] p = port();
   auto c = chan(p);
   let int y;
@@ -18,6 +18,6 @@ io fn main() {
   check (y == 10);
 }
 
-io fn child(chan[int] c) {
+impure fn child(chan[int] c) {
   c <| 10;
 }
diff --git a/src/test/run-pass/lib-map.rs b/src/test/run-pass/lib-map.rs
index 3b46f355..0ae8cc6b 100644
--- a/src/test/run-pass/lib-map.rs
+++ b/src/test/run-pass/lib-map.rs
@@ -347,5 +347,5 @@ fn main() {
   test_growth();
   test_removal();
 
-  std.sys.rustrt.gc();
+  std.sys.rustrt.do_gc();
 }
diff --git a/src/test/run-pass/obj-dtor.rs b/src/test/run-pass/obj-dtor.rs
index 8b79047b..d1f54f8f 100644
--- a/src/test/run-pass/obj-dtor.rs
+++ b/src/test/run-pass/obj-dtor.rs
@@ -5,7 +5,7 @@ obj worker(chan[int] c) {
   }
 }
 
-io fn do_work(chan[int] c) {
+impure fn do_work(chan[int] c) {
   log "in child task";
   {
     let worker w = worker(c);
@@ -20,7 +20,7 @@ io fn do_work(chan[int] c) {
   }
 }
 
-io fn main() {
+impure fn main() {
   let port[int] p = port();
   log "spawning worker";
   auto w = spawn do_work(chan(p));
diff --git a/src/test/run-pass/preempt.rs b/src/test/run-pass/preempt.rs
index ee37bcf4..06787097 100644
--- a/src/test/run-pass/preempt.rs
+++ b/src/test/run-pass/preempt.rs
@@ -1,6 +1,6 @@
 // This checks that preemption works.
 
-io fn starve_main(chan[int] alive) {
+impure fn starve_main(chan[int] alive) {
   log "signalling main";
   alive <| 1;
   log "starving main";
@@ -10,7 +10,7 @@ io fn starve_main(chan[int] alive) {
   }
 }
 
-io fn main() {
+impure fn main() {
   let port[int] alive = port();
   log "main started";
   let task s = spawn starve_main(chan(alive));
diff --git a/src/test/run-pass/task-comm-0.rs b/src/test/run-pass/task-comm-0.rs
index 28294422..085f958e 100644
--- a/src/test/run-pass/task-comm-0.rs
+++ b/src/test/run-pass/task-comm-0.rs
@@ -1,14 +1,14 @@
-io fn main() -> () {
+impure fn main() -> () {
     test05();
 }
 
-io fn test05_start(chan[int] ch) {
+impure fn test05_start(chan[int] ch) {
     ch <| 10;
     ch <| 20;
     ch <| 30;
 }
 
-io fn test05() {
+impure fn test05() {
     let port[int] po = port();
     let chan[int] ch = chan(po);
     spawn test05_start(chan(po));
diff --git a/src/test/run-pass/task-comm-11.rs b/src/test/run-pass/task-comm-11.rs
index 519eb699..41069c7f 100644
--- a/src/test/run-pass/task-comm-11.rs
+++ b/src/test/run-pass/task-comm-11.rs
@@ -1,9 +1,9 @@
-io fn start(chan[chan[str]] c) {
+impure fn start(chan[chan[str]] c) {
     let port[str] p = port();
     c <| chan(p);
 }
 
-io fn main() {
+impure fn main() {
     let port[chan[str]] p = port();
     auto child = spawn "child" start(chan(p));
     auto c <- p;
diff --git a/src/test/run-pass/task-comm-13-thread.rs b/src/test/run-pass/task-comm-13-thread.rs
index 0dab20ed..e7cfc247 100644
--- a/src/test/run-pass/task-comm-13-thread.rs
+++ b/src/test/run-pass/task-comm-13-thread.rs
@@ -1,7 +1,7 @@
 use std;
 import std._task;
 
-io fn start(chan[int] c, int start, int number_of_messages) {
+impure fn start(chan[int] c, int start, int number_of_messages) {
     let int i = 0;
     while (i < number_of_messages) {
         c <| start + i;
diff --git a/src/test/run-pass/task-comm-13.rs b/src/test/run-pass/task-comm-13.rs
index 97bdcb6a..6b29ec1e 100644
--- a/src/test/run-pass/task-comm-13.rs
+++ b/src/test/run-pass/task-comm-13.rs
@@ -1,7 +1,7 @@
 use std;
 import std._task;
 
-io fn start(chan[int] c, int start, int number_of_messages) {
+impure fn start(chan[int] c, int start, int number_of_messages) {
     let int i = 0;
     while (i < number_of_messages) {
         c <| start + i;
diff --git a/src/test/run-pass/task-comm-4.rs b/src/test/run-pass/task-comm-4.rs
index b185d425..31b94603 100644
--- a/src/test/run-pass/task-comm-4.rs
+++ b/src/test/run-pass/task-comm-4.rs
@@ -1,8 +1,8 @@
-io fn main() -> () {
+impure fn main() -> () {
    test00();
 }
 
-io fn test00() {
+impure fn test00() {
     let int r = 0;    
     let int sum = 0;
     let port[int] p = port();
diff --git a/src/test/run-pass/task-comm-5.rs b/src/test/run-pass/task-comm-5.rs
index 950f4149..76606094 100644
--- a/src/test/run-pass/task-comm-5.rs
+++ b/src/test/run-pass/task-comm-5.rs
@@ -1,8 +1,8 @@
-io fn main() -> () {
+impure fn main() -> () {
    test00();
 }
 
-io fn test00() {
+impure fn test00() {
     let int r = 0;    
     let int sum = 0;
     let port[int] p = port();
diff --git a/src/test/run-pass/task-comm-6.rs b/src/test/run-pass/task-comm-6.rs
index 2774c0ba..4ab97135 100644
--- a/src/test/run-pass/task-comm-6.rs
+++ b/src/test/run-pass/task-comm-6.rs
@@ -1,8 +1,8 @@
-io fn main() -> () {
+impure fn main() -> () {
    test00();
 }
 
-io fn test00() {
+impure fn test00() {
     let int r = 0;    
     let int sum = 0;
     let port[int] p = port();
diff --git a/src/test/run-pass/task-comm-7.rs b/src/test/run-pass/task-comm-7.rs
index bb59807d..099f8d6b 100644
--- a/src/test/run-pass/task-comm-7.rs
+++ b/src/test/run-pass/task-comm-7.rs
@@ -1,8 +1,8 @@
-io fn main() -> () {
+impure fn main() -> () {
    test00();
 }
 
-io fn test00_start(chan[int] c, int start, int number_of_messages) {
+impure fn test00_start(chan[int] c, int start, int number_of_messages) {
     let int i = 0;
     while (i < number_of_messages) {
         c <| start + i;
@@ -10,7 +10,7 @@ io fn test00_start(chan[int] c, int start, int number_of_messages) {
     }    
 }
 
-io fn test00() {
+impure fn test00() {
     let int r = 0;    
     let int sum = 0;
     let port[int] p = port();