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.

Sign up for GitHub

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

Jump to bottom

Add tests ensuring zero-Duration timeouts result in errors; fix Redox issues. #48330

Merged
merged 2 commits into from
Feb 25, 2018
Merged

Add tests ensuring zero-Duration timeouts result in errors; fix Redox issues. #48330

merged 2 commits into from
Feb 25, 2018

Conversation

frewsxcv
Copy link
Member

@frewsxcv frewsxcv commented Feb 18, 2018 •
edited
Loading

Part of #48311

@frewsxcv
Copy link
Member Author

@bors try

@rust-highfive
Copy link
Collaborator

r? @TimNN

(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
@bors
Copy link
Contributor

bors commented Feb 18, 2018

⌛ Trying commit d45282ab98e6eb20cf0c2fea5945ef3627ed247d with merge e5ec420868711c2004c414664fe666c655a8d94b...

@bors
Copy link
Contributor

bors commented Feb 18, 2018

💔 Test failed - status-travis

@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 18, 2018
@frewsxcv frewsxcv force-pushed the frewsxcv-tests-zero-duration branch 3 times, most recently from c01582e to 2db8a7d Compare February 19, 2018 01:22
@frewsxcv
Copy link
Member Author

@bors try

@bors
Copy link
Contributor

bors commented Feb 19, 2018

⌛ Trying commit 2db8a7da8b842ee7b3be83b8c647ae55b31fef0c with merge 0ff0573af24d21ddd66cfee71a1b144b59e521a7...

@frewsxcv
Copy link
Member Author

@bors try

@bors
Copy link
Contributor

bors commented Feb 19, 2018

⌛ Trying commit d17d645 with merge 636afc379b28036f1d9e661f55085b22780ffda2...

@bors
Copy link
Contributor

bors commented Feb 19, 2018

☀️ Test successful - status-travis
State: approved= try=True

@frewsxcv
Copy link
Member Author

ah, i thought bors try would run on all platforms – looks like it's just linux. in any case, i fixed the redox implementation to return an error if a zero duration is passed (see the latest commit). i don't think there are any other implementations i need to fixup

@sfackler r?

@frewsxcv frewsxcv changed the title Add tests ensuring zero-Duration timeouts result in errors. Add tests ensuring zero-Duration timeouts result in errors; fix Redox issues. Feb 19, 2018
@sfackler
Copy link
Member

@bors r+

@bors
Copy link
Contributor

bors commented Feb 20, 2018

📌 Commit 0755825 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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Feb 20, 2018
@Manishearth Manishearth mentioned this pull request Feb 25, 2018
Closed
Manishearth added a commit to Manishearth/rust that referenced this pull request Feb 25, 2018
@Manishearth
Rollup merge of rust-lang#48330 - frewsxcv:frewsxcv-tests-zero-durati…
f2085e3 
…on, r=sfackler

Add tests ensuring zero-Duration timeouts result in errors; fix Redox issues.

Part of rust-lang#48311
@kennytm kennytm mentioned this pull request Feb 25, 2018
Merged
@kennytm
Copy link
Member

kennytm commented Feb 25, 2018

@bors r-

This failed to compile on Redox.

[01:04:49] error[E0433]: failed to resolve. Use of undeclared type or module `io`
[01:04:49]    --> libstd/sys/redox/net/tcp.rs:134:28
[01:04:49]     |
[01:04:49] 134 |                 return Err(io::Error::new(io::ErrorKind::InvalidInput,
[01:04:49]     |                            ^^ Use of undeclared type or module `io`
[01:04:49] 
[01:04:49] error[E0433]: failed to resolve. Use of undeclared type or module `io`
[01:04:49]    --> libstd/sys/redox/net/tcp.rs:134:43
[01:04:49]     |
[01:04:49] 134 |                 return Err(io::Error::new(io::ErrorKind::InvalidInput,
[01:04:49]     |                                           ^^ Use of undeclared type or module `io`
[01:04:49] 
[01:04:49] error[E0433]: failed to resolve. Use of undeclared type or module `io`
[01:04:49]    --> libstd/sys/redox/net/tcp.rs:151:28
[01:04:49]     |
[01:04:49] 151 |                 return Err(io::Error::new(io::ErrorKind::InvalidInput,
[01:04:49]     |                            ^^ Use of undeclared type or module `io`
[01:04:49] 
[01:04:49] error[E0433]: failed to resolve. Use of undeclared type or module `io`
[01:04:49]    --> libstd/sys/redox/net/tcp.rs:151:43
[01:04:49]     |
[01:04:49] 151 |                 return Err(io::Error::new(io::ErrorKind::InvalidInput,
[01:04:49]     |                                           ^^ Use of undeclared type or module `io`
[01:04:49] 
[01:04:49] error[E0433]: failed to resolve. Use of undeclared type or module `io`
[01:04:49]    --> libstd/sys/redox/net/udp.rs:183:28
[01:04:49]     |
[01:04:49] 183 |                 return Err(io::Error::new(io::ErrorKind::InvalidInput,
[01:04:49]     |                            ^^ Use of undeclared type or module `io`
[01:04:49] 
[01:04:49] error[E0433]: failed to resolve. Use of undeclared type or module `io`
[01:04:49]    --> libstd/sys/redox/net/udp.rs:183:43
[01:04:49]     |
[01:04:49] 183 |                 return Err(io::Error::new(io::ErrorKind::InvalidInput,
[01:04:49]     |                                           ^^ Use of undeclared type or module `io`
[01:04:49] 
[01:04:49] error[E0433]: failed to resolve. Use of undeclared type or module `io`
[01:04:49]    --> libstd/sys/redox/net/udp.rs:200:28
[01:04:49]     |
[01:04:49] 200 |                 return Err(io::Error::new(io::ErrorKind::InvalidInput,
[01:04:49]     |                            ^^ Use of undeclared type or module `io`
[01:04:49] 
[01:04:49] error[E0433]: failed to resolve. Use of undeclared type or module `io`
[01:04:49]    --> libstd/sys/redox/net/udp.rs:200:43
[01:04:49]     |
[01:04:49] 200 |                 return Err(io::Error::new(io::ErrorKind::InvalidInput,
[01:04:49]     |                                           ^^ Use of undeclared type or module `io`
[01:04:49] 
[01:04:49] error[E0425]: cannot find value `dur` in this scope
[01:04:49]    --> libstd/sys/redox/net/tcp.rs:133:16
[01:04:49]     |
[01:04:49] 133 |             if dur.as_secs() == 0 && dur.subsec_nanos() == 0 {
[01:04:49]     |                ^^^ not found in this scope
[01:04:49] 
[01:04:49] error[E0425]: cannot find value `dur` in this scope
[01:04:49]    --> libstd/sys/redox/net/tcp.rs:133:38
[01:04:49]     |
[01:04:49] 133 |             if dur.as_secs() == 0 && dur.subsec_nanos() == 0 {
[01:04:49]     |                                      ^^^ not found in this scope
[01:04:49] 
[01:04:49] error[E0425]: cannot find value `dur` in this scope
[01:04:49]    --> libstd/sys/redox/net/tcp.rs:150:16
[01:04:49]     |
[01:04:49] 150 |             if dur.as_secs() == 0 && dur.subsec_nanos() == 0 {
[01:04:49]     |                ^^^ not found in this scope
[01:04:49] 
[01:04:49] error[E0425]: cannot find value `dur` in this scope
[01:04:49]    --> libstd/sys/redox/net/tcp.rs:150:38
[01:04:49]     |
[01:04:49] 150 |             if dur.as_secs() == 0 && dur.subsec_nanos() == 0 {
[01:04:49]     |                                      ^^^ not found in this scope
[01:04:49] 
[01:04:49] error[E0425]: cannot find value `dur` in this scope
[01:04:49]    --> libstd/sys/redox/net/udp.rs:182:16
[01:04:49]     |
[01:04:49] 182 |             if dur.as_secs() == 0 && dur.subsec_nanos() == 0 {
[01:04:49]     |                ^^^ not found in this scope
[01:04:49] 
[01:04:49] error[E0425]: cannot find value `dur` in this scope
[01:04:49]    --> libstd/sys/redox/net/udp.rs:182:38
[01:04:49]     |
[01:04:49] 182 |             if dur.as_secs() == 0 && dur.subsec_nanos() == 0 {
[01:04:49]     |                                      ^^^ not found in this scope
[01:04:49] 
[01:04:49] error[E0425]: cannot find value `dur` in this scope
[01:04:49]    --> libstd/sys/redox/net/udp.rs:199:16
[01:04:49]     |
[01:04:49] 199 |             if dur.as_secs() == 0 && dur.subsec_nanos() == 0 {
[01:04:49]     |                ^^^ not found in this scope
[01:04:49] 
[01:04:49] error[E0425]: cannot find value `dur` in this scope
[01:04:49]    --> libstd/sys/redox/net/udp.rs:199:38
[01:04:49]     |
[01:04:49] 199 |             if dur.as_secs() == 0 && dur.subsec_nanos() == 0 {
[01:04:49]     |                                      ^^^ not found in this scope
[01:04:49] 
[01:04:51] error: aborting due to 16 previous errors
[01:04:51] 
[01:04:51] error: Could not compile `std`.

@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-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Feb 25, 2018
@frewsxcv
Copy link
Member Author

redox compile errors fixed 🔨 👷

@bors r=sfackler

@bors
Copy link
Contributor

bors commented Feb 25, 2018

📌 Commit a554a2f 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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Feb 25, 2018
kennytm added a commit to kennytm/rust that referenced this pull request Feb 25, 2018
@kennytm
Rollup merge of rust-lang#48330 - frewsxcv:frewsxcv-tests-zero-durati…
1aa1035 
…on, r=sfackler

Add tests ensuring zero-Duration timeouts result in errors; fix Redox issues.

Part of rust-lang#48311
bors added a commit that referenced this pull request Feb 25, 2018
@bors
Auto merge of #48531 - kennytm:rollup, r=kennytm
322d7f7 
Rollup of 17 pull requests

- Successful merges: #47964, #47970, #48076, #48115, #48166, #48281, #48297, #48302, #48362, #48369, #48489, #48491, #48494, #48517, #48529, #48235, #48330
- Failed merges:
@bors bors merged commit a554a2f into rust-lang:master Feb 25, 2018
@frewsxcv frewsxcv mentioned this pull request Mar 3, 2018
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@TimNN TimNN

Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@frewsxcv @rust-highfive @bors @sfackler @kennytm @TimNN