Merge pull request #411 from rust-osdev/optional-take

phil-opp · web-flow · commit 751585c6fa7a · 2023-12-29T20:25:10.000+01:00
Add a `take` method to `Optional`
diff --git a/api/src/info.rs b/api/src/info.rs
@@ -341,6 +341,11 @@ impl<T> Optional<T> {
             Self::None => None,
         }
     }
+
+    /// Takes the value out of the `Optional`, leaving a `None` in its place.
+    pub fn take(&mut self) -> Option<T> {
+        core::mem::replace(self, Optional::None).into_option()
+    }
 }
 
 impl<T> From<Option<T>> for Optional<T> {

Original file line number	Diff line number	Diff line change
`@@ -341,6 +341,11 @@ impl<T> Optional<T> {`
`341`	`341`	`Self::None => None,`
`342`	`342`	`}`
`343`	`343`	`}`
	`344`	`+`
	`345`	+ /// Takes the value out of the `Optional`, leaving a `None` in its place.
	`346`	`+ pub fn take(&mut self) -> Option<T> {`
	`347`	`+ core::mem::replace(self, Optional::None).into_option()`
	`348`	`+ }`
`344`	`349`	`}`
`345`	`350`
`346`	`351`	`impl<T> From<Option<T>> for Optional<T> {`