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

Fix panic strings. #47307

Merged
merged 1 commit into from
Jan 12, 2018
Merged

Fix panic strings. #47307

merged 1 commit into from
Jan 12, 2018

Conversation

dlrobertson
Copy link
Contributor

  • Fix panic string in check_ast_crate.
  • Update panic string for Duration subtraction on overflow/underflow.

Not sure if the changes to Duration are helpful/needed. Mostly just a nit.
Otherwise this is just a one character change :)

On another note: I hit the panic in check_ast_crate when compiling
m-labs/smoltcp with the following:

cargo test --doc --no-default-features --features "std socket-raw"`

@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 @shepmaster (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
kennytm reviewed Jan 10, 2018
View reviewed changes
src/libstd/time/duration.rs Outdated
@@ -290,7 +290,7 @@ impl Duration {
}

/// Checked `Duration` subtraction. Computes `self - other`, returning [`None`]
/// if the result would be negative or if overflow occurred.
/// if underflow or overflow occurred.
Copy link
Member

Choose a reason for hiding this comment

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

Please revert these changes. The term "overflow" is correct, see #46898.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

👍

@kennytm kennytm added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jan 10, 2018
@dlrobertson
Fix panic strings.
c78679d 
 - Fix panic string in `check_ast_crate`.
@dlrobertson
Copy link
Contributor Author

Updated! Such a massive PR lol

@kennytm
Copy link
Member

kennytm commented Jan 10, 2018

Thanks!

@bors r+ rollup

@bors
Copy link
Contributor

bors commented Jan 10, 2018

📌 Commit c78679d has been approved by kennytm

@kennytm kennytm mentioned this pull request Jan 10, 2018
Closed
@shepmaster
Copy link
Member

Such a massive PR lol

On the flip side, a lot of times the smallest changes are the ones you have to scrutinize the hardest. It's nice to have easier ones every so often ;-)

kennytm added a commit to kennytm/rust that referenced this pull request Jan 11, 2018
@kennytm
Rollup merge of rust-lang#47307 - dlrobertson:fix_panic_strings, r=ke…
b95f18f 
…nnytm

Fix panic strings.

 - Fix panic string in `check_ast_crate`.
 - Update panic string for Duration subtraction on overflow/underflow.

Not sure if the changes to `Duration` are helpful/needed. Mostly just a nit.
Otherwise this is just a one character change :)

On another note: I hit the panic in `check_ast_crate` when compiling
[m-labs/smoltcp] with the following:

```
cargo test --doc --no-default-features --features "std socket-raw"`
```

[m-labs/smoltcp]: https://github.com/m-labs/smoltcp
kennytm added a commit to kennytm/rust that referenced this pull request Jan 11, 2018
@kennytm
Rollup merge of rust-lang#47307 - dlrobertson:fix_panic_strings, r=ke…
505718d 
…nnytm

Fix panic strings.

 - Fix panic string in `check_ast_crate`.
 - Update panic string for Duration subtraction on overflow/underflow.

Not sure if the changes to `Duration` are helpful/needed. Mostly just a nit.
Otherwise this is just a one character change :)

On another note: I hit the panic in `check_ast_crate` when compiling
[m-labs/smoltcp] with the following:

```
cargo test --doc --no-default-features --features "std socket-raw"`
```

[m-labs/smoltcp]: https://github.com/m-labs/smoltcp
@kennytm kennytm mentioned this pull request Jan 11, 2018
Closed
bors added a commit that referenced this pull request Jan 11, 2018
@bors
Auto merge of #47350 - kennytm:rollup, r=kennytm
27270e6 
Rollup of 12 pull requests

- Successful merges: #47283, #47288, #47289, #47298, #47305, #47307, #47310, #47322, #47324, #47328, #47340, #47344
- Failed merges:
bors added a commit that referenced this pull request Jan 12, 2018
@bors
Auto merge of #47350 - kennytm:rollup, r=kennytm
712e755 
Rollup of 12 pull requests

- Successful merges: #47283, #47288, #47289, #47298, #47305, #47307, #47310, #47322, #47324, #47328, #47340, #47344
- Failed merges:
kennytm added a commit to kennytm/rust that referenced this pull request Jan 12, 2018
@kennytm
Rollup merge of rust-lang#47307 - dlrobertson:fix_panic_strings, r=ke…
9bedbcc 
…nnytm

Fix panic strings.

 - Fix panic string in `check_ast_crate`.
 - Update panic string for Duration subtraction on overflow/underflow.

Not sure if the changes to `Duration` are helpful/needed. Mostly just a nit.
Otherwise this is just a one character change :)

On another note: I hit the panic in `check_ast_crate` when compiling
[m-labs/smoltcp] with the following:

```
cargo test --doc --no-default-features --features "std socket-raw"`
```

[m-labs/smoltcp]: https://github.com/m-labs/smoltcp
@kennytm kennytm mentioned this pull request Jan 12, 2018
Merged
bors added a commit that referenced this pull request Jan 12, 2018
@bors
Auto merge of #47392 - kennytm:rollup, r=kennytm
51b0b37 
Rollup of 24 pull requests

- Successful merges: #46985, #47069, #47081, #47185, #47282, #47283, #47288, #47289, #47298, #47305, #47306, #47307, #47310, #47324, #47328, #47331, #47340, #47343, #47344, #47352, #47357, #47365, #47375, #47382
- Failed merges: #47334
@bors bors merged commit c78679d into rust-lang:master Jan 12, 2018
@dlrobertson dlrobertson deleted the fix_panic_strings branch January 14, 2018 20:05
@oberien oberien mentioned this pull request Jan 15, 2018
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@kennytm kennytm kennytm left review comments

Assignees

@shepmaster shepmaster

Labels
S-waiting-on-review Status: Awaiting review from the assignee but also interested parties.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@dlrobertson @rust-highfive @kennytm @bors @shepmaster