Adding specs for traits and trait impl blocks. Addresses #41

crates/anodized-core/src/annotate/mod.rs

@@ -106,6 +106,7 @@ impl Parse for Spec {
             maintains,
             captures,
             ensures,
+            span: input.span(),
         })
     }
 }

crates/anodized-core/src/annotate/tests.rs

@@ -1,6 +1,7 @@
 use crate::test_util::assert_spec_eq;
 
 use super::*;
+use proc_macro2::Span;
 use syn::parse_quote;
 
 #[test]
@@ -18,6 +19,7 @@ fn simple_spec() {
             closure: parse_quote! { |output| output > x },
             cfg: None,
         }],
+        span: Span::call_site(),
     };
 
     assert_spec_eq(&spec, &expected);
@@ -40,6 +42,7 @@ fn all_clauses() {
             closure: parse_quote! { |z| z >= x },
             cfg: None,
         }],
+        span: Span::call_site(),
     };
 
     assert_spec_eq(&spec, &expected);
@@ -101,6 +104,7 @@ fn array_of_conditions() {
                 cfg: None,
             },
         ],
+        span: Span::call_site(),
     };
 
     assert_spec_eq(&spec, &expected);
@@ -120,6 +124,7 @@ fn ensures_with_explicit_closure() {
             closure: parse_quote! { |result| result.is_ok() || result.unwrap_err().kind() == ErrorKind::NotFound },
             cfg: None,
         }],
+        span: Span::call_site(),
     };
 
     assert_spec_eq(&spec, &expected);
@@ -151,6 +156,7 @@ fn multiple_clauses_of_same_flavor() {
                 cfg: None,
             },
         ],
+        span: Span::call_site(),
     };
 
     assert_spec_eq(&spec, &expected);
@@ -193,6 +199,7 @@ fn mixed_single_and_array_clauses() {
                 cfg: None,
             },
         ],
+        span: Span::call_site(),
     };
 
     assert_spec_eq(&spec, &expected);
@@ -218,6 +225,7 @@ fn cfg_attributes() {
             closure: parse_quote! { |output| output < x },
             cfg: Some(parse_quote! { not(debug_assertions) }),
         }],
+        span: Span::call_site(),
     };
 
     assert_spec_eq(&spec, &expected);
@@ -269,6 +277,7 @@ fn macro_in_condition() {
             closure: parse_quote! { |output| matches!(self.state, State::Running) },
             cfg: None,
         }],
+        span: Span::call_site(),
     };
 
     assert_spec_eq(&spec, &expected);
@@ -298,6 +307,7 @@ fn binds_pattern() {
                 cfg: None,
             },
         ],
+        span: Span::call_site(),
     };
 
     assert_spec_eq(&spec, &expected);
@@ -323,6 +333,7 @@ fn multiple_conditions() {
         maintains: vec![parse_quote! { self.items.len() <= self.items.capacity() }],
         captures: vec![],
         ensures: vec![],
+        span: Span::call_site(),
     };
 
     assert_spec_eq(&spec, &expected);
@@ -352,6 +363,7 @@ fn rename_return_value() {
                 cfg: None,
             },
         ],
+        span: Span::call_site(),
     };
 
     assert_spec_eq(&spec, &expected);
@@ -375,6 +387,7 @@ fn captures_simple_identifier() {
             closure: parse_quote! { |output| output == old_count + 1 },
             cfg: None,
         }],
+        span: Span::call_site(),
     };
 
     assert_spec_eq(&spec, &expected);
@@ -398,6 +411,7 @@ fn captures_identifier_with_alias() {
             closure: parse_quote! { |output| output > prev_value },
             cfg: None,
         }],
+        span: Span::call_site(),
     };
 
     assert_spec_eq(&spec, &expected);
@@ -449,6 +463,7 @@ fn captures_array() {
                 cfg: None,
             },
         ],
+        span: Span::call_site(),
     };
 
     assert_spec_eq(&spec, &expected);
@@ -475,6 +490,7 @@ fn captures_with_all_clauses() {
             closure: parse_quote! { |result| result > old_val },
             cfg: None,
         }],
+        span: Span::call_site(),
     };
 
     assert_spec_eq(&spec, &expected);
@@ -507,6 +523,7 @@ fn captures_array_expression() {
             closure: parse_quote! { |output| slice.len() == 3 },
             cfg: None,
         }],
+        span: Span::call_site(),
     };
 
     assert_spec_eq(&spec, &expected);
@@ -576,6 +593,7 @@ fn captures_edge_case_cast_expr() {
             alias: parse_quote! { old_red },
         }],
         ensures: vec![],
+        span: Span::call_site(),
     };
 
     assert_spec_eq(&spec, &expected);
@@ -605,6 +623,7 @@ fn captures_edge_case_array_of_cast_exprs() {
             alias: parse_quote! { r8g8b8 },
         }],
         ensures: vec![],
+        span: Span::call_site(),
     };
 
     assert_spec_eq(&spec, &expected);
@@ -638,6 +657,7 @@ fn captures_edge_case_list_of_cast_exprs() {
             },
         ],
         ensures: vec![],
+        span: Span::call_site(),
     };
 
     assert_spec_eq(&spec, &expected);

crates/anodized-core/src/instrument/function/mod.rs

@@ -8,7 +8,7 @@ use quote::{ToTokens, quote};
 use syn::{Block, Ident, ItemFn, parse::Result, parse_quote};
 
 impl Backend {
-    pub fn instrument_fn(self, spec: Spec, mut func: ItemFn) -> syn::Result<ItemFn> {
+    pub fn instrument_fn(&self, spec: Spec, mut func: ItemFn) -> syn::Result<ItemFn> {
         let is_async = func.sig.asyncness.is_some();
 
         // Extract the return type from the function signature
@@ -27,7 +27,7 @@ impl Backend {
     }
 
     fn instrument_fn_body(
-        self,
+        &self,
         spec: &Spec,
         original_body: &Block,
         is_async: bool,

crates/anodized-core/src/instrument/mod.rs

@@ -1,7 +1,9 @@
 use proc_macro2::TokenStream;
 use quote::quote;
 use syn::Meta;
+
 pub mod function;
+pub mod trait_spec;
 
 pub struct Backend {
     pub build_check: fn(Option<&Meta>, &TokenStream, &str, &TokenStream) -> TokenStream,