Merge pull request #791 from Jascha-N/fix-fnkind-pattern

mcarton · mcarton · commit 68b2f12adf35 · 2016-03-23T16:38:13.000+01:00
Match attributes in FnKind patterns
diff --git a/src/misc.rs b/src/misc.rs
@@ -39,7 +39,7 @@ impl LintPass for TopLevelRefPass {
 
 impl LateLintPass for TopLevelRefPass {
     fn check_fn(&mut self, cx: &LateContext, k: FnKind, decl: &FnDecl, _: &Block, _: Span, _: NodeId) {
-        if let FnKind::Closure = k {
+        if let FnKind::Closure(_) = k {
             // Does not apply to closures
             return;
         }
diff --git a/src/new_without_default.rs b/src/new_without_default.rs
@@ -46,7 +46,7 @@ impl LateLintPass for NewWithoutDefault {
             return;
         }
 
-        if let FnKind::Method(name, _, _) = kind {
+        if let FnKind::Method(name, _, _, _) = kind {
             if decl.inputs.is_empty() && name.as_str() == "new" {
                 let self_ty = cx.tcx.lookup_item_type(cx.tcx.map.local_def_id(cx.tcx.map.get_parent(id))).ty;
 

Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ impl LintPass for TopLevelRefPass {`
`39`	`39`
`40`	`40`	`impl LateLintPass for TopLevelRefPass {`
`41`	`41`	`fn check_fn(&mut self, cx: &LateContext, k: FnKind, decl: &FnDecl, _: &Block, _: Span, _: NodeId) {`
`42`		`- if let FnKind::Closure = k {`
	`42`	`+ if let FnKind::Closure(_) = k {`
`43`	`43`	`// Does not apply to closures`
`44`	`44`	`return;`
`45`	`45`	`}`
Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ impl LateLintPass for NewWithoutDefault {`
`46`	`46`	`return;`
`47`	`47`	`}`
`48`	`48`
`49`		`- if let FnKind::Method(name, _, _) = kind {`
	`49`	`+ if let FnKind::Method(name, _, _, _) = kind {`
`50`	`50`	`if decl.inputs.is_empty() && name.as_str() == "new" {`
`51`	`51`	`let self_ty = cx.tcx.lookup_item_type(cx.tcx.map.local_def_id(cx.tcx.map.get_parent(id))).ty;`
`52`	`52`