diff options
| author | Mazdak Farrokhzad <twingoow@gmail.com> | 2019-12-16 17:28:40 +0100 |
|---|---|---|
| committer | Mazdak Farrokhzad <twingoow@gmail.com> | 2019-12-20 22:22:44 +0100 |
| commit | a7aec3f207fb40f0c4c857fb91a03372ac8bcd69 (patch) | |
| tree | e38449760063595a6d65b15f5beadbf8d76094d4 /src/libsyntax_ext/deriving/generic | |
| parent | 01a46509a4c2dc430ebebf940a26232fdaeeba81 (diff) | |
| download | rust-a7aec3f207fb40f0c4c857fb91a03372ac8bcd69.tar.gz rust-a7aec3f207fb40f0c4c857fb91a03372ac8bcd69.zip | |
1. ast::Mutability::{Mutable -> Mut, Immutable -> Not}.
2. mir::Mutability -> ast::Mutability.
Diffstat (limited to 'src/libsyntax_ext/deriving/generic')
| -rw-r--r-- | src/libsyntax_ext/deriving/generic/mod.rs | 8 | ||||
| -rw-r--r-- | src/libsyntax_ext/deriving/generic/ty.rs | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/libsyntax_ext/deriving/generic/mod.rs b/src/libsyntax_ext/deriving/generic/mod.rs index b7707bfb8e5..2c329691318 100644 --- a/src/libsyntax_ext/deriving/generic/mod.rs +++ b/src/libsyntax_ext/deriving/generic/mod.rs @@ -1018,7 +1018,7 @@ impl<'a> MethodDef<'a> { struct_path, struct_def, &format!("__self_{}", i), - ast::Mutability::Immutable, + ast::Mutability::Not, use_temporaries); patterns.push(pat); raw_fields.push(ident_expr); @@ -1228,8 +1228,8 @@ impl<'a> MethodDef<'a> { type_ident, variant, self_arg_name, - ast::Mutability::Immutable); - (cx.pat(sp, PatKind::Ref(p, ast::Mutability::Immutable)), idents) + ast::Mutability::Not); + (cx.pat(sp, PatKind::Ref(p, ast::Mutability::Not)), idents) }; // A single arm has form (&VariantK, &VariantK, ...) => BodyK @@ -1559,7 +1559,7 @@ impl<'a> TraitDef<'a> { field_paths.iter() .map(|path| { let binding_mode = if use_temporaries { - ast::BindingMode::ByValue(ast::Mutability::Immutable) + ast::BindingMode::ByValue(ast::Mutability::Not) } else { ast::BindingMode::ByRef(mutbl) }; diff --git a/src/libsyntax_ext/deriving/generic/ty.rs b/src/libsyntax_ext/deriving/generic/ty.rs index 607746597a5..b7aa8874aad 100644 --- a/src/libsyntax_ext/deriving/generic/ty.rs +++ b/src/libsyntax_ext/deriving/generic/ty.rs @@ -108,7 +108,7 @@ pub enum Ty<'a> { } pub fn borrowed_ptrty() -> PtrTy { - Borrowed(None, ast::Mutability::Immutable) + Borrowed(None, ast::Mutability::Not) } pub fn borrowed(ty: Box<Ty<'_>>) -> Ty<'_> { Ptr(ty, borrowed_ptrty()) @@ -268,7 +268,7 @@ pub fn get_explicit_self(cx: &ExtCtxt<'_>, // this constructs a fresh `self` path let self_path = cx.expr_self(span); match *self_ptr { - None => (self_path, respan(span, SelfKind::Value(ast::Mutability::Immutable))), + None => (self_path, respan(span, SelfKind::Value(ast::Mutability::Not))), Some(ref ptr) => { let self_ty = respan(span, |