]> git.lizzy.rs Git - rust.git/commitdiff
Auto merge of #36203 - petrochenkov:uvsdot, r=nrc
authorbors <bors@rust-lang.org>
Sun, 4 Sep 2016 21:03:01 +0000 (14:03 -0700)
committerGitHub <noreply@github.com>
Sun, 4 Sep 2016 21:03:01 +0000 (14:03 -0700)
Replace `_, _` with `..` in patterns

This is how https://github.com/rust-lang/rust/issues/33627 looks in action.

Looks especially nice in leftmost/rightmost positions `(first, ..)`/`(.., last)`.
I haven't touched libsyntax intentionally because the feature is still unstable.

1  2 
src/librustc/session/config.rs
src/librustc_driver/lib.rs
src/librustc_metadata/creader.rs
src/librustc_mir/transform/qualify_consts.rs
src/librustc_save_analysis/dump_visitor.rs
src/librustc_save_analysis/lib.rs

Simple merge
Simple merge
Simple merge
index f32baf30ff42e4517c24ec4790eb61f381c05b0b,f69edea047e311fc61d2df449c189fd8ac2691ee..04cd72ac2d3647de31dc91b94bc15fc5762b2b89
@@@ -224,10 -216,9 +225,10 @@@ impl<'l, 'tcx: 'l> SaveContext<'l, 'tcx
                      qualname: qualname,
                      scope: self.enclosing_scope(item.id),
                      variants: def.variants.iter().map(|v| v.node.data.id()).collect(),
 +                    visibility: From::from(&item.vis),
                  }))
              }
-             ast::ItemKind::Impl(_, _, _, ref trait_ref, ref typ, _) => {
+             ast::ItemKind::Impl(.., ref trait_ref, ref typ, _) => {
                  let mut type_data = None;
                  let sub_span;