]> git.lizzy.rs Git - rust.git/commitdiff
Auto merge of #25698 - mdinger:flat_map, r=steveklabnik
authorbors <bors@rust-lang.org>
Mon, 25 May 2015 19:52:45 +0000 (19:52 +0000)
committerbors <bors@rust-lang.org>
Mon, 25 May 2015 19:52:45 +0000 (19:52 +0000)
I'm not sure why `core` is on but it's blocking the playpen. Doesn't seem to be needed but I'm not sure. It's not on the playpen template and playpen works on release and nightly.

Seems easier to understand without `take()`.

1  2 
src/libcore/iter.rs

Simple merge