Address rust-lang/rust#106810

Also, revert the following commits:

- cc8b57a
- 7e9057f

Author: smoelius

cargo-dylint/tests/boundary_toolchains.rs

@@ -6,7 +6,12 @@ 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")];
+// smoelius: Put recent boundaries first, since they're more likely to cause problems.
+const BOUNDARIES: [(&str, &str); 3] = [
+    ("2023-01-19", "2023-01-20"),
+    ("2022-09-08", "2022-09-09"),
+    ("2022-07-14", "2022-07-15"),
+];
 
 #[test]
 fn boundary_toolchains() {

scripts/publish.sh

@@ -50,7 +50,7 @@ published() {
     echo '[workspace]' >> Cargo.toml
     cat > rust-toolchain << EOF
 [toolchain]
-channel = "nightly-2023-01-19"
+channel = "nightly"
 components = ["llvm-tools-preview", "rustc-dev"]
 EOF
     echo "Checking whether \`$1:$2\` is published ..." >&2

utils/linting/Cargo.lock

@@ -17,6 +17,9 @@ toml = "0.5"
 
 dylint_internal = { version = "=2.1.3", path = "../../internal" }
 
+[dev-dependencies]
+assert_cmd = "2.0"
+
 [package.metadata.docs.rs]
 rustdoc-args = ["--cfg", "docsrs"]
 

utils/linting/Cargo.toml

@@ -1,4 +1,3 @@
 [toolchain]
-# smoelius: Temporarily pin to `nightly-2023-01-19` until rust-lang/rust#106810 can be dealt with.
-channel = "nightly-2023-01-19"
+channel = "nightly"
 components = ["llvm-tools-preview", "rustc-dev"]

utils/linting/rust-toolchain

@@ -16,7 +16,13 @@ use cargo_metadata::{Metadata, MetadataCommand};
 use dylint_internal::env;
 use rustc_session::Session;
 use rustc_span::Symbol;
-use std::{any::type_name, cell::RefCell, fs::read_to_string, path::Path, sync::Mutex};
+use std::{
+    any::type_name,
+    cell::RefCell,
+    fs::read_to_string,
+    path::{Path, PathBuf},
+    sync::Mutex,
+};
 use thiserror::Error;
 
 pub const DYLINT_VERSION: &str = "0.1.0";
@@ -72,8 +78,8 @@ macro_rules! __make_late_closure {
 }
 
 // smoelius: Relevant PR and merge commit:
-// * https://github.com/rust-lang/rust/pull/101501
-// * https://github.com/rust-lang/rust/commit/87788097b776f8e3662f76627944230684b671bd
+// - https://github.com/rust-lang/rust/pull/101501
+// - https://github.com/rust-lang/rust/commit/87788097b776f8e3662f76627944230684b671bd
 #[rustversion::since(2022-09-08)]
 #[doc(hidden)]
 #[macro_export]
@@ -310,8 +316,7 @@ pub fn try_init_config(sess: &Session) -> ConfigResult<()> {
             Some(Symbol::intern(&value)),
         ));
         Some(value)
-    } else if let Some(local_crate_source_file) = sess
-        .local_crate_source_file
+    } else if let Some(local_crate_source_file) = local_crate_source_file(sess)
         .as_deref()
         .map(Path::canonicalize)
         .transpose()?
@@ -363,3 +368,16 @@ pub fn try_init_config(sess: &Session) -> ConfigResult<()> {
 
     Ok(())
 }
+
+#[rustversion::before(2023-01-19)]
+fn local_crate_source_file(sess: &Session) -> Option<PathBuf> {
+    sess.local_crate_source_file.clone()
+}
+
+// smoelius: Relevant PR and merge commit:
+// - https://github.com/rust-lang/rust/pull/106810
+// - https://github.com/rust-lang/rust/commit/65d2f2a5f9c323c88d1068e8e90d0b47a20d491c
+#[rustversion::since(2023-01-19)]
+fn local_crate_source_file(sess: &Session) -> Option<PathBuf> {
+    sess.local_crate_source_file()
+}

utils/linting/src/lib.rs

@@ -0,0 +1,18 @@
+use assert_cmd::{assert::AssertResult, prelude::*};
+
+#[test]
+fn builds_with_latest_nightly() {
+    update_nightly().unwrap();
+
+    std::process::Command::new("cargo")
+        .args(["+nightly", "build"])
+        .assert()
+        .success();
+}
+
+fn update_nightly() -> AssertResult {
+    std::process::Command::new("rustup")
+        .args(["update", "--no-self-update", "nightly"])
+        .assert()
+        .try_success()
+}