bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

[breaking-change] don't glob export ast::Mutablity variants

Browse source
This commit is contained in:
Oliver 'ker' Schneider 2016-02-09 17:44:47 +01:00 • committed by Oliver Schneider
parent 14e09ad468
commit 73fa9b2da2
21 changed files with 87 additions and 73 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/libsyntax_ext/deriving/generic/mod.rs
View file

@ -864,7 +864,9 @@ impl<'a> MethodDef<'a> {
let self_arg = match explicit_self.node {
ast::SelfKind::Static => None,
// creating fresh self id
_ => Some(ast::Arg::new_self(trait_.span, ast::MutImmutable, special_idents::self_))
_ => Some(ast::Arg::new_self(trait_.span,
ast::Mutability::Immutable,
special_idents::self_))
};
let args = {
let args = arg_types.into_iter().map(|(name, ty)| {
@ -942,7 +944,7 @@ impl<'a> MethodDef<'a> {
struct_def,
&format!("__self_{}",
i),
ast::MutImmutable);
ast::Mutability::Immutable);
patterns.push(pat);
raw_fields.push(ident_expr);
}
@ -1135,11 +1137,12 @@ impl<'a> MethodDef<'a> {
let mut match_arms: Vec<ast::Arm> = variants.iter().enumerate()
.map(|(index, variant)| {
let mk_self_pat = |cx: &mut ExtCtxt, self_arg_name: &str| {
let (p, idents) = trait_.create_enum_variant_pattern(cx, type_ident,
&**variant,
self_arg_name,
ast::MutImmutable);
(cx.pat(sp, ast::PatRegion(p, ast::MutImmutable)), idents)
let (p, idents) = trait_.create_enum_variant_pattern(
cx, type_ident,
&**variant,
self_arg_name,
ast::Mutability::Immutable);
(cx.pat(sp, ast::PatRegion(p, ast::Mutability::Immutable)), idents)
};
// A single arm has form (&VariantK, &VariantK, ...) => BodyK