Skip to content

Commit f12388c

Browse files
committed
Reformat
1 parent 6f83cee commit f12388c

File tree

5 files changed

+43
-63
lines changed

5 files changed

+43
-63
lines changed

Cargo.lock

Lines changed: 31 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

lib/text-size/src/range.rs

Lines changed: 5 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -83,10 +83,7 @@ impl TextRange {
8383
/// ```
8484
#[inline]
8585
pub const fn empty(offset: TextSize) -> TextRange {
86-
TextRange {
87-
start: offset,
88-
end: offset,
89-
}
86+
TextRange { start: offset, end: offset }
9087
}
9188

9289
/// Create a range up to the given end (`..end`).
@@ -105,10 +102,7 @@ impl TextRange {
105102
/// ```
106103
#[inline]
107104
pub const fn up_to(end: TextSize) -> TextRange {
108-
TextRange {
109-
start: TextSize::new(0),
110-
end,
111-
}
105+
TextRange { start: TextSize::new(0), end }
112106
}
113107
}
114108

@@ -130,9 +124,7 @@ impl TextRange {
130124
#[inline]
131125
pub const fn len(self) -> TextSize {
132126
// HACK for const fn: math on primitives only
133-
TextSize {
134-
raw: self.end().raw - self.start().raw,
135-
}
127+
TextSize { raw: self.end().raw - self.start().raw }
136128
}
137129

138130
/// Check if this range is empty.
@@ -418,17 +410,15 @@ impl Add<TextSize> for TextRange {
418410
type Output = TextRange;
419411
#[inline]
420412
fn add(self, offset: TextSize) -> TextRange {
421-
self.checked_add(offset)
422-
.expect("TextRange +offset overflowed")
413+
self.checked_add(offset).expect("TextRange +offset overflowed")
423414
}
424415
}
425416

426417
impl Sub<TextSize> for TextRange {
427418
type Output = TextRange;
428419
#[inline]
429420
fn sub(self, offset: TextSize) -> TextRange {
430-
self.checked_sub(offset)
431-
.expect("TextRange -offset overflowed")
421+
self.checked_sub(offset).expect("TextRange -offset overflowed")
432422
}
433423
}
434424

lib/text-size/src/serde_impls.rs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,7 @@ impl<'de> Deserialize<'de> for TextRange {
3838
{
3939
let (start, end) = Deserialize::deserialize(deserializer)?;
4040
if !(start <= end) {
41-
return Err(de::Error::custom(format!(
42-
"invalid range: {:?}..{:?}",
43-
start, end
44-
)));
41+
return Err(de::Error::custom(format!("invalid range: {:?}..{:?}", start, end)));
4542
}
4643
Ok(TextRange::new(start, end))
4744
}

lib/text-size/src/size.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ use {
55
fmt, iter,
66
num::TryFromIntError,
77
ops::{Add, AddAssign, Sub, SubAssign},
8-
u32,
98
},
109
};
1110

lib/text-size/tests/serde.rs

Lines changed: 6 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -20,60 +20,30 @@ fn size_serialization() {
2020
fn range_serialization() {
2121
assert_tokens(
2222
&range(00..10),
23-
&[
24-
Token::Tuple { len: 2 },
25-
Token::U32(00),
26-
Token::U32(10),
27-
Token::TupleEnd,
28-
],
23+
&[Token::Tuple { len: 2 }, Token::U32(00), Token::U32(10), Token::TupleEnd],
2924
);
3025
assert_tokens(
3126
&range(10..20),
32-
&[
33-
Token::Tuple { len: 2 },
34-
Token::U32(10),
35-
Token::U32(20),
36-
Token::TupleEnd,
37-
],
27+
&[Token::Tuple { len: 2 }, Token::U32(10), Token::U32(20), Token::TupleEnd],
3828
);
3929
assert_tokens(
4030
&range(20..30),
41-
&[
42-
Token::Tuple { len: 2 },
43-
Token::U32(20),
44-
Token::U32(30),
45-
Token::TupleEnd,
46-
],
31+
&[Token::Tuple { len: 2 }, Token::U32(20), Token::U32(30), Token::TupleEnd],
4732
);
4833
assert_tokens(
4934
&range(30..40),
50-
&[
51-
Token::Tuple { len: 2 },
52-
Token::U32(30),
53-
Token::U32(40),
54-
Token::TupleEnd,
55-
],
35+
&[Token::Tuple { len: 2 }, Token::U32(30), Token::U32(40), Token::TupleEnd],
5636
);
5737
}
5838

5939
#[test]
6040
fn invalid_range_deserialization() {
6141
assert_tokens::<TextRange>(
6242
&range(62..92),
63-
&[
64-
Token::Tuple { len: 2 },
65-
Token::U32(62),
66-
Token::U32(92),
67-
Token::TupleEnd,
68-
],
43+
&[Token::Tuple { len: 2 }, Token::U32(62), Token::U32(92), Token::TupleEnd],
6944
);
7045
assert_de_tokens_error::<TextRange>(
71-
&[
72-
Token::Tuple { len: 2 },
73-
Token::U32(92),
74-
Token::U32(62),
75-
Token::TupleEnd,
76-
],
46+
&[Token::Tuple { len: 2 }, Token::U32(92), Token::U32(62), Token::TupleEnd],
7747
"invalid range: 92..62",
7848
);
7949
}

0 commit comments

Comments
 (0)