Fix bad error reporting for assert directive

csnover · Nov 15, 2022 · eaad123 · eaad123
1 parent 8ec595a
commit eaad123
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 6 deletions.
diff --git a/binrw/tests/ui/invalid_assert_condition.stderr b/binrw/tests/ui/invalid_assert_condition.stderr
@@ -1,10 +1,10 @@
 error[E0308]: mismatched types
   --> tests/ui/invalid_assert_condition.rs:4:13
    |
-3  | #[derive(BinRead)]
-   |          ------- arguments to this function are incorrect
 4  | #[br(assert("wrong type"))]
-   |             ^^^^^^^^^^^^ expected `bool`, found `&str`
+   |      ------ ^^^^^^^^^^^^ expected `bool`, found `&str`
+   |      |
+   |      arguments to this function are incorrect
    |
 note: function defined here
   --> src/private.rs

diff --git a/binrw_derive/src/binrw/codegen/mod.rs b/binrw_derive/src/binrw/codegen/mod.rs
@@ -129,6 +129,7 @@ fn generate_trait_impl<const WRITE: bool>(
 fn get_assertions(assertions: &[Assert]) -> impl Iterator<Item = TokenStream> + '_ {
     assertions.iter().map(
         |Assert {
+             kw_span,
              condition,
              consequent,
          }| {
@@ -148,7 +149,7 @@ fn get_assertions(assertions: &[Assert]) -> impl Iterator<Item = TokenStream> +
                 }
             };
 
-            quote! {
+            quote_spanned_any! {*kw_span=>
                 #ASSERT(#condition, #POS, #error_fn)?;
             }
         },

diff --git a/binrw_derive/src/binrw/parser/types/assert.rs b/binrw_derive/src/binrw/parser/types/assert.rs
@@ -1,5 +1,5 @@
 use crate::{binrw::parser::attrs, meta_types::KeywordToken};
-use proc_macro2::TokenStream;
+use proc_macro2::{Span, TokenStream};
 use quote::{quote, ToTokens};
 use syn::{parse::Parse, spanned::Spanned, token::Token, Expr, ExprLit, Lit};
 
@@ -11,6 +11,7 @@ pub(crate) enum Error {
 
 #[derive(Debug, Clone)]
 pub(crate) struct Assert {
+    pub(crate) kw_span: Span,
     pub(crate) condition: TokenStream,
     pub(crate) consequent: Option<Error>,
 }
@@ -19,13 +20,14 @@ impl<K: Parse + Spanned + Token> TryFrom<attrs::AssertLike<K>> for Assert {
     type Error = syn::Error;
 
     fn try_from(value: attrs::AssertLike<K>) -> Result<Self, Self::Error> {
+        let kw_span = value.keyword_span();
         let mut args = value.fields.iter();
 
         let condition = if let Some(cond) = args.next() {
             cond.into_token_stream()
         } else {
             return Err(Self::Error::new(
-                value.keyword_span(),
+                kw_span,
                 format!(
                     "{} requires a boolean expression as an argument",
                     value.dyn_display()
@@ -49,6 +51,7 @@ impl<K: Parse + Spanned + Token> TryFrom<attrs::AssertLike<K>> for Assert {
         };
 
         Ok(Self {
+            kw_span,
             condition,
             consequent,
         })