pogmommy/eww
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Yeet hash_extract_if, let_chains

Browse source
This commit is contained in:
elkowar 2024-02-17 12:43:14 +01:00 • committed by ElKowar
parent e93f345210
commit 6c786447e5
2 changed files with 1 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
crates/eww/src/main.rs
View file

@ -2,8 +2,6 @@
#![feature(extract_if)] #![feature(extract_if)]
#![feature(slice_concat_trait)] #![feature(slice_concat_trait)]
#![feature(try_blocks)] #![feature(try_blocks)]
#![feature(hash_extract_if)]
#![feature(let_chains)]
#![allow(rustdoc::private_intra_doc_links)] #![allow(rustdoc::private_intra_doc_links)]
extern crate gtk; extern crate gtk;

3
crates/eww/src/widgets/widget_definitions.rs
View file

@ -128,8 +128,7 @@ static DEPRECATED_ATTRS: Lazy<HashSet<&str>> =
/// @widget widget /// @widget widget
/// @desc these properties apply to _all_ widgets, and can be used anywhere! /// @desc these properties apply to _all_ widgets, and can be used anywhere!
pub(super) fn resolve_widget_attrs(bargs: &mut BuilderArgs, gtk_widget: &gtk::Widget) -> Result<()> { pub(super) fn resolve_widget_attrs(bargs: &mut BuilderArgs, gtk_widget: &gtk::Widget) -> Result<()> {
let deprecated: HashSet<_> = DEPRECATED_ATTRS.to_owned(); let contained_deprecated: Vec<_> = DEPRECATED_ATTRS.iter().filter_map(|x| bargs.unhandled_attrs.remove_entry(*x)).collect();
let contained_deprecated: Vec<_> = bargs.unhandled_attrs.extract_if(|a, _| deprecated.contains(&a.0 as &str)).collect();
if !contained_deprecated.is_empty() { if !contained_deprecated.is_empty() {
let diag = error_handling_ctx::stringify_diagnostic(gen_diagnostic! { let diag = error_handling_ctx::stringify_diagnostic(gen_diagnostic! {
kind = Severity::Error, kind = Severity::Error,