Fix diff option conflict in UI test #109036
Merged
Conversation
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
|
(rustbot has picked a reviewer for you, use r? to override) |
|
Looks like triagebot forgot to give this a label. @rustbot ready |
rustbot
added
the
S-waiting-on-review
|
actually this looks fine to me @bors r+ rollup |
bors
added
S-waiting-on-bors
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Apr 13, 2023
…iaskrgr Rollup of 8 pull requests Successful merges: - rust-lang#109036 (Fix diff option conflict in UI test) - rust-lang#110193 (Check for body owner fallibly in error reporting) - rust-lang#110233 (Make rust-intrinsic ABI unwindable) - rust-lang#110259 (Added diagnostic for pin! macro in addition to Box::pin if Unpin isn't implemented) - rust-lang#110265 (Automatically update the LLVM submodule for musl target (and other places)) - rust-lang#110277 (dead-code-lint: de-dup multiple unused assoc functions) - rust-lang#110283 (Only emit alignment checks if we have a panic_impl) - rust-lang#110291 (Implement `Copy` for `LocationDetail`) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
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.
Trivial fix for test case
tests/run-make/rustdoc-verify-output-files,it's failing on MacOS, the
-uoption specifies the unified context format, while the-qoption specifies only brief output. These two options are incompatible, since the unified context format produces a more detailed output than the brief output format.