Permalink
Browse files

Pull utilize.seq functions into midje.clojure.core

  • Loading branch information...
1 parent 2a9930c commit 95b6c09530499cff7b82edc513711c5d89eaa78e @marick committed Jan 26, 2013
@@ -1,6 +1,7 @@
(ns ^{:doc "Functions I wouldn't mind to see in clojure.core"}
midje.clojure.core
- (:require clojure.pprint))
+ (:require clojure.pprint
+ utilize.seq))
;; Note: some of this code is taken from https://github.com/flatland/useful/blob/develop/src/flatland/useful/ns.clj
;; Those functions should be immigrated once the new useful namespace is pushed to clojars.
@@ -143,6 +144,8 @@ metadata (as provided by def) merged into the metadata of the original."
[f x]
(cons (f (first x)) (rest x)))
+(immigrate-from 'utilize.seq '[separate find-first only])
+
;;; Printing
@@ -1,7 +1,6 @@
(ns ^{:doc "The semi-sweet representation of provided forms."}
midje.data.prerequisite-state
(:use midje.clojure.core
- [utilize.seq :only (separate find-first)]
[midje.util.object-utils :only [object-name]]
midje.util.form-utils
[midje.checking.extended-equality :only [extended-= extended-list-=]]
@@ -11,8 +11,7 @@
symbol-named? translate-zipper]]
[midje.util.laziness :only [eagerly]]
[midje.util.thread-safe-var-nesting :only [namespace-values-inside-out
- with-pushed-namespace-values]]
- [utilize.seq :only [separate]])
+ with-pushed-namespace-values]])
(:require [clojure.zip :as zip]
[midje.util.unify :as unify]
[midje.parsing.2-to-lexical-maps.fakes :as fakes]))
@@ -1,7 +1,6 @@
(ns ^{:doc "generate a map for a particular example"}
midje.parsing.2-to-lexical-maps.examples
(:use midje.clojure.core
- [utilize.seq :only (separate find-first)]
[midje.util.object-utils :only [object-name]]
[midje.checkers :only [exactly]]
[midje.checking.checkers.defining :only [checker? checker-makers]]
@@ -1,7 +1,6 @@
(ns ^{:doc "An intermediate stage in the compilation of prerequisites."}
midje.parsing.2-to-lexical-maps.fakes
(:use midje.clojure.core
- [utilize.seq :only (separate find-first)]
[midje.util.object-utils :only [object-name]]
[midje.checkers :only [exactly]]
[midje.checking.checkers.defining :only [checker? checker-makers]]
@@ -1,8 +1,8 @@
(ns ^{:doc "midje.background uses these to wrap extra code around
:contents, :facts, or :expects"}
midje.parsing.util.wrapping
- (:use [midje.util.form-utils :only [first-named?]]
- [utilize.seq :only [separate]]
+ (:use midje.clojure.core
+ [midje.util.form-utils :only [first-named?]]
[midje.util.thread-safe-var-nesting :only [namespace-values-inside-out
set-namespace-value
with-pushed-namespace-values]])
@@ -2,7 +2,6 @@
(:use [midje sweet test-util]
[midje.data.prerequisite-state :except [mockable-funcall? unfolding-step merge-metaconstant-bindings
unique-vars handle-mocked-call best-call-action ]]
- [utilize.seq :only (find-first only)]
[midje.test-util]
midje.util)
(:require [midje.config :as config])
@@ -1,5 +1,4 @@
(ns midje.parsing.2-to-lexical-maps.t-fakes
(:use [midje sweet test-util]
midje.parsing.2-to-lexical-maps.fakes
- [utilize.seq :only (find-first only)]
midje.util))
@@ -1,7 +1,6 @@
(ns midje.parsing.3-from-lexical-maps.t-from-fake-maps
(:use [midje sweet test-util]
[midje.parsing.3-from-lexical-maps.from-fake-maps]
- [utilize.seq :only (find-first only)]
[midje.test-util]
midje.util)
(:require [midje.config :as config])

0 comments on commit 95b6c09

Please sign in to comment.