Fix helper pick-up and rename tests

library/kani_macros/src/derive.rs

@@ -240,12 +240,12 @@ fn parse_inv_expr(ident: &Ident, field: &syn::Field) -> Option<TokenStream> {
 
     // Keep the helper attribute if we find it
     for attr in &field.attrs {
-        if attr.path().is_ident("invariant") {
+        if attr.path().is_ident("safety_constraint") {
             inv_helper_attr = Some(attr);
         }
     }
 
-    // Parse the arguments in the invariant helper attribute
+    // Parse the arguments in the `#[safety_constraint(...)]` attribute
     if let Some(attr) = inv_helper_attr {
         let expr_args: Result<syn::Expr, syn::Error> = attr.parse_args();
 

tests/expected/derive-arbitrary/invariant_helper/invariant_helper.rs → tests/expected/derive-arbitrary/safety_constraint_helper/safety_constraint_helper.rs

@@ -1,7 +1,7 @@
 // Copyright Kani Contributors
 // SPDX-License-Identifier: Apache-2.0 OR MIT
 
-//! Check that the invariant attribute helper adds the conditions provided to
+//! Check that the `#[safety_constraint(...)]` attribute helper adds the conditions provided to
 //! the attribute to the derived `Arbitrary` implementation.
 
 extern crate kani;

tests/expected/derive-invariant/invariant_helper/invariant_helper.rs → tests/expected/derive-invariant/safety_constraint_helper/safety_constraint_helper.rs

@@ -1,7 +1,7 @@
 // Copyright Kani Contributors
 // SPDX-License-Identifier: Apache-2.0 OR MIT
 
-//! Check that the invariant attribute helper adds the conditions provided to
+//! Check that the `#[safety_constraint(...)]` attribute helper adds the conditions provided to
 //! the attribute to the derived `Invariant` implementation.
 
 extern crate kani;

tests/expected/derive-invariant/invariant_helper_funs/invariant_helper_funs.rs → tests/expected/derive-invariant/safety_constraint_helper_funs/safety_constraint_helper_funs.rs

@@ -1,7 +1,7 @@
 // Copyright Kani Contributors
 // SPDX-License-Identifier: Apache-2.0 OR MIT
 
-//! Check that functions can be called in the invariant attribute helpers.
+//! Check that functions can be called in the `#[safety_constraint(...)]` attribute helpers.
 //! This is like the `invariant_helper` test but using a function instead
 //! of passing in a predicate.
 

tests/ui/derive-invariant/helper-empty/helper-empty.rs

@@ -1,7 +1,7 @@
 // Copyright Kani Contributors
 // SPDX-License-Identifier: Apache-2.0 OR MIT
 
-//! Check the compilation error for the invariant attribute helper when an
+//! Check the compilation error for the `#[safety_constraint(...)]` attribute helper when an
 //! argument isn't provided.
 
 extern crate kani;

tests/ui/derive-invariant/helper-no-expr/helper-no-expr.rs

@@ -1,7 +1,7 @@
 // Copyright Kani Contributors
 // SPDX-License-Identifier: Apache-2.0 OR MIT
 
-//! Check the compilation error for the invariant attribute helper when the
+//! Check the compilation error for the `#[safety_constraint(...)]` attribute helper when the
 //! argument is not a proper expression.
 
 extern crate kani;

tests/ui/derive-invariant/helper-wrong-expr/expected

@@ -1,9 +1,9 @@
 error[E0308]: mismatched types
    |
 14 |     #[safety_constraint(x >= 0)]
-   |                      ^ expected `&i32`, found integer
+   |                              ^ expected `&i32`, found integer
    |
 help: consider dereferencing the borrow
    |
 14 |     #[safety_constraint(*x >= 0)]
-   |                 +
+   |

tests/ui/derive-invariant/helper-wrong-expr/helper-wrong-expr.rs

@@ -1,7 +1,7 @@
 // Copyright Kani Contributors
 // SPDX-License-Identifier: Apache-2.0 OR MIT
 
-//! Check the compilation error for the invariant attribute helper when the
+//! Check the compilation error for the `#[safety_constraint(...)]` attribute helper when the
 //! argument cannot be evaluated in the struct's context.
 
 extern crate kani;