]> git.lizzy.rs Git - rust.git/commit
rollup merge of #23939: nikomatsakis/fn-box
authorAlex Crichton <alex@alexcrichton.com>
Wed, 1 Apr 2015 20:30:51 +0000 (13:30 -0700)
committerAlex Crichton <alex@alexcrichton.com>
Wed, 1 Apr 2015 20:30:51 +0000 (13:30 -0700)
commit9bb05fd41403c6fc28b82e8eff35f8791876ac18
tree735ecba6abbc1915e7298dae72cbe034b7cf9d88
parente9bacbaa2c9c88aaecf07ee30f02d08a1999e5c6
parent8eed73feb659633ef809e2af3399e53d5de6c6fa
rollup merge of #23939: nikomatsakis/fn-box

Conflicts:
src/liballoc/boxed.rs
src/liballoc/boxed.rs
src/libstd/lib.rs