Merge pull request #764 from oli-obk/fix/cc/multi_diverge

prevent cc lint from panicking on unreachable code

Author: mcarton

src/cyclomatic_complexity.rs

@@ -47,6 +47,10 @@ impl CyclomaticComplexity {
         let cfg = CFG::new(cx.tcx, block);
         let n = cfg.graph.len_nodes() as u64;
         let e = cfg.graph.len_edges() as u64;
+        if e + 2 < n {
+            // the function has unreachable code, other lints should catch this
+            return;
+        }
         let cc = e + 2 - n;
         let mut helper = CCHelper {
             match_arms: 0,

tests/compile-fail/cyclomatic_complexity.rs

@@ -298,3 +298,9 @@ fn void(void: Void) { //~ ERROR: the function has a cyclomatic complexity of 1
         }
     }
 }
+
+#[cyclomatic_complexity = "0"]
+fn mcarton_sees_all() {
+    panic!("meh");
+    panic!("möh");
+}