Merge pull request google#424 from google:fix_clippy

PiperOrigin-RevId: 651900468

Author: copybara-github

.github/workflows/ci.yml

@@ -37,6 +37,7 @@ jobs:
       - name: cargo clippy
         uses: actions-rs/[email protected]
         with:
+          args: --all-targets --all-features
           token: ${{ secrets.GITHUB_TOKEN }}
 
   test:
@@ -57,6 +58,22 @@ jobs:
       - name: cargo test --locked
         run: cargo test --locked --all-features
 
+  lint:
+    runs-on: ubuntu-latest
+    name: lint / ubuntu
+    strategy:
+      matrix:
+        toolchain: [nightly]
+    steps:
+      - uses: actions/checkout@v4
+      - name: Install ${{ matrix.toolchain }}
+        uses: dtolnay/rust-toolchain@21dc36fb71dd22e3317045c0c31a3f4249868b17
+        with:
+          toolchain: ${{ matrix.toolchain }}
+          components: rustfmt
+      - name: cargo fmt --check
+        run: cargo fmt --check
+
   test-no-default-features:
     runs-on: ubuntu-latest
     name: test (no default features) / ubuntu / ${{ matrix.toolchain }}

googletest/src/matcher_support/count_elements.rs

@@ -36,7 +36,7 @@ mod tests {
 
     #[test]
     fn count_elements_vec() -> Result<()> {
-        verify_that!(count_elements(&vec![1, 2, 3]), eq(3))
+        verify_that!(count_elements(vec![1, 2, 3]), eq(3))
     }
 
     #[test]

googletest/src/matcher_support/summarize_diff.rs

@@ -306,7 +306,7 @@ fn stdout_supports_color() -> bool {
 
 #[rustversion::not(since(1.70))]
 fn stdout_supports_color() -> bool {
-    is_env_var_set("FORCE_COLOR")
+    is_env_var_set("FORCE_COLOR") && !is_env_var_set("NO_COLOR")
 }
 
 fn is_env_var_set(var: &'static str) -> bool {

googletest/src/matchers/is_encoded_string_matcher.rs

@@ -148,7 +148,7 @@ mod tests {
 
     #[test]
     fn has_correct_explanation_in_matched_case() -> Result<()> {
-        let explanation = is_utf8_string(eq("A string")).explain_match(&"A string".as_bytes());
+        let explanation = is_utf8_string(eq("A string")).explain_match("A string".as_bytes());
 
         verify_that!(
             explanation,
@@ -158,15 +158,14 @@ mod tests {
 
     #[test]
     fn has_correct_explanation_when_byte_array_is_not_utf8_encoded() -> Result<()> {
-        let explanation = is_utf8_string(eq("A string")).explain_match(&&[192, 128, 0, 64]);
+        let explanation = is_utf8_string(eq("A string")).explain_match([192, 128, 0, 64]);
 
         verify_that!(explanation, displays_as(starts_with("which is not a UTF-8 encoded string: ")))
     }
 
     #[test]
     fn has_correct_explanation_when_inner_matcher_does_not_match() -> Result<()> {
-        let explanation =
-            is_utf8_string(eq("A string")).explain_match(&"Another string".as_bytes());
+        let explanation = is_utf8_string(eq("A string")).explain_match("Another string".as_bytes());
 
         verify_that!(
             explanation,

googletest/tests/lib.rs

@@ -21,7 +21,6 @@ mod field_matcher_test;
 mod matches_pattern_test;
 mod pointwise_matcher_test;
 mod property_matcher_test;
-#[cfg(feature = "proptest")]
 mod proptest_integration_test;
 mod tuple_matcher_test;
 mod unordered_elements_are_matcher_test;

googletest/tests/no_color_test.rs

@@ -12,10 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#![cfg(feature = "supports-color")]
-
 use googletest::prelude::*;
-use indoc::indoc;
 use std::fmt::{Display, Write};
 
 // Make a long text with each element of the iterator on one line.
@@ -35,20 +32,19 @@ fn colors_suppressed_when_both_no_color_and_force_color_are_set() -> Result<()>
     std::env::set_var("NO_COLOR", "1");
     std::env::set_var("FORCE_COLOR", "1");
 
-    let result = verify_that!(build_text(1..50), eq(build_text(1..51)));
+    let result = verify_that!(build_text(1..50), eq(&build_text(1..51)));
 
     verify_that!(
         result,
-        err(displays_as(contains_substring(indoc! {
+        err(displays_as(contains_substring(
             "
-
-            Difference(-actual / +expected):
-             1
-             2
-             <---- 45 common lines omitted ---->
-             48
-             49
-            +50"
-        })))
+  Difference(-actual / +expected):
+   1
+   2
+   <---- 45 common lines omitted ---->
+   48
+   49
+  +50"
+        )))
     )
 }

googletest/tests/property_matcher_test.rs

@@ -128,12 +128,15 @@ fn describes_itself_in_not_matching_case() -> Result<()> {
 
 #[test]
 fn explains_mismatch_referencing_explanation_of_inner_matcher() -> Result<()> {
+    #[derive(Debug)]
+    struct SomeStruct;
+
     impl SomeStruct {
         fn get_a_collection(&self) -> Vec<u32> {
             vec![]
         }
     }
-    let value = SomeStruct { a_property: 2 };
+    let value = SomeStruct;
     let result =
         verify_that!(value, property!(&SomeStruct.get_a_collection(), ref container_eq([1])));
 
@@ -184,12 +187,14 @@ fn describes_itself_in_not_matching_case_for_ref() -> Result<()> {
 #[test]
 fn explains_mismatch_referencing_explanation_of_inner_matcher_for_ref() -> Result<()> {
     static EMPTY_COLLECTION: Vec<u32> = vec![];
+    #[derive(Debug)]
+    struct SomeStruct;
     impl SomeStruct {
         fn get_a_collection_ref(&self) -> &[u32] {
             &EMPTY_COLLECTION
         }
     }
-    let value = SomeStruct { a_property: 2 };
+    let value = SomeStruct;
     let result =
         verify_that!(value, property!(&SomeStruct.get_a_collection_ref(), container_eq([1])));