diff --git a/svd-parser/src/elementext.rs b/svd-parser/src/elementext.rs index 63f2ad1..044a759 100644 --- a/svd-parser/src/elementext.rs +++ b/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(&self, k: K) -> Option + fn get_child(&self, k: K) -> Option> where K: AsRef; fn get_child_text_opt(&self, k: K) -> Result, SVDErrorAt> @@ -20,7 +20,7 @@ pub trait ElementExt { fn get_text(&self) -> Result<&str, SVDErrorAt>; - fn get_child_elem(&self, n: &str) -> Result; + fn get_child_elem(&self, n: &str) -> Result, SVDErrorAt>; fn get_child_u32(&self, n: &str) -> Result; fn get_child_u64(&self, n: &str) -> Result; fn get_child_bool(&self, n: &str) -> Result; @@ -30,7 +30,7 @@ pub trait ElementExt { /// Implements extensions for roxmltree::Node impl ElementExt for Node<'_, '_> { - fn get_child(&self, k: K) -> Option + fn get_child(&self, k: K) -> Option> where K: AsRef, { @@ -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 { + fn get_child_elem(&self, n: &str) -> Result, SVDErrorAt> { self.get_child(n) .ok_or_else(|| SVDError::MissingTag(n.to_string()).at(self.id())) } diff --git a/svd-rs/src/cluster.rs b/svd-rs/src/cluster.rs index f9c15ab..f6a57ef 100644 --- a/svd-rs/src/cluster.rs +++ b/svd-rs/src/cluster.rs @@ -276,12 +276,12 @@ 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(), } @@ -289,40 +289,40 @@ impl ClusterInfo { /// 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(), } diff --git a/svd-rs/src/dimelement.rs b/svd-rs/src/dimelement.rs index b351f05..a6d618d 100644 --- a/svd-rs/src/dimelement.rs +++ b/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, diff --git a/svd-rs/src/peripheral.rs b/svd-rs/src/peripheral.rs index 1867822..fffcd11 100644 --- a/svd-rs/src/peripheral.rs +++ b/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(), diff --git a/svd-rs/src/register.rs b/svd-rs/src/register.rs index b9a8622..eb4198b 100644 --- a/svd-rs/src/register.rs +++ b/svd-rs/src/register.rs @@ -396,7 +396,7 @@ impl RegisterInfo { } /// Returns iterator over child fields - pub fn fields(&self) -> std::slice::Iter { + pub fn fields(&self) -> std::slice::Iter<'_, Field> { match &self.fields { Some(fields) => fields.iter(), None => [].iter(), @@ -404,7 +404,7 @@ impl RegisterInfo { } /// Returns mutable iterator over child fields - pub fn fields_mut(&mut self) -> std::slice::IterMut { + pub fn fields_mut(&mut self) -> std::slice::IterMut<'_, Field> { match &mut self.fields { Some(fields) => fields.iter_mut(), None => [].iter_mut(),