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

Simplify notes on testing and concurrency #38013

Merged
merged 1 commit into from
Dec 25, 2016

Conversation

wezm
Copy link
Member

@wezm wezm commented Nov 26, 2016

The start of the notes on tests running concurrently, added in #37766 read a little awkwardly. This PR fixes that and simplifies the wording a bit.

r? @steveklabnik

@rust-highfive
Copy link
Collaborator

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

If any changes to this PR are deemed necessary, please add them as extra commits. This ensures that the reviewer can see what has changed since they last reviewed the code. Due to the way GitHub handles out-of-date commits, this should also make it reasonably obvious what issues have or haven't been addressed. Large or tricky changes may require several passes of review and changes.

Please see the contribution instructions for more information.

@bors
Copy link
Contributor

bors commented Dec 4, 2016

☔ The latest upstream changes (presumably #38148) made this pull request unmergeable. Please resolve the merge conflicts.

@steveklabnik
Copy link
Member

Hey @wezm , I'm so sorry that my review here has slipped. Catching up on all of them now.

I'm in favor of this patch, but it seems to be out of date now. That's my fault; can you rebase it, please? I'm happy to help with that if you need any.

@wezm wezm force-pushed the simplify-test-notes branch from 9136dfb to 517fce0 Compare December 12, 2016 21:42
@wezm
Copy link
Member Author

wezm commented Dec 12, 2016

No worries @steveklabnik PR updated.

@steveklabnik
Copy link
Member

Travis failure shouldn't be a problem. Thanks!

@bors: r+ rollup

@bors
Copy link
Contributor

bors commented Dec 22, 2016

📌 Commit 517fce0 has been approved by steveklabnik

steveklabnik added a commit to steveklabnik/rust that referenced this pull request Dec 24, 2016
…abnik

Simplify notes on testing and concurrency

The start of the notes on tests running concurrently, added in rust-lang#37766 read a little awkwardly. This PR fixes that and simplifies the wording a bit.

r? @steveklabnik
bors added a commit that referenced this pull request Dec 24, 2016
Rollup of 14 pull requests

- Successful merges: #37956, #38013, #38297, #38480, #38497, #38502, #38505, #38513, #38521, #38549, #38554, #38557, #38568, #38572
- Failed merges:
@bors bors merged commit 517fce0 into rust-lang:master Dec 25, 2016
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.

4 participants