]> git.lizzy.rs Git - rust.git/commitdiff
Rollup merge of #22640 - sfackler:fix-take, r=alexcrichton
authorManish Goregaokar <manishsmail@gmail.com>
Mon, 23 Feb 2015 09:24:34 +0000 (14:54 +0530)
committerAlex Crichton <alex@alexcrichton.com>
Mon, 23 Feb 2015 19:43:56 +0000 (11:43 -0800)
 We can't call into the inner reader for a 0-byte read because that may
end up blocking or returning an error.

r? @alexcrichton

1  2 
src/libstd/io/mod.rs

Simple merge