Merge pull request #88 from element-hq/langleyd/update-rust-190

Update rust to 1.90 (stable)

Author: langleyd

Cargo.toml

@@ -13,7 +13,7 @@ default-members = [
 resolver = "2"
 
 [workspace.package]
-rust-version = "1.83"
+rust-version = "1.90"
 license-file = "README.md"
 
 [workspace.dependencies]

crates/wysiwyg/src/composer_model/lists.rs

@@ -183,7 +183,7 @@ where
     ) -> ComposerUpdate<S> {
         let list_loc_in_range =
             range.locations.iter().find(|l| l.kind == DomNodeKind::List);
-        let list_is_before_selection = list_loc_in_range.map_or(false, |l| {
+        let list_is_before_selection = list_loc_in_range.is_some_and(|l| {
             l.relative_position() == DomLocationPosition::Before
         });
         let list_is_last_node_in_selection =

crates/wysiwyg/src/composer_model/new_lines.rs

@@ -223,7 +223,7 @@ where
 
             let mut children = sub_tree_container.remove_children();
             let new_paragraph =
-                if children.first().map_or(false, |n| n.kind() == Paragraph) {
+                if children.first().is_some_and(|n| n.kind() == Paragraph) {
                     children.remove(0)
                 } else {
                     DomNode::new_paragraph(children)

crates/wysiwyg/src/dom/iter.rs

@@ -24,7 +24,7 @@ where
     S: UnicodeString,
 {
     /// Return an iterator over all nodes of this DOM, in depth-first order
-    pub fn iter(&self) -> DomIterator<S> {
+    pub fn iter(&self) -> DomIterator<'_, S> {
         DomIterator::over(self.document_node())
     }
 
@@ -48,34 +48,37 @@ where
 
     /// Return an iterator over all nodes of the DOM from the passed node,
     /// depth-first order (including self).
-    #[allow(elided_named_lifetimes)]
-    pub fn iter_from<'a>(&'a self, node: &'a DomNode<S>) -> DomNodeIterator<S> {
+    pub fn iter_from<'a>(
+        &'a self,
+        node: &'a DomNode<S>,
+    ) -> DomNodeIterator<'a, S> {
         DomNodeIterator::over(self, node)
     }
 
     /// Return an iterator over all nodes of the DOM from the passed DomHandle,
     /// depth-first order (including self).
-    pub fn iter_from_handle(&self, handle: &DomHandle) -> DomNodeIterator<S> {
+    pub fn iter_from_handle(
+        &self,
+        handle: &DomHandle,
+    ) -> DomNodeIterator<'_, S> {
         DomNodeIterator::over(self, self.lookup_node(handle))
     }
 
     /// Return an iterator over all handles of the DOM from the passed handle,
     /// depth-first order (including self).
-    #[allow(elided_named_lifetimes)]
     pub fn handle_iter_from<'a>(
         &'a self,
         handle: &'a DomHandle,
-    ) -> DomHandleIterator<S> {
+    ) -> DomHandleIterator<'a, S> {
         DomHandleIterator::over(self, handle)
     }
 
     /// Return an iterator over all text nodes of the DOM from the passed node,
     /// depth-first order (including self).
-    #[allow(elided_named_lifetimes)]
     pub fn iter_text_from<'a>(
         &'a self,
         node: &'a DomNode<S>,
-    ) -> impl Iterator<Item = &TextNode<S>> {
+    ) -> impl Iterator<Item = &'a TextNode<S>> {
         self.iter_from(node).filter_map(DomNode::as_text)
     }
 
@@ -135,7 +138,7 @@ where
 {
     /// Return an iterator over all nodes of the subtree starting from this
     /// node (including self), in depth-first order
-    pub fn iter_subtree(&self) -> DomIterator<S> {
+    pub fn iter_subtree(&self) -> DomIterator<'_, S> {
         DomIterator::over(self)
     }
 
@@ -212,7 +215,6 @@ where
     }
 }
 
-#[allow(clippy::needless_lifetimes)]
 impl<'a, S> DoubleEndedIterator for DomNodeIterator<'a, S>
 where
     S: UnicodeString,
@@ -300,7 +302,6 @@ where
     }
 }
 
-#[allow(clippy::needless_lifetimes)]
 impl<'a, S> Iterator for DomHandleIterator<'a, S>
 where
     S: UnicodeString,
@@ -330,7 +331,6 @@ where
     }
 }
 
-#[allow(clippy::needless_lifetimes)]
 impl<'a, S> DoubleEndedIterator for DomHandleIterator<'a, S>
 where
     S: UnicodeString,

crates/wysiwyg/src/dom/nodes/text_node.rs

@@ -220,17 +220,13 @@ where
         if !state.is_inside_code_block {
             escaped = escaped.replace("  ", "\u{A0}\u{A0}");
 
-            if state.next_sibling.is_none()
-                && escaped.chars().next_back().map_or(false, |c| c == ' ')
-            {
+            if state.next_sibling.is_none() && (escaped.ends_with(' ')) {
                 // If this is the last node and it ends in a space, replace that
                 // space with a non-breaking one.
                 escaped.replace_range(escaped.len() - 1.., "\u{A0}");
             }
 
-            if state.prev_sibling.is_none()
-                && escaped.chars().next().map_or(false, |c| c == ' ')
-            {
+            if state.prev_sibling.is_none() && (escaped.starts_with(' ')) {
                 // If this is the first node and it starts with a space, replace that
                 // space with a non-breaking one.
                 escaped.replace_range(..1, "\u{A0}");

crates/wysiwyg/src/dom/parser/parse.rs

@@ -396,22 +396,23 @@ mod sys {
                             _ => None,
                         };
 
-                        if is_mention && text.is_some() {
-                            self.current_path.push(DomNodeKind::Mention);
-                            let mention =
-                                Self::new_mention(child, text.unwrap());
-                            node.append_child(mention);
-                        } else {
-                            self.current_path.push(DomNodeKind::Link);
-
-                            let link = Self::new_link(child);
-                            node.append_child(link);
-                            self.convert_children(
-                                padom,
-                                child,
-                                last_container_mut_in(&mut node),
-                                html_source,
-                            )?;
+                        match (is_mention, text) {
+                            (true, Some(text)) => {
+                                self.current_path.push(DomNodeKind::Mention);
+                                let mention = Self::new_mention(child, text);
+                                node.append_child(mention);
+                            }
+                            _ => {
+                                self.current_path.push(DomNodeKind::Link);
+                                let link = Self::new_link(child);
+                                node.append_child(link);
+                                self.convert_children(
+                                    padom,
+                                    child,
+                                    last_container_mut_in(&mut node),
+                                    html_source,
+                                )?;
+                            }
                         }
                         self.current_path.remove(cur_path_idx);
                     }

rust-toolchain.toml

@@ -1,3 +1,3 @@
 [toolchain]
-channel = "1.83"
+channel = "1.90"
 components = ["rustfmt"]