]> git.lizzy.rs Git - rust.git/commitdiff
auto merge of #9757 : erickt/rust/master, r=alexcrichton
authorbors <bors@rust-lang.org>
Tue, 8 Oct 2013 18:06:41 +0000 (11:06 -0700)
committerbors <bors@rust-lang.org>
Tue, 8 Oct 2013 18:06:41 +0000 (11:06 -0700)
I accidentally left an infinite loop in a default method in `num::ToPrimitive::to_u64()`. This fixes it.


Trivial merge