Further cleanup

rust-lang · Jan 17, 2024 · 48ec833 · 48ec833
1 parent db7a0b2
commit 48ec833
Showing 1 changed file with 10 additions and 8 deletions.
diff --git a/build_zng.rs b/build_zng.rs
@@ -85,14 +85,16 @@ struct Ctx<'ctx> {
 
 impl<'ctx> Ctx<'ctx> {
     fn enable(&mut self, tf: TargetFeature) -> bool {
-        if let Some(enabled) = self.enabled {
-            if !enabled.contains(tf.check) {
-                return false;
-            }
-        }
+        let enabled = self
+            .enabled
+            .as_ref()
+            .expect("target features not set for ctx")
+            .contains(tf.check);
 
-        self.push(tf);
-        true
+        if enabled {
+            self.push(tf);
+        }
+        enabled
     }
 
     fn compile_check(&mut self, subdir: &str, tf: TargetFeature) -> bool {
@@ -226,7 +228,7 @@ impl<'ctx> Ctx<'ctx> {
 
 impl<'ctx> Drop for Ctx<'ctx> {
     fn drop(&mut self) {
-        let app = std::mem::replace(&mut self.append, Default::default());
+        let app = std::mem::take(&mut self.append);
         for flag in app.flags {
             self.cfg.flag(flag);
         }