user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

auto merge of #5426 : nikomatsakis/rust/issue-4846-lifetimes-in-expl-self, r=pcwalton

Browse source 
(this will be needed for snapshotting at some point)

r? @pcwalton
This commit is contained in:
bors 2013-03-19 12:43:14 -07:00
commit e1888948c6
13 changed files with 166 additions and 55 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/libsyntax/ext/auto_encode.rs
View file

@ -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,

6
src/libsyntax/ext/deriving.rs
View file

@ -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.