Change format of rustdoc-js tests by putting query and correction directly alongside the expected values#112468
Merged
bors merged 2 commits intorust-lang:masterfrom Jun 10, 2023
Conversation
rustbot
added
S-waiting-on-review
This comment has been minimized.
This comment has been minimized.
… directly alongside the expected values
GuillaumeGomez
force-pushed
the
change-rustdoc-js-formats
branch
from
ae34a41 to
9803651
Compare
Member
Author
|
Fixed eslint error. |
Contributor
|
@bors r+ rollup |
Collaborator
bors
added
S-waiting-on-bors
GuillaumeGomez
added a commit
to GuillaumeGomez/rust
that referenced
this pull request
Jun 9, 2023
…ormats, r=notriddle Change format of rustdoc-js tests by putting query and correction directly alongside the expected values As I was working on fixing merge conflicts in rust-lang#108537, I faced quite a big issue when trying to update the `rustdoc-js*` tests. To make it much simpler, this PR moves the `query` and `correction` directly alongside the expected data so now we know what is the query that is being run without needing to add comments or going back to the top of the file. r? `@notriddle`
This was referenced Jun 9, 2023
GuillaumeGomez
added a commit
to GuillaumeGomez/rust
that referenced
this pull request
Jun 9, 2023
…ormats, r=notriddle Change format of rustdoc-js tests by putting query and correction directly alongside the expected values As I was working on fixing merge conflicts in rust-lang#108537, I faced quite a big issue when trying to update the `rustdoc-js*` tests. To make it much simpler, this PR moves the `query` and `correction` directly alongside the expected data so now we know what is the query that is being run without needing to add comments or going back to the top of the file. r? ``@notriddle``
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Jun 10, 2023
…iaskrgr Rollup of 6 pull requests Successful merges: - rust-lang#110141 (expand: Change how `#![cfg(FALSE)]` behaves on crate root) - rust-lang#112369 (More CGU cleanups) - rust-lang#112467 (Compile rustc_driver by default) - rust-lang#112468 (Change format of rustdoc-js tests by putting query and correction directly alongside the expected values) - rust-lang#112473 (Update cargo) - rust-lang#112481 (Ignore tests that hang in new solver) r? `@ghost` `@rustbot` modify labels: rollup
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
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.
As I was working on fixing merge conflicts in #108537, I faced quite a big issue when trying to update the
rustdoc-js*tests. To make it much simpler, this PR moves thequeryandcorrectiondirectly alongside the expected data so now we know what is the query that is being run without needing to add comments or going back to the top of the file.r? @notriddle