Support rust-lang/rust#101501

smoelius · smoelius · commit 4febf443850a · 2022-10-02T18:33:48.000Z
And add `boundary_toolchains` test
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/cargo-dylint/tests/boundary_toolchains.rs b/cargo-dylint/tests/boundary_toolchains.rs
@@ -0,0 +1,36 @@
+use dylint_internal::{
+    clippy_utils::set_toolchain_channel, find_and_replace, rustup::SanitizeEnvironment,
+    testing::new_template,
+};
+use tempfile::tempdir;
+use test_log::test;
+
+// smoelius: The channel date is one day later than the `rustc --version` date.
+const BOUNDARIES: [(&str, &str); 2] = [("2022-07-14", "2022-07-15"), ("2022-09-08", "2022-09-09")];
+
+#[test]
+fn boundary_toolchain() {
+    for (before, after) in BOUNDARIES {
+        for date in [before, after] {
+            let channel = format!("nightly-{}", date);
+
+            let tempdir = tempdir().unwrap();
+
+            new_template(tempdir.path()).unwrap();
+
+            find_and_replace(
+                &tempdir.path().join("Cargo.toml"),
+                &[r#"s/\r?\nclippy_utils = [^\r\n]*//"#],
+            )
+            .unwrap();
+
+            set_toolchain_channel(tempdir.path(), &channel).unwrap();
+
+            dylint_internal::cargo::test(&format!("with channel `{}`", channel), false)
+                .sanitize_environment()
+                .current_dir(&tempdir)
+                .success()
+                .unwrap();
+        }
+    }
+}
diff --git a/driver/src/lib.rs b/driver/src/lib.rs
@@ -136,6 +136,9 @@ fn zero_mir_opt_level(config: &mut rustc_interface::Config) {
     config.opts.debugging_opts.mir_opt_level.zero();
 }
 
+// Relevant PR and merge commit:
+// * https://github.com/rust-lang/rust/pull/98975
+// * https://github.com/rust-lang/rust/commit/0ed9c64c3e63acac9bd77abce62501696c390450
 #[rustversion::since(2022-07-14)]
 fn zero_mir_opt_level(config: &mut rustc_interface::Config) {
     config.opts.unstable_opts.mir_opt_level = Some(0);
diff --git a/utils/linting/Cargo.toml b/utils/linting/Cargo.toml
@@ -9,3 +9,4 @@ repository = "https://github.com/trailofbits/dylint"
 
 [dependencies]
 paste = "1.0.9"
+rustversion = "1.0.9"
diff --git a/utils/linting/README.md b/utils/linting/README.md
@@ -59,7 +59,7 @@ rustc_session::declare_lint_pass!(Name => [NAME]);
 `impl_late_lint!`, etc. are like `declare_late_lint!`, etc. except:
 
 - each calls [`impl_lint_pass!`] instead of `declare_lint_pass!`;
-- each requires an additional argument to specify the default value of the lint's [`LintPass`] structure.
+- each requires an additional argument to specify the value of the lint's [`LintPass`] structure.
 
 That is, `impl_late_lint!`'s additional argument is what goes here:
 
diff --git a/utils/linting/src/lib.rs b/utils/linting/src/lib.rs
@@ -23,7 +23,7 @@ macro_rules! dylint_library {
 
 #[macro_export]
 macro_rules! __declare_and_register_lint {
-    ($(#[$attr:meta])* $vis:vis $NAME:ident, $Level:ident, $desc:expr, $register_pass_method:ident, $default:expr) => {
+    ($(#[$attr:meta])* $vis:vis $NAME:ident, $Level:ident, $desc:expr, $register_pass_method:ident, $pass:expr) => {
         $crate::dylint_library!();
 
         extern crate rustc_lint;
@@ -32,17 +32,42 @@ macro_rules! __declare_and_register_lint {
         #[no_mangle]
         pub fn register_lints(_sess: &rustc_session::Session, lint_store: &mut rustc_lint::LintStore) {
             lint_store.register_lints(&[$NAME]);
-            lint_store.$register_pass_method(|| Box::new($default));
+            lint_store.$register_pass_method($pass);
         }
 
         rustc_session::declare_lint!($(#[$attr])* $vis $NAME, $Level, $desc);
     };
 }
 
+#[rustversion::before(2022-09-08)]
+#[macro_export]
+macro_rules! __make_late_closure {
+    ($pass:expr) => {
+        || Box::new($pass)
+    };
+}
+
+// Relevant PR and merge commit:
+// * https://github.com/rust-lang/rust/pull/101501
+// * https://github.com/rust-lang/rust/commit/87788097b776f8e3662f76627944230684b671bd
+#[rustversion::since(2022-09-08)]
+#[macro_export]
+macro_rules! __make_late_closure {
+    ($pass:expr) => {
+        |_| Box::new($pass)
+    };
+}
+
 #[macro_export]
 macro_rules! impl_pre_expansion_lint {
-    ($(#[$attr:meta])* $vis:vis $NAME:ident, $Level:ident, $desc:expr, $default:expr) => {
-        $crate::__declare_and_register_lint!($(#[$attr])* $vis $NAME, $Level, $desc, register_pre_expansion_pass, $default);
+    ($(#[$attr:meta])* $vis:vis $NAME:ident, $Level:ident, $desc:expr, $pass:expr) => {
+        $crate::__declare_and_register_lint!(
+            $(#[$attr])* $vis $NAME,
+            $Level,
+            $desc,
+            register_pre_expansion_pass,
+            || Box::new($pass)
+        );
         $crate::paste::paste! {
             rustc_session::impl_lint_pass!([< $NAME:camel >] => [$NAME]);
         }
@@ -51,8 +76,14 @@ macro_rules! impl_pre_expansion_lint {
 
 #[macro_export]
 macro_rules! impl_early_lint {
-    ($(#[$attr:meta])* $vis:vis $NAME:ident, $Level:ident, $desc:expr, $default:expr) => {
-        $crate::__declare_and_register_lint!($(#[$attr])* $vis $NAME, $Level, $desc, register_early_pass, $default);
+    ($(#[$attr:meta])* $vis:vis $NAME:ident, $Level:ident, $desc:expr, $pass:expr) => {
+        $crate::__declare_and_register_lint!(
+            $(#[$attr])* $vis $NAME,
+            $Level,
+            $desc,
+            register_early_pass,
+            || Box::new($pass)
+        );
         $crate::paste::paste! {
             rustc_session::impl_lint_pass!([< $NAME:camel >] => [$NAME]);
         }
@@ -61,8 +92,14 @@ macro_rules! impl_early_lint {
 
 #[macro_export]
 macro_rules! impl_late_lint {
-    ($(#[$attr:meta])* $vis:vis $NAME:ident, $Level:ident, $desc:expr, $default:expr) => {
-        $crate::__declare_and_register_lint!($(#[$attr])* $vis $NAME, $Level, $desc, register_late_pass, $default);
+    ($(#[$attr:meta])* $vis:vis $NAME:ident, $Level:ident, $desc:expr, $pass:expr) => {
+        $crate::__declare_and_register_lint!(
+            $(#[$attr])* $vis $NAME,
+            $Level,
+            $desc,
+            register_late_pass,
+            $crate::__make_late_closure!($pass)
+        );
         $crate::paste::paste! {
             rustc_session::impl_lint_pass!([< $NAME:camel >] => [$NAME]);
         }
@@ -73,7 +110,13 @@ macro_rules! impl_late_lint {
 macro_rules! declare_pre_expansion_lint {
     ($(#[$attr:meta])* $vis:vis $NAME:ident, $Level:ident, $desc:expr) => {
         $crate::paste::paste! {
-            $crate::__declare_and_register_lint!($(#[$attr])* $vis $NAME, $Level, $desc, register_pre_expansion_pass, [< $NAME:camel >]);
+            $crate::__declare_and_register_lint!(
+                $(#[$attr])* $vis $NAME,
+                $Level,
+                $desc,
+                register_pre_expansion_pass,
+                || Box::new([< $NAME:camel >])
+            );
             rustc_session::declare_lint_pass!([< $NAME:camel >] => [$NAME]);
         }
     };
@@ -83,7 +126,13 @@ macro_rules! declare_pre_expansion_lint {
 macro_rules! declare_early_lint {
     ($(#[$attr:meta])* $vis:vis $NAME:ident, $Level:ident, $desc:expr) => {
         $crate::paste::paste! {
-            $crate::__declare_and_register_lint!($(#[$attr])* $vis $NAME, $Level, $desc, register_early_pass, [< $NAME:camel >]);
+            $crate::__declare_and_register_lint!(
+                $(#[$attr])* $vis $NAME,
+                $Level,
+                $desc,
+                register_early_pass,
+                || Box::new([< $NAME:camel >])
+            );
             rustc_session::declare_lint_pass!([< $NAME:camel >] => [$NAME]);
         }
     };
@@ -93,7 +142,13 @@ macro_rules! declare_early_lint {
 macro_rules! declare_late_lint {
     ($(#[$attr:meta])* $vis:vis $NAME:ident, $Level:ident, $desc:expr) => {
         $crate::paste::paste! {
-            $crate::__declare_and_register_lint!($(#[$attr])* $vis $NAME, $Level, $desc, register_late_pass, [< $NAME:camel >]);
+            $crate::__declare_and_register_lint!(
+                $(#[$attr])* $vis $NAME,
+                $Level,
+                $desc,
+                register_late_pass,
+                $crate::__make_late_closure!([< $NAME:camel >])
+            );
             rustc_session::declare_lint_pass!([< $NAME:camel >] => [$NAME]);
         }
     };

Original file line number	Diff line number	Diff line change
`@@ -136,6 +136,9 @@ fn zero_mir_opt_level(config: &mut rustc_interface::Config) {`
`136`	`136`	`config.opts.debugging_opts.mir_opt_level.zero();`
`137`	`137`	`}`
`138`	`138`
	`139`	`+// Relevant PR and merge commit:`
	`140`	`+// * https://github.com/rust-lang/rust/pull/98975`
	`141`	`+// * https://github.com/rust-lang/rust/commit/0ed9c64c3e63acac9bd77abce62501696c390450`
`139`	`142`	`#[rustversion::since(2022-07-14)]`
`140`	`143`	`fn zero_mir_opt_level(config: &mut rustc_interface::Config) {`
`141`	`144`	`config.opts.unstable_opts.mir_opt_level = Some(0);`
Original file line number	Diff line number	Diff line change
`@@ -9,3 +9,4 @@ repository = "https://github.com/trailofbits/dylint"`
`9`	`9`
`10`	`10`	`[dependencies]`
`11`	`11`	`paste = "1.0.9"`
	`12`	`+rustversion = "1.0.9"`