commit 4a34b0d78148e4148dc79136a34afdc0125e75d5
author Jaewan Kim <jaewan@google.com> Fri Jan 19 13:17:47 2024 +0900
committer Jaewan Kim <jaewan@google.com> Thu Jan 25 00:43:46 2024 +0900
tree 123e4ac2a1e2bdf66b0af69af272972e9cdbef58
parent 1ec249c4961434e5d10ca4871a4ab6e3f2fa2bd4

libfdt: Fix subnodes() lifetime

Bug: 318431695
Test: atest liblibfdt.integration_test
Change-Id: Ib0ca4c9eb74918896666544793362acfc372e689

libs/libfdt/src/iterators.rs

diff --git a/libs/libfdt/src/iterators.rs b/libs/libfdt/src/iterators.rs
index 7406164..e818c68 100644
--- a/libs/libfdt/src/iterators.rs
+++ b/libs/libfdt/src/iterators.rs
@@ -304,7 +304,7 @@
 }
 
 impl<'a> SubnodeIterator<'a> {
-    pub(crate) fn new(node: &'a FdtNode) -> Result<Self, FdtError> {
+    pub(crate) fn new(node: &FdtNode<'a>) -> Result<Self, FdtError> {
         let subnode = node.first_subnode()?;
 
         Ok(Self { subnode })

libs/libfdt/src/lib.rs

diff --git a/libs/libfdt/src/lib.rs b/libs/libfdt/src/lib.rs
index d90f5f0..9782dde 100644
--- a/libs/libfdt/src/lib.rs
+++ b/libs/libfdt/src/lib.rs
@@ -468,7 +468,7 @@
     }
 
     /// Returns an iterator of subnodes
-    pub fn subnodes(&'a self) -> Result<SubnodeIterator<'a>> {
+    pub fn subnodes(&self) -> Result<SubnodeIterator<'a>> {
         SubnodeIterator::new(self)
     }