Update to latest rust master

This commit is contained in:
Erick Tryzelaar
2014-11-17 19:21:46 -08:00
parent 18d943e8a7
commit ff8c8c77cc
8 changed files with 12 additions and 12 deletions
+1 -1
View File
@@ -251,7 +251,7 @@ pub trait Deserializer<E>: Iterator<Result<Token, E>> {
}
#[inline]
fn expect_num<T: NumCast>(&mut self, token: Token) -> Result<T, E> {
fn expect_num<T: num::NumCast>(&mut self, token: Token) -> Result<T, E> {
match token {
Int(x) => to_result!(num::cast(x), self.syntax_error(token, PRIMITIVE_TOKEN_KINDS)),
I8(x) => to_result!(num::cast(x), self.syntax_error(token, PRIMITIVE_TOKEN_KINDS)),