Merge branch 'master' into text-editor

3 files changed, 4 insertions, 10 deletions

diff --git a/src/lib.rs b/src/lib.rs
index e435a041..f9f3952c 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -156,14 +156,8 @@
     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,
     rustdoc::broken_intra_doc_links
 )]
-#![allow(clippy::inherent_to_string, clippy::type_complexity)]
 #![cfg_attr(docsrs, feature(doc_auto_cfg))]
 use iced_widget::graphics;
 use iced_widget::renderer;
diff --git a/src/settings.rs b/src/settings.rs
index 6b9ce095..42df31e4 100644
--- a/src/settings.rs
+++ b/src/settings.rs
@@ -83,10 +83,10 @@ where
     fn default() -> Self {
         Self {
             id: None,
-            window: Default::default(),
+            window: window::Settings::default(),
             flags: Default::default(),
-            fonts: Default::default(),
-            default_font: Default::default(),
+            fonts: Vec::new(),
+            default_font: Font::default(),
             default_text_size: Pixels(16.0),
             antialiasing: false,
             exit_on_close_request: true,
diff --git a/src/window/settings.rs b/src/window/settings.rs
index 458b9232..0ee573e5 100644
--- a/src/window/settings.rs
+++ b/src/window/settings.rs
@@ -52,7 +52,7 @@ impl Default for Settings {
             transparent: false,
             level: Level::default(),
             icon: None,
-            platform_specific: Default::default(),
+            platform_specific: PlatformSpecific::default(),
         }
     }
 }