Skip to content

Commit 9a4480f

Browse files
committed
Update lints
1 parent f11f9b2 commit 9a4480f

File tree

5 files changed

+19
-18
lines changed

5 files changed

+19
-18
lines changed

.github/workflows/build.yaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -257,8 +257,7 @@ jobs:
257257
run: |
258258
cargo clippy \
259259
--all-features \
260-
--benches \
261-
--tests \
260+
--all-targets \
262261
--target x86_64-unknown-linux-gnu \
263262
--target aarch64-apple-darwin \
264263
--target x86_64-pc-windows-gnu \

Cargo.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,6 @@ unused-import-braces = "warn"
9191
unused-lifetimes = "warn"
9292
unused-qualifications = "warn"
9393
# unused-results = "warn"
94-
unused-tuple-struct-fields = "warn"
9594
variant-size-differences = "warn"
9695

9796
[workspace.lints.clippy]

tests/serde/timestamps.rs

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ fn serialize_timestamp() {
6060
}
6161

6262
#[test]
63-
fn serialize_timestamp_milliseconds() {
63+
fn serialize_timestamp_milliseconds() -> serde_json::Result<()> {
6464
let value_milliseconds = TestMilliseconds {
6565
dt: datetime!(2000-01-01 00:00:00.999 UTC),
6666
};
@@ -78,14 +78,15 @@ fn serialize_timestamp_milliseconds() {
7878
);
7979
// serde_test does not support I128, see: https://github.com/serde-rs/test/issues/18
8080
let milliseconds_str = r#"{"dt":946684800999}"#;
81-
let deserialized_milliseconds: TestMilliseconds = serde_json::from_str(milliseconds_str).unwrap();
82-
let serialized_milliseconds = serde_json::to_string(&value_milliseconds).unwrap();
81+
let deserialized_milliseconds: TestMilliseconds = serde_json::from_str(milliseconds_str)?;
82+
let serialized_milliseconds = serde_json::to_string(&value_milliseconds)?;
8383
assert_eq!(value_milliseconds.dt, deserialized_milliseconds.dt);
8484
assert_eq!(serialized_milliseconds, milliseconds_str);
85+
Ok(())
8586
}
8687

8788
#[test]
88-
fn serialize_timestamp_microseconds() {
89+
fn serialize_timestamp_microseconds() -> serde_json::Result<()> {
8990
let value_microseconds = TestMicroseconds {
9091
dt: datetime!(2000-01-01 00:00:00.999_999 UTC),
9192
};
@@ -103,14 +104,15 @@ fn serialize_timestamp_microseconds() {
103104
);
104105
// serde_test does not support I128, see: https://github.com/serde-rs/test/issues/18
105106
let microseconds_str = r#"{"dt":946684800999999}"#;
106-
let deserialized_microseconds: TestMicroseconds = serde_json::from_str(microseconds_str).unwrap();
107-
let serialized_microseconds = serde_json::to_string(&value_microseconds).unwrap();
107+
let deserialized_microseconds: TestMicroseconds = serde_json::from_str(microseconds_str)?;
108+
let serialized_microseconds = serde_json::to_string(&value_microseconds)?;
108109
assert_eq!(value_microseconds.dt, deserialized_microseconds.dt);
109110
assert_eq!(serialized_microseconds, microseconds_str);
111+
Ok(())
110112
}
111113

112114
#[test]
113-
fn serialize_timestamp_nanoseconds() {
115+
fn serialize_timestamp_nanoseconds() -> serde_json::Result<()> {
114116
let value_nanoseconds = TestNanoseconds {
115117
dt: datetime!(2000-01-01 00:00:00.999_999_999 UTC),
116118
};
@@ -128,8 +130,9 @@ fn serialize_timestamp_nanoseconds() {
128130
);
129131
// serde_test does not support I128, see: https://github.com/serde-rs/test/issues/18
130132
let nanoseconds_str = r#"{"dt":946684800999999999}"#;
131-
let deserialized_nanoseconds: TestNanoseconds = serde_json::from_str(nanoseconds_str).unwrap();
132-
let serialized_nanoseconds = serde_json::to_string(&value_nanoseconds).unwrap();
133+
let deserialized_nanoseconds: TestNanoseconds = serde_json::from_str(nanoseconds_str)?;
134+
let serialized_nanoseconds = serde_json::to_string(&value_nanoseconds)?;
133135
assert_eq!(value_nanoseconds.dt, deserialized_nanoseconds.dt);
134136
assert_eq!(serialized_nanoseconds, nanoseconds_str);
137+
Ok(())
135138
}

time/src/format_description/parse/mod.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -239,7 +239,6 @@ impl From<Error> for crate::error::InvalidFormatDescription {
239239
struct Unused<T>(core::marker::PhantomData<T>);
240240

241241
/// Indicate that a value is currently unused.
242-
#[allow(clippy::missing_const_for_fn)] // false positive
243242
fn unused<T>(_: T) -> Unused<T> {
244243
Unused(core::marker::PhantomData)
245244
}

time/src/parsing/iso8601.rs

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ impl<const CONFIG: EncodedConfig> Iso8601<CONFIG> {
2121
// Basic: [year]["W"][week][dayk]
2222
// Extended: [year]["-"]["W"][week]["-"][dayk]
2323
/// Parse a date in the basic or extended format. Reduced precision is permitted.
24-
#[allow(clippy::needless_pass_by_ref_mut)] // rust-lang/rust-clippy#11620
2524
pub(crate) fn parse_date<'a>(
2625
parsed: &'a mut Parsed,
2726
extended_kind: &'a mut ExtendedKind,
@@ -37,7 +36,7 @@ impl<const CONFIG: EncodedConfig> Iso8601<CONFIG> {
3736
None => ExtendedKind::Basic, // no separator before mandatory month/ordinal/week
3837
};
3938

40-
let mut ret_error = match (|| {
39+
let parsed_month_day = (|| {
4140
let ParsedItem(mut input, month) = month(input).ok_or(InvalidComponent("month"))?;
4241
if extended_kind.is_extended() {
4342
input = ascii_char::<b'-'>(input)
@@ -46,7 +45,8 @@ impl<const CONFIG: EncodedConfig> Iso8601<CONFIG> {
4645
}
4746
let ParsedItem(input, day) = day(input).ok_or(InvalidComponent("day"))?;
4847
Ok(ParsedItem(input, (month, day)))
49-
})() {
48+
})();
49+
let mut ret_error = match parsed_month_day {
5050
Ok(ParsedItem(input, (month, day))) => {
5151
*parsed = parsed
5252
.with_year(year)
@@ -70,7 +70,7 @@ impl<const CONFIG: EncodedConfig> Iso8601<CONFIG> {
7070
return Ok(input);
7171
}
7272

73-
match (|| {
73+
let parsed_week_weekday = (|| {
7474
let input = ascii_char::<b'W'>(input)
7575
.ok_or((false, InvalidLiteral))?
7676
.into_inner();
@@ -84,7 +84,8 @@ impl<const CONFIG: EncodedConfig> Iso8601<CONFIG> {
8484
let ParsedItem(input, weekday) =
8585
dayk(input).ok_or((true, InvalidComponent("weekday")))?;
8686
Ok(ParsedItem(input, (week, weekday)))
87-
})() {
87+
})();
88+
match parsed_week_weekday {
8889
Ok(ParsedItem(input, (week, weekday))) => {
8990
*parsed = parsed
9091
.with_iso_year(year)

0 commit comments

Comments
 (0)