stable build

master
Avril 4 years ago
parent 7368adc761
commit bcc5daa5e0
Signed by: flanchan
GPG Key ID: 284488987C31F630

@ -149,7 +149,9 @@ where I: IntoIterator<Item=T>,
let task = progress.add_task(format!("{:?}", filename.as_ref()));
future::join(task, worker).await
} else {
(Option::<!>::None, do_work(process.as_ref(), &filename, ()).await)
#[cfg(nightly)] type NoReturn = !;
#[cfg(not(nightly))] type NoReturn = ();
(Option::<NoReturn>::None, do_work(process.as_ref(), &filename, ()).await)
}
}
};
@ -165,7 +167,13 @@ where I: IntoIterator<Item=T>,
if #[cfg(feature="progress")] {
worker.0.ok().into()
} else {
cfg_if!{
if #[cfg(nightly)] {
std::marker::PhantomData::<!>
} else {
std::marker::PhantomData::<()>
}
}
}
}
};

Loading…
Cancel
Save