Move to source analysis object

enrichman · Aug 15, 2020 · 5cab48a · 5cab48a
1 parent 6153462
commit 5cab48a
Show file tree

Hide file tree

Showing 7 changed files with 846 additions and 702 deletions.
diff --git a/src/source_analysis/attributes.rs b/src/source_analysis/attributes.rs
@@ -1,39 +1,41 @@
 use crate::source_analysis::prelude::*;
 use syn::*;
 
-pub(crate) fn check_attr_list(
-    attrs: &[Attribute],
-    ctx: &Context,
-    analysis: &mut LineAnalysis,
-) -> bool {
-    let mut check_cover = true;
-    for attr in attrs {
-        analysis.ignore_tokens(attr);
-        if let Ok(x) = attr.parse_meta() {
-            if check_cfg_attr(&x) {
-                check_cover = false;
-            } else if x.path().is_ident("cfg") {
-                match x {
-                    Meta::List(ref ml) => {
-                        let mut skip = false;
-                        for c in &ml.nested {
-                            if let NestedMeta::Meta(Meta::Path(ref i)) = c {
-                                skip |= i.is_ident("test") && ctx.config.ignore_tests;
+impl SourceAnalysis {
+    pub(crate) fn check_attr_list(&mut self, attrs: &[Attribute], ctx: &Context) -> bool {
+        let analysis = self
+            .lines
+            .entry(ctx.file.to_path_buf())
+            .or_insert_with(line_analysis_missing);
+        let mut check_cover = true;
+        for attr in attrs {
+            analysis.ignore_tokens(attr);
+            if let Ok(x) = attr.parse_meta() {
+                if check_cfg_attr(&x) {
+                    check_cover = false;
+                } else if x.path().is_ident("cfg") {
+                    match x {
+                        Meta::List(ref ml) => {
+                            let mut skip = false;
+                            for c in &ml.nested {
+                                if let NestedMeta::Meta(Meta::Path(ref i)) = c {
+                                    skip |= i.is_ident("test") && ctx.config.ignore_tests;
+                                }
+                            }
+                            if skip {
+                                check_cover = false;
                             }
                         }
-                        if skip {
-                            check_cover = false;
-                        }
+                        _ => {}
                     }
-                    _ => {}
                 }
             }
+            if !check_cover {
+                break;
+            }
         }
-        if !check_cover {
-            break;
-        }
+        check_cover
     }
-    check_cover
 }
 
 pub(crate) fn check_cfg_attr(attr: &Meta) -> bool {