diff --git a/src/nouveau/compiler/bitview/lib.rs b/src/nouveau/compiler/bitview/lib.rs index 4b4a42276b3..87600221586 100644 --- a/src/nouveau/compiler/bitview/lib.rs +++ b/src/nouveau/compiler/bitview/lib.rs @@ -264,31 +264,31 @@ pub trait SetField { fn set_field(&mut self, range: Range, val: T); } -impl<'a, T: SetFieldU64> SetField for T { +impl SetField for T { fn set_field(&mut self, range: Range, val: u64) { self.set_field_u64(range, val); } } -impl<'a, T: SetFieldU64> SetField for T { +impl SetField for T { fn set_field(&mut self, range: Range, val: u32) { self.set_field(range, u64::from(val)); } } -impl<'a, T: SetFieldU64> SetField for T { +impl SetField for T { fn set_field(&mut self, range: Range, val: u16) { self.set_field(range, u64::from(val)); } } -impl<'a, T: SetFieldU64> SetField for T { +impl SetField for T { fn set_field(&mut self, range: Range, val: u8) { self.set_field(range, u64::from(val)); } } -impl<'a, T: SetFieldU64> SetField for T { +impl SetField for T { fn set_field(&mut self, range: Range, val: bool) { assert!(range.end == range.start + 1); self.set_field(range, u64::from(val)); @@ -299,13 +299,13 @@ pub trait SetBit { fn set_bit(&mut self, bit: usize, val: bool); } -impl<'a, T: SetFieldU64> SetBit for T { +impl SetBit for T { fn set_bit(&mut self, bit: usize, val: bool) { self.set_field(bit..(bit + 1), val); } } -impl<'a, T: SetFieldU64> SetField for T { +impl SetField for T { fn set_field(&mut self, range: Range, val: i64) { let bits = range.end - range.start; let mask = u64_mask_for_bits(bits); @@ -321,19 +321,19 @@ impl<'a, T: SetFieldU64> SetField for T { } } -impl<'a, T: SetFieldU64> SetField for T { +impl SetField for T { fn set_field(&mut self, range: Range, val: i32) { self.set_field(range, i64::from(val)); } } -impl<'a, T: SetFieldU64> SetField for T { +impl SetField for T { fn set_field(&mut self, range: Range, val: i16) { self.set_field(range, i64::from(val)); } } -impl<'a, T: SetFieldU64> SetField for T { +impl SetField for T { fn set_field(&mut self, range: Range, val: i8) { self.set_field(range, i64::from(val)); } diff --git a/src/nouveau/compiler/nak/sph.rs b/src/nouveau/compiler/nak/sph.rs index e5f70b42f9d..9e2db02b4e8 100644 --- a/src/nouveau/compiler/nak/sph.rs +++ b/src/nouveau/compiler/nak/sph.rs @@ -133,7 +133,7 @@ impl ShaderProgramHeader { } #[inline] - fn common_word3<'a>(&mut self) -> SubSPHView<'_> { + fn common_word3(&mut self) -> SubSPHView<'_> { BitMutView::new_subset(&mut self.data, 96..128) }