diff options
| author | Erick Tryzelaar <erick.tryzelaar@gmail.com> | 2013-03-01 07:01:48 -0800 |
|---|---|---|
| committer | Erick Tryzelaar <erick.tryzelaar@gmail.com> | 2013-03-01 07:01:48 -0800 |
| commit | 85fecd0ba77066e604cec9d3866b76edc626b5d3 (patch) | |
| tree | a375b9e61af4c5e105b58271c9381fdaf58d31b0 /src/libsyntax/parse/mod.rs | |
| parent | d2c4b6492dbccc1bb60f163ac583467bc63abce6 (diff) | |
| parent | a660bb362ce5a39014fb274367e6361d4deb8a7d (diff) | |
| download | rust-85fecd0ba77066e604cec9d3866b76edc626b5d3.tar.gz rust-85fecd0ba77066e604cec9d3866b76edc626b5d3.zip | |
Merge remote-tracking branch 'remotes/origin/incoming' into incoming
Diffstat (limited to 'src/libsyntax/parse/mod.rs')
| -rw-r--r-- | src/libsyntax/parse/mod.rs | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/libsyntax/parse/mod.rs b/src/libsyntax/parse/mod.rs index 816e4137126..887f064018f 100644 --- a/src/libsyntax/parse/mod.rs +++ b/src/libsyntax/parse/mod.rs @@ -299,6 +299,8 @@ mod test { use super::*; use std::serialize::Encodable; use std; + use core::io; + use core::option::None; use core::str; use util::testing::*; @@ -314,7 +316,7 @@ mod test { @~"fn foo (x : int) { x; }", ~[], new_parse_sess(None)); - check_equal(to_json_str(tts as Encodable::<std::json::Encoder>), + check_equal(to_json_str(@tts as Encodable::<std::json::Encoder>), ~"[[\"tt_tok\",[,[\"IDENT\",[\"fn\",false]]]],\ [\"tt_tok\",[,[\"IDENT\",[\"foo\",false]]]],\ [\"tt_delim\",[[[\"tt_tok\",[,[\"LPAREN\",[]]]],\ |