Account for API changes

Author: smoelius

Cargo.toml

@@ -77,6 +77,7 @@ level = "deny"
 check-cfg = [
     "cfg(coverage)",
     "cfg(dylint_lib, values(any()))",
+    "cfg(nightly)",
     "cfg(__cargo_cli)",
     "cfg(__cargo_lib)",
     "cfg(__library_packages)",

clippy.toml

@@ -2,3 +2,6 @@ disallowed-methods = [
     { path = "std::process::Command::output", reason = "use `CommandExt::logged_output`" },
     { path = "std::result::Result::expect", reason = "hides errors; use `unwrap_or_else(|error| panic!(...))`" },
 ]
+# smoelius: Dylint's MSRV is actually 1.81. But some of the lints need 1.82 for `is_none_or` and
+# `is_some_and`.
+msrv = "1.82"

dylint/src/package_options/auto_correct/highlight.rs

@@ -36,6 +36,7 @@ pub struct Highlight {
     pub is_primary: bool,
 }
 
+#[allow(clippy::missing_fields_in_debug)]
 impl std::fmt::Debug for Highlight {
     #[cfg_attr(dylint_lib = "general", allow(non_local_effect_before_error_return))]
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {

dylint/src/package_options/auto_correct/rewrite/diff.rs

@@ -65,6 +65,7 @@ pub(super) fn patches_from_diff<'repo>(diff: &Diff<'repo>) -> Result<Vec<Patch<'
         .map(|idx| -> Result<_> {
             let patch = Patch::from_diff(diff, idx)?;
             // smoelius: Only return patches for Rust source files.
+            #[allow(clippy::nonminimal_bool)]
             if !patch
                 .as_ref()
                 .and_then(|patch| patch.delta().old_file().path())

examples/general/Cargo.lock

@@ -16,6 +16,7 @@ path = "ui/main.rs"
 [dependencies]
 clippy_utils = { workspace = true }
 
+dylint_internal = { path = "../../../internal", features = ["match_def_path"] }
 dylint_linting = { path = "../../../utils/linting" }
 
 [dev-dependencies]

examples/general/await_holding_span_guard/Cargo.toml

@@ -5,7 +5,7 @@ extern crate rustc_hir;
 extern crate rustc_middle;
 
 use clippy_utils::diagnostics::span_lint_and_then;
-use clippy_utils::match_def_path;
+use dylint_internal::match_def_path;
 use rustc_hir as hir;
 use rustc_hir::def_id::DefId;
 use rustc_lint::{LateContext, LateLintPass};

examples/general/await_holding_span_guard/src/lib.rs

@@ -5,12 +5,13 @@
 extern crate rustc_ast;
 extern crate rustc_span;
 
-use clippy_utils::{diagnostics::span_lint, sym};
+use clippy_utils::diagnostics::span_lint;
 use rustc_ast::{
     BinOpKind, Expr, ExprKind, MacCall, ptr::P, token::Token, token::TokenKind,
     tokenstream::TokenTree,
 };
 use rustc_lint::{EarlyContext, EarlyLintPass};
+use rustc_span::Symbol;
 
 dylint_linting::declare_pre_expansion_lint! {
     /// ### What it does
@@ -65,7 +66,7 @@ dylint_linting::declare_pre_expansion_lint! {
 
 fn is_matches_macro(expr: &P<Expr>) -> Option<&P<MacCall>> {
     if let ExprKind::MacCall(mac) = &expr.kind // must be a macro call
-        && mac.path == sym!(matches)
+        && mac.path == Symbol::intern("matches")
     // must be a matches! symbol
     {
         return Some(mac);

examples/general/incorrect_matches_operation/src/lib.rs

@@ -21,6 +21,7 @@ path = "ui_public_only/main.rs"
 clippy_utils = { workspace = true }
 serde = { workspace = true, features = ["derive"] }
 
+dylint_internal = { path = "../../../internal", features = ["match_def_path"] }
 dylint_linting = { path = "../../../utils/linting" }
 
 [dev-dependencies]

examples/general/non_local_effect_before_error_return/Cargo.toml

@@ -10,7 +10,12 @@ extern crate rustc_index;
 extern crate rustc_middle;
 extern crate rustc_span;
 
-use clippy_utils::{diagnostics::span_lint_and_then, match_def_path};
+use clippy_utils::{
+    diagnostics::span_lint_and_then,
+    paths::{PathLookup, PathNS},
+    type_path,
+};
+use dylint_internal::match_def_path;
 use rustc_errors::Diag;
 use rustc_hir::{def_id::LocalDefId, intravisit::FnKind};
 use rustc_index::bit_set::DenseBitSet;
@@ -221,6 +226,8 @@ fn in_async_function(tcx: ty::TyCtxt<'_>, hir_id: rustc_hir::HirId) -> bool {
         })
 }
 
+static CORE_FMT_ERROR: PathLookup = type_path!(core::fmt::Error);
+
 fn is_lintable_result(cx: &LateContext<'_>, ty: ty::Ty) -> bool {
     if let ty::Adt(adt, substs) = ty.kind() {
         if !cx.tcx.is_diagnostic_item(sym::Result, adt.did()) {
@@ -230,7 +237,7 @@ fn is_lintable_result(cx: &LateContext<'_>, ty: ty::Ty) -> bool {
         // Don't lint if the error type is core::fmt::Error
         if let Some(error_ty) = substs.get(1)
             && let ty::Adt(error_adt, _) = error_ty.expect_ty().kind()
-            && match_def_path(cx, error_adt.did(), &["core", "fmt", "Error"])
+            && CORE_FMT_ERROR.matches(cx, error_adt.did())
         {
             return false;
         }