Skip to content

Commit

Permalink
fix: fix lints
Browse files Browse the repository at this point in the history
Combined diff of a7a09ea and bfc5cb9

Co-authored-by: Johan Geluk <[email protected]>
  • Loading branch information
w-lfchen and geluk committed Aug 13, 2024
1 parent 434353f commit 256cc6f
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 4 deletions.
1 change: 0 additions & 1 deletion crates/eww/src/widgets/systray.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ use crate::widgets::window::Window;
use futures::StreamExt;
use gdk::NotifyType;
use gtk::{cairo::Surface, gdk::ffi::gdk_cairo_surface_create_from_pixbuf, prelude::*};
use notifier_host;
use std::{cell::RefCell, future::Future, rc::Rc};

// DBus state shared between systray instances, to avoid creating too many connections etc.
Expand Down
4 changes: 2 additions & 2 deletions crates/eww/src/window_arguments.rs
Original file line number Diff line number Diff line change
Expand Up @@ -59,10 +59,10 @@ impl WindowArguments {

// Ensure that the arguments passed to the window that are already interpreted by eww (id, screen)
// are set to the correct values
if expected_args.contains(&"id".to_string()) {
if expected_args.contains(&String::from("id")) {
local_variables.insert(VarName::from("id"), DynVal::from(self.instance_id.clone()));
}
if self.monitor.is_some() && expected_args.contains(&"screen".to_string()) {
if self.monitor.is_some() && expected_args.contains(&String::from("screen")) {
let mon_dyn = DynVal::from(&self.monitor.clone().unwrap());
local_variables.insert(VarName::from("screen"), mon_dyn);
}
Expand Down
2 changes: 1 addition & 1 deletion crates/notifier_host/src/icon.rs
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ fn icon_from_name(
) -> std::result::Result<gtk::gdk_pixbuf::Pixbuf, IconError> {
let theme = if let Some(path) = theme_path {
let theme = gtk::IconTheme::new();
theme.prepend_search_path(&path);
theme.prepend_search_path(path);
theme
} else {
gtk::IconTheme::default().expect("Could not get default gtk theme")
Expand Down

0 comments on commit 256cc6f

Please sign in to comment.