diff options
| author | Ziad Hatahet <hatahet@gmail.com> | 2013-10-23 10:09:06 -0700 |
|---|---|---|
| committer | Ziad Hatahet <hatahet@gmail.com> | 2013-10-23 10:09:06 -0700 |
| commit | 7d69837bd263f334aa9dea4235698c006f7b1ce8 (patch) | |
| tree | b43315adfc734b0ab480b40674721c99902f3eb2 /src/libsyntax/ext | |
| parent | 60245b9290388671edac86d6db1619f60a9ccb68 (diff) | |
| parent | a4ec8af4c549bd806522826b756e18fbf0b5c47b (diff) | |
| download | rust-7d69837bd263f334aa9dea4235698c006f7b1ce8.tar.gz rust-7d69837bd263f334aa9dea4235698c006f7b1ce8.zip | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'src/libsyntax/ext')
| -rw-r--r-- | src/libsyntax/ext/deriving/ty.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libsyntax/ext/deriving/ty.rs b/src/libsyntax/ext/deriving/ty.rs index 83c73e3d85f..c60259304ae 100644 --- a/src/libsyntax/ext/deriving/ty.rs +++ b/src/libsyntax/ext/deriving/ty.rs @@ -240,13 +240,13 @@ pub fn get_explicit_self(cx: @ExtCtxt, span: Span, self_ptr: &Option<PtrTy>) let self_path = cx.expr_self(span); match *self_ptr { None => { - (self_path, respan(span, ast::sty_value)) + (self_path, respan(span, ast::sty_value(ast::MutImmutable))) } Some(ref ptr) => { let self_ty = respan( span, match *ptr { - Send => ast::sty_uniq, + Send => ast::sty_uniq(ast::MutImmutable), Managed(mutbl) => ast::sty_box(mutbl), Borrowed(ref lt, mutbl) => { let lt = lt.map(|s| cx.lifetime(span, cx.ident_of(s))); |