mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rollup merge of #100933 - a1phyr:cheap_assert_match_failed, r=JoshTriplett

Browse Source 
Reduce code size of `assert_matches_failed`

Using `write_str` instead of `<str as Display>::fmt` avoids the `pad` function which is very expensive to have in size-constrained code.
This commit is contained in:
Yuki Okushi 2022-08-26 09:51:45 +09:00 committed by GitHub
commit 684955591c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
library/core/src/panicking.rs
View File

@ -190,11 +190,11 @@ pub fn assert_matches_failed<T: fmt::Debug + ?Sized>(
right: &str, right: &str,
args: Option<fmt::Arguments<'_>>, args: Option<fmt::Arguments<'_>>,
) -> ! { ) -> ! {
// Use the Display implementation to display the pattern. // The pattern is a string so it can be displayed directly.
struct Pattern<'a>(&'a str); struct Pattern<'a>(&'a str);
impl fmt::Debug for Pattern<'_> { impl fmt::Debug for Pattern<'_> {
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
fmt::Display::fmt(self.0, f) f.write_str(self.0)
} }
} }
assert_failed_inner(AssertKind::Match, &left, &Pattern(right), args); assert_failed_inner(AssertKind::Match, &left, &Pattern(right), args);