From 3333fef1af826c2467b9d1fe04779affb0c385d5 Mon Sep 17 00:00:00 2001
From: Patrick Walton <pcwalton@mimiga.net>
Date: Thu, 19 Jan 2012 16:10:31 -0800
Subject: [PATCH] test: "tag" -> "enum" in run-pass and run-fail

---
 src/test/run-fail/non-exhaustive-match.rs                 | 2 +-
 src/test/run-pass/alias-uninit-value.rs                   | 2 +-
 src/test/run-pass/alloca-from-derived-tydesc.rs           | 2 +-
 src/test/run-pass/alt-path.rs                             | 2 +-
 src/test/run-pass/alt-pattern-drop.rs                     | 2 +-
 src/test/run-pass/alt-pattern-no-type-params.rs           | 2 +-
 src/test/run-pass/alt-phi.rs                              | 2 +-
 src/test/run-pass/alt-str.rs                              | 2 +-
 src/test/run-pass/alt-tag.rs                              | 2 +-
 src/test/run-pass/box-pattern.rs                          | 2 +-
 src/test/run-pass/chan-leak.rs                            | 2 +-
 src/test/run-pass/conditional-compile.rs                  | 4 ++--
 src/test/run-pass/constrained-type.rs                     | 2 +-
 src/test/run-pass/cycle-collection.rs                     | 2 +-
 src/test/run-pass/drop-on-empty-block-exit.rs             | 2 +-
 src/test/run-pass/empty-tag.rs                            | 2 +-
 src/test/run-pass/export-abstract-tag.rs                  | 2 +-
 src/test/run-pass/export-non-interference.rs              | 2 +-
 src/test/run-pass/export-tag-variant.rs                   | 4 ++--
 src/test/run-pass/export-unexported-dep.rs                | 2 +-
 src/test/run-pass/expr-alt-struct.rs                      | 2 +-
 src/test/run-pass/expr-if-struct.rs                       | 2 +-
 src/test/run-pass/generic-ivec-leak.rs                    | 2 +-
 src/test/run-pass/generic-recursive-tag.rs                | 2 +-
 src/test/run-pass/generic-tag-alt.rs                      | 2 +-
 src/test/run-pass/generic-tag-corruption.rs               | 2 +-
 src/test/run-pass/generic-tag-local.rs                    | 2 +-
 src/test/run-pass/generic-tag-values.rs                   | 2 +-
 src/test/run-pass/generic-tag.rs                          | 2 +-
 src/test/run-pass/hashmap-memory.rs                       | 2 +-
 src/test/run-pass/iface-cast.rs                           | 2 +-
 src/test/run-pass/init-res-into-things.rs                 | 4 ++--
 src/test/run-pass/issue-687.rs                            | 2 +-
 src/test/run-pass/issue-970.rs                            | 2 +-
 src/test/run-pass/issue-980.rs                            | 2 +-
 src/test/run-pass/leak-tag-copy.rs                        | 2 +-
 src/test/run-pass/let-destruct.rs                         | 2 +-
 src/test/run-pass/list.rs                                 | 2 +-
 .../run-pass/log-knows-the-names-of-variants-in-std.rs    | 2 +-
 src/test/run-pass/log-knows-the-names-of-variants.rs      | 2 +-
 src/test/run-pass/log-linearized.rs                       | 2 +-
 src/test/run-pass/mlist-cycle.rs                          | 2 +-
 src/test/run-pass/mlist.rs                                | 2 +-
 src/test/run-pass/mutual-recursion-group.rs               | 8 ++++----
 src/test/run-pass/nested-pattern.rs                       | 2 +-
 src/test/run-pass/newtype-polymorphic.rs                  | 2 +-
 src/test/run-pass/newtype.rs                              | 2 +-
 src/test/run-pass/non-boolean-pure-fns.rs                 | 2 +-
 src/test/run-pass/nullary-or-pattern.rs                   | 2 +-
 src/test/run-pass/or-pattern.rs                           | 2 +-
 src/test/run-pass/record-pat.rs                           | 4 ++--
 src/test/run-pass/resource-in-struct.rs                   | 2 +-
 src/test/run-pass/ret-none.rs                             | 2 +-
 src/test/run-pass/shadow.rs                               | 2 +-
 src/test/run-pass/shape_intrinsic_tag_then_rec.rs         | 4 ++--
 src/test/run-pass/simple-alt-generic-tag.rs               | 2 +-
 src/test/run-pass/simple-generic-alt.rs                   | 2 +-
 src/test/run-pass/simple-generic-tag.rs                   | 2 +-
 src/test/run-pass/size-and-align.rs                       | 2 +-
 src/test/run-pass/structured-compare-recursive.rs         | 2 +-
 src/test/run-pass/structured-compare.rs                   | 2 +-
 src/test/run-pass/tag-disr-val-shape.rs                   | 2 +-
 src/test/run-pass/tag-in-block.rs                         | 2 +-
 src/test/run-pass/tag-variant-disr-val.rs                 | 2 +-
 src/test/run-pass/tag.rs                                  | 2 +-
 src/test/run-pass/task-comm-16.rs                         | 2 +-
 src/test/run-pass/unchecked-predicates.rs                 | 2 +-
 src/test/run-pass/uniq-cc-generic.rs                      | 2 +-
 src/test/run-pass/uniq-cc.rs                              | 2 +-
 src/test/run-pass/unique-containing-tag.rs                | 2 +-
 src/test/run-pass/unique-in-tag.rs                        | 2 +-
 src/test/run-pass/unique-pat-2.rs                         | 2 +-
 src/test/run-pass/unique-pat-3.rs                         | 2 +-
 src/test/run-pass/use-uninit-alt.rs                       | 2 +-
 src/test/run-pass/use-uninit-alt2.rs                      | 2 +-
 src/test/run-pass/while-prelude-drop.rs                   | 2 +-
 76 files changed, 84 insertions(+), 84 deletions(-)

