More improvements to upgrade process

.github/workflows/upgrade_examples.yml

@@ -19,6 +19,9 @@ jobs:
           # https://github.com/peter-evans/create-pull-request/blob/main/docs/concepts-guidelines.md#push-using-ssh-deploy-keys
           ssh-key: ${{ secrets.SSH_KEY }}
 
+      - name: Install dylint-link
+        run: cargo install --path ./dylint-link --force
+
       - name: Upgrade examples
         run: |
           scripts/upgrade_examples.sh

dylint/src/package_options/auto_correct/highlight.rs

@@ -1,7 +1,7 @@
 use super::tokenization::{tokenize_fragment, tokenize_lines};
-use crate::opts;
+use crate::{error::warn, opts};
 use anyhow::Result;
-use cargo_metadata::diagnostic::{Diagnostic, DiagnosticSpan};
+use cargo_metadata::diagnostic::{Diagnostic, DiagnosticLevel, DiagnosticSpan};
 use dylint_internal::{cargo, rustup::SanitizeEnvironment, CommandExt};
 use serde::Deserialize;
 use std::{path::Path, time::Instant};
@@ -111,44 +111,56 @@ impl Highlight {
 /// Invokes `cargo build` at `path` and returns the generated diagnostic messages as [`Highlight`]s.
 pub fn collect_highlights(opts: &opts::Dylint, path: &Path) -> Result<Vec<Highlight>> {
     let start = Instant::now();
+
     let output = cargo::check("upgraded library package")
         .quiet(opts.quiet)
         .build()
         .sanitize_environment()
         .current_dir(path)
         .arg("--message-format=json")
         .logged_output(false)?;
-    let elapsed = start.elapsed();
-    eprintln!(
-        "Checked upgraded library package in {} seconds",
-        elapsed.as_secs()
-    );
-
-    if output.status.success() {
-        return Ok(Vec::new());
-    }
 
     let mut highlights = Vec::new();
-    let stdout = String::from_utf8(output.stdout)?;
-    for result in serde_json::Deserializer::from_str(&stdout).into_iter::<Message>() {
-        let message = result?;
-        if message.reason != "compiler-message" {
-            continue;
-        }
-        let Some(diagnostic) = message.diagnostic else {
-            continue;
-        };
-        for span in diagnostic.spans {
-            if span.text.is_empty() {
+
+    if !output.status.success() {
+        let stdout = String::from_utf8(output.stdout)?;
+        for result in serde_json::Deserializer::from_str(&stdout).into_iter::<Message>() {
+            let message = result?;
+            if message.reason != "compiler-message" {
                 continue;
             }
-            let highlight = Highlight::try_new(&diagnostic.message, span)?;
-            assert!(!highlight.tokens.is_empty());
-            highlights.push(highlight);
+            let Some(diagnostic) = message.diagnostic else {
+                continue;
+            };
+            if diagnostic.level == DiagnosticLevel::Error && diagnostic.spans.is_empty() {
+                warn(
+                    opts,
+                    &format!(
+                        "Found diagnostic error with no spans: {}",
+                        &diagnostic.message
+                    ),
+                );
+                continue;
+            }
+            for span in diagnostic.spans {
+                if span.text.is_empty() {
+                    continue;
+                }
+                let highlight = Highlight::try_new(&diagnostic.message, span)?;
+                assert!(!highlight.tokens.is_empty());
+                highlights.push(highlight);
+            }
         }
+
+        highlights.sort();
     }
 
-    highlights.sort();
+    let elapsed = start.elapsed();
+    eprintln!(
+        "Found {} highlights in {} seconds",
+        highlights.len(),
+        elapsed.as_secs()
+    );
 
     Ok(highlights)
 }

scripts/upgrade_examples.sh

@@ -29,7 +29,7 @@ for EXAMPLE in examples/general examples/supplementary examples/restriction $EXP
         PREV_REV="$(sed -n 's/^clippy_utils\>.*\(\<\(rev\|tag\) = "[^"]*"\).*$/\1/;T;p' "$EXAMPLE"/Cargo.toml)"
         PREV_CHANNEL="$(sed -n 's/^channel = "[^"]*"$/&/;T;p' "$EXAMPLE"/rust-toolchain)"
 
-        $CARGO_DYLINT upgrade "$EXAMPLE" --auto-correct || true
+        RUST_LOG=debug $CARGO_DYLINT upgrade "$EXAMPLE" --auto-correct
 
         REV="$(sed -n 's/^clippy_utils\>.*\(\<\(rev\|tag\) = "[^"]*"\).*$/\1/;T;p' "$EXAMPLE"/Cargo.toml)"
         sed -i "s/^\(clippy_config\>.*\)\<\(rev\|tag\) = \"[^\"]*\"\(.*\)$/\1$REV\3/" "$EXAMPLE"/Cargo.toml
@@ -53,7 +53,7 @@ for EXAMPLE in examples/general examples/supplementary examples/restriction $EXP
         mv "$EXAMPLE"/Cargo.toml~ "$EXAMPLE"/Cargo.toml
     fi
 
-    $CARGO_DYLINT upgrade "$EXAMPLE" --auto-correct
+    RUST_LOG=debug $CARGO_DYLINT upgrade "$EXAMPLE" --auto-correct
 
     if [[ "$EXAMPLE" = 'internal/template' ]]; then
         mv "$EXAMPLE"/Cargo.toml "$EXAMPLE"/Cargo.toml~