summaryrefslogtreecommitdiffstats
path: root/winit
diff options
context:
space:
mode:
authorLibravatar Héctor Ramón Jiménez <hector@hecrj.dev>2023-10-27 03:58:45 +0200
committerLibravatar Héctor Ramón Jiménez <hector@hecrj.dev>2023-10-27 03:58:45 +0200
commit65823875791ecebf24d049cc0782e7475a37899b (patch)
tree1088c656ef7ad9782374952045022d2c104931b2 /winit
parent8cc19de254c37d3123d5ea1b6513f1f34d35c7c8 (diff)
parentf1b1344d59fa7354615f560bd25ed01ad0c9f865 (diff)
downloadiced-65823875791ecebf24d049cc0782e7475a37899b.tar.gz
iced-65823875791ecebf24d049cc0782e7475a37899b.tar.bz2
iced-65823875791ecebf24d049cc0782e7475a37899b.zip
Merge branch 'master' into text-editor
Diffstat (limited to 'winit')
-rw-r--r--winit/src/application.rs14
-rw-r--r--winit/src/clipboard.rs4
-rw-r--r--winit/src/lib.rs6
-rw-r--r--winit/src/settings.rs2
-rw-r--r--winit/src/system.rs2
5 files changed, 11 insertions, 17 deletions
diff --git a/winit/src/application.rs b/winit/src/application.rs
index e80e9783..315e34d9 100644
--- a/winit/src/application.rs
+++ b/winit/src/application.rs
@@ -157,7 +157,7 @@ where
)
.with_visible(false);
- log::debug!("Window builder: {:#?}", builder);
+ log::debug!("Window builder: {builder:#?}");
let window = builder
.build(&event_loop)
@@ -174,7 +174,7 @@ where
let body = document.body().unwrap();
let target = target.and_then(|target| {
- body.query_selector(&format!("#{}", target))
+ body.query_selector(&format!("#{target}"))
.ok()
.unwrap_or(None)
});
@@ -769,7 +769,7 @@ pub fn run_command<A, C, E>(
size.width,
size.height,
)))
- .expect("Send message to event loop")
+ .expect("Send message to event loop");
}
window::Action::Maximize(maximized) => {
window.set_maximized(maximized);
@@ -791,7 +791,7 @@ pub fn run_command<A, C, E>(
));
}
window::Action::ChangeIcon(icon) => {
- window.set_window_icon(conversion::icon(icon))
+ window.set_window_icon(conversion::icon(icon));
}
window::Action::FetchMode(tag) => {
let mode = if window.is_visible().unwrap_or(true) {
@@ -805,7 +805,7 @@ pub fn run_command<A, C, E>(
.expect("Send message to event loop");
}
window::Action::ToggleMaximize => {
- window.set_maximized(!window.is_maximized())
+ window.set_maximized(!window.is_maximized());
}
window::Action::ToggleDecorations => {
window.set_decorations(!window.is_decorated());
@@ -840,7 +840,7 @@ pub fn run_command<A, C, E>(
bytes,
state.physical_size(),
)))
- .expect("Send message to event loop.")
+ .expect("Send message to event loop.");
}
},
command::Action::System(action) => match action {
@@ -858,7 +858,7 @@ pub fn run_command<A, C, E>(
proxy
.send_event(message)
- .expect("Send message to event loop")
+ .expect("Send message to event loop");
});
}
}
diff --git a/winit/src/clipboard.rs b/winit/src/clipboard.rs
index 7271441d..f7a32868 100644
--- a/winit/src/clipboard.rs
+++ b/winit/src/clipboard.rs
@@ -45,7 +45,7 @@ impl Clipboard {
State::Connected(clipboard) => match clipboard.write(contents) {
Ok(()) => {}
Err(error) => {
- log::warn!("error writing to clipboard: {}", error)
+ log::warn!("error writing to clipboard: {error}");
}
},
State::Unavailable => {}
@@ -59,6 +59,6 @@ impl crate::core::Clipboard for Clipboard {
}
fn write(&mut self, contents: String) {
- self.write(contents)
+ self.write(contents);
}
}
diff --git a/winit/src/lib.rs b/winit/src/lib.rs
index 9852a182..95b55bb9 100644
--- a/winit/src/lib.rs
+++ b/winit/src/lib.rs
@@ -22,15 +22,9 @@
missing_debug_implementations,
missing_docs,
unused_results,
- clippy::extra_unused_lifetimes,
- clippy::from_over_into,
- clippy::needless_borrow,
- clippy::new_without_default,
- clippy::useless_conversion,
unsafe_code,
rustdoc::broken_intra_doc_links
)]
-#![allow(clippy::inherent_to_string, clippy::type_complexity)]
#![cfg_attr(docsrs, feature(doc_auto_cfg))]
pub use iced_graphics as graphics;
pub use iced_runtime as runtime;
diff --git a/winit/src/settings.rs b/winit/src/settings.rs
index b4a1dd61..9d2bfbbc 100644
--- a/winit/src/settings.rs
+++ b/winit/src/settings.rs
@@ -239,7 +239,7 @@ impl Default for Window {
transparent: false,
level: Level::default(),
icon: None,
- platform_specific: Default::default(),
+ platform_specific: PlatformSpecific::default(),
}
}
}
diff --git a/winit/src/system.rs b/winit/src/system.rs
index 145a4d92..d4cef60e 100644
--- a/winit/src/system.rs
+++ b/winit/src/system.rs
@@ -23,7 +23,7 @@ pub(crate) fn information(
let memory_used = sysinfo::get_current_pid()
.and_then(|pid| system.process(pid).ok_or("Process not found"))
- .map(|process| process.memory())
+ .map(ProcessExt::memory)
.ok();
Information {