Removing matcher::* from predicate.

bjacotg · copybara-github · commit 23bdb0565b83 · 2023-05-05T09:34:29.000-07:00
This would be usefule only for code defining matchers. Hopefully, normal users can rely on the one define in matchers/.

PiperOrigin-RevId: 529738046
diff --git a/googletest/src/lib.rs b/googletest/src/lib.rs
@@ -255,6 +255,7 @@
 //!
 //! ```
 //! # use googletest::prelude::*;
+//! # use googletest::matcher::{Matcher, MatcherResult};
 //! # use std::fmt::Debug;
 //! #
 //! # struct MyEqMatcher<T> {
@@ -387,7 +388,6 @@ pub mod matcher_support;
 pub mod matchers;
 
 pub mod prelude {
-    pub use super::matcher::*;
     pub use super::matchers::*;
     pub use super::GoogleTestSupport;
     pub use super::IntoTestResult;
diff --git a/googletest/src/matchers/all_matcher.rs b/googletest/src/matchers/all_matcher.rs
@@ -151,6 +151,7 @@ pub mod internal {
 #[cfg(test)]
 mod tests {
     use super::internal;
+    use crate::matcher::{Matcher, MatcherResult};
     use crate::prelude::*;
     use indoc::indoc;
 
diff --git a/googletest/src/matchers/container_eq_matcher.rs b/googletest/src/matchers/container_eq_matcher.rs
@@ -179,6 +179,7 @@ fn build_explanation<T: Debug, U: Debug>(missing: Vec<T>, unexpected: Vec<U>) ->
 #[cfg(test)]
 mod tests {
     use super::container_eq;
+    use crate::matcher::{Matcher, MatcherResult};
     use crate::prelude::*;
     use std::collections::HashSet;
 
diff --git a/googletest/src/matchers/contains_matcher.rs b/googletest/src/matchers/contains_matcher.rs
@@ -154,6 +154,7 @@ impl<ActualT, InnerMatcherT> ContainsMatcher<ActualT, InnerMatcherT> {
 #[cfg(test)]
 mod tests {
     use super::{contains, ContainsMatcher};
+    use crate::matcher::{Matcher, MatcherResult};
     use crate::prelude::*;
 
     #[test]
diff --git a/googletest/src/matchers/contains_regex_matcher.rs b/googletest/src/matchers/contains_regex_matcher.rs
@@ -92,6 +92,7 @@ impl<ActualT: AsRef<str> + Debug + ?Sized> Matcher for ContainsRegexMatcher<Actu
 #[cfg(test)]
 mod tests {
     use super::{contains_regex, ContainsRegexMatcher};
+    use crate::matcher::{Matcher, MatcherResult};
     use crate::prelude::*;
 
     #[test]
diff --git a/googletest/src/matchers/display_matcher.rs b/googletest/src/matchers/display_matcher.rs
@@ -67,6 +67,7 @@ impl<T: Debug + Display, InnerMatcher: Matcher<ActualT = String>> Matcher
 #[cfg(test)]
 mod tests {
     use super::displays_as;
+    use crate::matcher::Matcher;
     use crate::prelude::*;
     use std::fmt::{Debug, Display, Error, Formatter};
 
diff --git a/googletest/src/matchers/err_matcher.rs b/googletest/src/matchers/err_matcher.rs
@@ -84,6 +84,7 @@ impl<T: Debug, E: Debug, InnerMatcherT: Matcher<ActualT = E>> Matcher
 #[cfg(test)]
 mod tests {
     use super::err;
+    use crate::matcher::{Matcher, MatcherResult};
     use crate::prelude::*;
 
     #[test]
diff --git a/googletest/src/matchers/ge_matcher.rs b/googletest/src/matchers/ge_matcher.rs
@@ -102,6 +102,7 @@ impl<ActualT: Debug + PartialOrd<ExpectedT>, ExpectedT: Debug> Matcher
 #[cfg(test)]
 mod tests {
     use super::ge;
+    use crate::matcher::{Matcher, MatcherResult};
     use crate::prelude::*;
     use std::ffi::OsString;
 
diff --git a/googletest/src/matchers/gt_matcher.rs b/googletest/src/matchers/gt_matcher.rs
@@ -102,6 +102,7 @@ impl<ActualT: Debug + PartialOrd<ExpectedT>, ExpectedT: Debug> Matcher
 #[cfg(test)]
 mod tests {
     use super::gt;
+    use crate::matcher::{Matcher, MatcherResult};
     use crate::prelude::*;
     use std::ffi::OsString;
 
diff --git a/googletest/src/matchers/le_matcher.rs b/googletest/src/matchers/le_matcher.rs
@@ -102,6 +102,7 @@ impl<ActualT: Debug + PartialOrd<ExpectedT>, ExpectedT: Debug> Matcher
 #[cfg(test)]
 mod tests {
     use super::le;
+    use crate::matcher::{Matcher, MatcherResult};
     use crate::prelude::*;
     use std::ffi::OsString;
 
diff --git a/googletest/src/matchers/lt_matcher.rs b/googletest/src/matchers/lt_matcher.rs
@@ -104,6 +104,7 @@ impl<ActualT: Debug + PartialOrd<ExpectedT>, ExpectedT: Debug> Matcher
 #[cfg(test)]
 mod tests {
     use super::lt;
+    use crate::matcher::{Matcher, MatcherResult};
     use crate::prelude::*;
     use std::ffi::OsString;
 
diff --git a/googletest/src/matchers/matches_regex_matcher.rs b/googletest/src/matchers/matches_regex_matcher.rs
@@ -109,6 +109,7 @@ where
 #[cfg(test)]
 mod tests {
     use super::{matches_regex, MatchesRegexMatcher};
+    use crate::matcher::{Matcher, MatcherResult};
     use crate::prelude::*;
 
     #[test]
diff --git a/googletest/src/matchers/near_matcher.rs b/googletest/src/matchers/near_matcher.rs
@@ -194,6 +194,7 @@ impl<T: Debug + Float> Matcher for NearMatcher<T> {
 #[cfg(test)]
 mod tests {
     use super::{approx_eq, near};
+    use crate::matcher::{Matcher, MatcherResult};
     use crate::prelude::*;
 
     #[test]
diff --git a/googletest/src/matchers/none_matcher.rs b/googletest/src/matchers/none_matcher.rs
@@ -57,6 +57,7 @@ impl<T: Debug> Matcher for NoneMatcher<T> {
 #[cfg(test)]
 mod tests {
     use super::none;
+    use crate::matcher::{Matcher, MatcherResult};
     use crate::prelude::*;
 
     #[test]
diff --git a/googletest/src/matchers/not_matcher.rs b/googletest/src/matchers/not_matcher.rs
@@ -67,6 +67,7 @@ impl<T: Debug, InnerMatcherT: Matcher<ActualT = T>> Matcher for NotMatcher<T, In
 #[cfg(test)]
 mod tests {
     use super::not;
+    use crate::matcher::{Matcher, MatcherResult};
     use crate::prelude::*;
 
     #[test]
diff --git a/googletest/src/matchers/ok_matcher.rs b/googletest/src/matchers/ok_matcher.rs
@@ -87,6 +87,7 @@ impl<T: Debug, E: Debug, InnerMatcherT: Matcher<ActualT = T>> Matcher
 #[cfg(test)]
 mod tests {
     use super::ok;
+    use crate::matcher::{Matcher, MatcherResult};
     use crate::prelude::*;
 
     #[test]
diff --git a/googletest/src/matchers/predicate_matcher.rs b/googletest/src/matchers/predicate_matcher.rs
@@ -161,6 +161,7 @@ where
 #[cfg(test)]
 mod tests {
     use super::predicate;
+    use crate::matcher::Matcher;
     use crate::prelude::*;
 
     // Simple matcher with a description
diff --git a/googletest/src/matchers/size_matcher.rs b/googletest/src/matchers/size_matcher.rs
@@ -94,6 +94,7 @@ where
 #[cfg(test)]
 mod tests {
     use super::size;
+    use crate::matcher::{MatchExplanation, Matcher, MatcherResult};
     use crate::prelude::*;
     use indoc::indoc;
     use std::collections::{
diff --git a/googletest/src/matchers/some_matcher.rs b/googletest/src/matchers/some_matcher.rs
@@ -79,6 +79,7 @@ impl<T: Debug, InnerMatcherT: Matcher<ActualT = T>> Matcher for SomeMatcher<T, I
 #[cfg(test)]
 mod tests {
     use super::some;
+    use crate::matcher::{Matcher, MatcherResult};
     use crate::prelude::*;
 
     #[test]
diff --git a/googletest/src/matchers/str_matcher.rs b/googletest/src/matchers/str_matcher.rs
@@ -512,6 +512,7 @@ impl Configuration {
 #[cfg(test)]
 mod tests {
     use super::{contains_substring, ends_with, starts_with, StrMatcher, StrMatcherConfigurator};
+    use crate::matcher::{Matcher, MatcherResult};
     use crate::prelude::*;
 
     #[test]
diff --git a/googletest/src/matchers/unordered_elements_are_matcher.rs b/googletest/src/matchers/unordered_elements_are_matcher.rs
@@ -1040,6 +1040,7 @@ pub mod internal {
 #[cfg(test)]
 mod tests {
     use super::internal::UnorderedElementsOfMapAreMatcher;
+    use crate::matcher::{Matcher, MatcherResult};
     use crate::prelude::*;
     use indoc::indoc;
     use std::collections::HashMap;
diff --git a/googletest/tests/all_matcher_test.rs b/googletest/tests/all_matcher_test.rs
@@ -12,6 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+use googletest::matcher::Matcher;
 use googletest::prelude::*;
 use indoc::indoc;
 
diff --git a/googletest/tests/elements_are_matcher_test.rs b/googletest/tests/elements_are_matcher_test.rs
@@ -12,6 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+use googletest::matcher::Matcher;
 use googletest::prelude::*;
 use indoc::indoc;
 
diff --git a/googletest/tests/field_matcher_test.rs b/googletest/tests/field_matcher_test.rs
@@ -12,6 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+use googletest::matcher::{Matcher, MatcherResult};
 use googletest::prelude::*;
 
 #[derive(Debug)]
diff --git a/googletest/tests/property_matcher_test.rs b/googletest/tests/property_matcher_test.rs
@@ -12,6 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+use googletest::matcher::{Matcher, MatcherResult};
 use googletest::prelude::*;
 
 #[derive(Debug)]
diff --git a/googletest/tests/tuple_matcher_test.rs b/googletest/tests/tuple_matcher_test.rs
@@ -12,6 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+use googletest::matcher::{Matcher, MatcherResult};
 use googletest::prelude::*;
 use indoc::indoc;
 
diff --git a/googletest/tests/unordered_elements_are_matcher_test.rs b/googletest/tests/unordered_elements_are_matcher_test.rs
@@ -12,6 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+use googletest::matcher::Matcher;
 use googletest::prelude::*;
 use indoc::indoc;
 use std::collections::HashMap;
