Skip to content

Conversation

scrabsha
Copy link
Contributor

@scrabsha scrabsha commented Aug 28, 2025

The GitHub-diff for this PR is honestly garbage. difft produces something somewhat legible. You can see the difft-produced diff using something like:

git remote add scrabsha [email protected]:scrabsha/rust.git
git fetch scrabsha
git -c diff.external=difft diff --merge-base master scrabsha/push-kskuprrtmnky

@rustbot author
r? @jdonszelmann

@rustbot
Copy link
Collaborator

rustbot commented Aug 28, 2025

jdonszelmann is currently at their maximum review capacity.
They may take a while to respond.

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Aug 28, 2025
@rustbot
Copy link
Collaborator

rustbot commented Aug 28, 2025

Reminder, once the PR becomes ready for a review, use @rustbot ready.

@scrabsha scrabsha force-pushed the push-kskuprrtmnky branch 2 times, most recently from ed06315 to 7740666 Compare September 2, 2025 20:05
@rustbot

This comment has been minimized.

@rustbot
Copy link
Collaborator

rustbot commented Sep 5, 2025

This PR was rebased onto a different master commit. Here's a range-diff highlighting what actually changed.

Rebasing is a normal part of keeping PRs up to date, so no action is needed—this note is just to help reviewers.

}

// FIXME(scrabsha): find a nice place for the comment right below :3

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

is this fixme still relevant? feels like a reasonable place for the comment?

@jdonszelmann
Copy link
Contributor

it's a giant PR and it's hard to review as well as I'd like. However, since no test output changed and everything here is just error reporting code that was mostly just moved I think it's reasonable to merge. I don't think this change can be split up easily. r=me after review comments are addressed

@scrabsha
Copy link
Contributor Author

while Pretty Big (tm), this PR does not have any functional change, i think it can be part of a rollup

@bors r=jdonszelmann rollup meow

@bors
Copy link
Collaborator

bors commented Sep 15, 2025

@scrabsha: 🔑 Insufficient privileges: Not in reviewers

@bors
Copy link
Collaborator

bors commented Sep 15, 2025

@scrabsha: 🔑 Insufficient privileges: not in try users

@scrabsha
Copy link
Contributor Author

scrabsha commented Sep 15, 2025

huh. @jdonszelmann could you r+ or delegate?

dispicable me Agnes pleading eyes

@jdonszelmann
Copy link
Contributor

@bors r+ rollup

@bors
Copy link
Collaborator

bors commented Sep 15, 2025

📌 Commit 9cbf1a5 has been approved by jdonszelmann

It is now in the queue for this repository.

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Sep 15, 2025
bors added a commit that referenced this pull request Sep 16, 2025
Rollup of 9 pull requests

Successful merges:

 - #145095 (Migrate `UnsizedConstParamTy`  to unstable impl of `ConstParamTy_`)
 - #145960 (Split `FnCtxt::report_args_error` into subfunctions)
 - #146402 (interpret: fix overlapping aggregate initialization)
 - #146466 (llvm-wrapper: other cleanup)
 - #146574 (compiletest: Enable new-output-capture by default)
 - #146599 (replace some `#[const_trait]` with `const trait`)
 - #146601 (compiletest: Make `./x test --test-args ...` work again)
 - #146608 (improve internal bootstrap docs)
 - #146609 (bootstrap: lower verbosity of cargo to one less than bootstrap's)

r? `@ghost`
`@rustbot` modify labels: rollup
bors added a commit that referenced this pull request Sep 16, 2025
Rollup of 9 pull requests

Successful merges:

 - #145095 (Migrate `UnsizedConstParamTy`  to unstable impl of `ConstParamTy_`)
 - #145960 (Split `FnCtxt::report_args_error` into subfunctions)
 - #146402 (interpret: fix overlapping aggregate initialization)
 - #146466 (llvm-wrapper: other cleanup)
 - #146574 (compiletest: Enable new-output-capture by default)
 - #146599 (replace some `#[const_trait]` with `const trait`)
 - #146601 (compiletest: Make `./x test --test-args ...` work again)
 - #146608 (improve internal bootstrap docs)
 - #146609 (bootstrap: lower verbosity of cargo to one less than bootstrap's)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 85249d5 into rust-lang:master Sep 16, 2025
10 checks passed
@rustbot rustbot added this to the 1.92.0 milestone Sep 16, 2025
rust-timer added a commit that referenced this pull request Sep 16, 2025
Rollup merge of #145960 - scrabsha:push-kskuprrtmnky, r=jdonszelmann

Split `FnCtxt::report_args_error` into subfunctions
@scrabsha scrabsha deleted the push-kskuprrtmnky branch September 16, 2025 08:05
github-actions bot pushed a commit to rust-lang/miri that referenced this pull request Sep 17, 2025
Rollup of 9 pull requests

Successful merges:

 - rust-lang/rust#145095 (Migrate `UnsizedConstParamTy`  to unstable impl of `ConstParamTy_`)
 - rust-lang/rust#145960 (Split `FnCtxt::report_args_error` into subfunctions)
 - rust-lang/rust#146402 (interpret: fix overlapping aggregate initialization)
 - rust-lang/rust#146466 (llvm-wrapper: other cleanup)
 - rust-lang/rust#146574 (compiletest: Enable new-output-capture by default)
 - rust-lang/rust#146599 (replace some `#[const_trait]` with `const trait`)
 - rust-lang/rust#146601 (compiletest: Make `./x test --test-args ...` work again)
 - rust-lang/rust#146608 (improve internal bootstrap docs)
 - rust-lang/rust#146609 (bootstrap: lower verbosity of cargo to one less than bootstrap's)

r? `@ghost`
`@rustbot` modify labels: rollup
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants