Skip to content

Commit 866c3a0

Browse files
committed
Address updated lints
1 parent aca5c36 commit 866c3a0

20 files changed

+37
-25
lines changed

Cargo.toml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -85,28 +85,28 @@ single-use-lifetimes = "warn"
8585
trivial-casts = "warn"
8686
trivial-numeric-casts = "warn"
8787
unreachable-pub = "warn"
88-
unstable-name-collisions = { level = "warn", priority = 1 } # overrides #![deny(future_incompatible)]
89-
unused = "warn"
88+
unused = { level = "warn", priority = -1 }
9089
unused-import-braces = "warn"
9190
unused-lifetimes = "warn"
9291
unused-qualifications = "warn"
93-
# unused-results = "warn"
9492
variant-size-differences = "warn"
9593

94+
unstable-name-collisions = { level = "allow", priority = 1 } # overrides #![deny(future_incompatible)], temporary while `.cast_{un}signed()` is unstable
95+
9696
[workspace.lints.clippy]
9797
alloc-instead-of-core = "deny"
9898
std-instead-of-core = "deny"
9999
undocumented-unsafe-blocks = "deny"
100100

101-
all = "warn"
101+
missing-docs-in-private-items = "warn"
102+
all = { level = "warn", priority = -1 }
102103
dbg-macro = "warn"
103104
decimal-literal-representation = "warn"
104105
explicit-auto-deref = "warn"
105106
get-unwrap = "warn"
106107
manual-let-else = "warn"
107-
missing-docs-in-private-items = "warn"
108108
missing-enforced-import-renames = "warn"
109-
nursery = "warn"
109+
nursery = { level = "warn", priority = -1 }
110110
obfuscated-if-else = "warn"
111111
print-stdout = "warn"
112112
semicolon-outside-block = "warn"

benchmarks/rand.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ macro_rules! bench_rand {
1111
iter_batched_ref!(
1212
ben,
1313
|| StepRng::new(0, 1),
14-
[|rng| rng.gen::<$type>()]
14+
[|rng| rng.r#gen::<$type>()]
1515
);
1616
})*
1717
}

tests/duration.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
use core::u64;
21
use std::cmp::Ordering;
32
use std::cmp::Ordering::{Equal, Greater, Less};
43
use std::time::Duration as StdDuration;

tests/main.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ fn run_with_all_features() -> Result<(), Box<dyn std::error::Error>> {
3434
impl std::error::Error for Error {}
3535

3636
let status = std::process::Command::new("cargo")
37-
.args(&["test", "--all-features"])
37+
.args(["test", "--all-features"])
3838
.status()?;
3939

4040
return if status.success() {

tests/rand.rs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,15 @@ fn support() {
77
let mut rng = rand::rngs::mock::StepRng::new(0, 656_175_560);
88

99
for _ in 0..7 {
10-
let _ = rng.gen::<Weekday>();
10+
let _ = rng.r#gen::<Weekday>();
1111
}
1212
for _ in 0..12 {
13-
let _ = rng.gen::<Month>();
13+
let _ = rng.r#gen::<Month>();
1414
}
15-
let _ = rng.gen::<Time>();
16-
let _ = rng.gen::<Date>();
17-
let _ = rng.gen::<UtcOffset>();
18-
let _ = rng.gen::<PrimitiveDateTime>();
19-
let _ = rng.gen::<OffsetDateTime>();
20-
let _ = rng.gen::<Duration>();
15+
let _ = rng.r#gen::<Time>();
16+
let _ = rng.r#gen::<Date>();
17+
let _ = rng.r#gen::<UtcOffset>();
18+
let _ = rng.r#gen::<PrimitiveDateTime>();
19+
let _ = rng.r#gen::<OffsetDateTime>();
20+
let _ = rng.r#gen::<Duration>();
2121
}

time/src/duration.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -517,7 +517,7 @@ impl Duration {
517517
/// ```rust
518518
/// # use time::{Duration, ext::NumericalDuration};
519519
/// assert_eq!(Duration::seconds_f64(0.5), 0.5.seconds());
520-
/// assert_eq!(Duration::seconds_f64(-0.5), -0.5.seconds());
520+
/// assert_eq!(Duration::seconds_f64(-0.5), (-0.5).seconds());
521521
/// ```
522522
pub fn seconds_f64(seconds: f64) -> Self {
523523
try_from_secs!(
@@ -564,7 +564,7 @@ impl Duration {
564564
/// ```rust
565565
/// # use time::{Duration, ext::NumericalDuration};
566566
/// assert_eq!(Duration::saturating_seconds_f64(0.5), 0.5.seconds());
567-
/// assert_eq!(Duration::saturating_seconds_f64(-0.5), -0.5.seconds());
567+
/// assert_eq!(Duration::saturating_seconds_f64(-0.5), (-0.5).seconds());
568568
/// assert_eq!(
569569
/// Duration::saturating_seconds_f64(f64::NAN),
570570
/// Duration::new(0, 0),
@@ -637,7 +637,7 @@ impl Duration {
637637
/// ```rust
638638
/// # use time::{Duration, ext::NumericalDuration};
639639
/// assert_eq!(Duration::checked_seconds_f64(0.5), Some(0.5.seconds()));
640-
/// assert_eq!(Duration::checked_seconds_f64(-0.5), Some(-0.5.seconds()));
640+
/// assert_eq!(Duration::checked_seconds_f64(-0.5), Some((-0.5).seconds()));
641641
/// assert_eq!(Duration::checked_seconds_f64(f64::NAN), None);
642642
/// assert_eq!(Duration::checked_seconds_f64(f64::NEG_INFINITY), None);
643643
/// assert_eq!(Duration::checked_seconds_f64(f64::INFINITY), None);
@@ -664,7 +664,7 @@ impl Duration {
664664
/// ```rust
665665
/// # use time::{Duration, ext::NumericalDuration};
666666
/// assert_eq!(Duration::checked_seconds_f32(0.5), Some(0.5.seconds()));
667-
/// assert_eq!(Duration::checked_seconds_f32(-0.5), Some(-0.5.seconds()));
667+
/// assert_eq!(Duration::checked_seconds_f32(-0.5), Some((-0.5).seconds()));
668668
/// assert_eq!(Duration::checked_seconds_f32(f32::NAN), None);
669669
/// assert_eq!(Duration::checked_seconds_f32(f32::NEG_INFINITY), None);
670670
/// assert_eq!(Duration::checked_seconds_f32(f32::INFINITY), None);

time/src/error/component_range.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,4 +89,5 @@ impl ComponentRange {
8989
}
9090

9191
#[cfg(feature = "std")]
92+
#[allow(clippy::std_instead_of_core)]
9293
impl std::error::Error for ComponentRange {}

time/src/error/conversion_range.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ impl fmt::Display for ConversionRange {
1616
}
1717

1818
#[cfg(feature = "std")]
19+
#[allow(clippy::std_instead_of_core)]
1920
impl std::error::Error for ConversionRange {}
2021

2122
impl From<ConversionRange> for crate::Error {

time/src/error/different_variant.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ impl fmt::Display for DifferentVariant {
1414
}
1515

1616
#[cfg(feature = "std")]
17+
#[allow(clippy::std_instead_of_core)]
1718
impl std::error::Error for DifferentVariant {}
1819

1920
impl From<DifferentVariant> for crate::Error {

time/src/error/format.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@ impl TryFrom<Format> for io::Error {
5555
}
5656

5757
#[cfg(feature = "std")]
58+
#[allow(clippy::std_instead_of_core)]
5859
impl std::error::Error for Format {
5960
fn source(&self) -> Option<&(dyn std::error::Error + 'static)> {
6061
match *self {

time/src/error/indeterminate_offset.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ impl fmt::Display for IndeterminateOffset {
1515
}
1616

1717
#[cfg(feature = "std")]
18+
#[allow(clippy::std_instead_of_core)]
1819
impl std::error::Error for IndeterminateOffset {}
1920

2021
impl From<IndeterminateOffset> for crate::Error {

time/src/error/invalid_format_description.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -125,4 +125,5 @@ impl fmt::Display for InvalidFormatDescription {
125125
}
126126

127127
#[cfg(feature = "std")]
128+
#[allow(clippy::std_instead_of_core)]
128129
impl std::error::Error for InvalidFormatDescription {}

time/src/error/invalid_variant.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ impl fmt::Display for InvalidVariant {
1414
}
1515

1616
#[cfg(feature = "std")]
17+
#[allow(clippy::std_instead_of_core)]
1718
impl std::error::Error for InvalidVariant {}
1819

1920
impl From<InvalidVariant> for crate::Error {

time/src/error/mod.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,7 @@ impl fmt::Display for Error {
105105
}
106106

107107
#[cfg(feature = "std")]
108+
#[allow(clippy::std_instead_of_core)]
108109
impl std::error::Error for Error {
109110
fn source(&self) -> Option<&(dyn std::error::Error + 'static)> {
110111
match self {

time/src/error/parse.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ impl fmt::Display for Parse {
3535
}
3636

3737
#[cfg(feature = "std")]
38+
#[allow(clippy::std_instead_of_core)]
3839
impl std::error::Error for Parse {
3940
fn source(&self) -> Option<&(dyn std::error::Error + 'static)> {
4041
match self {

time/src/error/parse_from_description.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ impl fmt::Display for ParseFromDescription {
3333
}
3434

3535
#[cfg(feature = "std")]
36+
#[allow(clippy::std_instead_of_core)]
3637
impl std::error::Error for ParseFromDescription {}
3738

3839
impl From<ParseFromDescription> for crate::Error {

time/src/error/try_from_parsed.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ impl TryFrom<TryFromParsed> for error::ComponentRange {
4444
}
4545

4646
#[cfg(feature = "std")]
47+
#[allow(clippy::std_instead_of_core)]
4748
impl std::error::Error for TryFromParsed {
4849
fn source(&self) -> Option<&(dyn std::error::Error + 'static)> {
4950
match self {

time/src/parsing/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ impl<'a, T> ParsedItem<'a, T> {
3535
/// Filter the value with the provided function. If the function returns `false`, the value
3636
/// is discarded and `None` is returned. Otherwise, the value is preserved and `Some(self)` is
3737
/// returned.
38-
pub(crate) fn filter(self, f: impl FnOnce(&T) -> bool) -> Option<ParsedItem<'a, T>> {
38+
pub(crate) fn filter(self, f: impl FnOnce(&T) -> bool) -> Option<Self> {
3939
f(&self.1).then_some(self)
4040
}
4141
}

time/src/rand.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ use crate::{Date, Duration, Month, OffsetDateTime, PrimitiveDateTime, Time, UtcO
77

88
impl Distribution<Time> for Standard {
99
fn sample<R: Rng + ?Sized>(&self, rng: &mut R) -> Time {
10-
Time::from_hms_nanos_ranged(rng.gen(), rng.gen(), rng.gen(), rng.gen())
10+
Time::from_hms_nanos_ranged(rng.r#gen(), rng.r#gen(), rng.r#gen(), rng.r#gen())
1111
}
1212
}
1313

@@ -21,7 +21,7 @@ impl Distribution<Date> for Standard {
2121

2222
impl Distribution<UtcOffset> for Standard {
2323
fn sample<R: Rng + ?Sized>(&self, rng: &mut R) -> UtcOffset {
24-
UtcOffset::from_hms_ranged(rng.gen(), rng.gen(), rng.gen())
24+
UtcOffset::from_hms_ranged(rng.r#gen(), rng.r#gen(), rng.r#gen())
2525
}
2626
}
2727

@@ -40,7 +40,7 @@ impl Distribution<OffsetDateTime> for Standard {
4040

4141
impl Distribution<Duration> for Standard {
4242
fn sample<R: Rng + ?Sized>(&self, rng: &mut R) -> Duration {
43-
Duration::new_ranged(rng.gen(), rng.gen())
43+
Duration::new_ranged(rng.r#gen(), rng.r#gen())
4444
}
4545
}
4646

time/src/serde/mod.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -172,9 +172,11 @@ use serde::{Deserialize, Deserializer, Serialize, Serializer};
172172
/// use time::serde;
173173
/// use time::format_description::well_known::{iso8601, Iso8601};
174174
///
175+
/// # #[allow(dead_code)]
175176
/// const CONFIG: iso8601::EncodedConfig = iso8601::Config::DEFAULT
176177
/// .set_year_is_six_digits(false)
177178
/// .encode();
179+
/// # #[allow(dead_code)]
178180
/// const FORMAT: Iso8601<CONFIG> = Iso8601::<CONFIG>;
179181
///
180182
/// // Makes a module `mod my_format { ... }`.

0 commit comments

Comments
 (0)