Rollup of 3 pull requests #115398
Merged
Rollup of 3 pull requests #115398
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
fixes bors snafu where it merged an outdated commit and missed this change
After rust-lang#114104, `rust-gpu` is unable to create a custom `Emitter` as the bounds have changed to include `WriteColor`. I was able to work around this by adding `termcolor` as a direct dependency, but I believe this should be exposed as part of `rustc_errors` proper. See rust-lang#102992 for why `rust-gpu` needs to create a custom emitter.
Fix bors missing a commit when merging rust-lang#115355 bors incorrectly merged an outdated version of PR rust-lang#115355 (via rollup rust-lang#115370): - it [recorded r+](rust-lang#115355 (comment)) as approving commit rust-lang@325b585, and thus merged the original revision rust-lang@7762ac7 - but the branch at the time was at commit rust-lang@eefa07d, so bors missed the `compiler/rustc_trait_selection/src/solve/search_graph/mod.rs` cleanup in commit rust-lang@0e1e964 😓 Thankfully the change that bors missed was small, and this new PR corrects the situation (as I'd rather avoid having confusing multiple merge commits of PR rust-lang#115355 in the git history) r? ``@compiler-errors``
`ignore-cross-compile` remaining tests that run binaries Follow up to rust-lang#114958
Make `termcolor` types public in `rustc_errors` After rust-lang#114104, `rust-gpu` is unable to create a custom `Emitter` as the bounds have changed to include `WriteColor`. I was able to work around this by adding `termcolor` as a direct dependency, but I believe this should be exposed as part of `rustc_errors` proper. See rust-lang#102992 for why `rust-gpu` needs to create a custom emitter.
rustbot
added
S-waiting-on-review
|
@bors r+ rollup=never p=3 |
bors
added
S-waiting-on-bors
|
☀️ Test successful - checks-actions |
|
📌 Perf builds for each rolled up PR:
previous master: 008c21c977 In the case of a perf regression, run the following command for each PR you suspect might be the cause: |
|
Finished benchmarking commit (8cbd2c8): comparison URL. Overall result: no relevant changes - no action needed@rustbot label: -perf-regression Instruction countThis benchmark run did not return any relevant results for this metric. Max RSS (memory usage)ResultsThis is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.
CyclesThis benchmark run did not return any relevant results for this metric. Binary sizeThis benchmark run did not return any relevant results for this metric. Bootstrap: 631.413s -> 631.674s (0.04%) |
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.
Successful merges:
ignore-cross-compileremaining tests that run binaries #115378 (ignore-cross-compileremaining tests that run binaries)termcolortypes public inrustc_errors#115393 (Maketermcolortypes public inrustc_errors)r? @ghost
@rustbot modify labels: rollup
Create a similar rollup