itsscb/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2026-01-17 17:12:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge rust-analyzer/text-size#8

Browse Source 
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 <cad97@cad97.com>
This commit is contained in:
bors[bot] 2020-03-13 14:43:59 +00:00 committed by GitHub
commit 481494f76d
2 changed files with 33 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
lib/text-size/src/size.rs
View File

@ -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

2
lib/text-size/tests/main.rs
View File

@ -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));
}