itsscb/cargo
1
0
Fork 0
mirror of https://github.com/rust-lang/cargo.git synced 2025-09-28 11:20:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Auto merge of #7367 - alexcrichton:less-fn-box, r=ehuss

Browse Source 
Remove another `FnBox` trait

No longer needed on stable!
This commit is contained in:
bors 2019-09-16 20:18:02 +00:00
commit 4a04a1cdb2
1 changed files with 2 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/cargo/core/compiler/job.rs
View File

@ -12,17 +12,7 @@ pub struct Job {
/// Each proc should send its description before starting.
/// It should send either once or close immediately.
pub struct Work {
inner: Box<dyn for<'a, 'b> FnBox<&'a JobState<'b>, CargoResult<()>> + Send>,
}
trait FnBox<A, R> {
fn call_box(self: Box<Self>, a: A) -> R;
}
impl<A, R, F: FnOnce(A) -> R> FnBox<A, R> for F {
fn call_box(self: Box<F>, a: A) -> R {
(*self)(a)
}
inner: Box<dyn FnOnce(&JobState<'_>) -> CargoResult<()> + Send>,
}
impl Work {
@ -38,7 +28,7 @@ impl Work {
}
pub fn call(self, tx: &JobState<'_>) -> CargoResult<()> {
self.inner.call_box(tx)
(self.inner)(tx)
}
pub fn then(self, next: Work) -> Work {