]> git.lizzy.rs Git - rust.git/commitdiff
rollup merge of #24401: fenduru/patch-2
authorAlex Crichton <alex@alexcrichton.com>
Tue, 14 Apr 2015 17:56:00 +0000 (10:56 -0700)
committerAlex Crichton <alex@alexcrichton.com>
Tue, 14 Apr 2015 17:56:00 +0000 (10:56 -0700)
Not sure if `From<Error>` is the correct way to reference that trait (maybe `From<E: Error>`?)

r? @steveklabnik


Trivial merge