Yeet trace_macros, extract_if, slice_concat_trait, never_type

This commit is contained in:
elkowar 2024-02-17 12:46:21 +01:00 committed by ElKowar
parent 6c786447e5
commit 0eed19332b
3 changed files with 2 additions and 6 deletions

View file

@ -1,6 +1,3 @@
#![feature(trace_macros)]
#![feature(extract_if)]
#![feature(slice_concat_trait)]
#![feature(try_blocks)] #![feature(try_blocks)]
#![allow(rustdoc::private_intra_doc_links)] #![allow(rustdoc::private_intra_doc_links)]

View file

@ -9,7 +9,7 @@ use crate::{
use eww_shared_util::{Span, Spanned, VarName}; use eww_shared_util::{Span, Spanned, VarName};
use std::{ use std::{
collections::HashMap, collections::HashMap,
convert::{TryFrom, TryInto}, convert::{Infallible, TryFrom, TryInto},
str::FromStr, str::FromStr,
sync::Arc, sync::Arc,
}; };
@ -126,7 +126,7 @@ impl SimplExpr {
} }
pub fn map_var_refs(self, f: impl Fn(Span, VarName) -> SimplExpr) -> Self { 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. /// resolve partially.

View file

@ -1,6 +1,5 @@
#![feature(try_blocks)] #![feature(try_blocks)]
#![feature(unwrap_infallible)] #![feature(unwrap_infallible)]
#![feature(never_type)]
pub mod ast; pub mod ast;
pub mod dynval; pub mod dynval;