Skip to content

Commit 6f7e51e

Browse files
petrochenkovpetrochenkov
committed
Replace _, _, _ with .. 
1 parent 1ca1de6 commit 6f7e51e

File tree

50 files changed

+117
-103
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+117
-103
lines changed

‎src/librustc/hir/def.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ impl Def {
124124
Def::Variant(_, id) | Def::Enum(id) | Def::TyAlias(id) | Def::AssociatedTy(_, id) |
125125
Def::TyParam(id) | Def::Struct(id) | Def::Union(id) | Def::Trait(id) |
126126
Def::Method(id) | Def::Const(id) | Def::AssociatedConst(id) |
127-
Def::Local(id, _) | Def::Upvar(id, _, _, _) => {
127+
Def::Local(id, _) | Def::Upvar(id, ..) => {
128128
id
129129
}
130130

‎src/librustc/hir/intravisit.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,8 @@ pub enum FnKind<'a> {
4949
impl<'a> FnKind<'a> {
5050
pub fn attrs(&self) -> &'a [Attribute] {
5151
match *self {
52-
FnKind::ItemFn(_, _, _, _, _, _, attrs) => attrs,
53-
FnKind::Method(_, _, _, attrs) => attrs,
52+
FnKind::ItemFn(.., attrs) => attrs,
53+
FnKind::Method(.., attrs) => attrs,
5454
FnKind::Closure(attrs) => attrs,
5555
}
5656
}
@@ -622,7 +622,7 @@ pub fn walk_fn_decl_nopat<'v, V: Visitor<'v>>(visitor: &mut V, function_declarat
622622

623623
pub fn walk_fn_kind<'v, V: Visitor<'v>>(visitor: &mut V, function_kind: FnKind<'v>) {
624624
match function_kind {
625-
FnKind::ItemFn(_, generics, _, _, _, _, _) => {
625+
FnKind::ItemFn(_, generics, ..) => {
626626
visitor.visit_generics(generics);
627627
}
628628
FnKind::Method(_, sig, _, _) => {

‎src/librustc/hir/pat_util.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ pub fn pat_is_refutable(dm: &DefMap, pat: &hir::Pat) -> bool {
6262
_ => false
6363
}
6464
}
65-
PatKind::Vec(_, _, _) => true,
65+
PatKind::Vec(..) => true,
6666
_ => false
6767
}
6868
}

‎src/librustc/infer/error_reporting.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1787,7 +1787,7 @@ fn lifetimes_in_scope<'a, 'gcx, 'tcx>(tcx: TyCtxt<'a, 'gcx, 'tcx>,
17871787
let method_id_opt = match tcx.map.find(parent) {
17881788
Some(node) => match node {
17891789
ast_map::NodeItem(item) => match item.node {
1790-
hir::ItemFn(_, _, _, _, ref gen, _) => {
1790+
hir::ItemFn(.., ref gen, _) => {
17911791
taken.extend_from_slice(&gen.lifetimes);
17921792
None
17931793
},
@@ -1811,7 +1811,7 @@ fn lifetimes_in_scope<'a, 'gcx, 'tcx>(tcx: TyCtxt<'a, 'gcx, 'tcx>,
18111811
if let Some(node) = tcx.map.find(parent) {
18121812
match node {
18131813
ast_map::NodeItem(item) => match item.node {
1814-
hir::ItemImpl(_, _, ref gen, _, _, _) => {
1814+
hir::ItemImpl(_, _, ref gen, ..) => {
18151815
taken.extend_from_slice(&gen.lifetimes);
18161816
}
18171817
_ => ()

‎src/librustc/infer/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -248,7 +248,7 @@ impl TypeOrigin {
248248
&TypeOrigin::RelateOutputImplTypes(_) => {
249249
"trait type parameters matches those specified on the impl"
250250
}
251-
&TypeOrigin::MatchExpressionArm(_, _, _) => "match arms have compatible types",
251+
&TypeOrigin::MatchExpressionArm(..) => "match arms have compatible types",
252252
&TypeOrigin::IfExpression(_) => "if and else have compatible types",
253253
&TypeOrigin::IfExpressionWithNoElse(_) => "if missing an else returns ()",
254254
&TypeOrigin::RangeExpression(_) => "start and end of range have compatible types",

‎src/librustc/lib.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
#![feature(conservative_impl_trait)]
3131
#![feature(const_fn)]
3232
#![feature(core_intrinsics)]
33+
#![feature(dotdot_in_tuple_patterns)]
3334
#![feature(enumset)]
3435
#![feature(libc)]
3536
#![feature(nonzero)]

‎src/librustc/middle/dead.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -344,7 +344,7 @@ impl<'v> Visitor<'v> for LifeSeeder {
344344
self.worklist.extend(enum_def.variants.iter()
345345
.map(|variant| variant.node.data.id()));
346346
}
347-
hir::ItemTrait(_, _, _, ref trait_items) => {
347+
hir::ItemTrait(.., ref trait_items) => {
348348
for trait_item in trait_items {
349349
match trait_item.node {
350350
hir::ConstTraitItem(_, Some(_)) |
@@ -357,7 +357,7 @@ impl<'v> Visitor<'v> for LifeSeeder {
357357
}
358358
}
359359
}
360-
hir::ItemImpl(_, _, _, ref opt_trait, _, ref impl_items) => {
360+
hir::ItemImpl(.., ref opt_trait, _, ref impl_items) => {
361361
for impl_item in impl_items {
362362
if opt_trait.is_some() ||
363363
has_allow_dead_code_or_lang_attr(&impl_item.attrs) {

‎src/librustc/middle/effect.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ impl<'a, 'tcx, 'v> Visitor<'v> for EffectCheckVisitor<'a, 'tcx> {
8383
block: &'v hir::Block, span: Span, id: ast::NodeId) {
8484

8585
let (is_item_fn, is_unsafe_fn) = match fn_kind {
86-
FnKind::ItemFn(_, _, unsafety, _, _, _, _) =>
86+
FnKind::ItemFn(_, _, unsafety, ..) =>
8787
(true, unsafety == hir::Unsafety::Unsafe),
8888
FnKind::Method(_, sig, _, _) =>
8989
(true, sig.unsafety == hir::Unsafety::Unsafe),
@@ -143,7 +143,7 @@ impl<'a, 'tcx, 'v> Visitor<'v> for EffectCheckVisitor<'a, 'tcx> {
143143

144144
fn visit_expr(&mut self, expr: &hir::Expr) {
145145
match expr.node {
146-
hir::ExprMethodCall(_, _, _) => {
146+
hir::ExprMethodCall(..) => {
147147
let method_call = MethodCall::expr(expr.id);
148148
let base_type = self.tcx.tables.borrow().method_map[&method_call].ty;
149149
debug!("effect: method call case, base type is {:?}",

‎src/librustc/middle/expr_use_visitor.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -544,7 +544,7 @@ impl<'a, 'gcx, 'tcx> ExprUseVisitor<'a, 'gcx, 'tcx> {
544544
self.consume_expr(&count);
545545
}
546546

547-
hir::ExprClosure(_, _, _, fn_decl_span) => {
547+
hir::ExprClosure(.., fn_decl_span) => {
548548
self.walk_captures(expr, fn_decl_span)
549549
}
550550

‎src/librustc/middle/reachable.rs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,8 @@ fn item_might_be_inlined(item: &hir::Item) -> bool {
4646
}
4747

4848
match item.node {
49-
hir::ItemImpl(_, _, ref generics, _, _, _) |
50-
hir::ItemFn(_, _, _, _, ref generics, _) => {
49+
hir::ItemImpl(_, _, ref generics, ..) |
50+
hir::ItemFn(.., ref generics, _) => {
5151
generics_require_inlining(generics)
5252
}
5353
_ => false,
@@ -187,7 +187,7 @@ impl<'a, 'tcx> ReachableContext<'a, 'tcx> {
187187
// does too.
188188
let impl_node_id = self.tcx.map.as_local_node_id(impl_did).unwrap();
189189
match self.tcx.map.expect_item(impl_node_id).node {
190-
hir::ItemImpl(_, _, ref generics, _, _, _) => {
190+
hir::ItemImpl(_, _, ref generics, ..) => {
191191
generics_require_inlining(generics)
192192
}
193193
_ => false
@@ -226,7 +226,7 @@ impl<'a, 'tcx> ReachableContext<'a, 'tcx> {
226226
// If we are building an executable, only explicitly extern
227227
// types need to be exported.
228228
if let ast_map::NodeItem(item) = *node {
229-
let reachable = if let hir::ItemFn(_, _, _, abi, _, _) = item.node {
229+
let reachable = if let hir::ItemFn(.., abi, _, _) = item.node {
230230
abi != Abi::Rust
231231
} else {
232232
false
@@ -248,7 +248,7 @@ impl<'a, 'tcx> ReachableContext<'a, 'tcx> {
248248
match *node {
249249
ast_map::NodeItem(item) => {
250250
match item.node {
251-
hir::ItemFn(_, _, _, _, _, ref search_block) => {
251+
hir::ItemFn(.., ref search_block) => {
252252
if item_might_be_inlined(&item) {
253253
intravisit::walk_block(self, &search_block)
254254
}
@@ -265,7 +265,7 @@ impl<'a, 'tcx> ReachableContext<'a, 'tcx> {
265265
// inherently and their children are already in the
266266
// worklist, as determined by the privacy pass
267267
hir::ItemExternCrate(_) | hir::ItemUse(_) |
268-
hir::ItemTy(..) | hir::ItemStatic(_, _, _) |
268+
hir::ItemTy(..) | hir::ItemStatic(..) |
269269
hir::ItemMod(..) | hir::ItemForeignMod(..) |
270270
hir::ItemImpl(..) | hir::ItemTrait(..) |
271271
hir::ItemStruct(..) | hir::ItemEnum(..) |
@@ -329,7 +329,7 @@ struct CollectPrivateImplItemsVisitor<'a> {
329329
impl<'a, 'v> Visitor<'v> for CollectPrivateImplItemsVisitor<'a> {
330330
fn visit_item(&mut self, item: &hir::Item) {
331331
// We need only trait impls here, not inherent impls, and only non-exported ones
332-
if let hir::ItemImpl(_, _, _, Some(_), _, ref impl_items) = item.node {
332+
if let hir::ItemImpl(.., Some(_), _, ref impl_items) = item.node {
333333
if !self.access_levels.is_reachable(item.id) {
334334
for impl_item in impl_items {
335335
self.worklist.push(impl_item.id);

‎src/librustc/middle/resolve_lifetime.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ impl<'a, 'tcx, 'v> Visitor<'v> for LifetimeContext<'a, 'tcx> {
158158
hir::ItemStruct(_, ref generics) |
159159
hir::ItemUnion(_, ref generics) |
160160
hir::ItemTrait(_, ref generics, _, _) |
161-
hir::ItemImpl(_, _, ref generics, _, _, _) => {
161+
hir::ItemImpl(_, _, ref generics, ..) => {
162162
// These kinds of items have only early bound lifetime parameters.
163163
let lifetimes = &generics.lifetimes;
164164
let start = if let hir::ItemTrait(..) = item.node {
@@ -204,7 +204,7 @@ impl<'a, 'tcx, 'v> Visitor<'v> for LifetimeContext<'a, 'tcx> {
204204
fn visit_fn(&mut self, fk: FnKind<'v>, decl: &'v hir::FnDecl,
205205
b: &'v hir::Block, s: Span, fn_id: ast::NodeId) {
206206
match fk {
207-
FnKind::ItemFn(_, generics, _, _, _, _, _) => {
207+
FnKind::ItemFn(_, generics, ..) => {
208208
self.visit_early_late(fn_id,decl, generics, |this| {
209209
this.add_scope_and_walk_fn(fk, decl, b, s, fn_id)
210210
})
@@ -499,7 +499,7 @@ impl<'a, 'tcx> LifetimeContext<'a, 'tcx> {
499499
fn_id: ast::NodeId) {
500500

501501
match fk {
502-
FnKind::ItemFn(_, generics, _, _, _, _, _) => {
502+
FnKind::ItemFn(_, generics, ..) => {
503503
intravisit::walk_fn_decl(self, fd);
504504
self.visit_generics(generics);
505505
}
@@ -584,7 +584,7 @@ impl<'a, 'tcx> LifetimeContext<'a, 'tcx> {
584584
}
585585
match parent.node {
586586
hir::ItemTrait(_, ref generics, _, _) |
587-
hir::ItemImpl(_, _, ref generics, _, _, _) => {
587+
hir::ItemImpl(_, _, ref generics, ..) => {
588588
start += generics.lifetimes.len() + generics.ty_params.len();
589589
}
590590
_ => {}

‎src/librustc/middle/stability.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -252,11 +252,11 @@ impl<'a, 'tcx, 'v> Visitor<'v> for Annotator<'a, 'tcx> {
252252
// they don't have their own stability. They still can be annotated as unstable
253253
// and propagate this unstability to children, but this annotation is completely
254254
// optional. They inherit stability from their parents when unannotated.
255-
hir::ItemImpl(_, _, _, None, _, _) | hir::ItemForeignMod(..) => {
255+
hir::ItemImpl(.., None, _, _) | hir::ItemForeignMod(..) => {
256256
self.in_trait_impl = false;
257257
kind = AnnotationKind::Container;
258258
}
259-
hir::ItemImpl(_, _, _, Some(_), _, _) => {
259+
hir::ItemImpl(.., Some(_), _, _) => {
260260
self.in_trait_impl = true;
261261
}
262262
hir::ItemStruct(ref sd, _) => {
@@ -528,7 +528,7 @@ pub fn check_item<'a, 'tcx>(tcx: TyCtxt<'a, 'tcx, 'tcx>,
528528
// For implementations of traits, check the stability of each item
529529
// individually as it's possible to have a stable trait with unstable
530530
// items.
531-
hir::ItemImpl(_, _, _, Some(ref t), _, ref impl_items) => {
531+
hir::ItemImpl(.., Some(ref t), _, ref impl_items) => {
532532
let trait_did = tcx.expect_def(t.ref_id).def_id();
533533
let trait_items = tcx.trait_items(trait_did);
534534

‎src/librustc/ty/mod.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1336,7 +1336,7 @@ impl<'a, 'tcx> ParameterEnvironment<'tcx> {
13361336
}
13371337
Some(ast_map::NodeItem(item)) => {
13381338
match item.node {
1339-
hir::ItemFn(_, _, _, _, _, ref body) => {
1339+
hir::ItemFn(.., ref body) => {
13401340
// We assume this is a function.
13411341
let fn_def_id = tcx.map.local_def_id(id);
13421342

@@ -2262,7 +2262,7 @@ impl<'a, 'gcx, 'tcx> TyCtxt<'a, 'gcx, 'tcx> {
22622262

22632263
pub fn provided_trait_methods(self, id: DefId) -> Vec<Rc<Method<'gcx>>> {
22642264
if let Some(id) = self.map.as_local_node_id(id) {
2265-
if let ItemTrait(_, _, _, ref ms) = self.map.expect_item(id).node {
2265+
if let ItemTrait(.., ref ms) = self.map.expect_item(id).node {
22662266
ms.iter().filter_map(|ti| {
22672267
if let hir::MethodTraitItem(_, Some(_)) = ti.node {
22682268
match self.impl_or_trait_item(self.map.local_def_id(ti.id)) {
@@ -2288,7 +2288,7 @@ impl<'a, 'gcx, 'tcx> TyCtxt<'a, 'gcx, 'tcx> {
22882288
pub fn associated_consts(self, id: DefId) -> Vec<Rc<AssociatedConst<'gcx>>> {
22892289
if let Some(id) = self.map.as_local_node_id(id) {
22902290
match self.map.expect_item(id).node {
2291-
ItemTrait(_, _, _, ref tis) => {
2291+
ItemTrait(.., ref tis) => {
22922292
tis.iter().filter_map(|ti| {
22932293
if let hir::ConstTraitItem(_, _) = ti.node {
22942294
match self.impl_or_trait_item(self.map.local_def_id(ti.id)) {
@@ -2304,7 +2304,7 @@ impl<'a, 'gcx, 'tcx> TyCtxt<'a, 'gcx, 'tcx> {
23042304
}
23052305
}).collect()
23062306
}
2307-
ItemImpl(_, _, _, _, _, ref iis) => {
2307+
ItemImpl(.., ref iis) => {
23082308
iis.iter().filter_map(|ii| {
23092309
if let hir::ImplItemKind::Const(_, _) = ii.node {
23102310
match self.impl_or_trait_item(self.map.local_def_id(ii.id)) {
@@ -2334,7 +2334,7 @@ impl<'a, 'gcx, 'tcx> TyCtxt<'a, 'gcx, 'tcx> {
23342334
match self.map.find(id) {
23352335
Some(ast_map::NodeItem(item)) => {
23362336
match item.node {
2337-
hir::ItemImpl(_, polarity, _, _, _, _) => Some(polarity),
2337+
hir::ItemImpl(_, polarity, ..) => Some(polarity),
23382338
_ => None
23392339
}
23402340
}

‎src/librustc_borrowck/borrowck/mir/mod.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,8 +67,8 @@ pub fn borrowck_mir<'a, 'tcx: 'a>(
6767
id: ast::NodeId,
6868
attributes: &[ast::Attribute]) {
6969
match fk {
70-
FnKind::ItemFn(name, _, _, _, _, _, _) |
71-
FnKind::Method(name, _, _, _) => {
70+
FnKind::ItemFn(name, ..) |
71+
FnKind::Method(name, ..) => {
7272
debug!("borrowck_mir({}) UNIMPLEMENTED", name);
7373
}
7474
FnKind::Closure(_) => {

‎src/librustc_borrowck/borrowck/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -711,7 +711,7 @@ impl<'a, 'tcx> BorrowckCtxt<'a, 'tcx> {
711711

712712
move_data::Captured =>
713713
(match self.tcx.map.expect_expr(the_move.id).node {
714-
hir::ExprClosure(_, _, _, fn_decl_span) => fn_decl_span,
714+
hir::ExprClosure(.., fn_decl_span) => fn_decl_span,
715715
ref r => bug!("Captured({}) maps to non-closure: {:?}",
716716
the_move.id, r),
717717
}, " (into closure)"),

‎src/librustc_borrowck/lib.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919

2020
#![allow(non_camel_case_types)]
2121

22+
#![feature(dotdot_in_tuple_patterns)]
2223
#![feature(quote)]
2324
#![feature(rustc_diagnostic_macros)]
2425
#![feature(rustc_private)]

‎src/librustc_const_eval/eval.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,7 @@ pub fn lookup_const_fn_by_id<'a, 'tcx>(tcx: TyCtxt<'a, 'tcx, 'tcx>, def_id: DefI
228228
};
229229

230230
match fn_like.kind() {
231-
FnKind::ItemFn(_, _, _, hir::Constness::Const, _, _, _) => {
231+
FnKind::ItemFn(_, _, _, hir::Constness::Const, ..) => {
232232
Some(fn_like)
233233
}
234234
FnKind::Method(_, m, _, _) => {

‎src/librustc_const_eval/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
html_favicon_url = "https://doc.rust-lang.org/favicon.ico",
2323
html_root_url = "https://doc.rust-lang.org/nightly/")]
2424

25-
25+
#![feature(dotdot_in_tuple_patterns)]
2626
#![feature(rustc_private)]
2727
#![feature(staged_api)]
2828
#![feature(rustc_diagnostic_macros)]

‎src/librustc_lint/bad_style.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -239,7 +239,7 @@ impl LateLintPass for NonSnakeCase {
239239
fk: FnKind, _: &hir::FnDecl,
240240
_: &hir::Block, span: Span, id: ast::NodeId) {
241241
match fk {
242-
FnKind::Method(name, _, _, _) => match method_context(cx, id, span) {
242+
FnKind::Method(name, ..) => match method_context(cx, id, span) {
243243
MethodLateContext::PlainImpl => {
244244
self.check_snake_case(cx, "method", &name.as_str(), Some(span))
245245
},
@@ -248,7 +248,7 @@ impl LateLintPass for NonSnakeCase {
248248
},
249249
_ => (),
250250
},
251-
FnKind::ItemFn(name, _, _, _, _, _, _) => {
251+
FnKind::ItemFn(name, ..) => {
252252
self.check_snake_case(cx, "function", &name.as_str(), Some(span))
253253
},
254254
FnKind::Closure(_) => (),

‎src/librustc_lint/builtin.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -203,10 +203,10 @@ impl LateLintPass for UnsafeCode {
203203

204204
fn check_item(&mut self, cx: &LateContext, it: &hir::Item) {
205205
match it.node {
206-
hir::ItemTrait(hir::Unsafety::Unsafe, _, _, _) =>
206+
hir::ItemTrait(hir::Unsafety::Unsafe, ..) =>
207207
cx.span_lint(UNSAFE_CODE, it.span, "declaration of an `unsafe` trait"),
208208

209-
hir::ItemImpl(hir::Unsafety::Unsafe, _, _, _, _, _) =>
209+
hir::ItemImpl(hir::Unsafety::Unsafe, ..) =>
210210
cx.span_lint(UNSAFE_CODE, it.span, "implementation of an `unsafe` trait"),
211211

212212
_ => return,
@@ -216,7 +216,7 @@ impl LateLintPass for UnsafeCode {
216216
fn check_fn(&mut self, cx: &LateContext, fk: FnKind, _: &hir::FnDecl,
217217
_: &hir::Block, span: Span, _: ast::NodeId) {
218218
match fk {
219-
FnKind::ItemFn(_, _, hir::Unsafety::Unsafe, _, _, _, _) =>
219+
FnKind::ItemFn(_, _, hir::Unsafety::Unsafe, ..) =>
220220
cx.span_lint(UNSAFE_CODE, span, "declaration of an `unsafe` function"),
221221

222222
FnKind::Method(_, sig, _, _) => {
@@ -351,7 +351,7 @@ impl LateLintPass for MissingDoc {
351351
hir::ItemEnum(..) => "an enum",
352352
hir::ItemStruct(..) => "a struct",
353353
hir::ItemUnion(..) => "a union",
354-
hir::ItemTrait(_, _, _, ref items) => {
354+
hir::ItemTrait(.., ref items) => {
355355
// Issue #11592, traits are always considered exported, even when private.
356356
if it.vis == hir::Visibility::Inherited {
357357
self.private_traits.insert(it.id);
@@ -363,7 +363,7 @@ impl LateLintPass for MissingDoc {
363363
"a trait"
364364
},
365365
hir::ItemTy(..) => "a type alias",
366-
hir::ItemImpl(_, _, _, Some(ref trait_ref), _, ref impl_items) => {
366+
hir::ItemImpl(.., Some(ref trait_ref), _, ref impl_items) => {
367367
// If the trait is private, add the impl items to private_traits so they don't get
368368
// reported for missing docs.
369369
let real_trait = cx.tcx.expect_def(trait_ref.ref_id).def_id();
@@ -1037,7 +1037,7 @@ impl LintPass for InvalidNoMangleItems {
10371037
impl LateLintPass for InvalidNoMangleItems {
10381038
fn check_item(&mut self, cx: &LateContext, it: &hir::Item) {
10391039
match it.node {
1040-
hir::ItemFn(_, _, _, _, ref generics, _) => {
1040+
hir::ItemFn(.., ref generics, _) => {
10411041
if attr::contains_name(&it.attrs, "no_mangle") {
10421042
if !cx.access_levels.is_reachable(it.id) {
10431043
let msg = format!("function {} is marked #[no_mangle], but not exported",

‎src/librustc_lint/lib.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
#![cfg_attr(test, feature(test))]
3232
#![feature(box_patterns)]
3333
#![feature(box_syntax)]
34+
#![feature(dotdot_in_tuple_patterns)]
3435
#![feature(quote)]
3536
#![feature(rustc_diagnostic_macros)]
3637
#![feature(rustc_private)]

0 commit comments

Comments
 (0)