Move util files to the matcher_support module.

PiperOrigin-RevId: 529710028

Author: bjacotg

googletest/src/lib.rs

@@ -383,6 +383,7 @@ extern crate googletest_macro;
 pub mod assertions;
 pub mod internal;
 pub mod matcher;
+pub mod matcher_support;
 pub mod matchers;
 
 pub mod prelude {

googletest/src/matchers/count_elements.rs renamed to googletest/src/matcher_support/count_elements.rs

@@ -74,7 +74,7 @@ impl Description {
     ///
     /// ```
     /// # use googletest::prelude::*;
-    /// # use googletest::matchers::description::Description;
+    /// # use googletest::matcher_support::description::Description;
     /// let description = std::iter::once("A B C\nD E F".to_string()).collect::<Description>();
     /// verify_that!(description.indent(), displays_as(eq("  A B C\n  D E F")))
     /// # .unwrap();
@@ -94,7 +94,7 @@ impl Description {
     ///
     /// ```
     /// # use googletest::prelude::*;
-    /// # use googletest::matchers::description::Description;
+    /// # use googletest::matcher_support::description::Description;
     /// let description = std::iter::once("A B C\nD E F".to_string()).collect::<Description>();
     /// verify_that!(description.bullet_list(), displays_as(eq("* A B C\n  D E F")))
     /// # .unwrap();
@@ -114,7 +114,7 @@ impl Description {
     ///
     /// ```
     /// # use googletest::prelude::*;
-    /// # use googletest::matchers::description::Description;
+    /// # use googletest::matcher_support::description::Description;
     /// let description = std::iter::once("A B C\nD E F".to_string()).collect::<Description>();
     /// verify_that!(description.enumerate(), displays_as(eq("0. A B C\n   D E F")))
     /// # .unwrap();

googletest/src/matchers/description.rs renamed to googletest/src/matcher_support/description.rs

@@ -0,0 +1,18 @@
+// Copyright 2023 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+pub(crate) mod count_elements;
+pub mod description;
+pub(crate) mod edit_distance;
+pub(crate) mod zipped_iterator;

googletest/src/matchers/edit_distance.rs renamed to googletest/src/matcher_support/edit_distance.rs

@@ -65,8 +65,8 @@ macro_rules! all {
 #[doc(hidden)]
 pub mod internal {
     use crate::matcher::{MatchExplanation, Matcher, MatcherResult};
+    use crate::matcher_support::description::Description;
     use crate::matchers::anything;
-    use crate::matchers::description::Description;
     use std::fmt::Debug;
 
     /// A matcher which matches an input value matched by all matchers in the

googletest/src/matcher_support/mod.rs

@@ -13,7 +13,7 @@
 // limitations under the License.
 
 use crate::matcher::{MatchExplanation, Matcher, MatcherResult};
-use crate::matchers::description::Description;
+use crate::matcher_support::description::Description;
 use std::{fmt::Debug, marker::PhantomData};
 
 /// Matches a container all of whose elements are matched by the matcher

googletest/src/matchers/zipped_iterator.rs renamed to googletest/src/matcher_support/zipped_iterator.rs

@@ -68,8 +68,8 @@ macro_rules! elements_are {
 #[doc(hidden)]
 pub mod internal {
     use crate::matcher::{MatchExplanation, Matcher, MatcherResult};
-    use crate::matchers::description::Description;
-    use crate::matchers::zipped_iterator::zip;
+    use crate::matcher_support::description::Description;
+    use crate::matcher_support::zipped_iterator::zip;
     use std::{fmt::Debug, marker::PhantomData};
 
     /// This struct is meant to be used only by the macro `elements_are!`.

googletest/src/matchers/all_matcher.rs

@@ -13,7 +13,7 @@
 // limitations under the License.
 
 use crate::matcher::{MatchExplanation, Matcher, MatcherResult};
-use crate::matchers::edit_distance;
+use crate::matcher_support::edit_distance;
 use std::{fmt::Debug, marker::PhantomData};
 
 /// Matches a value equal (in the sense of `==`) to `expected`.