Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge branch 'master' of git@github.com:richhickey/clojure

  • Loading branch information...
commit a3f2c4e584905cb5132cda14399818309f6c6bd0 2 parents c37c15c + fbe0183
@richhickey richhickey authored
View
2  src/clj/clojure/core.clj
@@ -2917,7 +2917,7 @@
(defmacro doto
"Evaluates x then calls all of the methods and functions with the
- value of x supplied at the from of the given arguments. The forms
+ value of x supplied at the front of the given arguments. The forms
are evaluated in order. Returns x.
(doto (new java.util.HashMap) (.put \"a\" 1) (.put \"b\" 2))"
View
4 src/clj/clojure/java/browse.clj
@@ -40,8 +40,8 @@
; the implementation of this function resides in another namespace to be loaded "on demand"
; this fixes a bug on mac os x where the process turns into a GUI app
; see http://code.google.com/p/clojure-contrib/issues/detail?id=32
- (require 'clojure.contrib.javadoc.browse-ui)
- ((find-var 'clojure.contrib.javadoc.browse-ui/open-url-in-swing) url))
+ (require 'clojure.java.browse-ui)
+ ((find-var 'clojure.java.browse-ui/open-url-in-swing) url))
(defn browse-url
"Open url in a browser"
View
2  src/clj/clojure/test.clj
@@ -193,7 +193,7 @@
All the test reporting functions write to the var *test-out*. By
default, this is the same as *out*, but you can rebind it to any
PrintWriter. For example, it could be a file opened with
- clojure.contrib.duck-streams/writer.
+ clojure.java.io/writer.
EXTENDING TEST-IS (ADVANCED)
View
4 src/clj/clojure/test/junit.clj
@@ -25,14 +25,14 @@
with-junit-output macro, like this:
(use 'clojure.test)
- (use 'clojure.contrib.test.junit)
+ (use 'clojure.test.junit)
(with-junit-output
(run-tests 'my.cool.library))
To write the output to a file, rebind clojure.test/*test-out* to
your own PrintWriter (perhaps opened using
- clojure.contrib.duck-streams/writer)."
+ clojure.java.io/writer)."
:author "Jason Sankey"}
clojure.test.junit
(:require [clojure.stacktrace :as stack]
Please sign in to comment.
Something went wrong with that request. Please try again.