diff --git a/crates/eww/src/main.rs b/crates/eww/src/main.rs index 6b2d9bd..d76b6ac 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 d11e053..ef7383b 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 d3acd6f..f2d688c 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;