Move the description module out of matcher_support.

Currently `description::Description` is in `matcher_support` because it facilitates writing matchers but is not a required part of the interface. In the future, the return types of `Matcher::describe` and `Matcher::explain_match` will be changed to `description::Description`, making it an essential part of the interface rather than a mere support mechanism. Thus it makes sense to put it in the root module rather than in `matcher_support`.

Author: hovinen

…etest/src/matcher_support/description.rs googletest/src/description.rsgoogletest/src/matcher_support/description.rs renamed to googletest/src/description.rs googletest/src/matcher_support/description.rs renamed to googletest/src/description.rs

@@ -83,7 +83,7 @@ impl Description {
     ///
     /// ```
     /// # use googletest::prelude::*;
-    /// # use googletest::matcher_support::description::Description;
+    /// # use googletest::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();
@@ -103,7 +103,7 @@ impl Description {
     ///
     /// ```
     /// # use googletest::prelude::*;
-    /// # use googletest::matcher_support::description::Description;
+    /// # use googletest::description::Description;
     /// let description = std::iter::once("A B C\nD E F".to_string()).collect::<Description>();
     /// verify_that!(description.indent_except_first_line(), displays_as(eq("A B C\n  D E F")))
     /// # .unwrap();
@@ -123,7 +123,7 @@ impl Description {
     ///
     /// ```
     /// # use googletest::prelude::*;
-    /// # use googletest::matcher_support::description::Description;
+    /// # use googletest::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();
@@ -143,7 +143,7 @@ impl Description {
     ///
     /// ```
     /// # use googletest::prelude::*;
-    /// # use googletest::matcher_support::description::Description;
+    /// # use googletest::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/lib.rs

@@ -21,6 +21,7 @@ extern crate quickcheck;
 
 #[macro_use]
 pub mod assertions;
+pub mod description;
 pub mod internal;
 pub mod matcher;
 pub mod matcher_support;

googletest/src/matcher_support/mod.rs

@@ -19,7 +19,6 @@
 //! matchers.
 
 pub(crate) mod count_elements;
-pub mod description;
 pub(crate) mod edit_distance;
 pub(crate) mod summarize_diff;
 pub(crate) mod zipped_iterator;

googletest/src/matchers/all_matcher.rs

@@ -64,8 +64,8 @@ macro_rules! __all {
 /// For internal use only. API stablility is not guaranteed!
 #[doc(hidden)]
 pub mod internal {
+    use crate::description::Description;
     use crate::matcher::{Matcher, MatcherResult};
-    use crate::matcher_support::description::Description;
     use crate::matchers::anything;
     use std::fmt::Debug;
 

googletest/src/matchers/any_matcher.rs

@@ -66,8 +66,8 @@ macro_rules! __any {
 /// For internal use only. API stablility is not guaranteed!
 #[doc(hidden)]
 pub mod internal {
+    use crate::description::Description;
     use crate::matcher::{Matcher, MatcherResult};
-    use crate::matcher_support::description::Description;
     use crate::matchers::anything;
     use std::fmt::Debug;
 

googletest/src/matchers/each_matcher.rs

@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+use crate::description::Description;
 use crate::matcher::{Matcher, MatcherResult};
-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/elements_are_matcher.rs

@@ -92,8 +92,8 @@ macro_rules! __elements_are {
 /// **For internal use only. API stablility is not guaranteed!**
 #[doc(hidden)]
 pub mod internal {
+    use crate::description::Description;
     use crate::matcher::{Matcher, MatcherResult};
-    use crate::matcher_support::description::Description;
     use crate::matcher_support::zipped_iterator::zip;
     use std::{fmt::Debug, marker::PhantomData};
 

googletest/src/matchers/pointwise_matcher.rs

@@ -151,8 +151,8 @@ macro_rules! __pointwise {
 /// **For internal use only. API stablility is not guaranteed!**
 #[doc(hidden)]
 pub mod internal {
+    use crate::description::Description;
     use crate::matcher::{Matcher, MatcherResult};
-    use crate::matcher_support::description::Description;
     use crate::matcher_support::zipped_iterator::zip;
     use std::{fmt::Debug, marker::PhantomData};
 

googletest/src/matchers/unordered_elements_are_matcher.rs

@@ -365,9 +365,9 @@ macro_rules! __is_contained_in {
 /// **For internal use only. API stablility is not guaranteed!**
 #[doc(hidden)]
 pub mod internal {
+    use crate::description::Description;
     use crate::matcher::{Matcher, MatcherResult};
     use crate::matcher_support::count_elements::count_elements;
-    use crate::matcher_support::description::Description;
     use std::collections::HashSet;
     use std::fmt::{Debug, Display};
     use std::marker::PhantomData;