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

Clarify "It is an error to..." wording for zero-duration behaviors. #48328

Merged

Conversation

frewsxcv
Copy link
Member

Documentation fix side of #48311.

@rust-highfive
Copy link
Collaborator

r? @alexcrichton

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

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Feb 18, 2018
@frewsxcv
Copy link
Member Author

r? @sfackler

i'm interested in doing the integration test thing you mentioned in the github issue, but i'll do that in a separate pr

@frewsxcv frewsxcv force-pushed the frewsxcv-clarify-error-zero-duration branch from 88973b6 to 19fa3da Compare February 18, 2018 19:22
@@ -282,6 +284,20 @@ impl TcpStream {
/// .expect("Couldn't connect to the server...");
/// stream.set_read_timeout(None).expect("set_read_timeout call failed");
/// ```
///
/// An [`Err`] is returned if the zero [`Duration`] is passed to this
Copy link
Member

Choose a reason for hiding this comment

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

I don't know if we need to have an explicit example of an invalid call.

Copy link
Member

Choose a reason for hiding this comment

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

We talked about it at the docs team meeting, and everyone was generally in favor of showing off error conditions.

@frewsxcv frewsxcv force-pushed the frewsxcv-clarify-error-zero-duration branch from 19fa3da to bb2fae6 Compare February 19, 2018 16:22
@frewsxcv frewsxcv force-pushed the frewsxcv-clarify-error-zero-duration branch from bb2fae6 to 931087c Compare February 22, 2018 13:04
@bors
Copy link
Contributor

bors commented Feb 22, 2018

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

@bors bors 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 the assignee but also interested parties. labels Feb 22, 2018
@frewsxcv frewsxcv force-pushed the frewsxcv-clarify-error-zero-duration branch from 931087c to 0700bd1 Compare February 24, 2018 13:57
@frewsxcv
Copy link
Member Author

tests are passing now, let me know if anyone sees anything else!

@shepmaster shepmaster added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Mar 2, 2018
@shepmaster
Copy link
Member

Heads-up @sfackler, this is ready for re-review.

@sfackler
Copy link
Member

sfackler commented Mar 3, 2018

@bors r+

@bors
Copy link
Contributor

bors commented Mar 3, 2018

📌 Commit 0700bd1 has been approved by sfackler

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Mar 3, 2018
Manishearth added a commit to Manishearth/rust that referenced this pull request Mar 3, 2018
@bors bors merged commit 0700bd1 into rust-lang:master Mar 3, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants