diff options
| author | bors <bors@rust-lang.org> | 2013-03-19 12:43:14 -0700 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2013-03-19 12:43:14 -0700 |
| commit | e1888948c640f8b8396091b336c2677cb82fdcce (patch) | |
| tree | ff3d02994510a741e117adf3d0f57d39b3623a1f /src/libsyntax/ext | |
| parent | a14ec73cd2d15a2454113011835557ccf447f14d (diff) | |
| parent | a6187c62e93ba96dce8f19849fb7016f4f941f8c (diff) | |
| download | rust-e1888948c640f8b8396091b336c2677cb82fdcce.tar.gz rust-e1888948c640f8b8396091b336c2677cb82fdcce.zip | |
auto merge of #5426 : nikomatsakis/rust/issue-4846-lifetimes-in-expl-self, r=pcwalton
(this will be needed for snapshotting at some point) r? @pcwalton
Diffstat (limited to 'src/libsyntax/ext')
| -rw-r--r-- | src/libsyntax/ext/auto_encode.rs | 6 | ||||
| -rw-r--r-- | src/libsyntax/ext/deriving.rs | 6 |
2 files changed, 7 insertions, 5 deletions
diff --git a/src/libsyntax/ext/auto_encode.rs b/src/libsyntax/ext/auto_encode.rs index 8c02b432371..294174dc8f9 100644 --- a/src/libsyntax/ext/auto_encode.rs +++ b/src/libsyntax/ext/auto_encode.rs @@ -634,8 +634,10 @@ fn mk_ser_method( ident: cx.ident_of(~"encode"), attrs: ~[], generics: ast_util::empty_generics(), - self_ty: codemap::spanned { node: ast::sty_region(ast::m_imm), - span: span }, + self_ty: codemap::spanned { + node: ast::sty_region(None, ast::m_imm), + span: span + }, purity: ast::impure_fn, decl: ser_decl, body: ser_body, diff --git a/src/libsyntax/ext/deriving.rs b/src/libsyntax/ext/deriving.rs index 76ab21f403b..a6165e50c85 100644 --- a/src/libsyntax/ext/deriving.rs +++ b/src/libsyntax/ext/deriving.rs @@ -220,7 +220,7 @@ fn create_eq_method(cx: @ext_ctxt, let body_block = build::mk_simple_block(cx, span, body); // Create the method. - let self_ty = spanned { node: sty_region(m_imm), span: span }; + let self_ty = spanned { node: sty_region(None, m_imm), span: span }; @ast::method { ident: method_ident, attrs: ~[], @@ -398,7 +398,7 @@ fn create_iter_bytes_method(cx: @ext_ctxt, let body_block = build::mk_block_(cx, span, statements); // Create the method. - let self_ty = spanned { node: sty_region(m_imm), span: span }; + let self_ty = spanned { node: sty_region(None, m_imm), span: span }; let method_ident = cx.ident_of(~"iter_bytes"); @ast::method { ident: method_ident, @@ -448,7 +448,7 @@ fn create_clone_method(cx: @ext_ctxt, let body_block = build::mk_simple_block(cx, span, expr); // Create the self type and method identifier. - let self_ty = spanned { node: sty_region(m_imm), span: span }; + let self_ty = spanned { node: sty_region(None, m_imm), span: span }; let method_ident = cx.ident_of(~"clone"); // Create the method. |