Refactor UInt Shr implementation (#169)

GarmashAlex · Pratyush · web-flow · commit b02b0c29115f · 2025-05-21T04:28:29.000Z
Co-authored-by: Pratyush Mishra &lt;pratyush795@gmail.com&gt;
diff --git a/src/uint/shr.rs b/src/uint/shr.rs
@@ -14,7 +14,7 @@ impl<const N: usize, T: PrimUInt, F: PrimeField> UInt<N, T, F> {
                 *a = b.clone();
             }
 
-            let value = self.value.and_then(|a| Some(a >> other));
+            let value = self.value.map(|a| a >> other);
             Ok(Self { bits, value })
         } else {
             panic!("attempt to shift right with overflow")
@@ -53,7 +53,7 @@ impl<const N: usize, T: PrimUInt, F: PrimeField, T2: PrimUInt> Shr<T2> for UInt<
     }
 }
 
-impl<'a, const N: usize, T: PrimUInt, F: PrimeField, T2: PrimUInt> Shr<T2> for &'a UInt<N, T, F> {
+impl<const N: usize, T: PrimUInt, F: PrimeField, T2: PrimUInt> Shr<T2> for &UInt<N, T, F> {
     type Output = UInt<N, T, F>;
 
     #[tracing::instrument(target = "gr1cs", skip(self, other))]

Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ impl<const N: usize, T: PrimUInt, F: PrimeField> UInt<N, T, F> {`
`14`	`14`	`*a = b.clone();`
`15`	`15`	`}`
`16`	`16`
`17`		`- let value = self.value.and_then(\|a\| Some(a >> other));`
	`17`	`+ let value = self.value.map(\|a\| a >> other);`
`18`	`18`	`Ok(Self { bits, value })`
`19`	`19`	`} else {`
`20`	`20`	`panic!("attempt to shift right with overflow")`
`@@ -53,7 +53,7 @@ impl<const N: usize, T: PrimUInt, F: PrimeField, T2: PrimUInt> Shr<T2> for UInt<`
`53`	`53`	`}`
`54`	`54`	`}`
`55`	`55`
`56`		`-impl<'a, const N: usize, T: PrimUInt, F: PrimeField, T2: PrimUInt> Shr<T2> for &'a UInt<N, T, F> {`
	`56`	`+impl<const N: usize, T: PrimUInt, F: PrimeField, T2: PrimUInt> Shr<T2> for &UInt<N, T, F> {`
`57`	`57`	`type Output = UInt<N, T, F>;`
`58`	`58`
`59`	`59`	`#[tracing::instrument(target = "gr1cs", skip(self, other))]`