Copybara import of the project:

--
4b67c374d49b00860a8f285aae2e064cc58a0dc7 by Bastien Jacot-Guillarmod <[email protected]>:

Make `ActualT` in `Matcher` a generic type parameter.

COPYBARA_INTEGRATE_REVIEW=google/googletest-rust#349 from google:generic_parameter 4b67c374d49b00860a8f285aae2e064cc58a0dc7
FUTURE_COPYBARA_INTEGRATE_REVIEW=google/googletest-rust#349 from google:generic_parameter 4b67c374d49b00860a8f285aae2e064cc58a0dc7
PiperOrigin-RevId: 607661947

Author: bjacotg

rust/test/shared/matchers.rs

@@ -2,24 +2,22 @@ use googletest::description::Description;
 use googletest::matcher::MatcherResult;
 use googletest::prelude::*;
 use protobuf::{AbsentField, Optional, PresentField, ProxiedWithPresence};
-use std::marker::PhantomData;
 
 /// ===============================
 ///               IS_UNSET
 /// ===============================
 pub fn is_unset<'a, T: std::fmt::Debug + ProxiedWithPresence + ?Sized + 'a>()
--> impl Matcher<ActualT = Optional<PresentField<'a, T>, AbsentField<'a, T>>> {
-    UnsetMatcher::<T> { _phantom: PhantomData }
+-> impl Matcher<Optional<PresentField<'a, T>, AbsentField<'a, T>>> {
+    UnsetMatcher
 }
 
-struct UnsetMatcher<'a, T: ProxiedWithPresence + ?Sized> {
-    _phantom: PhantomData<PresentField<'a, T>>,
-}
-
-impl<'a, T: std::fmt::Debug + ProxiedWithPresence + ?Sized> Matcher for UnsetMatcher<'a, T> {
-    type ActualT = Optional<PresentField<'a, T>, AbsentField<'a, T>>;
+#[derive(MatcherExt)]
+struct UnsetMatcher;
 
-    fn matches(&self, actual: &Self::ActualT) -> MatcherResult {
+impl<'a, T: std::fmt::Debug + ProxiedWithPresence + ?Sized>
+    Matcher<Optional<PresentField<'a, T>, AbsentField<'a, T>>> for UnsetMatcher
+{
+    fn matches(&self, actual: &Optional<PresentField<'a, T>, AbsentField<'a, T>>) -> MatcherResult {
         actual.is_unset().into()
     }
 
@@ -35,18 +33,17 @@ impl<'a, T: std::fmt::Debug + ProxiedWithPresence + ?Sized> Matcher for UnsetMat
 ///               IS_SET
 /// ===============================
 pub fn is_set<'a, T: std::fmt::Debug + ProxiedWithPresence + ?Sized + 'a>()
--> impl Matcher<ActualT = Optional<PresentField<'a, T>, AbsentField<'a, T>>> {
-    SetMatcher::<T> { _phantom: PhantomData }
-}
-
-struct SetMatcher<'a, T: ProxiedWithPresence + ?Sized> {
-    _phantom: PhantomData<PresentField<'a, T>>,
+-> impl Matcher<Optional<PresentField<'a, T>, AbsentField<'a, T>>> {
+    SetMatcher
 }
 
-impl<'a, T: std::fmt::Debug + ProxiedWithPresence + ?Sized> Matcher for SetMatcher<'a, T> {
-    type ActualT = Optional<PresentField<'a, T>, AbsentField<'a, T>>;
+#[derive(MatcherExt)]
+struct SetMatcher;
 
-    fn matches(&self, actual: &Self::ActualT) -> MatcherResult {
+impl<'a, T: std::fmt::Debug + ProxiedWithPresence + ?Sized>
+    Matcher<Optional<PresentField<'a, T>, AbsentField<'a, T>>> for SetMatcher
+{
+    fn matches(&self, actual: &Optional<PresentField<'a, T>, AbsentField<'a, T>>) -> MatcherResult {
         actual.is_set().into()
     }