Start9/start-os
2
0
Fork 0
mirror of https://github.com/Start9Labs/start-os.git synced 2026-03-26 10:21:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

allow explicit drop of GeneralGuard

Browse Source
This commit is contained in:
Aiden McClelland
2021-09-11 13:44:33 -06:00
committed by Aiden McClelland
parent 93acf1b6a0
commit 5211f7b2a0
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
appmgr/src/util/mod.rs
View File

@@ -1031,17 +1031,21 @@ impl<T> Future for NonDetachingJoinHandle<T> {
}
}
pub struct GeneralGuard<F: FnOnce()>(Option<F>);
impl<F: FnOnce()> GeneralGuard<F> {
pub struct GeneralGuard<F: FnOnce() -> T, T = ()>(Option<F>);
impl<F: FnOnce() -> T, T> GeneralGuard<F, T> {
pub fn new(f: F) -> Self {
GeneralGuard(Some(f))
}
pub fn drop(mut self) -> T {
self.0.take().unwrap()()
}
}
impl<F: FnOnce()> Drop for GeneralGuard<F> {
impl<F: FnOnce() -> T, T> Drop for GeneralGuard<F, T> {
fn drop(&mut self) {
if let Some(destroy) = self.0.take() {
destroy()
destroy();
}
}
}