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

Proptest/Resolver move test helper functions to support #6103

Merged
merged 3 commits into from
Sep 27, 2018

Conversation

Eh2406
Copy link
Contributor

@Eh2406 Eh2406 commented Sep 26, 2018

This moves all the code in tests/testsuite/resolve.rs that is not tests of cargo to tests/testsuite/support/resolve.rs. (follow up to #5921)
This also clears up some inconsistencies in naming between local variables in activate_deps_loop and BacktrackFrame. (follow up to #6097) This is a true refactoring, nothing about the executable has changed.

@rust-highfive
Copy link

r? @matklad

(rust_highfive has picked a reviewer for you, use r? to override)

@alexcrichton
Copy link
Member

Could the "cx" => "context" rename be left out? I haven't found historically that it makes reading code all that much easier and it's much nicer (subjectively in my opinion) to use cx

@Eh2406
Copy link
Contributor Author

Eh2406 commented Sep 27, 2018

done

@alexcrichton
Copy link
Member

@bors: r+

@bors
Copy link
Collaborator

bors commented Sep 27, 2018

📌 Commit 6562123 has been approved by alexcrichton

@bors
Copy link
Collaborator

bors commented Sep 27, 2018

⌛ Testing commit 6562123 with merge 26962e7cba7975b1a25cac88b7559c32e6d6a474...

@bors
Copy link
Collaborator

bors commented Sep 27, 2018

💔 Test failed - status-travis

@Eh2406
Copy link
Contributor Author

Eh2406 commented Sep 27, 2018

@bors: retry

@bors
Copy link
Collaborator

bors commented Sep 27, 2018

⌛ Testing commit 6562123 with merge 0edbfbb...

bors added a commit that referenced this pull request Sep 27, 2018
Proptest/Resolver move test helper functions to support

This moves all the code in `tests/testsuite/resolve.rs` that is not tests of cargo to ` tests/testsuite/support/resolve.rs`. (follow up to #5921)
This also clears up some inconsistencies in naming between local variables in `activate_deps_loop` and `BacktrackFrame`. (follow up to #6097) This is a true refactoring, nothing about the executable has changed.
@bors
Copy link
Collaborator

bors commented Sep 27, 2018

☀️ Test successful - status-appveyor, status-travis
Approved by: alexcrichton
Pushing 0edbfbb to master...

@bors bors merged commit 6562123 into rust-lang:master Sep 27, 2018
@Eh2406 Eh2406 deleted the proptest branch October 5, 2018 18:11
@ehuss ehuss added this to the 1.31.0 milestone Feb 6, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants