Merge remote-tracking branch 'upstream/master' into HEAD

Author: glaeqen

svd-parser/src/elementext.rs

@@ -8,7 +8,7 @@ use super::{Parse, SVDError, SVDErrorAt};
 
 /// Defines extensions for implementation over roxmltree::Node
 pub trait ElementExt {
-    fn get_child<K>(&self, k: K) -> Option<Node>
+    fn get_child<K>(&self, k: K) -> Option<Node<'_, '_>>
     where
         K: AsRef<str>;
     fn get_child_text_opt<K>(&self, k: K) -> Result<Option<String>, SVDErrorAt>
@@ -20,7 +20,7 @@ pub trait ElementExt {
 
     fn get_text(&self) -> Result<&str, SVDErrorAt>;
 
-    fn get_child_elem(&self, n: &str) -> Result<Node, SVDErrorAt>;
+    fn get_child_elem(&self, n: &str) -> Result<Node<'_, '_>, SVDErrorAt>;
     fn get_child_u32(&self, n: &str) -> Result<u32, SVDErrorAt>;
     fn get_child_u64(&self, n: &str) -> Result<u64, SVDErrorAt>;
     fn get_child_bool(&self, n: &str) -> Result<bool, SVDErrorAt>;
@@ -30,7 +30,7 @@ pub trait ElementExt {
 
 /// Implements extensions for roxmltree::Node
 impl ElementExt for Node<'_, '_> {
-    fn get_child<K>(&self, k: K) -> Option<Node>
+    fn get_child<K>(&self, k: K) -> Option<Node<'_, '_>>
     where
         K: AsRef<str>,
     {
@@ -80,7 +80,7 @@ impl ElementExt for Node<'_, '_> {
     }
 
     /// Get a named child element from an XML Element
-    fn get_child_elem(&self, n: &str) -> Result<Node, SVDErrorAt> {
+    fn get_child_elem(&self, n: &str) -> Result<Node<'_, '_>, SVDErrorAt> {
         self.get_child(n)
             .ok_or_else(|| SVDError::MissingTag(n.to_string()).at(self.id()))
     }

svd-rs/src/cluster.rs

@@ -276,53 +276,53 @@ impl ClusterInfo {
 
     /// Returns iterator over all descendant registers
     #[deprecated(since = "0.12.1", note = "Please use `all_registers` instead")]
-    pub fn reg_iter(&self) -> AllRegistersIter {
+    pub fn reg_iter(&self) -> AllRegistersIter<'_> {
         self.all_registers()
     }
 
     /// Returns iterator over all descendant registers
-    pub fn all_registers(&self) -> AllRegistersIter {
+    pub fn all_registers(&self) -> AllRegistersIter<'_> {
         AllRegistersIter {
             rem: self.children.iter().rev().collect(),
         }
     }
 
     /// Returns mutable iterator over all descendant registers
     #[deprecated(since = "0.12.1", note = "Please use `all_registers_mut` instead")]
-    pub fn reg_iter_mut(&mut self) -> AllRegistersIterMut {
+    pub fn reg_iter_mut(&mut self) -> AllRegistersIterMut<'_> {
         self.all_registers_mut()
     }
 
     /// Returns mutable iterator over all descendant registers
-    pub fn all_registers_mut(&mut self) -> AllRegistersIterMut {
+    pub fn all_registers_mut(&mut self) -> AllRegistersIterMut<'_> {
         AllRegistersIterMut {
             rem: self.children.iter_mut().rev().collect(),
         }
     }
 
     /// Returns iterator over child registers
-    pub fn registers(&self) -> RegisterIter {
+    pub fn registers(&self) -> RegisterIter<'_> {
         RegisterIter {
             all: self.children.iter(),
         }
     }
 
     /// Returns mutable iterator over child registers
-    pub fn registers_mut(&mut self) -> RegisterIterMut {
+    pub fn registers_mut(&mut self) -> RegisterIterMut<'_> {
         RegisterIterMut {
             all: self.children.iter_mut(),
         }
     }
 
     /// Returns iterator over child clusters
-    pub fn clusters(&self) -> ClusterIter {
+    pub fn clusters(&self) -> ClusterIter<'_> {
         ClusterIter {
             all: self.children.iter(),
         }
     }
 
     /// Returns mutable iterator over child clusters
-    pub fn clusters_mut(&mut self) -> ClusterIterMut {
+    pub fn clusters_mut(&mut self) -> ClusterIterMut<'_> {
         ClusterIterMut {
             all: self.children.iter_mut(),
         }

svd-rs/src/dimelement.rs

@@ -221,7 +221,7 @@ impl DimElement {
         Ok(())
     }
     /// Get the indexes of the array or list.
-    pub fn indexes(&self) -> Indexes {
+    pub fn indexes(&self) -> Indexes<'_> {
         Indexes {
             i: 0,
             dim: self.dim,

svd-rs/src/peripheral.rs

@@ -418,7 +418,7 @@ impl PeripheralInfo {
     }
 
     /// Returns iterator over child registers
-    pub fn registers(&self) -> RegisterIter {
+    pub fn registers(&self) -> RegisterIter<'_> {
         RegisterIter {
             all: match &self.registers {
                 Some(regs) => regs.iter(),
@@ -428,7 +428,7 @@ impl PeripheralInfo {
     }
 
     /// Returns mutable iterator over child registers
-    pub fn registers_mut(&mut self) -> RegisterIterMut {
+    pub fn registers_mut(&mut self) -> RegisterIterMut<'_> {
         RegisterIterMut {
             all: match &mut self.registers {
                 Some(regs) => regs.iter_mut(),
@@ -438,7 +438,7 @@ impl PeripheralInfo {
     }
 
     /// Returns iterator over child clusters
-    pub fn clusters(&self) -> ClusterIter {
+    pub fn clusters(&self) -> ClusterIter<'_> {
         ClusterIter {
             all: match &self.registers {
                 Some(regs) => regs.iter(),
@@ -448,7 +448,7 @@ impl PeripheralInfo {
     }
 
     /// Returns mutable iterator over child clusters
-    pub fn clusters_mut(&mut self) -> ClusterIterMut {
+    pub fn clusters_mut(&mut self) -> ClusterIterMut<'_> {
         ClusterIterMut {
             all: match &mut self.registers {
                 Some(regs) => regs.iter_mut(),
@@ -459,12 +459,12 @@ impl PeripheralInfo {
 
     /// Returns iterator over all descendant registers
     #[deprecated(since = "0.12.1", note = "Please use `all_registers` instead")]
-    pub fn reg_iter(&self) -> AllRegistersIter {
+    pub fn reg_iter(&self) -> AllRegistersIter<'_> {
         self.all_registers()
     }
 
     /// Returns iterator over all descendant registers
-    pub fn all_registers(&self) -> AllRegistersIter {
+    pub fn all_registers(&self) -> AllRegistersIter<'_> {
         AllRegistersIter {
             rem: match &self.registers {
                 Some(regs) => regs.iter().rev().collect(),
@@ -475,12 +475,12 @@ impl PeripheralInfo {
 
     /// Returns mutable iterator over all descendant registers
     #[deprecated(since = "0.12.1", note = "Please use `all_registers_mut` instead")]
-    pub fn reg_iter_mut(&mut self) -> AllRegistersIterMut {
+    pub fn reg_iter_mut(&mut self) -> AllRegistersIterMut<'_> {
         self.all_registers_mut()
     }
 
     /// Returns mutable iterator over all descendant registers
-    pub fn all_registers_mut(&mut self) -> AllRegistersIterMut {
+    pub fn all_registers_mut(&mut self) -> AllRegistersIterMut<'_> {
         AllRegistersIterMut {
             rem: match &mut self.registers {
                 Some(regs) => regs.iter_mut().rev().collect(),

svd-rs/src/register.rs

@@ -396,15 +396,15 @@ impl RegisterInfo {
     }
 
     /// Returns iterator over child fields
-    pub fn fields(&self) -> std::slice::Iter<Field> {
+    pub fn fields(&self) -> std::slice::Iter<'_, Field> {
         match &self.fields {
             Some(fields) => fields.iter(),
             None => [].iter(),
         }
     }
 
     /// Returns mutable iterator over child fields
-    pub fn fields_mut(&mut self) -> std::slice::IterMut<Field> {
+    pub fn fields_mut(&mut self) -> std::slice::IterMut<'_, Field> {
         match &mut self.fields {
             Some(fields) => fields.iter_mut(),
             None => [].iter_mut(),