Merge branch 'master' into dev-vthreads-exec

Author: fogus

docs/clojure.core.async.flow.html

@@ -200,7 +200,7 @@
 </pre></div></div><div class="public anchor" id="var-start"><h3>start</h3><div class="usage"><code>(start g)</code></div><div class="doc"><pre class="plaintext">starts the entire flow from init values. The processes start paused.
 Call 'resume' or 'resume-proc' to start flow.  Returns a map with keys:
 
-:report-chan - a core.async chan for reading.'ping' reponses
+:report-chan - a core.async chan for reading.'ping' responses
 will show up here, as will any explicit ::flow/report outputs
 from :transform
 

src/main/clojure/clojure/core/async/impl/channels.clj

@@ -309,8 +309,10 @@
   ManyToManyChannel
   (datafy [c]
     (let [b (.buf c)]
-      (cond->
-        {:put-count (count (.puts c))
-         :take-count (count (.takes c))
-         :closed? (impl/closed? c)}
-        b (assoc :buffer (clojure.datafy/datafy b))))))
+      (with-meta
+        (cond->
+          {:put-count (count (.puts c))
+           :take-count (count (.takes c))
+           :closed? (impl/closed? c)}
+          b (assoc :buffer (datafy/datafy b)))
+        {::datafy/obj c}))))