Add normalize() in run-make Diff type
#124561
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
The run-make-support library was changed cc @jieyouxu |
rustbot
added
the
S-waiting-on-review
Urgau
reviewed
Apr 30, 2024
| let expected_name = self.expected_name.as_ref().unwrap(); | ||
| let actual_name = self.actual_name.as_ref().unwrap(); | ||
| for (regex, replacement) in &self.normalizers { | ||
| let re = Regex::new(regex).expect("bad regex in custom normalization rule"); | ||
| actual = re.replace_all(&actual, replacement).into_owned(); |
There was a problem hiding this comment.
should we assert that we actually replace something?
GuillaumeGomez
force-pushed
the
run-make-normalize
branch
from
3929007 to
e0ec71f
Compare
|
Thanks! @bors r+ rollup |
bors
added
S-waiting-on-bors
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Apr 30, 2024
Rollup of 4 pull requests Successful merges: - rust-lang#124280 (Port repr128-dwarf run-make test to rmake) - rust-lang#124299 (Add test for issue 106269) - rust-lang#124553 (Write `git-commit-{sha,info}` for Cargo in source tarballs) - rust-lang#124561 (Add `normalize()` in run-make `Diff` type) r? `@ghost` `@rustbot` modify labels: rollup
rust-timer
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Apr 30, 2024
Rollup merge of rust-lang#124561 - GuillaumeGomez:run-make-normalize, r=jieyouxu Add `normalize()` in run-make `Diff` type I need it to do the same as: ``` //@ normalize-stdout-test "finished in \d+\.\d+s" -> "finished in $$TIME" ``` in doctests. I need it in particular for the rust-lang#123974 PR (which contains this commit until this PR current PR is merged). cc `@Urgau` r? `@jieyouxu`
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
I need it to do the same as:
in doctests.
I need it in particular for the #123974 PR (which contains this commit until this PR current PR is merged).
cc @Urgau
r? @jieyouxu