diff options
| author | bors <bors@rust-lang.org> | 2014-07-05 03:16:50 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2014-07-05 03:16:50 +0000 |
| commit | 29d6a8ecc6f43bac7171267993ef07dfdf528281 (patch) | |
| tree | 0257e896e9af3512f31e30519270bdeb22b545f4 /src/libsyntax/parse | |
| parent | 9f2a43c1b518a674ef4bb368732ee8dac3c1f779 (diff) | |
| parent | cc13f9bae8b4175513375f9de66f198a706c67d3 (diff) | |
| download | rust-29d6a8ecc6f43bac7171267993ef07dfdf528281.tar.gz rust-29d6a8ecc6f43bac7171267993ef07dfdf528281.zip | |
auto merge of #15425 : jbclements/rust/hygiene-for-3-kinds-of-args, r=cmr
This pull request adds hygiene for 3 kinds of argument bindings: - arguments to item fns, - arguments to `ExprFnBlock`s, and - arguments to `ExprProc`s It also adds a bunch of unit tests, fixes a few macro uses to be non-capturing, and has a few cleanup items. local `make check` succeeds.
Diffstat (limited to 'src/libsyntax/parse')
| -rw-r--r-- | src/libsyntax/parse/token.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libsyntax/parse/token.rs b/src/libsyntax/parse/token.rs index a93e8270d98..dcf37e37ff0 100644 --- a/src/libsyntax/parse/token.rs +++ b/src/libsyntax/parse/token.rs @@ -765,7 +765,7 @@ mod test { use ext::mtwt; fn mark_ident(id : ast::Ident, m : ast::Mrk) -> ast::Ident { - ast::Ident{name:id.name,ctxt:mtwt::new_mark(m,id.ctxt)} + ast::Ident{name:id.name,ctxt:mtwt::apply_mark(m,id.ctxt)} } #[test] fn mtwt_token_eq_test() { |