Stop getting googletest::Result from the prelude

The prelude's inclusion of googletest::Result is confusing
as it shadow's the standard library's Result type without
a visible import.

This is a first step towards removing googletest::Result
from the prelude.

PiperOrigin-RevId: 714850312

Author: cramertj

googletest/src/description.rs

@@ -260,6 +260,7 @@ impl<T: Into<Cow<'static, str>>> From<T> for Description {
 mod tests {
     use super::Description;
     use crate::prelude::*;
+    use crate::Result;
     use indoc::indoc;
 
     #[test]

googletest/src/fixtures.rs

@@ -144,6 +144,7 @@ mod tests {
     use crate as googletest;
     use crate::prelude::*;
     use crate::test;
+    use crate::Result;
 
     #[test]
     fn fixture_no_fixture() -> Result<()> {

googletest/src/internal/description_renderer.rs

@@ -278,6 +278,7 @@ enum Decoration {
 mod tests {
     use super::{Block, Fragment, List};
     use crate::prelude::*;
+    use crate::Result;
     use indoc::indoc;
 
     #[test]

googletest/src/matcher.rs

@@ -310,6 +310,7 @@ impl<T: Debug + Copy, M: Matcher<T>> Matcher<T> for &M {
 #[cfg(test)]
 mod tests {
     use crate::prelude::*;
+    use crate::Result;
 
     #[test]
     fn ref_matchers_can_be_reused() -> Result<()> {

googletest/src/matcher_support/auto_eq.rs

@@ -87,6 +87,7 @@ pub mod internal {
 #[cfg(test)]
 mod tests {
     use crate::prelude::*;
+    use crate::Result;
 
     #[test]
     fn auto_ref_matcher() -> Result<()> {

googletest/src/matcher_support/count_elements.rs

@@ -30,9 +30,9 @@ pub(crate) fn count_elements<ContainerT: IntoIterator>(value: ContainerT) -> usi
 
 #[cfg(test)]
 mod tests {
-
     use super::*;
     use crate::prelude::*;
+    use crate::Result;
 
     #[test]
     fn count_elements_vec() -> Result<()> {

googletest/src/matcher_support/edit_distance.rs

@@ -284,6 +284,7 @@ impl<T: Clone> Path<T> {
 mod tests {
     use super::*;
     use crate::prelude::*;
+    use crate::Result;
     use quickcheck::{quickcheck, Arbitrary, TestResult};
 
     #[test]

googletest/src/matcher_support/summarize_diff.rs

@@ -433,7 +433,7 @@ impl SummaryBuilder {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::{matcher_support::edit_distance::Mode, prelude::*};
+    use crate::{matcher_support::edit_distance::Mode, prelude::*, Result};
     use indoc::indoc;
     use std::fmt::Write;
 

googletest/src/matchers/all_matcher.rs

@@ -86,6 +86,7 @@ macro_rules! __all {
 mod tests {
     use crate::matcher::MatcherResult;
     use crate::prelude::*;
+    use crate::Result;
     use indoc::indoc;
 
     #[test]

googletest/src/matchers/any_matcher.rs

@@ -88,6 +88,7 @@ macro_rules! __any {
 mod tests {
     use crate::matcher::MatcherResult;
     use crate::prelude::*;
+    use crate::Result;
     use indoc::indoc;
 
     #[test]

googletest/src/matchers/anything_matcher.rs

@@ -55,6 +55,7 @@ impl<T: Debug + Copy> Matcher<T> for Anything {
 #[cfg(test)]
 mod tests {
     use crate::prelude::*;
+    use crate::Result;
 
     #[test]
     fn anything_matches_i32() -> Result<()> {

googletest/src/matchers/bool_matcher.rs

@@ -69,6 +69,7 @@ impl<'a> Matcher<&'a bool> for BoolMatcher {
 mod tests {
     use super::*;
     use crate::prelude::*;
+    use crate::Result;
 
     #[test]
     fn match_value() -> Result<()> {

googletest/src/matchers/char_count_matcher.rs

@@ -101,6 +101,7 @@ mod tests {
     use crate::description::Description;
     use crate::matcher::MatcherResult;
     use crate::prelude::*;
+    use crate::Result;
     use indoc::indoc;
     use std::fmt::Debug;
 

googletest/src/matchers/conjunction_matcher.rs

@@ -104,6 +104,7 @@ impl<T: Debug + Copy, M1: Matcher<T>, M2: Matcher<T>> Matcher<T> for Conjunction
 #[cfg(test)]
 mod tests {
     use crate::prelude::*;
+    use crate::Result;
     use indoc::indoc;
 
     #[test]

googletest/src/matchers/container_eq_matcher.rs

@@ -255,6 +255,7 @@ where
 mod tests {
     use crate::matcher::MatcherResult;
     use crate::prelude::*;
+    use crate::Result;
     use indoc::indoc;
     use std::collections::HashSet;
 

googletest/src/matchers/contains_matcher.rs

@@ -159,6 +159,7 @@ impl<InnerMatcherT> ContainsMatcher<InnerMatcherT> {
 mod tests {
     use crate::matcher::MatcherResult;
     use crate::prelude::*;
+    use crate::Result;
 
     #[test]
     fn contains_matches_singleton_slice_with_value() -> Result<()> {

googletest/src/matchers/contains_regex_matcher.rs

@@ -82,6 +82,7 @@ impl<ActualT: AsRef<str> + Debug + Copy> Matcher<ActualT> for ContainsRegexMatch
 mod tests {
     use crate::matcher::MatcherResult;
     use crate::prelude::*;
+    use crate::Result;
 
     #[test]
     fn contains_regex_matches_string_reference_with_pattern() -> Result<()> {

googletest/src/matchers/derefs_to_matcher.rs

@@ -63,6 +63,7 @@ mod tests {
     use std::rc::Rc;
 
     use crate::prelude::*;
+    use crate::Result;
     use indoc::indoc;
 
     #[test]

googletest/src/matchers/disjunction_matcher.rs

@@ -98,6 +98,7 @@ impl<T: Debug + Copy, M1: Matcher<T>, M2: Matcher<T>> Matcher<T> for Disjunction
 #[cfg(test)]
 mod tests {
     use crate::prelude::*;
+    use crate::Result;
     use indoc::indoc;
 
     #[test]

googletest/src/matchers/display_matcher.rs

@@ -67,6 +67,7 @@ impl<T: Debug + Display + Copy, InnerMatcher: for<'a> Matcher<&'a str>> Matcher<
 #[cfg(test)]
 mod tests {
     use crate::prelude::*;
+    use crate::Result;
     use indoc::indoc;
     use std::fmt::{Debug, Display, Error, Formatter};
 

googletest/src/matchers/each_matcher.rs

@@ -119,6 +119,7 @@ where
 #[cfg(test)]
 mod tests {
     use crate::prelude::*;
+    use crate::Result;
     use indoc::indoc;
     use std::collections::HashSet;
 

googletest/src/matchers/empty_matcher.rs

@@ -61,6 +61,7 @@ where
 #[cfg(test)]
 mod tests {
     use crate::prelude::*;
+    use crate::Result;
     use std::collections::HashSet;
 
     #[test]

googletest/src/matchers/eq_matcher.rs

@@ -138,6 +138,7 @@ fn to_display_output(string: &str) -> Option<String> {
 #[cfg(test)]
 mod tests {
     use crate::prelude::*;
+    use crate::Result;
     use indoc::indoc;
 
     #[test]

googletest/src/matchers/err_matcher.rs

@@ -111,6 +111,7 @@ impl<'a, T: Debug, E: Debug, InnerMatcherT: Matcher<&'a E>> Matcher<&'a std::res
 mod tests {
     use crate::matcher::MatcherResult;
     use crate::prelude::*;
+    use crate::Result;
     use indoc::indoc;
 
     #[test]

googletest/src/matchers/ge_matcher.rs

@@ -104,6 +104,7 @@ impl<ActualT: Debug + PartialOrd<ExpectedT> + Copy, ExpectedT: Debug> Matcher<Ac
 mod tests {
     use crate::matcher::MatcherResult;
     use crate::prelude::*;
+    use crate::Result;
     use indoc::indoc;
     use std::ffi::OsString;
 

googletest/src/matchers/gt_matcher.rs

@@ -104,6 +104,7 @@ impl<ActualT: Debug + PartialOrd<ExpectedT> + Copy, ExpectedT: Debug> Matcher<Ac
 mod tests {
     use crate::matcher::MatcherResult;
     use crate::prelude::*;
+    use crate::Result;
     use indoc::indoc;
     use std::ffi::OsString;
 

googletest/src/matchers/has_entry_matcher.rs

@@ -114,6 +114,7 @@ impl<'a, KeyT: Debug + Eq + Hash, ValueT: Debug, MatcherT: Matcher<&'a ValueT>>
 #[cfg(test)]
 mod tests {
     use crate::prelude::*;
+    use crate::Result;
     use indoc::indoc;
     use std::collections::HashMap;
 

googletest/src/matchers/is_encoded_string_matcher.rs

@@ -100,6 +100,7 @@ where
 mod tests {
     use crate::matcher::MatcherResult;
     use crate::prelude::*;
+    use crate::Result;
 
     #[test]
     fn matches_string_as_byte_slice() -> Result<()> {

googletest/src/matchers/is_nan_matcher.rs

@@ -40,6 +40,7 @@ impl<T: Float + Debug + Copy> Matcher<T> for IsNanMatcher {
 #[cfg(test)]
 mod tests {
     use crate::prelude::*;
+    use crate::Result;
 
     #[test]
     fn matches_f32_nan() -> Result<()> {

googletest/src/matchers/le_matcher.rs

@@ -102,6 +102,7 @@ impl<ActualT: Debug + PartialOrd<ExpectedT> + Copy, ExpectedT: Debug> Matcher<Ac
 mod tests {
     use crate::matcher::MatcherResult;
     use crate::prelude::*;
+    use crate::Result;
     use indoc::indoc;
     use std::ffi::OsString;
 

googletest/src/matchers/len_matcher.rs

@@ -89,6 +89,7 @@ mod tests {
     use crate::description::Description;
     use crate::matcher::MatcherResult;
     use crate::prelude::*;
+    use crate::Result;
     use indoc::indoc;
     use std::collections::{
         BTreeMap, BTreeSet, BinaryHeap, HashMap, HashSet, LinkedList, VecDeque,

googletest/src/matchers/lt_matcher.rs

@@ -104,6 +104,7 @@ impl<ActualT: Debug + PartialOrd<ExpectedT> + Copy, ExpectedT: Debug> Matcher<Ac
 mod tests {
     use crate::matcher::MatcherResult;
     use crate::prelude::*;
+    use crate::Result;
     use indoc::indoc;
     use std::ffi::OsString;
 

googletest/src/matchers/matches_regex_matcher.rs

@@ -103,6 +103,7 @@ where
 mod tests {
     use crate::matcher::MatcherResult;
     use crate::prelude::*;
+    use crate::Result;
 
     #[test]
     fn matches_regex_matches_string_reference_with_pattern() -> Result<()> {

googletest/src/matchers/near_matcher.rs

@@ -198,6 +198,7 @@ impl<T: Debug + Float + Copy> Matcher<T> for NearMatcher<T> {
 mod tests {
     use crate::matcher::MatcherResult;
     use crate::prelude::*;
+    use crate::Result;
 
     #[test]
     fn matches_value_inside_range() -> Result<()> {

googletest/src/matchers/none_matcher.rs

@@ -68,6 +68,7 @@ impl<'a, T: Debug> Matcher<&'a Option<T>> for NoneMatcher {
 mod tests {
     use crate::matcher::MatcherResult;
     use crate::prelude::*;
+    use crate::Result;
 
     #[test]
     fn none_matches_option_with_none() -> Result<()> {

googletest/src/matchers/not_matcher.rs

@@ -67,6 +67,7 @@ impl<T: Debug + Copy, InnerMatcherT: Matcher<T>> Matcher<T> for NotMatcher<Inner
 mod tests {
     use crate::matcher::MatcherResult;
     use crate::prelude::*;
+    use crate::Result;
     use indoc::indoc;
 
     #[test]

googletest/src/matchers/ok_matcher.rs

@@ -115,6 +115,7 @@ impl<'a, T: Debug, E: Debug, InnerMatcherT: Matcher<&'a T>> Matcher<&'a std::res
 mod tests {
     use crate::matcher::MatcherResult;
     use crate::prelude::*;
+    use crate::Result;
     use indoc::indoc;
 
     #[test]

googletest/src/matchers/points_to_matcher.rs

@@ -63,6 +63,7 @@ where
 #[cfg(test)]
 mod tests {
     use crate::prelude::*;
+    use crate::Result;
     use indoc::indoc;
 
     #[test]

googletest/src/matchers/predicate_matcher.rs

@@ -149,6 +149,7 @@ where
 #[cfg(test)]
 mod tests {
     use crate::prelude::*;
+    use crate::Result;
 
     // Simple matcher with a description
     fn is_odd() -> impl Matcher<i32> {

googletest/src/matchers/result_of_matcher.rs

@@ -164,6 +164,7 @@ pub mod internal {
 #[cfg(test)]
 mod tests {
     use crate::prelude::*;
+    use crate::Result;
     use indoc::indoc;
 
     #[test]

googletest/src/matchers/some_matcher.rs

@@ -109,6 +109,7 @@ impl<'a, T: Debug, InnerMatcherT: Matcher<&'a T>> Matcher<&'a Option<T>>
 mod tests {
     use crate::matcher::MatcherResult;
     use crate::prelude::*;
+    use crate::Result;
     use indoc::indoc;
 
     #[test]