[meta] update MSRV to Rust 1.81, switch lints from allow to expect

sunshowers · sunshowers · commit 0b6182393d19 · 2024-11-29T14:38:49.000-08:00
This caught a few outdated lints and a few that should have been `cfg(test)`.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -64,8 +64,8 @@ jobs:
           # macos-14 for M1 runners
           - macos-14
           - windows-latest
-        # 1.75 is the MSRV
-        rust-version: ["1.75", stable]
+        # 1.81 is the MSRV
+        rust-version: ["1.81", stable]
       fail-fast: false
     steps:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
diff --git a/Cargo.toml b/Cargo.toml
@@ -11,7 +11,7 @@ members = [
 ]
 
 [workspace.package]
-rust-version = "1.75"
+rust-version = "1.81"
 edition = "2021"
 license = "MIT OR Apache-2.0"
 
diff --git a/cargo-nextest/src/cargo_cli.rs b/cargo-nextest/src/cargo_cli.rs
@@ -228,7 +228,6 @@ impl<'a> CargoCli<'a> {
         }
     }
 
-    #[allow(dead_code)]
     pub(crate) fn add_arg(&mut self, arg: &'a str) -> &mut Self {
         self.args.push(Cow::Borrowed(arg));
         self
diff --git a/cargo-nextest/src/dispatch.rs b/cargo-nextest/src/dispatch.rs
@@ -602,7 +602,7 @@ struct TestBuildFilter {
 }
 
 impl TestBuildFilter {
-    #[allow(clippy::too_many_arguments)]
+    #[expect(clippy::too_many_arguments)]
     fn compute_test_list<'g>(
         &self,
         ctx: &TestExecuteContext<'_>,
@@ -2000,7 +2000,7 @@ enum SetupSource {
 }
 
 impl SelfCommand {
-    #[allow(unused_variables)]
+    #[cfg_attr(not(feature = "self-update"), expect(unused_variables))]
     fn exec(self, output: OutputOpts) -> Result<i32> {
         let output = output.init();
 
diff --git a/cargo-nextest/src/errors.rs b/cargo-nextest/src/errors.rs
@@ -336,7 +336,7 @@ impl ExpectedError {
         }
     }
 
-    #[allow(dead_code)]
+    #[expect(dead_code)]
     pub(crate) fn experimental_feature_error(name: &'static str, var_name: &'static str) -> Self {
         Self::ExperimentalFeatureNotEnabled { name, var_name }
     }
diff --git a/integration-tests/tests/integration/fixtures.rs b/integration-tests/tests/integration/fixtures.rs
@@ -48,7 +48,7 @@ impl CargoNextestCli {
         }
     }
 
-    #[allow(dead_code)]
+    #[expect(dead_code)]
     pub fn arg(&mut self, arg: impl Into<String>) -> &mut Self {
         self.args.push(arg.into());
         self
@@ -64,7 +64,7 @@ impl CargoNextestCli {
         self
     }
 
-    #[allow(dead_code)]
+    #[expect(dead_code)]
     pub fn envs(
         &mut self,
         envs: impl IntoIterator<Item = (impl Into<OsString>, impl Into<OsString>)>,
diff --git a/integration-tests/tests/integration/temp_project.rs b/integration-tests/tests/integration/temp_project.rs
@@ -79,14 +79,13 @@ impl TempProject {
         })
     }
 
-    #[allow(dead_code)]
+    #[expect(dead_code)]
     pub fn persist(&mut self) {
         if let Some(dir) = self.temp_dir.take() {
             _ = dir.into_path();
         }
     }
 
-    #[allow(dead_code)]
     pub fn temp_root(&self) -> &Utf8Path {
         &self.temp_root
     }
@@ -168,7 +167,7 @@ pub(crate) use windows::*;
 
 #[derive(Clone, Copy, Debug, PartialEq)]
 #[must_use]
-#[allow(dead_code)]
+#[expect(dead_code)]
 pub(crate) enum UdsStatus {
     Created,
     NotCreated,
diff --git a/nextest-filtering/src/parsing.rs b/nextest-filtering/src/parsing.rs
@@ -61,6 +61,7 @@ pub enum SetDef<S = SourceSpan> {
 }
 
 impl SetDef {
+    #[cfg(test)]
     fn drop_source_span(self) -> SetDef<()> {
         match self {
             Self::Package(matcher, _) => SetDef::Package(matcher, ()),
@@ -154,7 +155,7 @@ impl ParsedExpr {
         ParsedExpr::Set(SetDef::None)
     }
 
-    #[allow(unused)]
+    #[cfg(test)]
     fn drop_source_span(self) -> ParsedExpr<()> {
         match self {
             Self::Not(op, expr) => ParsedExpr::Not(op, Box::new(expr.drop_source_span())),
diff --git a/nextest-filtering/src/proptest_helpers.rs b/nextest-filtering/src/proptest_helpers.rs
@@ -1,10 +1,6 @@
 // Copyright (c) The nextest Contributors
 // SPDX-License-Identifier: MIT OR Apache-2.0
 
-// https://github.com/proptest-rs/proptest/pull/363, can be removed once that is in a released
-// version of proptest.
-#![allow(clippy::arc_with_non_send_sync)]
-
 use crate::{
     parsing::{
         AndOperator, DifferenceOperator, GenericGlob, NotOperator, OrOperator, ParsedExpr, SetDef,
diff --git a/nextest-filtering/tests/match.rs b/nextest-filtering/tests/match.rs
@@ -1,9 +1,6 @@
 // Copyright (c) The nextest Contributors
 // SPDX-License-Identifier: MIT OR Apache-2.0
 
-// test_case causes clippy warnings with Rust 1.71.
-#![allow(clippy::items_after_test_module)]
-
 use guppy::{
     graph::{cargo::BuildPlatform, PackageGraph},
     PackageId,
diff --git a/nextest-runner/src/cargo_config/env.rs b/nextest-runner/src/cargo_config/env.rs
@@ -40,8 +40,7 @@ impl EnvironmentMap {
         let mut map = BTreeMap::<imp::EnvKey, CargoEnvironmentVariable>::new();
 
         for (source, name, value) in env_configs {
-            #[allow(clippy::useless_conversion)]
-            match map.entry(OsString::from(name.clone()).into()) {
+            match map.entry(imp::EnvKey::from(name.clone())) {
                 Entry::Occupied(mut entry) => {
                     // Ignore the value lower in precedence, but do look at force and relative if
                     // they haven't been set already.
@@ -79,7 +78,7 @@ impl EnvironmentMap {
     }
 
     pub(crate) fn apply_env(&self, command: &mut Command) {
-        #[allow(clippy::useless_conversion)]
+        #[cfg_attr(not(windows), expect(clippy::useless_conversion))]
         let existing_keys: BTreeSet<imp::EnvKey> =
             std::env::vars_os().map(|(k, _v)| k.into()).collect();
 
@@ -250,6 +249,12 @@ mod imp {
         }
     }
 
+    impl From<String> for EnvKey {
+        fn from(k: String) -> Self {
+            OsString::from(k).into()
+        }
+    }
+
     impl From<EnvKey> for OsString {
         fn from(k: EnvKey) -> Self {
             k.os_string
diff --git a/nextest-runner/src/config/config_impl.rs b/nextest-runner/src/config/config_impl.rs
@@ -278,7 +278,7 @@ impl NextestConfig {
         Ok((config.into_config_impl(), compiled))
     }
 
-    #[allow(clippy::too_many_arguments)]
+    #[expect(clippy::too_many_arguments)]
     fn deserialize_individual_config(
         graph: &PackageGraph,
         workspace_root: &Utf8Path,
@@ -814,7 +814,7 @@ impl<'cfg> EvaluatableProfile<'cfg> {
         })
     }
 
-    #[allow(dead_code)]
+    #[cfg(test)]
     pub(super) fn custom_profile(&self) -> Option<&'cfg CustomProfileImpl> {
         self.custom_profile
     }
@@ -899,10 +899,10 @@ struct NextestConfigDeserialize {
 
     // These are parsed as part of NextestConfigVersionOnly. They're re-parsed here to avoid
     // printing an "unknown key" message.
-    #[allow(unused)]
+    #[expect(unused)]
     #[serde(default)]
     nextest_version: Option<NextestVersionDeserialize>,
-    #[allow(unused)]
+    #[expect(unused)]
     #[serde(default)]
     experimental: BTreeSet<String>,
 
@@ -1067,8 +1067,8 @@ pub(super) struct CustomProfileImpl {
     archive: Option<ArchiveConfig>,
 }
 
-#[allow(dead_code)]
 impl CustomProfileImpl {
+    #[cfg(test)]
     pub(super) fn test_threads(&self) -> Option<TestThreads> {
         self.test_threads
     }
diff --git a/nextest-runner/src/config/overrides.rs b/nextest-runner/src/config/overrides.rs
@@ -118,7 +118,7 @@ impl TestSettings {
     }
 }
 
-#[allow(dead_code)]
+#[expect(dead_code)]
 impl<Source: Copy> TestSettings<Source> {
     pub(super) fn new<'p>(profile: &'p EvaluatableProfile<'_>, query: &TestQuery<'_>) -> Self
     where
@@ -932,7 +932,7 @@ mod tests {
         assert_eq!(overrides.success_output(), TestOutputDisplay::Never);
         assert_eq!(overrides.failure_output(), TestOutputDisplay::Final);
         // For clarity.
-        #[allow(clippy::bool_assert_comparison)]
+        #[expect(clippy::bool_assert_comparison)]
         {
             assert_eq!(overrides.junit_store_success_output(), false);
             assert_eq!(overrides.junit_store_failure_output(), false);
@@ -978,7 +978,7 @@ mod tests {
         );
         assert_eq!(overrides.failure_output(), TestOutputDisplay::Final);
         // For clarity.
-        #[allow(clippy::bool_assert_comparison)]
+        #[expect(clippy::bool_assert_comparison)]
         {
             assert_eq!(overrides.junit_store_success_output(), true);
             assert_eq!(overrides.junit_store_failure_output(), false);
diff --git a/nextest-runner/src/double_spawn.rs b/nextest-runner/src/double_spawn.rs
@@ -77,7 +77,7 @@ impl DoubleSpawnInfo {
 #[derive(Debug)]
 pub struct DoubleSpawnContext {
     // Only used for the Drop impl.
-    #[allow(dead_code)]
+    #[expect(dead_code)]
     inner: imp::DoubleSpawnContext,
 }
 
diff --git a/nextest-runner/src/helpers.rs b/nextest-runner/src/helpers.rs
@@ -373,7 +373,7 @@ extern "C" {
 }
 
 #[inline]
-#[allow(dead_code)]
+#[expect(dead_code)]
 pub(crate) fn statically_unreachable() -> ! {
     unsafe {
         __nextest_external_symbol_that_does_not_exist();
diff --git a/nextest-runner/src/indenter.rs b/nextest-runner/src/indenter.rs
@@ -20,7 +20,7 @@ use crate::write_str::WriteStr;
 use std::io;
 
 /// The set of supported formats for indentation
-#[allow(missing_debug_implementations)]
+#[expect(missing_debug_implementations)]
 pub enum Format<'a> {
     /// Insert uniform indentation before every line
     ///
@@ -55,7 +55,7 @@ pub enum Format<'a> {
 /// lets it intercept each piece of output as its being written to the output buffer. It then
 /// splits on newlines giving slices into the original string. Finally we alternate writing these
 /// lines and the specified indentation to the output buffer.
-#[allow(missing_debug_implementations)]
+#[expect(missing_debug_implementations)]
 pub struct Indented<'a, D: ?Sized> {
     inner: &'a mut D,
     needs_indent: bool,
diff --git a/nextest-runner/src/list/output_format.rs b/nextest-runner/src/list/output_format.rs
@@ -1,9 +1,6 @@
 // Copyright (c) The nextest Contributors
 // SPDX-License-Identifier: MIT OR Apache-2.0
 
-// clippy complains about the Arbitrary impl for OutputFormat
-#![allow(clippy::unit_arg)]
-
 use crate::{errors::WriteTestListError, write_str::WriteStr};
 use owo_colors::Style;
 use serde::Serialize;
diff --git a/nextest-runner/src/list/test_list.rs b/nextest-runner/src/list/test_list.rs
@@ -220,7 +220,7 @@ pub struct TestList<'g> {
 
 impl<'g> TestList<'g> {
     /// Creates a new test list by running the given command and applying the specified filter.
-    #[allow(clippy::too_many_arguments)]
+    #[expect(clippy::too_many_arguments)]
     pub fn new<I>(
         ctx: &TestExecuteContext<'_>,
         test_artifacts: I,
diff --git a/nextest-runner/src/reporter/aggregator.rs b/nextest-runner/src/reporter/aggregator.rs
@@ -20,7 +20,7 @@ use quick_junit::{
 use std::{borrow::Cow, collections::HashMap, fs::File};
 
 #[derive(Clone, Debug)]
-#[allow(dead_code)]
+#[expect(dead_code)]
 pub(crate) struct EventAggregator<'cfg> {
     store_dir: Utf8PathBuf,
     // TODO: log information in a JSONable report (converting that to XML later) instead of directly
diff --git a/nextest-runner/src/reporter/displayer.rs b/nextest-runner/src/reporter/displayer.rs
@@ -562,7 +562,7 @@ fn write_summary_str(run_stats: &RunStats, styles: &Styles, out: &mut String) {
 
 #[derive(Debug)]
 enum FinalOutput {
-    Skipped(#[allow(dead_code)] MismatchReason),
+    Skipped(#[expect(dead_code)] MismatchReason),
     Executed {
         run_statuses: ExecutionStatuses,
         display_output: bool,
@@ -1068,7 +1068,7 @@ impl<'a> TestReporterImpl<'a> {
         Ok(())
     }
 
-    #[allow(clippy::too_many_arguments)]
+    #[expect(clippy::too_many_arguments)]
     fn write_setup_script_status_line(
         &self,
         script_id: &ScriptId,
diff --git a/nextest-runner/src/reuse_build/archiver.rs b/nextest-runner/src/reuse_build/archiver.rs
@@ -56,7 +56,7 @@ impl ArchiveFormat {
 /// Archives test binaries along with metadata to the given file.
 ///
 /// The output file is a Zstandard-compressed tarball (`.tar.zst`).
-#[allow(clippy::too_many_arguments)]
+#[expect(clippy::too_many_arguments)]
 pub fn archive_to_file<'a, F>(
     profile: EvaluatableProfile<'a>,
     binary_list: &'a BinaryList,
@@ -195,7 +195,7 @@ struct Archiver<'a, W: Write> {
 }
 
 impl<'a, W: Write> Archiver<'a, W> {
-    #[allow(clippy::too_many_arguments)]
+    #[expect(clippy::too_many_arguments)]
     fn new(
         config: &'a ArchiveConfig,
         binary_list: &'a BinaryList,
diff --git a/nextest-runner/src/runner.rs b/nextest-runner/src/runner.rs
diff --git a/nextest-runner/src/test_command/unix.rs b/nextest-runner/src/test_command/unix.rs
diff --git a/nextest-runner/src/test_filter.rs b/nextest-runner/src/test_filter.rs
diff --git a/nextest-runner/src/time/mod.rs b/nextest-runner/src/time/mod.rs
diff --git a/nextest-runner/src/time/stopwatch.rs b/nextest-runner/src/time/stopwatch.rs
diff --git a/nextest-runner/src/update.rs b/nextest-runner/src/update.rs
diff --git a/nextest-runner/tests/integration/basic.rs b/nextest-runner/tests/integration/basic.rs
diff --git a/nextest-runner/tests/integration/fixtures.rs b/nextest-runner/tests/integration/fixtures.rs
diff --git a/nextest-runner/tests/integration/target_runner.rs b/nextest-runner/tests/integration/target_runner.rs

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ members = [`
`11`	`11`	`]`
`12`	`12`
`13`	`13`	`[workspace.package]`
`14`		`-rust-version = "1.75"`
	`14`	`+rust-version = "1.81"`
`15`	`15`	`edition = "2021"`
`16`	`16`	`license = "MIT OR Apache-2.0"`
`17`	`17`
Original file line number	Diff line number	Diff line change
`@@ -228,7 +228,6 @@ impl<'a> CargoCli<'a> {`
`228`	`228`	`}`
`229`	`229`	`}`
`230`	`230`
`231`		`- #[allow(dead_code)]`
`232`	`231`	`pub(crate) fn add_arg(&mut self, arg: &'a str) -> &mut Self {`
`233`	`232`	`self.args.push(Cow::Borrowed(arg));`
`234`	`233`	`self`
Original file line number	Diff line number	Diff line change
`@@ -602,7 +602,7 @@ struct TestBuildFilter {`
`602`	`602`	`}`
`603`	`603`
`604`	`604`	`impl TestBuildFilter {`
`605`		`- #[allow(clippy::too_many_arguments)]`
	`605`	`+ #[expect(clippy::too_many_arguments)]`
`606`	`606`	`fn compute_test_list<'g>(`
`607`	`607`	`&self,`
`608`	`608`	`ctx: &TestExecuteContext<'_>,`
`@@ -2000,7 +2000,7 @@ enum SetupSource {`
`2000`	`2000`	`}`
`2001`	`2001`
`2002`	`2002`	`impl SelfCommand {`
`2003`		`- #[allow(unused_variables)]`
	`2003`	`+ #[cfg_attr(not(feature = "self-update"), expect(unused_variables))]`
`2004`	`2004`	`fn exec(self, output: OutputOpts) -> Result<i32> {`
`2005`	`2005`	`let output = output.init();`
`2006`	`2006`
Original file line number	Diff line number	Diff line change
`@@ -336,7 +336,7 @@ impl ExpectedError {`
`336`	`336`	`}`
`337`	`337`	`}`
`338`	`338`
`339`		`- #[allow(dead_code)]`
	`339`	`+ #[expect(dead_code)]`
`340`	`340`	`pub(crate) fn experimental_feature_error(name: &'static str, var_name: &'static str) -> Self {`
`341`	`341`	`Self::ExperimentalFeatureNotEnabled { name, var_name }`
`342`	`342`	`}`
Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ impl CargoNextestCli {`
`48`	`48`	`}`
`49`	`49`	`}`
`50`	`50`
`51`		`- #[allow(dead_code)]`
	`51`	`+ #[expect(dead_code)]`
`52`	`52`	`pub fn arg(&mut self, arg: impl Into<String>) -> &mut Self {`
`53`	`53`	`self.args.push(arg.into());`
`54`	`54`	`self`
`@@ -64,7 +64,7 @@ impl CargoNextestCli {`
`64`	`64`	`self`
`65`	`65`	`}`
`66`	`66`
`67`		`- #[allow(dead_code)]`
	`67`	`+ #[expect(dead_code)]`
`68`	`68`	`pub fn envs(`
`69`	`69`	`&mut self,`
`70`	`70`	`envs: impl IntoIterator<Item = (impl Into<OsString>, impl Into<OsString>)>,`
Original file line number	Diff line number	Diff line change
`@@ -79,14 +79,13 @@ impl TempProject {`
`79`	`79`	`})`
`80`	`80`	`}`
`81`	`81`
`82`		`- #[allow(dead_code)]`
	`82`	`+ #[expect(dead_code)]`
`83`	`83`	`pub fn persist(&mut self) {`
`84`	`84`	`if let Some(dir) = self.temp_dir.take() {`
`85`	`85`	`_ = dir.into_path();`
`86`	`86`	`}`
`87`	`87`	`}`
`88`	`88`
`89`		`- #[allow(dead_code)]`
`90`	`89`	`pub fn temp_root(&self) -> &Utf8Path {`
`91`	`90`	`&self.temp_root`
`92`	`91`	`}`
`@@ -168,7 +167,7 @@ pub(crate) use windows::*;`
`168`	`167`
`169`	`168`	`#[derive(Clone, Copy, Debug, PartialEq)]`
`170`	`169`	`#[must_use]`
`171`		`-#[allow(dead_code)]`
	`170`	`+#[expect(dead_code)]`
`172`	`171`	`pub(crate) enum UdsStatus {`
`173`	`172`	`Created,`
`174`	`173`	`NotCreated,`
Original file line number	Diff line number	Diff line change
`@@ -61,6 +61,7 @@ pub enum SetDef<S = SourceSpan> {`
`61`	`61`	`}`
`62`	`62`
`63`	`63`	`impl SetDef {`
	`64`	`+ #[cfg(test)]`
`64`	`65`	`fn drop_source_span(self) -> SetDef<()> {`
`65`	`66`	`match self {`
`66`	`67`	`Self::Package(matcher, _) => SetDef::Package(matcher, ()),`
`@@ -154,7 +155,7 @@ impl ParsedExpr {`
`154`	`155`	`ParsedExpr::Set(SetDef::None)`
`155`	`156`	`}`
`156`	`157`
`157`		`- #[allow(unused)]`
	`158`	`+ #[cfg(test)]`
`158`	`159`	`fn drop_source_span(self) -> ParsedExpr<()> {`
`159`	`160`	`match self {`
`160`	`161`	`Self::Not(op, expr) => ParsedExpr::Not(op, Box::new(expr.drop_source_span())),`