chore: update as necessary for upstream iced changes

3 files changed, 17 insertions, 17 deletions

diff --git a/examples/markdown/src/main.rs b/examples/markdown/src/main.rs
index fae13ca..4963792 100644
--- a/examples/markdown/src/main.rs
+++ b/examples/markdown/src/main.rs
@@ -17,7 +17,7 @@ struct State {
 #[derive(Debug, Clone)]
 enum Message {
     Edit(text_editor::Action),
-    LinkClicked(markdown::Url),
+    LinkClicked(markdown::Uri),
 }
 
 impl State {
@@ -45,7 +45,7 @@ impl State {
                 }
             }
             Message::LinkClicked(link) => {
-                let _ = open::that_in_background(link.to_string());
+                let _ = open::that_in_background(link);
             }
         }
     }
diff --git a/src/markdown.rs b/src/markdown.rs
index 9217409..f868f05 100644
--- a/src/markdown.rs
+++ b/src/markdown.rs
@@ -3,7 +3,7 @@ use iced_widget::graphics::text::Paragraph;
 use iced_widget::markdown::{
     Catalog, HeadingLevel, Item, Settings, Text, Viewer, view_with,
 };
-pub use iced_widget::markdown::{Content, Url, parse};
+pub use iced_widget::markdown::{Content, Uri, parse};
 use iced_widget::{column, container, row, scrollable};
 
 use crate::core::Font;
@@ -16,7 +16,7 @@ use crate::{rich_text, text};
 pub fn view<'a, Theme, Renderer>(
     items: impl IntoIterator<Item = &'a Item>,
     settings: impl Into<Settings>,
-) -> Element<'a, Url, Theme, Renderer>
+) -> Element<'a, Uri, Theme, Renderer>
 where
     Theme: Catalog + text::Catalog + 'a,
     Renderer: core::text::Renderer<Paragraph = Paragraph, Font = Font> + 'a,
@@ -29,7 +29,7 @@ pub fn heading<'a, Message, Theme, Renderer>(
     level: &'a HeadingLevel,
     text: &'a Text,
     index: usize,
-    on_link_click: impl Fn(Url) -> Message + 'a,
+    on_link_click: impl Fn(Uri) -> Message + 'a,
 ) -> Element<'a, Message, Theme, Renderer>
 where
     Message: 'a,
@@ -71,7 +71,7 @@ where
 pub fn paragraph<'a, Message, Theme, Renderer>(
     settings: Settings,
     text: &Text,
-    on_link_click: impl Fn(Url) -> Message + 'a,
+    on_link_click: impl Fn(Uri) -> Message + 'a,
 ) -> Element<'a, Message, Theme, Renderer>
 where
     Message: 'a,
@@ -161,7 +161,7 @@ where
 pub fn code_block<'a, Message, Theme, Renderer>(
     settings: Settings,
     lines: &'a [Text],
-    on_link_click: impl Fn(Url) -> Message + Clone + 'a,
+    on_link_click: impl Fn(Uri) -> Message + Clone + 'a,
 ) -> Element<'a, Message, Theme, Renderer>
 where
     Message: 'a,
@@ -194,12 +194,12 @@ where
 #[derive(Debug, Clone, Copy)]
 struct SelectableViewer;
 
-impl<'a, Theme, Renderer> Viewer<'a, Url, Theme, Renderer> for SelectableViewer
+impl<'a, Theme, Renderer> Viewer<'a, Uri, Theme, Renderer> for SelectableViewer
 where
     Theme: Catalog + text::Catalog + 'a,
     Renderer: core::text::Renderer<Paragraph = Paragraph, Font = Font> + 'a,
 {
-    fn on_link_click(url: Url) -> Url {
+    fn on_link_click(url: Uri) -> Uri {
         url
     }
 
@@ -209,8 +209,8 @@ where
         level: &'a HeadingLevel,
         text: &'a Text,
         index: usize,
-    ) -> Element<'a, Url, Theme, Renderer> {
-        heading::<'a, Url, Theme, Renderer>(
+    ) -> Element<'a, Uri, Theme, Renderer> {
+        heading::<'a, Uri, Theme, Renderer>(
             settings,
             level,
             text,
@@ -223,7 +223,7 @@ where
         &self,
         settings: Settings,
         text: &Text,
-    ) -> Element<'a, Url, Theme, Renderer> {
+    ) -> Element<'a, Uri, Theme, Renderer> {
         paragraph(settings, text, |url| url)
     }
 
@@ -231,7 +231,7 @@ where
         &self,
         settings: Settings,
         items: &'a [Vec<Item>],
-    ) -> Element<'a, Url, Theme, Renderer> {
+    ) -> Element<'a, Uri, Theme, Renderer> {
         unordered_list(self, settings, items)
     }
 
@@ -240,7 +240,7 @@ where
         settings: Settings,
         start: u64,
         items: &'a [Vec<Item>],
-    ) -> Element<'a, Url, Theme, Renderer> {
+    ) -> Element<'a, Uri, Theme, Renderer> {
         ordered_list(self, settings, start, items)
     }
 
@@ -250,7 +250,7 @@ where
         _language: Option<&'a str>,
         _code: &'a str,
         lines: &'a [Text],
-    ) -> Element<'a, Url, Theme, Renderer> {
+    ) -> Element<'a, Uri, Theme, Renderer> {
         code_block(settings, lines, |url| url)
     }
 }
diff --git a/src/text/rich.rs b/src/text/rich.rs
index 5ca3051..4a7549f 100644
--- a/src/text/rich.rs
+++ b/src/text/rich.rs
@@ -447,8 +447,8 @@ where
                                 ),
                             bounds.size()
                                 + Size::new(
-                                    span.padding.horizontal(),
-                                    span.padding.vertical(),
+                                    span.padding.x(),
+                                    span.padding.y(),
                                 ),
                         );