Skip to content
This repository was archived by the owner on Nov 6, 2020. It is now read-only.

bump crossbeam#10848

Merged
debris merged 1 commit into
masterfrom
bump-crossbeam
Jul 6, 2019
Merged

bump crossbeam#10848
debris merged 1 commit into
masterfrom
bump-crossbeam

Conversation

@debris
Copy link
Copy Markdown
Collaborator

@debris debris commented Jul 5, 2019

  • reduces the number of duplicated dependencies

@debris debris added A0-pleasereview 🤓 Pull request needs code review. A2-insubstantial 👶 Pull request requires no code review (e.g., a sub-repository hash update). labels Jul 5, 2019
@debris debris requested a review from dvdplm July 5, 2019 14:10
@ordian ordian added this to the 2.7 milestone Jul 5, 2019
Comment thread ethcore/src/executive.rs
.join()
})
.expect("Sub-thread never panics; qed")
.expect("Sub-thread never panics; qed")
Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

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

crossbeamapi has changed a bit here,

  • We have to call join inside fn scope callback, cause the join handle lifetime is now the same as scope lifetime :(
  • fn scope returns error, so that's why we have double expect here

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

fn scope returns error,

What are the conditions under which it errors?

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

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

If the child thread panics, an error is returned.

from https://docs.rs/crossbeam/0.7.1/crossbeam/thread/struct.ScopedJoinHandle.html

and

If any of the joined threads has panicked, an Err is returned containing errors from panicked threads.

from https://docs.rs/crossbeam/0.7.1/crossbeam/fn.scope.html

@ordian ordian added A8-looksgood 🦄 Pull request is reviewed well. and removed A0-pleasereview 🤓 Pull request needs code review. labels Jul 5, 2019
Comment thread ethcore/src/executive.rs
.join()
})
.expect("Sub-thread never panics; qed")
.expect("Sub-thread never panics; qed")
Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

fn scope returns error,

What are the conditions under which it errors?

@debris debris merged commit a6e96b0 into master Jul 6, 2019
@debris debris deleted the bump-crossbeam branch July 6, 2019 14:16
dvdplm added a commit that referenced this pull request Jul 6, 2019
* master:
  removed QueueError type (#10852)
  removed unused macros (#10851)
  bump crossbeam (#10848)
ordian pushed a commit that referenced this pull request Aug 12, 2019
ordian pushed a commit that referenced this pull request Aug 14, 2019
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

A2-insubstantial 👶 Pull request requires no code review (e.g., a sub-repository hash update). A8-looksgood 🦄 Pull request is reviewed well.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants