Simplify logic

estebank · pietroalbini · commit a0824fc78c27 · 2018-11-15T20:21:55.000+01:00
diff --git a/src/librustc/ty/context.rs b/src/librustc/ty/context.rs
@@ -1609,16 +1609,10 @@ impl<'a, 'gcx, 'tcx> TyCtxt<'a, 'gcx, 'tcx> {
         match self.hir.get(node_id) {
             Node::Item(item) => {
                 match item.node {
-                    ItemKind::Trait(..)
-                    | ItemKind::TraitAlias(..)
-                    | ItemKind::Mod(..)
-                    | ItemKind::ForeignMod(..)
-                    | ItemKind::GlobalAsm(..)
-                    | ItemKind::ExternCrate(..)
-                    | ItemKind::Use(..) => {
+                    ItemKind::Fn(..) => { /* type_of_def_id() will work */ }
+                    _ => {
                         return None;
                     }
-                    _ => { /* type_of_def_id() will work */ }
                 }
             }
             _ => { /* type_of_def_id() will work or panic */ }

Original file line number	Diff line number	Diff line change
`@@ -1609,16 +1609,10 @@ impl<'a, 'gcx, 'tcx> TyCtxt<'a, 'gcx, 'tcx> {`
`1609`	`1609`	`match self.hir.get(node_id) {`
`1610`	`1610`	`Node::Item(item) => {`
`1611`	`1611`	`match item.node {`
`1612`		`- ItemKind::Trait(..)`
`1613`		`- \| ItemKind::TraitAlias(..)`
`1614`		`- \| ItemKind::Mod(..)`
`1615`		`- \| ItemKind::ForeignMod(..)`
`1616`		`- \| ItemKind::GlobalAsm(..)`
`1617`		`- \| ItemKind::ExternCrate(..)`
`1618`		`- \| ItemKind::Use(..) => {`
	`1612`	`+ ItemKind::Fn(..) => { /* type_of_def_id() will work */ }`
	`1613`	`+ _ => {`
`1619`	`1614`	`return None;`
`1620`	`1615`	`}`
`1621`		`- _ => { /* type_of_def_id() will work */ }`
`1622`	`1616`	`}`
`1623`	`1617`	`}`
`1624`	`1618`	`_ => { /* type_of_def_id() will work or panic */ }`