Skip to content

Commit 7087796

Browse files
mkroeningIsaacWoods
authored andcommitted
feat(breaking): remove lifetime parameter from CapabilityIterator
The potential lifetime parameter is now part of `T`. Signed-off-by: Martin Kröning <[email protected]>
1 parent d243ca3 commit 7087796

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

src/capability/mod.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -89,19 +89,19 @@ impl PciCapability {
8989
}
9090
}
9191

92-
pub struct CapabilityIterator<'a, T: ConfigRegionAccess> {
92+
pub struct CapabilityIterator<T: ConfigRegionAccess> {
9393
address: PciAddress,
9494
offset: u16,
95-
access: &'a T,
95+
access: T,
9696
}
9797

98-
impl<'a, T: ConfigRegionAccess> CapabilityIterator<'a, T> {
99-
pub(crate) fn new(address: PciAddress, offset: u16, access: &'a T) -> CapabilityIterator<'a, T> {
98+
impl<T: ConfigRegionAccess> CapabilityIterator<T> {
99+
pub(crate) fn new(address: PciAddress, offset: u16, access: T) -> CapabilityIterator<T> {
100100
CapabilityIterator { address, offset, access }
101101
}
102102
}
103103

104-
impl<'a, T: ConfigRegionAccess> Iterator for CapabilityIterator<'a, T> {
104+
impl<T: ConfigRegionAccess> Iterator for CapabilityIterator<T> {
105105
type Item = PciCapability;
106106

107107
fn next(&mut self) -> Option<Self::Item> {
@@ -117,7 +117,7 @@ impl<'a, T: ConfigRegionAccess> Iterator for CapabilityIterator<'a, T> {
117117
id as u8,
118118
PciCapabilityAddress { address: self.address, offset: self.offset },
119119
extension,
120-
self.access,
120+
&self.access,
121121
);
122122
self.offset = next_ptr as u16;
123123
if let Some(cap) = cap {

src/lib.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -291,8 +291,8 @@ impl EndpointHeader {
291291
}
292292
}
293293

294-
pub fn capabilities<'a, T: ConfigRegionAccess>(&self, access: &'a T) -> CapabilityIterator<'a, T> {
295-
let pointer = self.capability_pointer(access);
294+
pub fn capabilities<T: ConfigRegionAccess>(&self, access: T) -> CapabilityIterator<T> {
295+
let pointer = self.capability_pointer(&access);
296296
CapabilityIterator::new(self.0, pointer, access)
297297
}
298298

0 commit comments

Comments
 (0)