diff options
| author | bors <bors@rust-lang.org> | 2013-05-20 12:04:47 -0700 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2013-05-20 12:04:47 -0700 |
| commit | 26babaafcdbcfdf2e842d84dbeabbed0dae6efef (patch) | |
| tree | 51ba2c1f043882643de9ca2957d9efab24335a91 /src/libsyntax/parse/lexer.rs | |
| parent | f3b458b5c5a555067e9d013066fac9c8de50c3f8 (diff) | |
| parent | b71a1ecea2de87cff3089f9f261be71cd314aac9 (diff) | |
| download | rust-26babaafcdbcfdf2e842d84dbeabbed0dae6efef.tar.gz rust-26babaafcdbcfdf2e842d84dbeabbed0dae6efef.zip | |
auto merge of #6559 : jbclements/rust/hygiene-fns-and-cleanup, r=jbclements
This includes new, tested, hygiene support functions. It also removes the interner_key! macro and replaces it with a function, which should be inline-able. It also contains some parser patch-ups and some docfixes. On my machine, this patch passes all tests.
Diffstat (limited to 'src/libsyntax/parse/lexer.rs')
| -rw-r--r-- | src/libsyntax/parse/lexer.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libsyntax/parse/lexer.rs b/src/libsyntax/parse/lexer.rs index 764dec0eeb3..5340293bb02 100644 --- a/src/libsyntax/parse/lexer.rs +++ b/src/libsyntax/parse/lexer.rs @@ -786,7 +786,7 @@ mod test { fn setup(teststr: ~str) -> Env { let cm = CodeMap::new(); let fm = cm.new_filemap(~"zebra.rs", @teststr); - let ident_interner = token::mk_ident_interner(); // interner::mk(); + let ident_interner = token::get_ident_interner(); let span_handler = diagnostic::mk_span_handler(diagnostic::mk_handler(None),@cm); Env { |