diff --git a/crates/eww/src/main.rs b/crates/eww/src/main.rs index f142c0e..6b2d9bd 100644 --- a/crates/eww/src/main.rs +++ b/crates/eww/src/main.rs @@ -2,8 +2,6 @@ #![feature(extract_if)] #![feature(slice_concat_trait)] #![feature(try_blocks)] -#![feature(hash_extract_if)] -#![feature(let_chains)] #![allow(rustdoc::private_intra_doc_links)] extern crate gtk; diff --git a/crates/eww/src/widgets/widget_definitions.rs b/crates/eww/src/widgets/widget_definitions.rs index 01b5056..0166ba5 100644 --- a/crates/eww/src/widgets/widget_definitions.rs +++ b/crates/eww/src/widgets/widget_definitions.rs @@ -128,8 +128,7 @@ static DEPRECATED_ATTRS: Lazy> = /// @widget widget /// @desc these properties apply to _all_ widgets, and can be used anywhere! pub(super) fn resolve_widget_attrs(bargs: &mut BuilderArgs, gtk_widget: >k::Widget) -> Result<()> { - let deprecated: HashSet<_> = DEPRECATED_ATTRS.to_owned(); - let contained_deprecated: Vec<_> = bargs.unhandled_attrs.extract_if(|a, _| deprecated.contains(&a.0 as &str)).collect(); + let contained_deprecated: Vec<_> = DEPRECATED_ATTRS.iter().filter_map(|x| bargs.unhandled_attrs.remove_entry(*x)).collect(); if !contained_deprecated.is_empty() { let diag = error_handling_ctx::stringify_diagnostic(gen_diagnostic! { kind = Severity::Error,