Skip to content

Commit d358131

Browse files
committed
Use byte string literals where possible
1 parent d385f05 commit d358131

File tree

4 files changed

+19
-26
lines changed

4 files changed

+19
-26
lines changed

src/format_description/parse.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,12 +54,12 @@ fn parse_item<'a>(
5454
if let [b'[', b'[', remaining @ ..] = s {
5555
*index += 2;
5656
return Ok(ParsedItem {
57-
item: FormatItem::Literal(&[b'[']),
57+
item: FormatItem::Literal(b"["),
5858
remaining,
5959
});
6060
};
6161

62-
if s.starts_with(&[b'[']) {
62+
if s.starts_with(b"[") {
6363
if let Some(bracket_index) = s.iter().position(|&c| c == b']') {
6464
*index += 1; // opening bracket
6565
let ret_val = ParsedItem {

src/formatting/formattable.rs

Lines changed: 9 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -180,21 +180,21 @@ impl sealed::Sealed for Rfc3339 {
180180
}
181181

182182
bytes += format_number_pad_zero::<4, _, _>(output, year as u32)?;
183-
bytes += write(output, &[b'-'])?;
183+
bytes += write(output, b"-")?;
184184
bytes += format_number_pad_zero::<2, _, _>(output, date.month() as u8)?;
185-
bytes += write(output, &[b'-'])?;
185+
bytes += write(output, b"-")?;
186186
bytes += format_number_pad_zero::<2, _, _>(output, date.day())?;
187-
bytes += write(output, &[b'T'])?;
187+
bytes += write(output, b"T")?;
188188
bytes += format_number_pad_zero::<2, _, _>(output, time.hour())?;
189-
bytes += write(output, &[b':'])?;
189+
bytes += write(output, b":")?;
190190
bytes += format_number_pad_zero::<2, _, _>(output, time.minute())?;
191-
bytes += write(output, &[b':'])?;
191+
bytes += write(output, b":")?;
192192
bytes += format_number_pad_zero::<2, _, _>(output, time.second())?;
193193

194194
#[allow(clippy::if_not_else)]
195195
if time.nanosecond() != 0 {
196196
let nanos = time.nanosecond();
197-
bytes += write(output, &[b'.'])?;
197+
bytes += write(output, b".")?;
198198
bytes += if nanos % 10 != 0 {
199199
format_number_pad_zero::<9, _, _>(output, nanos)
200200
} else if (nanos / 10) % 10 != 0 {
@@ -217,20 +217,13 @@ impl sealed::Sealed for Rfc3339 {
217217
}
218218

219219
if offset == UtcOffset::UTC {
220-
bytes += write(output, &[b'Z'])?;
220+
bytes += write(output, b"Z")?;
221221
return Ok(bytes);
222222
}
223223

224-
bytes += write(
225-
output,
226-
if offset.is_negative() {
227-
&[b'-']
228-
} else {
229-
&[b'+']
230-
},
231-
)?;
224+
bytes += write(output, if offset.is_negative() { b"-" } else { b"+" })?;
232225
bytes += format_number_pad_zero::<2, _, _>(output, offset.whole_hours().unsigned_abs())?;
233-
bytes += write(output, &[b':'])?;
226+
bytes += write(output, b":")?;
234227
bytes +=
235228
format_number_pad_zero::<2, _, _>(output, offset.minutes_past_hour().unsigned_abs())?;
236229

src/formatting/mod.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,7 @@ pub(crate) fn format_number_pad_space<
198198
) -> Result<usize, io::Error> {
199199
let mut bytes = 0;
200200
for _ in 0..(WIDTH.saturating_sub(value.num_digits())) {
201-
bytes += write(output, &[b' '])?;
201+
bytes += write(output, b" ")?;
202202
}
203203
bytes += write(output, itoa::Buffer::new().format(value).as_bytes())?;
204204
Ok(bytes)
@@ -217,7 +217,7 @@ pub(crate) fn format_number_pad_zero<
217217
) -> Result<usize, io::Error> {
218218
let mut bytes = 0;
219219
for _ in 0..(WIDTH.saturating_sub(value.num_digits())) {
220-
bytes += write(output, &[b'0'])?;
220+
bytes += write(output, b"0")?;
221221
}
222222
bytes += write(output, itoa::Buffer::new().format(value).as_bytes())?;
223223
Ok(bytes)
@@ -371,9 +371,9 @@ fn fmt_year(
371371
let mut bytes = 0;
372372
if repr != modifier::YearRepr::LastTwo {
373373
if full_year < 0 {
374-
bytes += write(output, &[b'-'])?;
374+
bytes += write(output, b"-")?;
375375
} else if sign_is_mandatory || cfg!(feature = "large-dates") && full_year >= 10_000 {
376-
bytes += write(output, &[b'+'])?;
376+
bytes += write(output, b"+")?;
377377
}
378378
}
379379
bytes += format_number(output, value.unsigned_abs(), padding)?;
@@ -478,9 +478,9 @@ fn fmt_offset_hour(
478478
) -> Result<usize, io::Error> {
479479
let mut bytes = 0;
480480
if offset.is_negative() {
481-
bytes += write(output, &[b'-'])?;
481+
bytes += write(output, b"-")?;
482482
} else if sign_is_mandatory {
483-
bytes += write(output, &[b'+'])?;
483+
bytes += write(output, b"+")?;
484484
}
485485
bytes += format_number::<2, _, _>(output, offset.whole_hours().unsigned_abs(), padding)?;
486486
Ok(bytes)

time-macros/src/format_description/parse.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,12 +43,12 @@ fn parse_item<'a>(
4343
if let [b'[', b'[', remaining @ ..] = s {
4444
*index += 2;
4545
return Ok(ParsedItem {
46-
item: FormatItem::Literal(&[b'[']),
46+
item: FormatItem::Literal(b"["),
4747
remaining,
4848
});
4949
};
5050

51-
if s.starts_with(&[b'[']) {
51+
if s.starts_with(b"[") {
5252
if let Some(bracket_index) = s.iter().position(|&c| c == b']') {
5353
*index += 1; // opening bracket
5454
let ret_val = ParsedItem {

0 commit comments

Comments
 (0)