Skip to content

Remove old_io from trpl/concurrency.md #24024

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

Closed
wants to merge 5 commits into from

Conversation

callahad
Copy link
Contributor

@callahad callahad commented Apr 3, 2015

No description provided.

@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 @huonw (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

This potentially fixes #24023

Still building beta -- will double check once that's done.

@callahad
Copy link
Contributor Author

callahad commented Apr 3, 2015

Oh, silly me. Duration is unused now. So those can be pulled, too.

Let me update the PR real quick.

@steveklabnik steveklabnik assigned steveklabnik and unassigned huonw Apr 3, 2015
callahad added 2 commits April 3, 2015 15:01
This block is supposed to be a mirror of the block above it, but with
most lines commented out to focus on the inner function body. However,
a few lines were missing in the commented region.
@tshepang
Copy link
Member

tshepang commented Apr 3, 2015

Duplicated effort sadly: #23871

@callahad
Copy link
Contributor Author

callahad commented Apr 3, 2015

Doh, sorry @tshepang :)

As of this last commit (adf8e11), all of the code samples compile and run (or fail) as expected in 1.0.0-beta.

r? @steveklabnik :)

@@ -272,6 +258,8 @@ thread::spawn(move || {
data[i] += 1;
});
# }
#
# thread::sleep_ms(50);
Copy link
Member

Choose a reason for hiding this comment

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

why add this sleep_ms

Copy link
Contributor Author

Choose a reason for hiding this comment

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

That block is supposed to be a mirror of the block above it, but with most lines commented out to focus on the inner function body.

For whatever reason, it didn't include the sleep, even in the current version of the document (https://github.com/rust-lang/rust/blob/80def6c2447d23a624e611417f24cf0ab2a5a676/src/doc/trpl/concurrency.md)

This is effectively a no-op, since the commented parts get elided when rendered (see http://doc.rust-lang.org/book/concurrency.html), but it was clearly intended to be a mirror of the previous block at some point. This brings it back into line with that.

Copy link
Member

Choose a reason for hiding this comment

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

nice catch

@tshepang
Copy link
Member

tshepang commented Apr 3, 2015

Will you squash these commits please, except maybe callahad@adf8e11.

@steveklabnik
Copy link
Member

Yes, thanks so much! r=me after a squash

@callahad
Copy link
Contributor Author

callahad commented Apr 3, 2015

Closing in favor of squished PR

@callahad callahad closed this Apr 3, 2015
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
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.

5 participants