auto merge of #11485 : eddyb/rust/sweep-old-rust, r=nikomatsakis

This commit is contained in:
bors 2014-01-14 12:32:11 -08:00
commit 9075025c7b
39 changed files with 191 additions and 262 deletions

View file

@ -251,7 +251,7 @@ pub fn get_explicit_self(cx: &ExtCtxt, span: Span, self_ptr: &Option<PtrTy>)
span,
match *ptr {
Send => ast::SelfUniq(ast::MutImmutable),
Managed => ast::SelfBox(ast::MutImmutable),
Managed => ast::SelfBox,
Borrowed(ref lt, mutbl) => {
let lt = lt.map(|s| cx.lifetime(span, cx.ident_of(s)));
ast::SelfRegion(lt, mutbl)