Fix mips platform support entries. #116669
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
|
r? @JohnTitor (rustbot has picked a reviewer for you, use r? to override) |
rustbot
added
the
S-waiting-on-review
|
@bors r+ rollup |
bors
added
S-waiting-on-bors
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Oct 12, 2023
…iaskrgr Rollup of 5 pull requests Successful merges: - rust-lang#116593 (Add unstable book page for the no-jump-tables codegen option) - rust-lang#116625 (`rustc_hir_pretty` cleanups) - rust-lang#116642 (Handle several `#[diagnostic::on_unimplemented]` attributes correctly) - rust-lang#116654 (coverage: Clarify loop-edge detection and graph traversal) - rust-lang#116669 (Fix mips platform support entries.) r? `@ghost` `@rustbot` modify labels: rollup
rust-timer
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Oct 12, 2023
Rollup merge of rust-lang#116669 - ehuss:fix-platform-table, r=nikic Fix mips platform support entries. The table entries for these MIPS entries were broken because they had the wrong number of columns (from rust-lang#116503). Additionally, there was a conflict with rust-lang#115238, which made the same change (but on different lines, so git didn't complain).
bors-ferrocene bot
added a commit
to ferrocene/ferrocene
that referenced
this pull request
Oct 13, 2023
50: Automated pull from upstream `master` r=Dajamante a=github-actions[bot] This PR pulls the following changes from the upstream repository: * rust-lang/rust#116619 * rust-lang/rust#115964 * rust-lang/rust#116391 * rust-lang/rust#116510 * rust-lang/rust#116671 * rust-lang/rust#116669 * rust-lang/rust#116654 * rust-lang/rust#116642 * rust-lang/rust#116625 * rust-lang/rust#116593 * rust-lang/rust#116649 * rust-lang/rust#116600 * rust-lang/rust#116628 Co-authored-by: Nadrieril <nadrieril+git@gmail.com> Co-authored-by: Scott McMurray <scottmcm@users.noreply.github.com> Co-authored-by: bjorn3 <17426603+bjorn3@users.noreply.github.com> Co-authored-by: Nicholas Nethercote <n.nethercote@gmail.com> Co-authored-by: Trevor Gross <tmgross@umich.edu> Co-authored-by: Georg Semmler <github@weiznich.de> Co-authored-by: Guillaume Gomez <guillaume.gomez@huawei.com> Co-authored-by: Gurinder Singh <frederick.the.fool@gmail.com> Co-authored-by: bors <bors@rust-lang.org>
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.
The table entries for these MIPS entries were broken because they had the wrong number of columns (from #116503). Additionally, there was a conflict with #115238, which made the same change (but on different lines, so git didn't complain).