Require "self" as base expression for intra-class method or field references

All field or method references within a class must begin with "self." now.
A bare reference to a field or method in the same class will no longer
typecheck.

2 files changed, 1 insertions, 8 deletions

diff --git a/src/rustc/syntax/ast.rs b/src/rustc/syntax/ast.rs
index c88f44d7153..c6fe959e290 100644
--- a/src/rustc/syntax/ast.rs
+++ b/src/rustc/syntax/ast.rs
@@ -83,11 +83,6 @@ enum def {
               @def    /* closed over def */,
               node_id /* expr node that creates the closure */),
     def_class(def_id),
-    // first def_id is for parent class
-    def_class_field(def_id, def_id),
-    // No purity allowed for now, I guess
-    // (simpler this way, b/c presumably methods read mut state)
-    def_class_method(def_id, def_id),
     def_region(node_id)
 }
 
diff --git a/src/rustc/syntax/ast_util.rs b/src/rustc/syntax/ast_util.rs
index bf32bb0ebf3..5e0f1c89817 100644
--- a/src/rustc/syntax/ast_util.rs
+++ b/src/rustc/syntax/ast_util.rs
@@ -40,9 +40,7 @@ fn def_id_of_def(d: def) -> def_id {
       def_fn(id, _) | def_mod(id) |
       def_native_mod(id) | def_const(id) |
       def_variant(_, id) | def_ty(id) | def_ty_param(id, _) |
-      def_use(id) |
-      def_class(id) | def_class_field(_, id) | def_class_method(_, id) { id }
-
+      def_use(id) | def_class(id) { id }
       def_arg(id, _) | def_local(id, _) | def_self(id) |
       def_upvar(id, _, _) | def_binding(id) | def_region(id) {
         local_def(id)