bendns' repos / rust-analyzer
Unnamed repository; edit this file 'description' to name the repository.
Merge rust-analyzer/text-size#8
8: Provide ref-transparent ops for TextSize r=matklad a=CAD97 Counter-proposal to rust-analyzer/text-size#7. Basically the same set of impls, but set up slightly differently. Co-authored-by: CAD97 <[email protected]>
Browse Source
bors[bot] 2020-03-13
parent 9719ae3 · parent 1341116 · commit 481494f
Diffstat
-rw-r--r--lib/text-size/src/size.rs58
-rw-r--r--lib/text-size/tests/main.rs2
2 files changed, 33 insertions, 27 deletions
diff --git a/lib/text-size/src/size.rs b/lib/text-size/src/size.rs
index 867a0004ae..454327a015 100644
--- a/lib/text-size/src/size.rs
+++ b/lib/text-size/src/size.rs
@@ -100,46 +100,52 @@ impl From<TextSize> for usize {
}
}
-macro_rules! arith {
- ($Op:ident $op:ident, $OpAssign:ident $op_assign:ident) => {
+macro_rules! ops {
+ (impl $Op:ident for TextSize by fn $f:ident = $op:tt) => {
impl $Op<TextSize> for TextSize {
type Output = TextSize;
- fn $op(self, rhs: TextSize) -> TextSize {
- TextSize($Op::$op(self.raw, rhs.raw))
+ fn $f(self, other: TextSize) -> TextSize {
+ TextSize(self.raw $op other.raw)
}
}
- impl $Op<TextSize> for &'_ TextSize {
+ impl $Op<&TextSize> for TextSize {
type Output = TextSize;
- fn $op(self, rhs: TextSize) -> TextSize {
- TextSize($Op::$op(self.raw, rhs.raw))
+ fn $f(self, other: &TextSize) -> TextSize {
+ self $op *other
}
}
- impl $Op<&'_ TextSize> for TextSize {
- type Output = TextSize;
- fn $op(self, rhs: &TextSize) -> TextSize {
- TextSize($Op::$op(self.raw, rhs.raw))
- }
- }
- impl $Op<&'_ TextSize> for &'_ TextSize {
- type Output = TextSize;
- fn $op(self, rhs: &TextSize) -> TextSize {
- TextSize($Op::$op(self.raw, rhs.raw))
- }
- }
-
- impl<A> $OpAssign<A> for TextSize
+ impl<T> $Op<T> for &TextSize
where
- TextSize: $Op<A, Output = TextSize>,
+ TextSize: $Op<T, Output=TextSize>,
{
- fn $op_assign(&mut self, rhs: A) {
- *self = $Op::$op(*self, rhs)
+ type Output = TextSize;
+ fn $f(self, other: T) -> TextSize {
+ *self $op other
}
}
};
}
-arith!(Add add, AddAssign add_assign);
-arith!(Sub sub, SubAssign sub_assign);
+ops!(impl Add for TextSize by fn add = +);
+ops!(impl Sub for TextSize by fn sub = -);
+
+impl<A> AddAssign<A> for TextSize
+where
+ TextSize: Add<A, Output = TextSize>,
+{
+ fn add_assign(&mut self, rhs: A) {
+ *self = *self + rhs
+ }
+}
+
+impl<S> SubAssign<S> for TextSize
+where
+ TextSize: Sub<S, Output = TextSize>,
+{
+ fn sub_assign(&mut self, rhs: S) {
+ *self = *self - rhs
+ }
+}
impl<A> iter::Sum<A> for TextSize
where
diff --git a/lib/text-size/tests/main.rs b/lib/text-size/tests/main.rs
index 9a20cf9819..66b6106671 100644
--- a/lib/text-size/tests/main.rs
+++ b/lib/text-size/tests/main.rs
@@ -11,7 +11,7 @@ fn range(x: ops::Range<u32>) -> TextRange {
#[test]
fn sum() {
let xs: Vec<TextSize> = vec![size(0), size(1), size(2)];
- assert_eq!(xs.iter().copied().sum::<TextSize>(), size(3));
+ assert_eq!(xs.iter().sum::<TextSize>(), size(3));
assert_eq!(xs.into_iter().sum::<TextSize>(), size(3));
}