removed deprecated subset?, superset? from clojure.contrib.set

Both functions have been promoted to clojure.set.

Signed-off-by: Stuart Sierra <mail@stuartsierra.com>

5 files changed, 3 insertions, 26 deletions

diff --git a/modules/datalog/pom.xml b/modules/datalog/pom.xml
index 90d5fbf7..8de72c0d 100644
--- a/modules/datalog/pom.xml
+++ b/modules/datalog/pom.xml
@@ -29,11 +29,6 @@
     </dependency>
     <dependency>
       <groupId>org.clojure.contrib</groupId>
-      <artifactId>set</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>org.clojure.contrib</groupId>
       <artifactId>graph</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
diff --git a/modules/datalog/src/main/clojure/clojure/contrib/datalog/literals.clj b/modules/datalog/src/main/clojure/clojure/contrib/datalog/literals.clj
index 37e5d8c9..b9a093d4 100644
--- a/modules/datalog/src/main/clojure/clojure/contrib/datalog/literals.clj
+++ b/modules/datalog/src/main/clojure/clojure/contrib/datalog/literals.clj
@@ -17,8 +17,7 @@
 (ns clojure.contrib.datalog.literals
   (:use clojure.contrib.datalog.util)
   (:use clojure.contrib.datalog.database)
-  (:use [clojure.set :only (intersection)])
-  (:use [clojure.contrib.set :only (subset?)]))
+  (:use [clojure.set :only (intersection subset?)]))
 
 
 ;;; Type Definitions
diff --git a/modules/datalog/src/main/clojure/clojure/contrib/datalog/rules.clj b/modules/datalog/src/main/clojure/clojure/contrib/datalog/rules.clj
index 9cb667e5..fd910a2a 100644
--- a/modules/datalog/src/main/clojure/clojure/contrib/datalog/rules.clj
+++ b/modules/datalog/src/main/clojure/clojure/contrib/datalog/rules.clj
@@ -18,8 +18,7 @@
   (:use clojure.contrib.datalog.util)
   (:use clojure.contrib.datalog.literals
        clojure.contrib.datalog.database)
-  (:use [clojure.set :only (union intersection difference)])
-  (:use [clojure.contrib.set :only (subset?)])
+  (:use [clojure.set :only (union intersection difference subset?)])
   (:use [clojure.contrib.except :only (throwf)])
   (:import java.io.Writer))
 
diff --git a/modules/datalog/src/test/clojure/clojure/contrib/datalog/tests/test_softstrat.clj b/modules/datalog/src/test/clojure/clojure/contrib/datalog/tests/test_softstrat.clj
index a33d8c96..06e6acc4 100644
--- a/modules/datalog/src/test/clojure/clojure/contrib/datalog/tests/test_softstrat.clj
+++ b/modules/datalog/src/test/clojure/clojure/contrib/datalog/tests/test_softstrat.clj
@@ -19,7 +19,7 @@
         clojure.contrib.datalog.magic
         clojure.contrib.datalog.rules
         clojure.contrib.datalog.database)
-  (:use [clojure.contrib.set :only (subset?)]))
+  (:use [clojure.set :only (subset?)]))
 
 
 
diff --git a/modules/set/src/main/clojure/clojure/contrib/set.clj b/modules/set/src/main/clojure/clojure/contrib/set.clj
index 4c831a6c..fefdba0d 100644
--- a/modules/set/src/main/clojure/clojure/contrib/set.clj
+++ b/modules/set/src/main/clojure/clojure/contrib/set.clj
@@ -21,22 +21,6 @@
     :doc "Clojure functions for operating on sets (supplemental to clojure.set)"}
   clojure.contrib.set)
 
-(defn subset? 
-  "Is set1 a subset of set2?"
-  {:deprecated "1.2"}
-  [set1 set2]
-  {:tag Boolean}
-  (and (<= (count set1) (count set2))
-       (every? set2 set1)))
-
-(defn superset? 
-  "Is set1 a superset of set2?"
-  {:deprecated "1.2"}
-  [set1 set2]
-  {:tag Boolean}
-  (and (>= (count set1) (count set2))
-       (every? set1 set2)))
-
 (defn proper-subset? 
   "Is s1 a proper subset of s2?"
   [set1 set2]