Skip to content

Commit 190cd1c

Browse files
hovinenbcopybara-github
authored andcommitted
Simplify the type parameters used when testing Matcher::describe.
The previous version used a suggestion from the Rust compiler, but this could be greatly simplified without confusing the compiler. PiperOrigin-RevId: 504022758
1 parent 047f101 commit 190cd1c

File tree

5 files changed

+5
-14
lines changed

5 files changed

+5
-14
lines changed

googletest/src/matchers/contains_substring_matcher.rs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -127,10 +127,7 @@ mod tests {
127127
let matcher = contains_substring("\n");
128128

129129
verify_that!(
130-
<ContainsSubstringMatcher<&str> as Matcher<&str>>::describe(
131-
&matcher,
132-
MatcherResult::Matches
133-
),
130+
Matcher::<&str>::describe(&matcher, MatcherResult::Matches),
134131
eq("contains substring \"\\n\"")
135132
)
136133
}

googletest/src/matchers/ends_with_matcher.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ mod tests {
135135
let matcher = ends_with("\n");
136136

137137
verify_that!(
138-
<EndsWithMatcher<&str> as Matcher<&str>>::describe(&matcher, MatcherResult::Matches),
138+
Matcher::<&str>::describe(&matcher, MatcherResult::Matches),
139139
eq("ends with suffix \"\\n\"")
140140
)
141141
}

googletest/src/matchers/eq_ignoring_ascii_case_matcher.rs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -162,10 +162,7 @@ mod tests {
162162
let matcher = eq_ignoring_ascii_case("\n");
163163

164164
verify_that!(
165-
<EqIgnoringCaseMatcher<&str> as Matcher<&str>>::describe(
166-
&matcher,
167-
MatcherResult::Matches
168-
),
165+
Matcher::<&str>::describe(&matcher, MatcherResult::Matches),
169166
eq("is equal to \"\\n\" (ignoring case)")
170167
)
171168
}

googletest/src/matchers/matches_regex_matcher.rs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -187,10 +187,7 @@ mod tests {
187187
let matcher = matches_regex("\n");
188188

189189
verify_that!(
190-
<MatchesRegexMatcher<&str> as Matcher<&str>>::describe(
191-
&matcher,
192-
MatcherResult::Matches
193-
),
190+
Matcher::<&str>::describe(&matcher, MatcherResult::Matches),
194191
eq("matches the regular expression \"\\n\"")
195192
)
196193
}

googletest/src/matchers/starts_with_matcher.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ mod tests {
146146
let matcher = starts_with("\n");
147147

148148
verify_that!(
149-
<StartsWithMatcher<&str> as Matcher<&str>>::describe(&matcher, MatcherResult::Matches),
149+
Matcher::<&str>::describe(&matcher, MatcherResult::Matches),
150150
eq("starts with prefix \"\\n\"")
151151
)
152152
}

0 commit comments

Comments
 (0)