diff --git a/src/test/run-fail/non-exhaustive-match.rs b/src/test/run-fail/non-exhaustive-match.rs
index 829477ce71a8..4be3aec6490e 100644
--- a/src/test/run-fail/non-exhaustive-match.rs
+++ b/src/test/run-fail/non-exhaustive-match.rs
@@ -4,6 +4,6 @@
 // -*- rust -*-
 
 // error-pattern:non-exhaustive match failure
-tag t { a; b; }
+enum t { a; b; }
 
 fn main() { let x = a; alt x { b { } } }
diff --git a/src/test/run-pass/alias-uninit-value.rs b/src/test/run-pass/alias-uninit-value.rs
index 37186537d6ca..d023ec67b49d 100644
--- a/src/test/run-pass/alias-uninit-value.rs
+++ b/src/test/run-pass/alias-uninit-value.rs
@@ -5,7 +5,7 @@ use std;
 import option;
 import option::none;
 
-tag sty { ty_nil; }
+enum sty { ty_nil; }
 
 type raw_t = {struct: sty, cname: option::t<str>, hash: uint};
 
diff --git a/src/test/run-pass/alloca-from-derived-tydesc.rs b/src/test/run-pass/alloca-from-derived-tydesc.rs
index 6077bbf6723b..8b7561c78b75 100644
--- a/src/test/run-pass/alloca-from-derived-tydesc.rs
+++ b/src/test/run-pass/alloca-from-derived-tydesc.rs
@@ -1,4 +1,4 @@
-tag option<T> { some(T); none; }
+enum option<T> { some(T); none; }
 
 type r<T> = {mutable v: [option<T>]};
 
diff --git a/src/test/run-pass/alt-path.rs b/src/test/run-pass/alt-path.rs
index bc2d3463959e..c474b1d7df22 100644
--- a/src/test/run-pass/alt-path.rs
+++ b/src/test/run-pass/alt-path.rs
@@ -1,7 +1,7 @@
 
 
 mod m1 {
-    tag foo { foo1; foo2; }
+    enum foo { foo1; foo2; }
 }
 
 fn bar(x: m1::foo) { alt x { m1::foo1 { } } }
diff --git a/src/test/run-pass/alt-pattern-drop.rs b/src/test/run-pass/alt-pattern-drop.rs
index d6af174757ce..73af1bacf575 100644
--- a/src/test/run-pass/alt-pattern-drop.rs
+++ b/src/test/run-pass/alt-pattern-drop.rs
@@ -5,7 +5,7 @@ use std;
 
 import std::dbg;
 
