fix: remove single quote to pass on both stable+nightly

sharksforarms · Jun 15, 2021 · dabc868 · dabc868
1 parent 876cb7a
commit dabc868
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 10 deletions.
diff --git a/deku-derive/src/macros/deku_read.rs b/deku-derive/src/macros/deku_read.rs
@@ -528,7 +528,7 @@ fn emit_field_read(
             if (!(#v)) {
                 // assertion is false, raise error
                 return Err(::#crate_::DekuError::Assertion(format!(
-                            "field '{}' failed assertion: {}",
+                            "field {} failed assertion: {}",
                             #field_ident_str,
                             stringify!(#v)
                         )));
@@ -543,7 +543,7 @@ fn emit_field_read(
             if (!(#internal_field_ident == (#v))) {
                 // assertion is false, raise error
                 return Err(::#crate_::DekuError::Assertion(format!(
-                            "field '{}' failed assertion: {}",
+                            "field {} failed assertion: {}",
                             #field_ident_str,
                             stringify!(#field_ident == #v)
                         )));

diff --git a/deku-derive/src/macros/deku_write.rs b/deku-derive/src/macros/deku_write.rs
@@ -492,7 +492,7 @@ fn emit_field_write(
             if (!(#v)) {
                 // assertion is false, raise error
                 return Err(::#crate_::DekuError::Assertion(format!(
-                            "field '{}' failed assertion: {}",
+                            "field {} failed assertion: {}",
                             #field_ident_str,
                             stringify!(#v)
                         )));
@@ -507,7 +507,7 @@ fn emit_field_write(
             if (!(*(#field_ident) == (#v))) {
                 // assertion is false, raise error
                 return Err(::#crate_::DekuError::Assertion(format!(
-                            "field '{}' failed assertion: {}",
+                            "field {} failed assertion: {}",
                             #field_ident_str,
                             stringify!(#field_ident == #v)
                         )));

diff --git a/src/attributes.rs b/src/attributes.rs
@@ -187,7 +187,7 @@ let data: Vec<u8> = vec![0x00, 0x01, 0x02];
 let value = DekuTest::try_from(data.as_ref());
 
 assert_eq!(
-    Err(DekuError::Assertion("field 'data' failed assertion: * data >= 8".into())),
+    Err(DekuError::Assertion("field data failed assertion: * data >= 8".into())),
     value
 );
 ```
@@ -220,7 +220,7 @@ value.data = 0x02;
 let value: Result<Vec<u8>, DekuError> = value.try_into();
 
 assert_eq!(
-    Err(DekuError::Assertion("field 'data' failed assertion: data == 0x01".into())),
+    Err(DekuError::Assertion("field data failed assertion: data == 0x01".into())),
     value
 );
 ```

diff --git a/tests/test_attributes/test_assert.rs b/tests/test_attributes/test_assert.rs
@@ -16,7 +16,7 @@ struct TestStruct {
         field_b: 0x02,
     }),
 
-    #[should_panic(expected = r#"Assertion("field \'field_b\' failed assertion: * field_a + * field_b >= 3")"#)]
+    #[should_panic(expected = r#"Assertion("field field_b failed assertion: * field_a + * field_b >= 3")"#)]
     case(&hex!("0101"), TestStruct::default())
 )]
 fn test_assert_read(input: &[u8], expected: TestStruct) {
@@ -30,7 +30,7 @@ fn test_assert_read(input: &[u8], expected: TestStruct) {
         field_b: 0x02,
     }, hex!("0102").to_vec()),
 
-    #[should_panic(expected = r#"Assertion("field \'field_b\' failed assertion: * field_a + * field_b >= 3")"#)]
+    #[should_panic(expected = r#"Assertion("field field_b failed assertion: * field_a + * field_b >= 3")"#)]
     case(TestStruct {
         field_a: 0x01,
         field_b: 0x01,

diff --git a/tests/test_attributes/test_assert_eq.rs b/tests/test_attributes/test_assert_eq.rs
@@ -16,7 +16,7 @@ struct TestStruct {
         field_b: 0x01,
     }),
 
-    #[should_panic(expected = r#"Assertion("field \'field_b\' failed assertion: field_b == * field_a")"#)]
+    #[should_panic(expected = r#"Assertion("field field_b failed assertion: field_b == * field_a")"#)]
     case(&hex!("0102"), TestStruct::default())
 )]
 fn test_assert_eq_read(input: &[u8], expected: TestStruct) {
@@ -30,7 +30,7 @@ fn test_assert_eq_read(input: &[u8], expected: TestStruct) {
         field_b: 0x01,
     }, hex!("0101").to_vec()),
 
-    #[should_panic(expected = r#"Assertion("field \'field_b\' failed assertion: field_b == * field_a")"#)]
+    #[should_panic(expected = r#"Assertion("field field_b failed assertion: field_b == * field_a")"#)]
     case(TestStruct {
         field_a: 0x01,
         field_b: 0x02,