don't use Result::ok just to be able to use unwrap/unwrap_or #23512
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
r? @pcwalton (rust_highfive has picked a reviewer for you, use r? to override) |
| @@ -591,8 +591,10 @@ impl<T: Send> Sender<T> { | |||
| // This send cannot panic because the thread is | |||
| // asleep (we're looking at it), so the receiver | |||
| // can't go away. | |||
| (*a.get()).send(t).ok().unwrap(); | |||
| token.signal(); | |||
| if let Err(_) = (*a.get()).send(t) { | |||
There was a problem hiding this comment.
this is really ugly, but it represents the comment more.
maybe I should just leave the ok().unwrap()?
There was a problem hiding this comment.
Yeah I'd just leave this as it was.
oli-obk
force-pushed
the
result_ok_unwrap
branch
from
65cf919 to
c1c786d
Compare
| @@ -12,7 +12,7 @@ use std::thread; | |||
|
|
|||
| pub fn main() { | |||
| let t = thread::spawn(move|| child((10, 20, 30, 40, 50, 60, 70, 80, 90)) ); | |||
| t.join().ok().unwrap(); | |||
| t.join().ok().unwrap(); // forget Err value, since it doesn't implement Debug | |||
There was a problem hiding this comment.
join() returns a Result<T, Box<Any + Send + 'static>>
there are lots of other cases where the result is ignored since Debug cannot be implemented generically to return "thread panicked" on Err
oli-obk
force-pushed
the
result_ok_unwrap
branch
4 times, most recently
from
ee74f02 to
da18d83
Compare
|
Looks good to me, thanks! r=me with a squash and a nit |
|
make check running, will squash once it's done |
oli-obk
force-pushed
the
result_ok_unwrap
branch
from
05fc098 to
b4a1e59
Compare
|
squashed and checked @alexcrichton |
bors
added a commit
that referenced
this pull request
Mar 20, 2015
because then the call to `unwrap()` will not print the error object.
This was referenced Mar 21, 2015
Merged
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
because then the call to
unwrap()will not print the error object.