diff options
Diffstat (limited to 'src')
9 files changed, 21 insertions, 21 deletions
diff --git a/src/main/clojure/clojure/contrib/command_line.clj b/src/main/clojure/clojure/contrib/command_line.clj index 56a2fece..02995ddd 100644 --- a/src/main/clojure/clojure/contrib/command_line.clj +++ b/src/main/clojure/clojure/contrib/command_line.clj @@ -13,7 +13,7 @@ :doc "Process command-line arguments according to a given cmdspec"} clojure.contrib.command-line (:require (clojure.contrib [seq :as su])) - (:use (clojure.contrib [str-utils :only (str-join)]))) + (:use (clojure.contrib [string :only (str-join)]))) (defn make-map [args cmdspec] (let [{spec true [rest-sym] false} (su/group-by vector? cmdspec) diff --git a/src/main/clojure/clojure/contrib/gen_html_docs.clj b/src/main/clojure/clojure/contrib/gen_html_docs.clj index 3885b3e9..53d205b3 100644 --- a/src/main/clojure/clojure/contrib/gen_html_docs.clj +++ b/src/main/clojure/clojure/contrib/gen_html_docs.clj @@ -47,7 +47,7 @@ one or more Clojure libraries."} clojure.contrib.gen-html-docs (:require [clojure.contrib.io :as io]) - (:use [clojure.contrib seq str-utils repl-utils def prxml]) + (:use [clojure.contrib seq string repl-utils def prxml]) (:import [java.lang Exception] [java.util.regex Pattern])) @@ -512,7 +512,7 @@ emits the generated HTML to the path named by path." 'clojure.contrib.shell 'clojure.contrib.sql 'clojure.contrib.stream-utils - 'clojure.contrib.str-utils + 'clojure.contrib.string 'clojure.contrib.test-contrib 'clojure.contrib.trace 'clojure.contrib.types @@ -533,7 +533,7 @@ emits the generated HTML to the path named by path." 'clojure.contrib.test-clojure.reader 'clojure.contrib.test-clojure.sequences 'clojure.contrib.test-contrib.shell - 'clojure.contrib.test-contrib.str-utils + 'clojure.contrib.test-contrib.string 'clojure.contrib.zip-filter.xml ])) ) diff --git a/src/main/clojure/clojure/contrib/load_all.clj b/src/main/clojure/clojure/contrib/load_all.clj index 5e7ca36c..8d3ac4ed 100644 --- a/src/main/clojure/clojure/contrib/load_all.clj +++ b/src/main/clojure/clojure/contrib/load_all.clj @@ -75,13 +75,13 @@ server-socket set shell sql -str-utils -str-utils2 +string +string stream-utils swing-utils test-contrib test-contrib.shell -test-contrib.str-utils +test-contrib.string trace types zip-filter diff --git a/src/main/clojure/clojure/contrib/repl_utils.clj b/src/main/clojure/clojure/contrib/repl_utils.clj index d5c18151..2c1a5fa2 100644 --- a/src/main/clojure/clojure/contrib/repl_utils.clj +++ b/src/main/clojure/clojure/contrib/repl_utils.clj @@ -17,7 +17,7 @@ (clojure.lang RT Compiler Compiler$C)) (:use [clojure.contrib.seq :only (indexed)] [clojure.contrib.javadoc.browse :only (browse-url)] - [clojure.contrib.str-utils :only (str-join re-sub re-partition)])) + [clojure.contrib.string :only (str-join re-sub re-partition)])) ;; ---------------------------------------------------------------------- ;; Examine Java classes diff --git a/src/main/clojure/clojure/contrib/string.clj b/src/main/clojure/clojure/contrib/string.clj index 1e028f15..7fa871ea 100644 --- a/src/main/clojure/clojure/contrib/string.clj +++ b/src/main/clojure/clojure/contrib/string.clj @@ -14,11 +14,11 @@ (ns #^{:author "Stuart Sierra" :doc "This is a library of string manipulation functions. It - is intented as a replacement for clojure.contrib.str-utils. + is intented as a replacement for clojure.contrib.string. - You cannot (use 'clojure.contrib.str-utils3) because it defines + You cannot (use 'clojure.contrib.string) because it defines functions with the same names as functions in clojure.core. - Instead, do (require '[clojure.contrib.str-utils3 :as s]) + Instead, do (require '[clojure.contrib.string :as s]) or something similar. Goals: @@ -28,7 +28,7 @@ Some ideas are borrowed from http://github.com/francoisdevlin/devlinsf-clojure-utils/"} - clojure.contrib.str-utils3 + clojure.contrib.string (:refer-clojure :exclude (take replace drop butlast partition contains? get repeat reverse partial)) (:import (java.util.regex Pattern))) @@ -281,14 +281,14 @@ [#^String s] (seq (.split #"\r?\n" s))) -;; borrowed from compojure.str-utils, by James Reeves, EPL 1.0 +;; borrowed from compojure.string, by James Reeves, EPL 1.0 (defn #^String map-str "Apply f to each element of coll, concatenate all results into a String." [f coll] (apply str (map f coll))) -;; borrowed from compojure.str-utils, by James Reeves, EPL 1.0 +;; borrowed from compojure.string, by James Reeves, EPL 1.0 (defn grep "Filters elements of coll by a regular expression. The String representation (with str) of each element is tested with re-find." diff --git a/src/test/clojure/clojure/contrib/test_contrib/str_utils.clj b/src/test/clojure/clojure/contrib/test_contrib/str_utils.clj index 815525bb..1a7787b6 100644 --- a/src/test/clojure/clojure/contrib/test_contrib/str_utils.clj +++ b/src/test/clojure/clojure/contrib/test_contrib/str_utils.clj @@ -1,6 +1,6 @@ -(ns clojure.contrib.test-contrib.str-utils +(ns clojure.contrib.test-contrib.string (:use clojure.test - clojure.contrib.str-utils)) + clojure.contrib.string)) (deftest test-re-gsub diff --git a/src/test/clojure/clojure/contrib/test_contrib/str_utils2.clj b/src/test/clojure/clojure/contrib/test_contrib/str_utils2.clj index ee6aa68e..b20f402f 100644 --- a/src/test/clojure/clojure/contrib/test_contrib/str_utils2.clj +++ b/src/test/clojure/clojure/contrib/test_contrib/str_utils2.clj @@ -1,5 +1,5 @@ -(ns clojure.contrib.test-contrib.str-utils2 - (:require [clojure.contrib.str-utils2 :as s]) +(ns clojure.contrib.test-contrib.string + (:require [clojure.contrib.string :as s]) (:use clojure.test)) (deftest t-codepoints diff --git a/src/test/clojure/clojure/contrib/test_contrib/str_utils3.clj b/src/test/clojure/clojure/contrib/test_contrib/str_utils3.clj index 9fcb176d..a25c3944 100644 --- a/src/test/clojure/clojure/contrib/test_contrib/str_utils3.clj +++ b/src/test/clojure/clojure/contrib/test_contrib/str_utils3.clj @@ -1,5 +1,5 @@ -(ns clojure.contrib.test-contrib.str-utils3 - (:require [clojure.contrib.str-utils3 :as s]) +(ns clojure.contrib.test-contrib.string + (:require [clojure.contrib.string :as s]) (:use clojure.test)) (deftest t-codepoints diff --git a/src/test/clojure/clojure/contrib/test_contrib/test_trace.clj b/src/test/clojure/clojure/contrib/test_contrib/test_trace.clj index 32c2ccbe..88010724 100644 --- a/src/test/clojure/clojure/contrib/test_contrib/test_trace.clj +++ b/src/test/clojure/clojure/contrib/test_contrib/test_trace.clj @@ -1,6 +1,6 @@ (ns clojure.contrib.test-contrib.test-trace (:use clojure.test - [clojure.contrib trace str-utils])) + [clojure.contrib trace string])) (deftrace call-myself [n] (when-not (< n 1) |