Skip to content
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.

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

Only show toolchain list once when using --installed #88

Merged
merged 3 commits into from
Sep 5, 2023

Conversation

marcospb19
Copy link
Collaborator

Fixes #86.

@marcospb19 marcospb19 force-pushed the output-toolchain-list-only-once branch from a855ca3 to 4777210 Compare February 2, 2023 00:25
@marcospb19
Copy link
Collaborator Author

marcospb19 commented Feb 2, 2023

EDIT: see comment below from Joshua.

I force pushed the fix to a test, it was panicking in the main function.

One thing I noticed is that

))?;
is the only place where main can panic, in the other 9 places, the error is outputted and the program exits, maybe we should get rid of this one panic?

@jyn514
Copy link
Collaborator

jyn514 commented Feb 2, 2023

I force pushed the fix to a test, it was panicking in the main function.

We cleared this up in DMs, this was a panic in the test suite, not cargo-sweep itself.

Copy link
Collaborator

@jyn514 jyn514 left a comment

Choose a reason for hiding this comment

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

Thanks! Left a couple nits but this looks good overall :) could you please add a test showing the new behavior?

src/main.rs Show resolved Hide resolved
src/main.rs Show resolved Hide resolved
@jyn514 jyn514 added the S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. label Feb 2, 2023
@marcospb19
Copy link
Collaborator Author

I think I'll wait for #78 to merge, to avoid giving him new conflicts again, and to reuse the project structure he created to test -r to test this one right here.

@marcospb19 marcospb19 force-pushed the output-toolchain-list-only-once branch 2 times, most recently from 4b60471 to 59e0166 Compare February 4, 2023 08:09
@marcospb19
Copy link
Collaborator Author

Changing to draft while we wait on #78 to be merged to reuse some of the testing code.

@marcospb19 marcospb19 marked this pull request as draft February 4, 2023 20:39
@marcospb19 marcospb19 force-pushed the output-toolchain-list-only-once branch 3 times, most recently from c62fc85 to 332fc64 Compare February 15, 2023 04:55
@marcospb19 marcospb19 marked this pull request as ready for review February 15, 2023 04:56
@@ -0,0 +1 @@

Copy link
Collaborator Author

@marcospb19 marcospb19 Feb 15, 2023

Choose a reason for hiding this comment

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

I did this because it's simpler to run on tests/, the alternative here would probably be to copy all projects to a tempdir, create the target folder in each copy, and run sweep -r -i in this tempdir instead of tests/.

@marcospb19
Copy link
Collaborator Author

marcospb19 commented Aug 7, 2023

Excuse me @jyn514, could you please update the label S-waiting-on-author to S-waiting-on-review?

@jyn514
Copy link
Collaborator

jyn514 commented Aug 7, 2023

Sorry for the long delay. I am taking a semi-permanent break from github and don't know when I'll have time to maintain cargo-sweep.

@marcospb19 you've done a lot of work on cargo-sweep in the past and I trust your judgement - are you interested in becoming a maintainer? :)

@jyn514 jyn514 added S-waiting-on-review Status: Awaiting review from a maintainer and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Aug 7, 2023
@jyn514
Copy link
Collaborator

jyn514 commented Aug 7, 2023

In the meantime I'm happy to merge this as soon as you fix the conflicts.

@jyn514 jyn514 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 a maintainer labels Aug 7, 2023
@marcospb19
Copy link
Collaborator Author

@jyn514

Sorry for the long delay. I am taking a semi-permanent break from github and don't know when I'll have time to maintain cargo-sweep.

Have a great break! And thanks for everything you've done.

@marcospb19 you've done a lot of work on cargo-sweep in the past and I trust your judgement - are you interested in becoming a maintainer? :)

I feel flattered to have your trust!

Yeah, I'm down! I believe the next good step would be to check out cargo-clean-all, see if both overlap and where are they going with the project.

In the meantime I'm happy to merge this as soon as you fix the conflicts.

Ok, I'll do that!

@marcospb19 marcospb19 force-pushed the output-toolchain-list-only-once branch from 332fc64 to 0cd0328 Compare August 31, 2023 23:29
@marcospb19
Copy link
Collaborator Author

Rebase done, conflicts solved.

@marcospb19
Copy link
Collaborator Author

marcospb19 commented Aug 31, 2023

Tests failing due to that bad regex on that specific test... let me see what I can do.

Update to self: in macOS, there's a additional .o file being removed.

the test `empty_project_output` used to expect Cargo to output exactly 4
files in the target folder, so we would delete them and see 4 lines as
output, however, in MacOS we can see 5 files instead of 4

this change makes the test expect 2 or more files instead
@marcospb19
Copy link
Collaborator Author

Done by last commit! Clippy is failing due to a proc-macro2 update issue, which should be fixed by another PR.

@jyn514 jyn514 merged commit 701ebef into holmgr:master Sep 5, 2023
8 of 9 checks passed
@jyn514
Copy link
Collaborator

jyn514 commented Sep 5, 2023

Yeah, I'm down! I believe the next good step would be to check out cargo-clean-all, see if both overlap and where are they going with the project.

sounds perfect! check your email, you should have an invite :)

@marcospb19 marcospb19 deleted the output-toolchain-list-only-once branch September 6, 2023 15:06
@marcospb19 marcospb19 mentioned this pull request Sep 12, 2023
@marcospb19 marcospb19 mentioned this pull request Oct 5, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Show toolchain list only once when the -i/--installed flag is provided
2 participants