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

Remove old_io from trpl/concurrency.md #24031

Merged
merged 1 commit into from Apr 4, 2015

Conversation

callahad
Copy link
Contributor

@callahad callahad commented Apr 3, 2015

Also: the std_misc feature flag is removed; it's not needed in Beta.

Hat tip to @tshepang in #23871

Fixes #24023

This PR replaces #24024

Also: the std_misc feature flag is removed; it's not needed in Beta.

Hat tip to @tshepang in rust-lang#23871

Fixes rust-lang#24023
@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 @pcwalton (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. 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 CONTRIBUTING.md for more information.

@callahad
Copy link
Contributor Author

callahad commented Apr 3, 2015

Doh, forgot about @rust-highfive's auto-assignment.

Per Steve's comment in #24024:

r? @steveklabnik

@steveklabnik
Copy link
Member

@bors: r+ rollup

@bors
Copy link
Contributor

bors commented Apr 3, 2015

📌 Commit 3b73a6e has been approved by steveklabnik

@steveklabnik
Copy link
Member

Thank you!

In the future, you don't need a new PR to do this: http://blog.steveklabnik.com/posts/2012-11-08-how-to-squash-commits-in-a-github-pull-request

@callahad
Copy link
Contributor Author

callahad commented Apr 3, 2015

Oh, really? GitHub handles a force push like that intelligently? Awesome!

the_more_you_know_banner

@steveklabnik
Copy link
Member

Yup! :)

Manishearth added a commit to Manishearth/rust that referenced this pull request Apr 4, 2015
…veklabnik

 Also: the std_misc feature flag is removed; it's not needed in Beta.

Hat tip to @tshepang in rust-lang#23871

Fixes rust-lang#24023

This PR replaces rust-lang#24024
Manishearth added a commit to Manishearth/rust that referenced this pull request Apr 4, 2015
@Manishearth
Copy link
Member

Needs Manishearth@b62c110 to pass

@callahad
Copy link
Contributor Author

callahad commented Apr 4, 2015

@Manishearth I'm still super unfamiliar with the Rust contrib process. Do I need to take any action (adding / squashing your commit into this PR), or is your fixup going to get handled elsewhere?

@Manishearth
Copy link
Member

Oh, sorry.

So your PR is included in the current rollup (big ball of PRs to push through the CI), including this fix. If all goes well you don't have to worry.

However, if the rollup fails or is abandoned, the next time this gets built it will fail.

I suggest you cherrypick that commit into your PR and leave it like that :)

@bors bors merged commit 3b73a6e into rust-lang:master Apr 4, 2015
@Manishearth
Copy link
Member

(It merged now, so you don't need to do anything)

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.

TRPL: remove old_io from concurrency chapter
6 participants