diff options
| author | Vadim Petrochenkov <vadim.petrochenkov@gmail.com> | 2016-08-26 19:23:42 +0300 |
|---|---|---|
| committer | Vadim Petrochenkov <vadim.petrochenkov@gmail.com> | 2016-09-04 12:30:33 +0300 |
| commit | e05e74ac831bc8438f5daeb98432a29285ed9514 (patch) | |
| tree | 47360c576b78ad13db5a2d4faf1f1ce3055c5dfc /src/libsyntax_ext | |
| parent | 6f7e51e49b7d74f8112cf048fcbd377d0db7c326 (diff) | |
| download | rust-e05e74ac831bc8438f5daeb98432a29285ed9514.tar.gz rust-e05e74ac831bc8438f5daeb98432a29285ed9514.zip | |
Replace `_, _` with `..`
Diffstat (limited to 'src/libsyntax_ext')
| -rw-r--r-- | src/libsyntax_ext/asm.rs | 2 | ||||
| -rw-r--r-- | src/libsyntax_ext/deriving/debug.rs | 2 | ||||
| -rw-r--r-- | src/libsyntax_ext/deriving/generic/mod.rs | 8 | ||||
| -rw-r--r-- | src/libsyntax_ext/deriving/hash.rs | 2 | ||||
| -rw-r--r-- | src/libsyntax_ext/lib.rs | 1 |
5 files changed, 8 insertions, 7 deletions
diff --git a/src/libsyntax_ext/asm.rs b/src/libsyntax_ext/asm.rs index 6f368e1bc6f..77425b809de 100644 --- a/src/libsyntax_ext/asm.rs +++ b/src/libsyntax_ext/asm.rs @@ -233,7 +233,7 @@ pub fn expand_asm<'cx>(cx: &'cx mut ExtCtxt, p.bump(); state = st; } - (&token::Eof, _, _) => break 'statement, + (&token::Eof, ..) => break 'statement, _ => break, } } diff --git a/src/libsyntax_ext/deriving/debug.rs b/src/libsyntax_ext/deriving/debug.rs index b974699003b..f367fed9cc2 100644 --- a/src/libsyntax_ext/deriving/debug.rs +++ b/src/libsyntax_ext/deriving/debug.rs @@ -78,7 +78,7 @@ fn show_substructure(cx: &mut ExtCtxt, span: Span, substr: &Substructure) -> P<E let mut stmts = match *substr.fields { Struct(_, ref fields) | - EnumMatching(_, _, ref fields) => { + EnumMatching(.., ref fields) => { let mut stmts = vec![]; if !is_struct { // tuple struct/"normal" variant diff --git a/src/libsyntax_ext/deriving/generic/mod.rs b/src/libsyntax_ext/deriving/generic/mod.rs index b37d5332983..600f5d335c4 100644 --- a/src/libsyntax_ext/deriving/generic/mod.rs +++ b/src/libsyntax_ext/deriving/generic/mod.rs @@ -976,7 +976,7 @@ impl<'a> MethodDef<'a> { other: other_fields.iter_mut() .map(|l| { match l.next().unwrap() { - (_, _, ex, _) => ex, + (.., ex, _) => ex, } }) .collect(), @@ -1527,7 +1527,7 @@ impl<'a> TraitDef<'a> { VariantData::Struct(..) => { let field_pats = subpats.into_iter() .zip(&ident_exprs) - .map(|(pat, &(sp, ident, _, _))| { + .map(|(pat, &(sp, ident, ..))| { if ident.is_none() { cx.span_bug(sp, "a braced struct with unnamed fields in `derive`"); } @@ -1583,7 +1583,7 @@ pub fn cs_fold<F>(use_foldl: bool, where F: FnMut(&mut ExtCtxt, Span, P<Expr>, P<Expr>, &[P<Expr>]) -> P<Expr> { match *substructure.fields { - EnumMatching(_, _, ref all_fields) | + EnumMatching(.., ref all_fields) | Struct(_, ref all_fields) => { if use_foldl { all_fields.iter().fold(base, |old, field| { @@ -1623,7 +1623,7 @@ pub fn cs_same_method<F>(f: F, where F: FnOnce(&mut ExtCtxt, Span, Vec<P<Expr>>) -> P<Expr> { match *substructure.fields { - EnumMatching(_, _, ref all_fields) | + EnumMatching(.., ref all_fields) | Struct(_, ref all_fields) => { // call self_n.method(other_1_n, other_2_n, ...) let called = all_fields.iter() diff --git a/src/libsyntax_ext/deriving/hash.rs b/src/libsyntax_ext/deriving/hash.rs index 0941ebca868..97d7f2ce800 100644 --- a/src/libsyntax_ext/deriving/hash.rs +++ b/src/libsyntax_ext/deriving/hash.rs @@ -82,7 +82,7 @@ fn hash_substructure(cx: &mut ExtCtxt, trait_span: Span, substr: &Substructure) let fields = match *substr.fields { Struct(_, ref fs) => fs, - EnumMatching(_, _, ref fs) => { + EnumMatching(.., ref fs) => { let variant_value = deriving::call_intrinsic(cx, trait_span, "discriminant_value", diff --git a/src/libsyntax_ext/lib.rs b/src/libsyntax_ext/lib.rs index 4bae9ec5a1a..2065d92fd6e 100644 --- a/src/libsyntax_ext/lib.rs +++ b/src/libsyntax_ext/lib.rs @@ -19,6 +19,7 @@ html_root_url = "https://doc.rust-lang.org/nightly/")] #![cfg_attr(not(stage0), deny(warnings))] +#![feature(dotdot_in_tuple_patterns)] #![feature(rustc_macro_lib)] #![feature(rustc_macro_internals)] #![feature(rustc_private)] |