Skip to content

Remove DebbugerScripts from bootstrap CLI #96310

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 1 commit into from
May 2, 2022
Merged

Remove DebbugerScripts from bootstrap CLI #96310

merged 1 commit into from
May 2, 2022

Conversation

bertptrs
Copy link
Contributor

This PR implements #95992 and removes the debugger scripts from the bootstrap CLI.

I could not find a lot of documentation on the bootstrap binary so perhaps there's still some documentation to be updated.

@rust-highfive
Copy link
Contributor

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @Mark-Simulacrum (or someone else) soon.

Please see the contribution instructions for more information.

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Apr 22, 2022
Mark-Simulacrum
Mark-Simulacrum reviewed Apr 24, 2022
View reviewed changes
src/bootstrap/dist.rs Outdated
@@ -456,7 +456,7 @@ impl Step for DebuggerScripts {
type Output = ();

fn should_run(run: ShouldRun<'_>) -> ShouldRun<'_> {
run.path("src/etc/lldb_batchmode.py")
run.never()
}

fn make_run(run: RunConfig<'_>) {
Copy link
Member

Choose a reason for hiding this comment

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

We can delete make_run if should_run is run.never() I believe.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

It took me a while to grasp what this would mean but I think I agree. I've removed the function in a fixup. The default implementation should suffice.

@Mark-Simulacrum
Copy link
Member

r=me with a little more cleanup done :)

@Mark-Simulacrum Mark-Simulacrum added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Apr 24, 2022
@bertptrs bertptrs force-pushed the remove-debugger-bootstrap branch from c02c617 to 072b4c2 Compare May 1, 2022 12:04
@bertptrs bertptrs requested a review from Mark-Simulacrum May 1, 2022 12:07
@bertptrs
Copy link
Contributor Author

bertptrs commented May 1, 2022

r? @Mark-Simulacrum

@Mark-Simulacrum Mark-Simulacrum added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels May 1, 2022
@jyn514
Copy link
Member

jyn514 commented May 1, 2022

@bertptrs I suspect Mark will want you to squash the two commits, it would save time if you went ahead and did it now. There are instructions at https://rustc-dev-guide.rust-lang.org/git.html#advanced-rebasing.

Mark-Simulacrum
Mark-Simulacrum approved these changes May 1, 2022
View reviewed changes
Copy link
Member

@Mark-Simulacrum Mark-Simulacrum left a comment

Choose a reason for hiding this comment

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

r=me with commits squashed

@bertptrs bertptrs force-pushed the remove-debugger-bootstrap branch from 072b4c2 to 02d41b8 Compare May 2, 2022 06:04
@bertptrs
Copy link
Contributor Author

bertptrs commented May 2, 2022

Done

r? @Mark-Simulacrum

@Mark-Simulacrum
Copy link
Member

@bors r+

@bors
Copy link
Collaborator

bors commented May 2, 2022

📌 Commit 02d41b8 has been approved by Mark-Simulacrum

@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. labels May 2, 2022
@bors
Copy link
Collaborator

bors commented May 2, 2022

⌛ Testing commit 02d41b8 with merge 5428983...

@bors
Copy link
Collaborator

bors commented May 2, 2022

☀️ Test successful - checks-actions
Approved by: Mark-Simulacrum
Pushing 5428983 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label May 2, 2022
@bors bors merged commit 5428983 into rust-lang:master May 2, 2022
@rustbot rustbot added this to the 1.62.0 milestone May 2, 2022
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (5428983): comparison url.

Summary:

  • Primary benchmarks: 😿 relevant regression found
  • Secondary benchmarks: no relevant changes found
Regressions 😿
(primary)		 Regressions 😿
(secondary)		 Improvements 🎉
(primary)		 Improvements 🎉
(secondary)		 All 😿 🎉
(primary)
count1 1 0 0 0 1
mean2 0.9% N/A N/A N/A 0.9%
max 0.9% N/A N/A N/A 0.9%

If you disagree with this performance assessment, please file an issue in rust-lang/rustc-perf.

@rustbot label: -perf-regression

Footnotes

  1. number of relevant changes ↩

  2. the arithmetic mean of the percent change ↩

@bertptrs bertptrs deleted the remove-debugger-bootstrap branch May 13, 2022 08:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Mark-Simulacrum Mark-Simulacrum Mark-Simulacrum approved these changes

@jyn514 jyn514 jyn514 approved these changes

Assignees

@Mark-Simulacrum Mark-Simulacrum

Labels
merged-by-bors This PR was explicitly merged by bors. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Milestone
1.62.0
Development

Successfully merging this pull request may close these issues.
7 participants
@bertptrs @rust-highfive @Mark-Simulacrum @jyn514 @bors @rust-timer @rustbot