From 6a76e2a1a57c63c07dd157accb8a2e11848984a6 Mon Sep 17 00:00:00 2001
From: elkowar <5300871+elkowar@users.noreply.github.com>
Date: Sat, 17 Feb 2024 12:46:21 +0100
Subject: [PATCH] Yeet trace_macros, extract_if, slice_concat_trait, never_type

---
 crates/eww/src/main.rs       | 3 ---
 crates/simplexpr/src/eval.rs | 4 ++--
 crates/simplexpr/src/lib.rs  | 1 -
 3 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/crates/eww/src/main.rs b/crates/eww/src/main.rs
index 6b2d9bdd..d76b6ac5 100644
--- a/crates/eww/src/main.rs
+++ b/crates/eww/src/main.rs
@@ -1,6 +1,3 @@
-#![feature(trace_macros)]
-#![feature(extract_if)]
-#![feature(slice_concat_trait)]
 #![feature(try_blocks)]
 #![allow(rustdoc::private_intra_doc_links)]
 
diff --git a/crates/simplexpr/src/eval.rs b/crates/simplexpr/src/eval.rs
index d11e053e..ef7383b5 100644
--- a/crates/simplexpr/src/eval.rs
+++ b/crates/simplexpr/src/eval.rs
@@ -9,7 +9,7 @@ use crate::{
 use eww_shared_util::{Span, Spanned, VarName};
 use std::{
     collections::HashMap,
-    convert::{TryFrom, TryInto},
+    convert::{Infallible, TryFrom, TryInto},
     str::FromStr,
     sync::Arc,
 };
@@ -126,7 +126,7 @@ impl SimplExpr {
     }
 
     pub fn map_var_refs(self, f: impl Fn(Span, VarName) -> SimplExpr) -> Self {
-        self.try_map_var_refs(|span, var| Ok::<_, !>(f(span, var))).into_ok()
+        self.try_map_var_refs(|span, var| Ok::<_, Infallible>(f(span, var))).unwrap()
     }
 
     /// resolve partially.
diff --git a/crates/simplexpr/src/lib.rs b/crates/simplexpr/src/lib.rs
index d3acd6f1..f2d688cb 100644
--- a/crates/simplexpr/src/lib.rs
+++ b/crates/simplexpr/src/lib.rs
@@ -1,6 +1,5 @@
 #![feature(try_blocks)]
 #![feature(unwrap_infallible)]
-#![feature(never_type)]
 
 pub mod ast;
 pub mod dynval;