-tag t { make_t(@int); clam; }
+enum t { make_t(@int); clam; }
 
 fn foo(s: @int) {
     let count = dbg::refcount(s);
diff --git a/src/test/run-pass/alt-pattern-no-type-params.rs b/src/test/run-pass/alt-pattern-no-type-params.rs
index e9c94962452b..1c5355f816a1 100644
--- a/src/test/run-pass/alt-pattern-no-type-params.rs
+++ b/src/test/run-pass/alt-pattern-no-type-params.rs
@@ -1,4 +1,4 @@
-tag maybe<T> { nothing; just(T); }
+enum maybe<T> { nothing; just(T); }
 
 fn foo(x: maybe<int>) {
     alt x { nothing { #error("A"); } just(a) { #error("B"); } }
diff --git a/src/test/run-pass/alt-phi.rs b/src/test/run-pass/alt-phi.rs
index 67b4a9b6a128..fe7073d65f46 100644
--- a/src/test/run-pass/alt-phi.rs
+++ b/src/test/run-pass/alt-phi.rs
@@ -1,6 +1,6 @@
 
 
-tag thing { a; b; c; }
+enum thing { a; b; c; }
 
 fn foo(it: block(int)) { it(10); }
 
diff --git a/src/test/run-pass/alt-str.rs b/src/test/run-pass/alt-str.rs
index 884a4da8a3d8..9982da07d1e1 100644
--- a/src/test/run-pass/alt-str.rs
+++ b/src/test/run-pass/alt-str.rs
@@ -3,7 +3,7 @@
 fn main() {
     alt "test" { "not-test" { fail; } "test" { } _ { fail; } }
 
-    tag t { tag1(str); tag2; }
+    enum t { tag1(str); tag2; }
 
 
     alt tag1("test") {
diff --git a/src/test/run-pass/alt-tag.rs b/src/test/run-pass/alt-tag.rs
index 462e6acda4e0..42a3d2aa842c 100644
--- a/src/test/run-pass/alt-tag.rs
+++ b/src/test/run-pass/alt-tag.rs
@@ -2,7 +2,7 @@
 
 
 // -*- rust -*-
-tag color {
+enum color {
     rgb(int, int, int);
     rgba(int, int, int, int);
     hsl(int, int, int);
diff --git a/src/test/run-pass/box-pattern.rs b/src/test/run-pass/box-pattern.rs
index 973d7e303b9c..1b4f284c2a53 100644
--- a/src/test/run-pass/box-pattern.rs
+++ b/src/test/run-pass/box-pattern.rs
@@ -1,5 +1,5 @@
 type foo = {a: int, b: uint};
-tag bar { u(@foo); w(int); }
+enum bar { u(@foo); w(int); }
 
 fn main() {
     assert (alt u(@{a: 10, b: 40u}) {
diff --git a/src/test/run-pass/chan-leak.rs b/src/test/run-pass/chan-leak.rs
index f7adb1a0961d..effe019ccd39 100644
--- a/src/test/run-pass/chan-leak.rs
+++ b/src/test/run-pass/chan-leak.rs
@@ -8,7 +8,7 @@ import comm;
 import comm::port;
 import comm::recv;
 
-tag request { quit; close(chan<bool>); }
+enum request { quit; close(chan<bool>); }
 
 type ctx = chan<request>;
 
diff --git a/src/test/run-pass/conditional-compile.rs b/src/test/run-pass/conditional-compile.rs
index 46187c3b53b0..60955f88f27c 100644
--- a/src/test/run-pass/conditional-compile.rs
+++ b/src/test/run-pass/conditional-compile.rs
@@ -20,9 +20,9 @@ type t = int;
 type t = bool;
 
 #[cfg(bogus)]
-tag tg { foo; }
+enum tg { foo; }
 
-tag tg { bar; }
+enum tg { bar; }
 
 #[cfg(bogus)]
 resource r(i: int) { }
diff --git a/src/test/run-pass/constrained-type.rs b/src/test/run-pass/constrained-type.rs
index fdf48e2fb04f..32602cd2e484 100644
--- a/src/test/run-pass/constrained-type.rs
+++ b/src/test/run-pass/constrained-type.rs
@@ -1,6 +1,6 @@
 // -*- rust -*-
 
-tag list { cons(int, @list); nil; }
+enum list { cons(int, @list); nil; }
 
 type bubu = {x: int, y: int};
 
diff --git a/src/test/run-pass/cycle-collection.rs b/src/test/run-pass/cycle-collection.rs
index 8cb2bc7979f3..d0c85d6774f5 100644
--- a/src/test/run-pass/cycle-collection.rs
+++ b/src/test/run-pass/cycle-collection.rs
@@ -1,4 +1,4 @@
-tag taggy {
+enum taggy {
     cons(@mutable taggy);
     nil;
 }
diff --git a/src/test/run-pass/drop-on-empty-block-exit.rs b/src/test/run-pass/drop-on-empty-block-exit.rs
index 97a161f19e73..ec9627452cda 100644
--- a/src/test/run-pass/drop-on-empty-block-exit.rs
+++ b/src/test/run-pass/drop-on-empty-block-exit.rs
@@ -1,5 +1,5 @@
 
 
-tag t { foo(@int); }
+enum t { foo(@int); }
 
 fn main() { let tt = foo(@10); alt tt { foo(z) { } } }
diff --git a/src/test/run-pass/empty-tag.rs b/src/test/run-pass/empty-tag.rs
index d9563dd74c4c..ba7941e680e3 100644
--- a/src/test/run-pass/empty-tag.rs
+++ b/src/test/run-pass/empty-tag.rs
@@ -1,4 +1,4 @@
-tag chan { chan_t; }
+enum chan { chan_t; }
 
 fn wrapper3(i: chan) {
     assert i == chan_t;
diff --git a/src/test/run-pass/export-abstract-tag.rs b/src/test/run-pass/export-abstract-tag.rs
index f30d128635b3..cb820bc26ced 100644
--- a/src/test/run-pass/export-abstract-tag.rs
+++ b/src/test/run-pass/export-abstract-tag.rs
@@ -5,7 +5,7 @@ mod foo {
     export t;
     export f;
 
-    tag t { t1; }
+    enum t { t1; }
 
     fn f() -> t { ret t1; }
 }
diff --git a/src/test/run-pass/export-non-interference.rs b/src/test/run-pass/export-non-interference.rs
index e3efcc2835f3..630fb2919bf6 100644
--- a/src/test/run-pass/export-non-interference.rs
+++ b/src/test/run-pass/export-non-interference.rs
@@ -2,6 +2,6 @@
 export foo;
 export main;
 
-tag list_cell<T> { cons(@list_cell<T>); }
+enum list_cell<T> { cons(@list_cell<T>); }
 
 fn main() { }
diff --git a/src/test/run-pass/export-tag-variant.rs b/src/test/run-pass/export-tag-variant.rs
index 12eaf63949b9..9862fc1fbd70 100644
--- a/src/test/run-pass/export-tag-variant.rs
+++ b/src/test/run-pass/export-tag-variant.rs
@@ -1,8 +1,8 @@
-// Export the tag variants, without the tag
+// Export the enum variants, without the enum
 
 mod foo {
     export t1;
-    tag t { t1; }
+    enum t { t1; }
 }
 
 fn main() { let v = foo::t1; }
diff --git a/src/test/run-pass/export-unexported-dep.rs b/src/test/run-pass/export-unexported-dep.rs
index 357821ac34ea..71f2f9ca9003 100644
--- a/src/test/run-pass/export-unexported-dep.rs
+++ b/src/test/run-pass/export-unexported-dep.rs
@@ -6,7 +6,7 @@ mod foo {
     export g;
 
     // not exported
-    tag t { t1; t2; }
+    enum t { t1; t2; }
 
     fn f() -> t { ret t1; }
 
diff --git a/src/test/run-pass/expr-alt-struct.rs b/src/test/run-pass/expr-alt-struct.rs
index e346c9d2a9fb..cee1bb22dee6 100644
--- a/src/test/run-pass/expr-alt-struct.rs
+++ b/src/test/run-pass/expr-alt-struct.rs
@@ -10,7 +10,7 @@ fn test_rec() {
 }
 
 fn test_tag() {
-    tag mood { happy; sad; }
+    enum mood { happy; sad; }
     let rs = alt true { true { happy } false { sad } };
     assert (rs == happy);
 }
diff --git a/src/test/run-pass/expr-if-struct.rs b/src/test/run-pass/expr-if-struct.rs
index 56728c677069..af19923d85d1 100644
--- a/src/test/run-pass/expr-if-struct.rs
+++ b/src/test/run-pass/expr-if-struct.rs
@@ -10,7 +10,7 @@ fn test_rec() {
 }
 
 fn test_tag() {
-    tag mood { happy; sad; }
+    enum mood { happy; sad; }
     let rs = if true { happy } else { sad };
     assert (rs == happy);
 }
diff --git a/src/test/run-pass/generic-ivec-leak.rs b/src/test/run-pass/generic-ivec-leak.rs
index 4e4508d08e9f..fe7ca6112180 100644
--- a/src/test/run-pass/generic-ivec-leak.rs
+++ b/src/test/run-pass/generic-ivec-leak.rs
@@ -1,4 +1,4 @@
-tag wrapper<T> { wrapped(T); }
+enum wrapper<T> { wrapped(T); }
 
 fn main() { let w = wrapped([1, 2, 3, 4, 5]); }
 
diff --git a/src/test/run-pass/generic-recursive-tag.rs b/src/test/run-pass/generic-recursive-tag.rs
index 94e97bf170d1..a39b5689970d 100644
--- a/src/test/run-pass/generic-recursive-tag.rs
+++ b/src/test/run-pass/generic-recursive-tag.rs
@@ -1,6 +1,6 @@
 
 
-tag list<T> { cons(@T, @list<T>); nil; }
+enum list<T> { cons(@T, @list<T>); nil; }
 
 fn main() {
     let a: list<int> =
diff --git a/src/test/run-pass/generic-tag-alt.rs b/src/test/run-pass/generic-tag-alt.rs
index 469dc2008450..d3b0060a1ee1 100644
--- a/src/test/run-pass/generic-tag-alt.rs
+++ b/src/test/run-pass/generic-tag-alt.rs
@@ -1,6 +1,6 @@
 
 
-tag foo<T> { arm(T); }
+enum foo<T> { arm(T); }
 
 fn altfoo<T>(f: foo<T>) {
     let hit = false;
diff --git a/src/test/run-pass/generic-tag-corruption.rs b/src/test/run-pass/generic-tag-corruption.rs
index 13019735c261..2487129ecae2 100644
--- a/src/test/run-pass/generic-tag-corruption.rs
+++ b/src/test/run-pass/generic-tag-corruption.rs
@@ -2,6 +2,6 @@
 
 
 // This causes memory corruption in stage0.
-tag thing<K> { some(K); }
+enum thing<K> { some(K); }
 
 fn main() { let x = some("hi"); }
diff --git a/src/test/run-pass/generic-tag-local.rs b/src/test/run-pass/generic-tag-local.rs
index 529cec476d0c..dd03f3852a9d 100644
--- a/src/test/run-pass/generic-tag-local.rs
+++ b/src/test/run-pass/generic-tag-local.rs
@@ -1,5 +1,5 @@
 
 
-tag clam<T> { a(T); }
+enum clam<T> { a(T); }
 
 fn main() { let c = a(3); }
diff --git a/src/test/run-pass/generic-tag-values.rs b/src/test/run-pass/generic-tag-values.rs
index 7b03e75ef082..6bedc222024a 100644
--- a/src/test/run-pass/generic-tag-values.rs
+++ b/src/test/run-pass/generic-tag-values.rs
@@ -2,7 +2,7 @@
 
 
 // -*- rust -*-
-tag noption<T> { some(T); }
+enum noption<T> { some(T); }
 
 fn main() {
     let nop: noption<int> = some::<int>(5);
diff --git a/src/test/run-pass/generic-tag.rs b/src/test/run-pass/generic-tag.rs
index 6bc7c4528242..88eda46ab173 100644
--- a/src/test/run-pass/generic-tag.rs
+++ b/src/test/run-pass/generic-tag.rs
@@ -1,5 +1,5 @@
 
 
-tag option<T> { some(@T); none; }
+enum option<T> { some(@T); none; }
 
 fn main() { let a: option<int> = some::<int>(@10); a = none::<int>; }
diff --git a/src/test/run-pass/hashmap-memory.rs b/src/test/run-pass/hashmap-memory.rs
index 343a042dbc1b..333779fbc6db 100644
--- a/src/test/run-pass/hashmap-memory.rs
+++ b/src/test/run-pass/hashmap-memory.rs
@@ -30,7 +30,7 @@ mod map_reduce {
 
     type mapper = native fn(str, putter);
 
-    tag ctrl_proto { find_reducer([u8], chan<int>); mapper_done; }
+    enum ctrl_proto { find_reducer([u8], chan<int>); mapper_done; }
 
     fn start_mappers(ctrl: chan<ctrl_proto>, inputs: [str]) {
         for i: str in inputs {
diff --git a/src/test/run-pass/iface-cast.rs b/src/test/run-pass/iface-cast.rs
index c8704ab50a62..94dbc3fcdb04 100644
--- a/src/test/run-pass/iface-cast.rs
+++ b/src/test/run-pass/iface-cast.rs
@@ -1,6 +1,6 @@
 // Test cyclic detector when using iface instances.
 
-tag Tree = TreeR;
+enum Tree = TreeR;
 type TreeR = @{
     mutable left: option<Tree>,
     mutable right: option<Tree>,
diff --git a/src/test/run-pass/init-res-into-things.rs b/src/test/run-pass/init-res-into-things.rs
index 71b5a7e9e42e..556ad530c34d 100644
--- a/src/test/run-pass/init-res-into-things.rs
+++ b/src/test/run-pass/init-res-into-things.rs
@@ -22,7 +22,7 @@ fn test_rec() {
 }
 
 fn test_tag() {
-    tag t {
+    enum t {
         t0(r);
     }
 
@@ -62,7 +62,7 @@ fn test_box_rec() {
 fn main() {
     test_box();
     test_rec();
-    // FIXME: tag constructors don't optimize their arguments into moves
+    // FIXME: enum constructors don't optimize their arguments into moves
     // test_tag();
     test_tup();
     test_unique();
diff --git a/src/test/run-pass/issue-687.rs b/src/test/run-pass/issue-687.rs
index cbdadda8e881..18f2978a018a 100644
--- a/src/test/run-pass/issue-687.rs
+++ b/src/test/run-pass/issue-687.rs
@@ -7,7 +7,7 @@ import comm::port;
 import comm::recv;
 import comm::send;
 
-tag msg { closed; received([u8]); }
+enum msg { closed; received([u8]); }
 
 fn producer(c: chan<[u8]>) {
     send(c, [1u8, 2u8, 3u8, 4u8]);
diff --git a/src/test/run-pass/issue-970.rs b/src/test/run-pass/issue-970.rs
index a19b6ccbc7ba..f256a936431e 100644
--- a/src/test/run-pass/issue-970.rs
+++ b/src/test/run-pass/issue-970.rs
@@ -1,4 +1,4 @@
-tag maybe_ordered_pair {
+enum maybe_ordered_pair {
     yes({low: int, high: int} : less_than(*.low, *.high));
     no;
 }
diff --git a/src/test/run-pass/issue-980.rs b/src/test/run-pass/issue-980.rs
index fe0e75b22e21..4f4ed283265f 100644
--- a/src/test/run-pass/issue-980.rs
+++ b/src/test/run-pass/issue-980.rs
@@ -1,4 +1,4 @@
-tag maybe_pointy {
+enum maybe_pointy {
     no_pointy;
     yes_pointy(@pointy);
 }
diff --git a/src/test/run-pass/leak-tag-copy.rs b/src/test/run-pass/leak-tag-copy.rs
index 7c5eb538bc23..eca6134f94d9 100644
--- a/src/test/run-pass/leak-tag-copy.rs
+++ b/src/test/run-pass/leak-tag-copy.rs
@@ -1,5 +1,5 @@
 
 
-tag t { a; b(@int); }
+enum t { a; b(@int); }
 
 fn main() { let x = b(@10); x = a; }
diff --git a/src/test/run-pass/let-destruct.rs b/src/test/run-pass/let-destruct.rs
index bdc7c6a798c4..932cd3f0bd0e 100644
--- a/src/test/run-pass/let-destruct.rs
+++ b/src/test/run-pass/let-destruct.rs
@@ -1,4 +1,4 @@
-tag xx = int;
+enum xx = int;
 
 fn main() {
     let @{x: xx(x), y: y} = @{x: xx(10), y: 20};
diff --git a/src/test/run-pass/list.rs b/src/test/run-pass/list.rs
index 272ec4b3b6fa..e0f372cf7266 100644
--- a/src/test/run-pass/list.rs
+++ b/src/test/run-pass/list.rs
@@ -2,6 +2,6 @@
 
 
 // -*- rust -*-
-tag list { cons(int, @list); nil; }
+enum list { cons(int, @list); nil; }
 
 fn main() { cons(10, @cons(11, @cons(12, @nil))); }
diff --git a/src/test/run-pass/log-knows-the-names-of-variants-in-std.rs b/src/test/run-pass/log-knows-the-names-of-variants-in-std.rs
index 1ac1e0e3ef56..ca4a40074b6e 100644
--- a/src/test/run-pass/log-knows-the-names-of-variants-in-std.rs
+++ b/src/test/run-pass/log-knows-the-names-of-variants-in-std.rs
@@ -1,7 +1,7 @@
 use std;
 import std::list;
 
-tag foo {
+enum foo {
   a(uint);
   b(str);
 }
diff --git a/src/test/run-pass/log-knows-the-names-of-variants.rs b/src/test/run-pass/log-knows-the-names-of-variants.rs
index ac8e368540ca..6850ad761e38 100644
--- a/src/test/run-pass/log-knows-the-names-of-variants.rs
+++ b/src/test/run-pass/log-knows-the-names-of-variants.rs
@@ -1,4 +1,4 @@
-tag foo {
+enum foo {
   a(uint);
   b(str);
   c;
diff --git a/src/test/run-pass/log-linearized.rs b/src/test/run-pass/log-linearized.rs
index 984683d8ad22..725643f7317f 100644
--- a/src/test/run-pass/log-linearized.rs
+++ b/src/test/run-pass/log-linearized.rs
@@ -1,6 +1,6 @@
 // Tests that shapes respect linearize_ty_params().
 
-tag option<T> {
+enum option<T> {
     none;
     some(T);
 }
diff --git a/src/test/run-pass/mlist-cycle.rs b/src/test/run-pass/mlist-cycle.rs
index 1f7bd05a7ab9..b44514021a44 100644
--- a/src/test/run-pass/mlist-cycle.rs
+++ b/src/test/run-pass/mlist-cycle.rs
@@ -4,7 +4,7 @@ use std;
 
 type cell = {mutable c: @list};
 
-tag list { link(@cell); nil; }
+enum list { link(@cell); nil; }
 
 fn main() {
     let first: @cell = @{mutable c: @nil()};
diff --git a/src/test/run-pass/mlist.rs b/src/test/run-pass/mlist.rs
index 5b5a2c3fdf06..8746dfc949df 100644
--- a/src/test/run-pass/mlist.rs
+++ b/src/test/run-pass/mlist.rs
@@ -1,4 +1,4 @@
 // -*- rust -*-
-tag mlist { cons(int, @mlist); nil; }
+enum mlist { cons(int, @mlist); nil; }
 
 fn main() { cons(10, @cons(11, @cons(12, @nil))); }
diff --git a/src/test/run-pass/mutual-recursion-group.rs b/src/test/run-pass/mutual-recursion-group.rs
index f21bbf1a435d..516a04203e33 100644
--- a/src/test/run-pass/mutual-recursion-group.rs
+++ b/src/test/run-pass/mutual-recursion-group.rs
@@ -2,12 +2,12 @@
 
 
 // -*- rust -*-
-tag colour { red; green; blue; }
+enum colour { red; green; blue; }
 
-tag tree { children(@list); leaf(colour); }
+enum tree { children(@list); leaf(colour); }
 
-tag list { cons(@tree, @list); nil; }
+enum list { cons(@tree, @list); nil; }
 
-tag small_list { kons(int, @small_list); neel; }
+enum small_list { kons(int, @small_list); neel; }
 
 fn main() { }
diff --git a/src/test/run-pass/nested-pattern.rs b/src/test/run-pass/nested-pattern.rs
index c0d0528674be..af8b2632ece7 100644
--- a/src/test/run-pass/nested-pattern.rs
+++ b/src/test/run-pass/nested-pattern.rs
@@ -6,7 +6,7 @@ import option;
 import option::some;
 import option::none;
 
-tag t { foo(int, uint); bar(int, option::t<int>); }
+enum t { foo(int, uint); bar(int, option::t<int>); }
 
 fn nested(o: t) {
     alt o {
diff --git a/src/test/run-pass/newtype-polymorphic.rs b/src/test/run-pass/newtype-polymorphic.rs
index f25665ca86c1..69efb1291467 100644
--- a/src/test/run-pass/newtype-polymorphic.rs
+++ b/src/test/run-pass/newtype-polymorphic.rs
@@ -1,4 +1,4 @@
-tag myvec<X> = [X];
+enum myvec<X> = [X];
 
 fn myvec_deref<X: copy>(mv: myvec<X>) -> [X] { ret *mv; }
 
diff --git a/src/test/run-pass/newtype.rs b/src/test/run-pass/newtype.rs
index 3152e1b69eb5..32fde0f4edc4 100644
--- a/src/test/run-pass/newtype.rs
+++ b/src/test/run-pass/newtype.rs
@@ -1,4 +1,4 @@
-tag mytype = {compute: native fn(mytype) -> int, val: int};
+enum mytype = {compute: native fn(mytype) -> int, val: int};
 
 fn compute(i: mytype) -> int { ret i.val + 20; }
 
diff --git a/src/test/run-pass/non-boolean-pure-fns.rs b/src/test/run-pass/non-boolean-pure-fns.rs
index 6081dc145fd6..2081dd307488 100644
--- a/src/test/run-pass/non-boolean-pure-fns.rs
+++ b/src/test/run-pass/non-boolean-pure-fns.rs
@@ -13,7 +13,7 @@ pure fn nonempty_list<T: copy>(ls: list<T>) -> bool { pure_length(ls) > 0u }
 // Of course, the compiler can't take advantage of the
 // knowledge that ls is a cons node. Future work.
 // Also, this is pretty contrived since nonempty_list
-// could be a "tag refinement", if we implement those.
+// could be a "enum refinement", if we implement those.
 fn safe_head<T: copy>(ls: list<T>) : nonempty_list(ls) -> T {
     check is_not_empty(ls);
     ret head(ls);
diff --git a/src/test/run-pass/nullary-or-pattern.rs b/src/test/run-pass/nullary-or-pattern.rs
index 661d5cc7a388..6efbafa1c072 100644
--- a/src/test/run-pass/nullary-or-pattern.rs
+++ b/src/test/run-pass/nullary-or-pattern.rs
@@ -1,4 +1,4 @@
-tag blah { a; b; }
+enum blah { a; b; }
 
 fn or_alt(q: blah) -> int {
   alt q { a | b { 42 } }
diff --git a/src/test/run-pass/or-pattern.rs b/src/test/run-pass/or-pattern.rs
index cc86fbd3e8bd..6b78b381f00b 100644
--- a/src/test/run-pass/or-pattern.rs
+++ b/src/test/run-pass/or-pattern.rs
@@ -1,4 +1,4 @@
-tag blah { a(int, int, uint); b(int, int); c; }
+enum blah { a(int, int, uint); b(int, int); c; }
 
 fn or_alt(q: blah) -> int {
     alt q { a(x, y, _) | b(x, y) { ret x + y; } c { ret 0; } }
diff --git a/src/test/run-pass/record-pat.rs b/src/test/run-pass/record-pat.rs
index 06228674e3f8..d06bfe9c7200 100644
--- a/src/test/run-pass/record-pat.rs
+++ b/src/test/run-pass/record-pat.rs
@@ -1,6 +1,6 @@
-tag t1 { a(int); b(uint); }
+enum t1 { a(int); b(uint); }
 type t2 = {x: t1, y: int};
-tag t3 { c(t2, uint); }
+enum t3 { c(t2, uint); }
 
 fn m(in: t3) -> int {
     alt in {
diff --git a/src/test/run-pass/resource-in-struct.rs b/src/test/run-pass/resource-in-struct.rs
index 758beb3d9e12..81dc1680442d 100644
--- a/src/test/run-pass/resource-in-struct.rs
+++ b/src/test/run-pass/resource-in-struct.rs
@@ -5,7 +5,7 @@ type closable = @mutable bool;
 
 resource close_res(i: closable) { *i = false; }
 
-tag option<T> { none; some(T); }
+enum option<T> { none; some(T); }
 
 fn sink(res: option<close_res>) { }
 
diff --git a/src/test/run-pass/ret-none.rs b/src/test/run-pass/ret-none.rs
index 7481bfe9100c..a32e09c139e9 100644
--- a/src/test/run-pass/ret-none.rs
+++ b/src/test/run-pass/ret-none.rs
@@ -1,6 +1,6 @@
 
 
-tag option<T> { none; some(T); }
+enum option<T> { none; some(T); }
 
 fn f<T: copy>() -> option<T> { ret none; }
 
diff --git a/src/test/run-pass/shadow.rs b/src/test/run-pass/shadow.rs
index dd430bc7089c..05215d5e3f6d 100644
--- a/src/test/run-pass/shadow.rs
+++ b/src/test/run-pass/shadow.rs
@@ -16,6 +16,6 @@ fn foo(c: [int]) {
     }
 }
 
-tag t<T> { none; some(T); }
+enum t<T> { none; some(T); }
 
 fn main() { let x = 10; let x = x + 20; assert (x == 30); foo([]); }
diff --git a/src/test/run-pass/shape_intrinsic_tag_then_rec.rs b/src/test/run-pass/shape_intrinsic_tag_then_rec.rs
index a50e5ed82d74..f40309ec3a15 100644
--- a/src/test/run-pass/shape_intrinsic_tag_then_rec.rs
+++ b/src/test/run-pass/shape_intrinsic_tag_then_rec.rs
@@ -1,5 +1,5 @@
 // Exercises a bug in the shape code that was exposed
-// on x86_64: when there is a tag embedded in an
+// on x86_64: when there is a enum embedded in an
 // interior record which is then itself interior to
 // something else, shape calculations were off.
 use std;
@@ -7,7 +7,7 @@ import std::list;
 import std::list::list;
 import option;
 
-tag opt_span {
+enum opt_span {
 
     //hack (as opposed to option::t), to make `span` compile
     os_none;
diff --git a/src/test/run-pass/simple-alt-generic-tag.rs b/src/test/run-pass/simple-alt-generic-tag.rs
index fd499bddd8f6..3e7df3063614 100644
--- a/src/test/run-pass/simple-alt-generic-tag.rs
+++ b/src/test/run-pass/simple-alt-generic-tag.rs
@@ -1,6 +1,6 @@
 
 
-tag opt<T> { none; }
+enum opt<T> { none; }
 
 fn main() {
     let x = none::<int>;
diff --git a/src/test/run-pass/simple-generic-alt.rs b/src/test/run-pass/simple-generic-alt.rs
index 6bf9566f156c..743277d461c2 100644
--- a/src/test/run-pass/simple-generic-alt.rs
+++ b/src/test/run-pass/simple-generic-alt.rs
@@ -1,5 +1,5 @@
 
 
-tag clam<T> { a(T); }
+enum clam<T> { a(T); }
 
 fn main() { let c = a(2); alt c { a::<int>(_) { } } }
diff --git a/src/test/run-pass/simple-generic-tag.rs b/src/test/run-pass/simple-generic-tag.rs
index 49bf69bde743..3a0843d8e919 100644
--- a/src/test/run-pass/simple-generic-tag.rs
+++ b/src/test/run-pass/simple-generic-tag.rs
@@ -1,5 +1,5 @@
 
 
-tag clam<T> { a(T); }
+enum clam<T> { a(T); }
 
 fn main() { }
diff --git a/src/test/run-pass/size-and-align.rs b/src/test/run-pass/size-and-align.rs
index 34b2ce242ca2..bb4afdb4c3de 100644
--- a/src/test/run-pass/size-and-align.rs
+++ b/src/test/run-pass/size-and-align.rs
@@ -2,7 +2,7 @@
 
 
 // -*- rust -*-
-tag clam<T> { a(T, int); b; }
+enum clam<T> { a(T, int); b; }
 
 fn uhoh<T>(v: [clam<T>]) {
     alt v[1] {
diff --git a/src/test/run-pass/structured-compare-recursive.rs b/src/test/run-pass/structured-compare-recursive.rs
index cee650ed40e9..72d75a33bf09 100644
--- a/src/test/run-pass/structured-compare-recursive.rs
+++ b/src/test/run-pass/structured-compare-recursive.rs
@@ -1,5 +1,5 @@
 
 
-tag taggy { foo(@taggy); bar; }
+enum taggy { foo(@taggy); bar; }
 
 fn main() { assert (bar <= bar); }
diff --git a/src/test/run-pass/structured-compare.rs b/src/test/run-pass/structured-compare.rs
index 04bc1d75da83..014196c87583 100644
--- a/src/test/run-pass/structured-compare.rs
+++ b/src/test/run-pass/structured-compare.rs
@@ -1,6 +1,6 @@
 
 
-tag foo { large; small; }
+enum foo { large; small; }
 
 fn main() {
     let a = {x: 1, y: 2, z: 3};
diff --git a/src/test/run-pass/tag-disr-val-shape.rs b/src/test/run-pass/tag-disr-val-shape.rs
index 26c230e79459..0c8b23e3dc3f 100644
--- a/src/test/run-pass/tag-disr-val-shape.rs
+++ b/src/test/run-pass/tag-disr-val-shape.rs
@@ -1,6 +1,6 @@
 // xfail-pretty Issue #1510
 
-tag color {
+enum color {
     red = 0xff0000;
     green = 0x00ff00;
     blue = 0x0000ff;
diff --git a/src/test/run-pass/tag-in-block.rs b/src/test/run-pass/tag-in-block.rs
index d76ee9ed12ae..fe74c1e5ed7c 100644
--- a/src/test/run-pass/tag-in-block.rs
+++ b/src/test/run-pass/tag-in-block.rs
@@ -2,7 +2,7 @@
 
 fn foo() {
     fn zed(z: bar) { }
-    tag bar { nil; }
+    enum bar { nil; }
     fn baz() { zed(nil); }
 }
 
diff --git a/src/test/run-pass/tag-variant-disr-val.rs b/src/test/run-pass/tag-variant-disr-val.rs
index 588b4107f130..65deb3ed0cb1 100644
--- a/src/test/run-pass/tag-variant-disr-val.rs
+++ b/src/test/run-pass/tag-variant-disr-val.rs
@@ -1,4 +1,4 @@
-tag color {
+enum color {
     red = 0xff0000;
     green = 0x00ff00;
     blue = 0x0000ff;
diff --git a/src/test/run-pass/tag.rs b/src/test/run-pass/tag.rs
index d0022341f8d1..76d6b8069dbd 100644
--- a/src/test/run-pass/tag.rs
+++ b/src/test/run-pass/tag.rs
@@ -2,7 +2,7 @@
 
 
 // -*- rust -*-
-tag colour { red(int, int); green; }
+enum colour { red(int, int); green; }
 
 fn f() { let x = red(1, 2); let y = green; assert (x != y); }
 
diff --git a/src/test/run-pass/task-comm-16.rs b/src/test/run-pass/task-comm-16.rs
index f1c83487c725..63e39789657a 100644
--- a/src/test/run-pass/task-comm-16.rs
+++ b/src/test/run-pass/task-comm-16.rs
@@ -50,7 +50,7 @@ fn test_str() {
 }
 
 fn test_tag() {
-    tag t { tag1; tag2(int); tag3(int, u8, char); }
+    enum t { tag1; tag2(int); tag3(int, u8, char); }
     let po = port();
     let ch = chan(po);
     send(ch, tag1);
diff --git a/src/test/run-pass/unchecked-predicates.rs b/src/test/run-pass/unchecked-predicates.rs
index 062f9c81a8b5..b2069f3a2651 100644
--- a/src/test/run-pass/unchecked-predicates.rs
+++ b/src/test/run-pass/unchecked-predicates.rs
@@ -26,7 +26,7 @@ pure fn nonempty_list<T: copy>(ls: list<T>) -> bool { pure_length(ls) > 0u }
 // Of course, the compiler can't take advantage of the
 // knowledge that ls is a cons node. Future work.
 // Also, this is pretty contrived since nonempty_list
-// could be a "tag refinement", if we implement those.
+// could be a "enum refinement", if we implement those.
 fn safe_head<T: copy>(ls: list<T>) : nonempty_list(ls) -> T {
     check is_not_empty(ls);
     ret head(ls)
diff --git a/src/test/run-pass/uniq-cc-generic.rs b/src/test/run-pass/uniq-cc-generic.rs
index 2a4392456977..536696d18d1c 100644
--- a/src/test/run-pass/uniq-cc-generic.rs
+++ b/src/test/run-pass/uniq-cc-generic.rs
@@ -1,4 +1,4 @@
-tag maybe_pointy {
+enum maybe_pointy {
     none;
     p(@pointy);
 }
diff --git a/src/test/run-pass/uniq-cc.rs b/src/test/run-pass/uniq-cc.rs
index b0f634ee98c2..de3ef188fb3f 100644
--- a/src/test/run-pass/uniq-cc.rs
+++ b/src/test/run-pass/uniq-cc.rs
@@ -1,4 +1,4 @@
-tag maybe_pointy {
+enum maybe_pointy {
     none;
     p(@pointy);
 }
diff --git a/src/test/run-pass/unique-containing-tag.rs b/src/test/run-pass/unique-containing-tag.rs
index 9bc189cbea90..88afe81b926a 100644
--- a/src/test/run-pass/unique-containing-tag.rs
+++ b/src/test/run-pass/unique-containing-tag.rs
@@ -1,5 +1,5 @@
 fn main() {
-    tag t { t1(int); t2(int); }
+    enum t { t1(int); t2(int); }
 
     let x = ~t1(10);
 
diff --git a/src/test/run-pass/unique-in-tag.rs b/src/test/run-pass/unique-in-tag.rs
index bcf3469281bf..443193f342e7 100644
--- a/src/test/run-pass/unique-in-tag.rs
+++ b/src/test/run-pass/unique-in-tag.rs
@@ -1,5 +1,5 @@
 fn test1() {
-    tag bar { u(~int); w(int); }
+    enum bar { u(~int); w(int); }
 
     let x = u(~10);
     assert alt x {
diff --git a/src/test/run-pass/unique-pat-2.rs b/src/test/run-pass/unique-pat-2.rs
index 91a95ed3aeea..f461560ff847 100644
--- a/src/test/run-pass/unique-pat-2.rs
+++ b/src/test/run-pass/unique-pat-2.rs
@@ -1,6 +1,6 @@
 
 type foo = {a: int, b: uint};
-tag bar { u(~foo); w(int); }
+enum bar { u(~foo); w(int); }
 
 fn main() {
     assert (alt u(~{a: 10, b: 40u}) {
diff --git a/src/test/run-pass/unique-pat-3.rs b/src/test/run-pass/unique-pat-3.rs
index a8ca302b3952..cb744685b05d 100644
--- a/src/test/run-pass/unique-pat-3.rs
+++ b/src/test/run-pass/unique-pat-3.rs
@@ -1,5 +1,5 @@
 
-tag bar { u(~int); w(int); }
+enum bar { u(~int); w(int); }
 
 fn main() {
     assert alt u(~10) {
diff --git a/src/test/run-pass/use-uninit-alt.rs b/src/test/run-pass/use-uninit-alt.rs
index 8b2735435495..b0a5e79c6f93 100644
--- a/src/test/run-pass/use-uninit-alt.rs
+++ b/src/test/run-pass/use-uninit-alt.rs
@@ -6,6 +6,6 @@ fn foo<T>(o: myoption<T>) -> int {
     ret x;
 }
 
-tag myoption<T> { none; some(T); }
+enum myoption<T> { none; some(T); }
 
 fn main() { log(debug, 5); }
diff --git a/src/test/run-pass/use-uninit-alt2.rs b/src/test/run-pass/use-uninit-alt2.rs
index cccb1ac14d77..106c9af5f4cc 100644
--- a/src/test/run-pass/use-uninit-alt2.rs
+++ b/src/test/run-pass/use-uninit-alt2.rs
@@ -6,6 +6,6 @@ fn foo<T>(o: myoption<T>) -> int {
     ret x;
 }
 
-tag myoption<T> { none; some(T); }
+enum myoption<T> { none; some(T); }
 
 fn main() { log(debug, 5); }
diff --git a/src/test/run-pass/while-prelude-drop.rs b/src/test/run-pass/while-prelude-drop.rs
index 9688c4363708..c2f84ada888b 100644
--- a/src/test/run-pass/while-prelude-drop.rs
+++ b/src/test/run-pass/while-prelude-drop.rs
@@ -1,5 +1,5 @@
 
-tag t { a; b(str); }
+enum t { a; b(str); }
 
 fn make(i: int) -> t {
     if i > 10 { ret a; }