diff options
| author | Erick Tryzelaar <erick.tryzelaar@gmail.com> | 2013-03-27 00:14:52 -0700 |
|---|---|---|
| committer | Erick Tryzelaar <erick.tryzelaar@gmail.com> | 2013-03-27 07:04:12 -0700 |
| commit | 4d995e66a274511d70eb02abdb80da43ccf70aee (patch) | |
| tree | 23c02d318afe24ec0014e42f9e593c860e73aae8 /src/libsyntax/parse/mod.rs | |
| parent | b10b8c3ee41447299504127c341bc363d180356c (diff) | |
| download | rust-4d995e66a274511d70eb02abdb80da43ccf70aee.tar.gz rust-4d995e66a274511d70eb02abdb80da43ccf70aee.zip | |
std: change default json enum encoder to use strings or a flat vec
Diffstat (limited to 'src/libsyntax/parse/mod.rs')
| -rw-r--r-- | src/libsyntax/parse/mod.rs | 32 |
1 files changed, 17 insertions, 15 deletions
diff --git a/src/libsyntax/parse/mod.rs b/src/libsyntax/parse/mod.rs index 7f6b511f9f0..0ddf9111e02 100644 --- a/src/libsyntax/parse/mod.rs +++ b/src/libsyntax/parse/mod.rs @@ -329,25 +329,27 @@ mod test { assert_eq!( to_json_str(@tts), ~"[\ - [\"tt_tok\",[null,[\"IDENT\",[\"fn\",false]]]],\ - [\"tt_tok\",[null,[\"IDENT\",[\"foo\",false]]]],\ - [\"tt_delim\",[\ + [\"tt_tok\",null,[\"IDENT\",\"fn\",false]],\ + [\"tt_tok\",null,[\"IDENT\",\"foo\",false]],\ + [\ + \"tt_delim\",\ [\ - [\"tt_tok\",[null,[\"LPAREN\",[]]]],\ - [\"tt_tok\",[null,[\"IDENT\",[\"x\",false]]]],\ - [\"tt_tok\",[null,[\"COLON\",[]]]],\ - [\"tt_tok\",[null,[\"IDENT\",[\"int\",false]]]],\ - [\"tt_tok\",[null,[\"RPAREN\",[]]]]\ + [\"tt_tok\",null,\"LPAREN\"],\ + [\"tt_tok\",null,[\"IDENT\",\"x\",false]],\ + [\"tt_tok\",null,\"COLON\"],\ + [\"tt_tok\",null,[\"IDENT\",\"int\",false]],\ + [\"tt_tok\",null,\"RPAREN\"]\ ]\ - ]],\ - [\"tt_delim\",[\ + ],\ + [\ + \"tt_delim\",\ [\ - [\"tt_tok\",[null,[\"LBRACE\",[]]]],\ - [\"tt_tok\",[null,[\"IDENT\",[\"x\",false]]]],\ - [\"tt_tok\",[null,[\"SEMI\",[]]]],\ - [\"tt_tok\",[null,[\"RBRACE\",[]]]]\ + [\"tt_tok\",null,\"LBRACE\"],\ + [\"tt_tok\",null,[\"IDENT\",\"x\",false]],\ + [\"tt_tok\",null,\"SEMI\"],\ + [\"tt_tok\",null,\"RBRACE\"]\ ]\ - ]]\ + ]\ ]" ); let ast1 = new_parser_from_tts(new_parse_sess(None),~[],tts) |