Fix confusing error message for sub_instant by avdv · Pull Request #51255 · rust-lang/rust

avdv · 2018-05-31T20:06:16Z

When subtracting an Instant from another, the function will panick when RHS > self, but the error message confusingly displays a different error:

let i = Instant::now();let other = Instant::now();if other > i {println!("{:?}", i - other);}

This results in a panic:

thread 'test_instant' panicked at 'other was less than the current instant', libstd/sys/unix/time.rs:292:17

But clearly, other was actually greater than the current instant.

When subtracting an Instant from another, the function will panick when `RHS > self`, but the error message confusingly displays a different error: ```rust let i = Instant::now(); let other = Instant::now(); if other > i { println!("{:?}", i - other); } ``` This results in a panic: ``` thread 'test_instant' panicked at 'other was less than the current instant', libstd/sys/unix/time.rs:292:17 ```

rust-highfive · 2018-05-31T20:06:19Z

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @kennytm (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.

kennytm · 2018-05-31T20:45:49Z

Thank you @avdv! Would you mind updating this file as well?

src/libstd/sys/redox/time.rs

Also, I think the error message from the Windows and CloudABI implementations are even more clearer:

Uses the same wording as [`src/libstd/sys/windows/time.rs`][1]. 1: https://github.com/avdv/rust/blob/95e2bf253d864c5e14ad000ffa2040ce85916056/src/libstd/sys/windows/time.rs#L65

avdv · 2018-06-04T07:05:43Z

Hi @kennytm,

I went with the first alternative phrase; I liked it the best. I updated the PR accordingly.

Cheers.

kennytm · 2018-06-04T09:38:29Z

@bors r+ rollup

bors · 2018-06-04T09:38:30Z

📌 Commit 33c4b37 has been approved by kennytm

bors · 2018-06-05T04:27:56Z

⌛ Testing commit 33c4b37 with merge 56f7181b2af07b5357d2bd8c7ad4d3e2435a8cf0...

bors · 2018-06-05T07:14:48Z

💔 Test failed - status-travis

rust-highfive · 2018-06-05T07:14:50Z

The job x86_64-gnu-distcheck of your PR failed on Travis (raw log). Through arcane magic we have determined that the following fragments from the build log may contain information about the problem.

Click to expand the log.

[02:25:57] test thread::tests::test_try_panic_message_owned_str ... ok
[02:25:57] test thread::tests::test_try_panic_message_static_str ... ok
[02:25:57] test thread::tests::test_try_panic_message_unit_struct ... ok
[02:25:57] test thread::tests::test_unnamed_thread ... ok
[02:25:57] thread '<unnamed>' panicked at 'specified instant was later than self', libstd/sys/unix/time.rs:292:17
[02:25:57] test time::tests::instant_elapsed ... ok
[02:25:57] test time::tests::instant_math ... ok
[02:25:57] test time::tests::instant_monotonic ... ok
[02:25:57] test time::tests::since_epoch ... ok
---
[02:43:47] [TIMING] Compiletest { compiler: Compiler { stage: 2, host: "x86_64-unknown-linux-gnu" }, target: "x86_64-unknown-linux-gnu", mode: "ui", suite: "rustdoc-ui", path: None, compare_mode: None } -- 0.495
[02:43:47] Build completed successfully in 1:43:21
[02:43:47] Distcheck rust-src
[02:43:47] Updating registry `https://github.com/rust-lang/crates.io-index`
[02:44:27] warning: spurious network error (2 tries remaining): curl error: Couldn't resolve host 'github.com'
[02:44:27] ; class=Net (12)
[02:44:47] warning: spurious network error (1 tries remaining): curl error: Couldn't resolve host 'github.com'
[02:44:47] ; class=Net (12)
[02:45:07] error: failed to load source for a dependency on `rand`
[02:45:07] Caused by:
[02:45:07] Unable to update registry `https://github.com/rust-lang/crates.io-index`
[02:45:07] [02:45:07] Caused by:
[02:45:07] Caused by:
[02:45:07] failed to fetch `https://github.com/rust-lang/crates.io-index`
[02:45:07] [02:45:07] Caused by:
[02:45:07] curl error: Couldn't resolve host 'github.com'
[02:45:07] ; class=Net (12)
[02:45:07] [02:45:07] [02:45:07] command did not execute successfully: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0/bin/cargo" "generate-lockfile" "--manifest-path" "/checkout/obj/build/tmp/distcheck-src/rust-src/lib/rustlib/src/rust/src/libstd/Cargo.toml"
[02:45:07] [02:45:07] [02:45:07] failed to run: /checkout/obj/build/bootstrap/debug/bootstrap test distcheck
[02:45:07] Build completed unsuccessfully in 2:42:19

I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact @TimNN. (Feature Requests)

rust-highfive · 2018-06-05T07:15:25Z

The job x86_64-gnu-distcheck of your PR failed on Travis (raw log). Through arcane magic we have determined that the following fragments from the build log may contain information about the problem.

Click to expand the log.

[02:43:47] [TIMING] Compiletest { compiler: Compiler { stage: 2, host: "x86_64-unknown-linux-gnu" }, target: "x86_64-unknown-linux-gnu", mode: "ui", suite: "rustdoc-ui", path: None, compare_mode: None } -- 0.495
[02:43:47] Build completed successfully in 1:43:21
[02:43:47] Distcheck rust-src
[02:43:47] Updating registry `https://github.com/rust-lang/crates.io-index`
[02:44:27] warning: spurious network error (2 tries remaining): curl error: Couldn't resolve host 'github.com'
[02:44:27] ; class=Net (12)
[02:44:47] warning: spurious network error (1 tries remaining): curl error: Couldn't resolve host 'github.com'
[02:44:47] ; class=Net (12)
[02:45:07] error: failed to load source for a dependency on `rand`
[02:45:07] Caused by:
[02:45:07] Unable to update registry `https://github.com/rust-lang/crates.io-index`
[02:45:07] [02:45:07] Caused by:
[02:45:07] Caused by:
[02:45:07] failed to fetch `https://github.com/rust-lang/crates.io-index`
[02:45:07] [02:45:07] Caused by:
[02:45:07] curl error: Couldn't resolve host 'github.com'
[02:45:07] ; class=Net (12)
[02:45:07] [02:45:07] [02:45:07] command did not execute successfully: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0/bin/cargo" "generate-lockfile" "--manifest-path" "/checkout/obj/build/tmp/distcheck-src/rust-src/lib/rustlib/src/rust/src/libstd/Cargo.toml"
[02:45:07] [02:45:07] [02:45:07] failed to run: /checkout/obj/build/bootstrap/debug/bootstrap test distcheck
[02:45:07] Build completed unsuccessfully in 2:42:19

I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact @TimNN. (Feature Requests)

kennytm · 2018-06-05T12:24:57Z

@bors retry travis-ci/travis-ci#9696

Fix confusing error message for sub_instant When subtracting an Instant from another, the function will panick when `RHS > self`, but the error message confusingly displays a different error: ```rust let i = Instant::now(); let other = Instant::now(); if other > i { println!("{:?}", i - other); } ``` This results in a panic: ``` thread 'test_instant' panicked at 'other was less than the current instant', libstd/sys/unix/time.rs:292:17 ``` But clearly, `other` was actually greater than the current instant.

Rollup of 7 pull requests Successful merges: - #50852 (Add doc comment to hiding portions of code example) - #51183 (Update rustdoc book to suggest using Termination trait instead of hidden ‘foo’ function) - #51255 (Fix confusing error message for sub_instant) - #51256 (Fix crate-name option in rustdoc) - #51308 (Check array indices in constant propagation) - #51343 (test: Ignore some problematic tests on sparc and sparc64) - #51358 (Tests that #39963 is fixed on MIR borrowck) Failed merges:

rust-highfive assigned kennytm May 31, 2018

rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label May 31, 2018

kennytm 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 Jun 2, 2018

Clarify error phrase in sub_instant function
33c4b37
Uses the same wording as [`src/libstd/sys/windows/time.rs`][1]. 1: https://github.com/avdv/rust/blob/95e2bf253d864c5e14ad000ffa2040ce85916056/src/libstd/sys/windows/time.rs#L65

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 Jun 4, 2018

bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Jun 5, 2018

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 Jun 5, 2018

Mark-Simulacrum mentioned this pull request Jun 5, 2018
Rollup of 7 pull requests #51369
Merged

bors merged commit 33c4b37 into rust-lang:masterJun 5, 2018

avdv deleted the patch-1 branch June 5, 2018 20:32

Navigation Menu

Uh oh!

Uh oh!

Fix confusing error message for sub_instant - #51255

Fix confusing error message for sub_instant#51255
bors merged 2 commits into
rust-lang:masterfrom
avdv:patch-1

avdv commented May 31, 2018•
edited
Loading

Uh oh!

rust-highfive commented May 31, 2018

Uh oh!

kennytm commented May 31, 2018

Uh oh!

avdv commented Jun 4, 2018

Uh oh!

kennytm commented Jun 4, 2018

Uh oh!

bors commented Jun 4, 2018

Uh oh!

bors commented Jun 5, 2018

Uh oh!

bors commented Jun 5, 2018

Uh oh!

rust-highfive commented Jun 5, 2018

Uh oh!

rust-highfive commented Jun 5, 2018

Uh oh!

kennytm commented Jun 5, 2018

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

Uh oh!

Uh oh!

Conversation

avdv commented May 31, 2018• edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

rust-highfive commented May 31, 2018

Uh oh!

kennytm commented May 31, 2018

Uh oh!

avdv commented Jun 4, 2018

Uh oh!

kennytm commented Jun 4, 2018

Uh oh!

bors commented Jun 4, 2018

Uh oh!

bors commented Jun 5, 2018

Uh oh!

bors commented Jun 5, 2018

Uh oh!

rust-highfive commented Jun 5, 2018

Uh oh!

rust-highfive commented Jun 5, 2018

Uh oh!

kennytm commented Jun 5, 2018

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

avdv commented May 31, 2018•
edited
Loading