Revert "Implement simple effect typing for variables" and "Handle switch effects".

src/splay-tree.h

Index: src/splay-tree.h
diff --git a/src/splay-tree.h b/src/splay-tree.h
index f393027a82ce16528125a5624814e44b0be9b95e..8844d8a8ffeb2d62a856ff19a1bdc2ff58e8aa24 100644
--- a/src/splay-tree.h
+++ b/src/splay-tree.h
@@ -39,9 +39,9 @@ namespace internal {
 //
 //   typedef Key: the key type
 //   typedef Value: the value type
-//   static const Key kNoKey: the dummy key used when no key is set
-//   static Value kNoValue(): the dummy value used to initialize nodes
-//   static int (Compare)(Key& a, Key& b) -> {-1, 0, 1}: comparison function
+//   static const kNoKey: the dummy key used when no key is set
+//   static const kNoValue: the dummy value used to initialize nodes
+//   int (Compare)(Key& a, Key& b) -> {-1, 0, 1}: comparison function
 //
 // The tree is also parameterized by an allocation policy
 // (Allocator). The policy is used for allocating lists in the C free
@@ -74,11 +74,6 @@ class SplayTree {
     UNREACHABLE();
   }
 
-  AllocationPolicy allocator() { return allocator_; }
-
-  // Checks if there is a mapping for the key.
-  bool Contains(const Key& key);
-
   // Inserts the given key in this tree with the given value.  Returns
   // true if a node was inserted, otherwise false.  If found the locator
   // is enabled and provides access to the mapping for the key.
@@ -109,9 +104,6 @@ class SplayTree {
   // Remove the node with the given key from the tree.
   bool Remove(const Key& key);
 
-  // Remove all keys from the tree.
-  void Clear() { ResetRoot(); }
-
   bool is_empty() { return root_ == NULL; }
 
   // Perform the splay operation for the given key. Moves the node with