sonicop 26.8.110 → 26.8.111

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a00a7d0dc817fde927c8f9a5eb24db975f85aa2f4dda36ae1f7de548aa6557f6
-  data.tar.gz: 2c09e86e186f680c8f31cf5fd0e979fb974bc23ad173fa14e4f100f98dc95ce3
+  metadata.gz: 8537845670d9f9608820455763080e3173cbc5ef1d15e9fee908b16196132eae
+  data.tar.gz: 63c63e6d899ff77c46d6608a179af0708d5bf69b03ced51311c1190b70d8922b
 SHA512:
-  metadata.gz: 786c6eb994b2d5020f9f035623ec0f54ab95ad3f0359f747efd0bf97fd1bd4cca00d21b7a652b483861aef2af80dabb18dea4185bf9320a214307c4ea8780a8a
-  data.tar.gz: 8c0b93e14e6e7a56f497cc55aad95ce730c681515f9e2f8d67efcfe3c8ae44d98dc8f5ab1bf9c25b60f6de0791b0ed077bc3df0b4a679d3c07416a731426c66d
+  metadata.gz: 58132ce002c9581b4d8d2b89b66e314eba80d123d530074b40f979b19df3fd92bc197d2183d3d21456ea2519789ab1db316098acb5d8db0e76446ef4a21583db
+  data.tar.gz: 12caa6a19a43a625a28209687d8d89866c724ff86850513b1dffdf18e3cd29f93683c97a6f673a2326c2329859946a818c01112ef5e62576b37a190c8df584b1

data/Cargo.lock

@@ -4,9 +4,9 @@ version = 4
 
 [[package]]
 name = "aho-corasick"
-version = "1.1.4"
+version = "1.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ddd31a130427c27518df266943a5308ed92d4b226cc639f5a8f1002816174301"
+checksum = "c982642fa9e8606056828ee9a8505737230110bb1099153c79efe865c59d12ba"
 dependencies = [
  "memchr",
 ]
@@ -135,9 +135,9 @@ checksum = "9330f8b2ff13f34540b44e946ef35111825727b38d33286ef986142615121801"
 
 [[package]]
 name = "clap"
-version = "4.6.4"
+version = "4.6.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d91e0c145792ef73a6ad36d27c75ac09f1832222a3c209689d90f534685ee5b7"
+checksum = "301b56658598e48f3648647ac6fc887be7e7108eddfa4e9b63fcf3ec58c0cadf"
 dependencies = [
  "clap_builder",
  "clap_derive",
@@ -145,9 +145,9 @@ dependencies = [
 
 [[package]]
 name = "clap_builder"
-version = "4.6.2"
+version = "4.6.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f09628afdcc538b57f3c6341e9c8e9970f18e4a481690a64974d7023bd33548b"
+checksum = "94a65403d1a1bd28f7dc68eb8506e8874808ee5eecb59298de588e2e1407a078"
 dependencies = [
  "anstream",
  "anstyle",
@@ -276,9 +276,9 @@ checksum = "da7c62ceae207dd37ea5b845da6a0696c799f85e97da1ab5b7910be3c1c80223"
 
 [[package]]
 name = "find-msvc-tools"
-version = "0.1.10"
+version = "0.1.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26b73573e6edcd2af0cdf47bd6cb58f0b3839491263c314eaad1ccf24430e1de"
+checksum = "d45db016d36b838f563236e9193d0ee6ce38f3f68b6c94e914b4929c96bbb890"
 
 [[package]]
 name = "foreign-types"
@@ -349,9 +349,9 @@ checksum = "6dbf3de79e51f3d586ab4cb9d5c3e2c14aa28ed23d180cf89b4df0454a69cc87"
 
 [[package]]
 name = "ignore"
-version = "0.4.31"
+version = "0.4.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f8a7b8211e695a1d0cd91cace480d4d0bd57667ab10277cc412c5f7f4884f83"
+checksum = "0b17771570a2b94107741a7b033f19132c2eee21d59d21b24d2ced26500bd66e"
 dependencies = [
  "crossbeam-deque",
  "globset",
@@ -587,9 +587,9 @@ dependencies = [
 
 [[package]]
 name = "regex-automata"
-version = "0.4.16"
+version = "0.4.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8fcfdb36bda0c880c5931cdc7a2bcdc8ba4556847b9d912bca70bc94708711ad"
+checksum = "ad8553b9b26413251cbf30e620595c7a41b3887f03da04579c0e6b0d6a06b4b2"
 dependencies = [
  "aho-corasick",
  "memchr",
@@ -742,7 +742,7 @@ checksum = "f8fadd59c855ef2080decdef8ff161eb6661b86933c9d82e5ba29dc602a55aba"
 
 [[package]]
 name = "sonicop"
-version = "26.8.110"
+version = "26.8.111"
 dependencies = [
  "anyhow",
  "assert_cmd",
@@ -847,8 +847,8 @@ checksum = "009994f150cc0cd50ff54917d5bc8bffe8cad10ca10d81c34da2ec421ae61782"
 
 [[package]]
 name = "tree-sitter-ruby"
-version = "26.8.101"
-source = "git+https://github.com/owayo/tree-sitter-ruby.git?rev=f1a19bb27ba64300d1032b813c51437a5a76ea33#f1a19bb27ba64300d1032b813c51437a5a76ea33"
+version = "26.8.102"
+source = "git+https://github.com/owayo/tree-sitter-ruby.git?tag=v26.8.102#b51a2c820a49b7270806a5480a003db4c183f8ff"
 dependencies = [
  "cc",
  "tree-sitter-language",

data/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "sonicop"
-version = "26.8.110"
+version = "26.8.111"
 edition = "2024"
 rust-version = "1.85"
 description = "A fast, native RuboCop-compatible Ruby linter and formatter"
@@ -16,10 +16,10 @@ path = "src/main.rs"
 
 [dependencies]
 anyhow = "1.0.104"
-clap = { version = "4.6.4", features = ["derive", "wrap_help"] }
+clap = { version = "4.6.5", features = ["derive", "wrap_help"] }
 encoding_rs = "0.8.35"
 globset = "0.4.19"
-ignore = "0.4.31"
+ignore = "0.4.32"
 rayon = "1.12.0"
 regex = "1.13.1"
 serde = { version = "1.0.229", features = ["derive"] }
@@ -28,7 +28,7 @@ serde_yaml_ng = "0.10"
 shell-words = "1.1.1"
 tempfile = "3.27.0"
 tree-sitter = "0.26.11"
-tree-sitter-ruby = { git = "https://github.com/owayo/tree-sitter-ruby.git", rev = "f1a19bb27ba64300d1032b813c51437a5a76ea33" }
+tree-sitter-ruby = { git = "https://github.com/owayo/tree-sitter-ruby.git", tag = "v26.8.102" }
 ureq = { version = "3.4", default-features = false, features = ["native-tls"] }
 
 [dev-dependencies]

data/README.ja.md

@@ -165,13 +165,13 @@ Mastodon でバイト単位に一致します。この 2 つは死守ライン
 
 | コーパス | ファイル | RuboCop 並列 | Sonicop 並列 | RuboCop 単一 | Sonicop 単一 |
 |---|---:|---:|---:|---:|---:|
-| rubocop/rubocop | 1,765 | 11.49 秒 | **3.45 秒** | 42.49 秒 | **16.39 秒** |
-| mastodon/mastodon | 3,290 | 27.26 秒 | **6.03 秒** | 42.07 秒 | **19.53 秒** |
-| Homebrew/brew | 2,179 | 20.37 秒 | **5.36 秒** | 45.08 秒 | **16.03 秒** |
-| rails/rails | 3,551 | 45.89 秒 | **18.96 秒** | 99.56 秒 | **44.61 秒** |
-| ruby/ruby | 7,466 | 117.79 秒 | **54.97 秒** | 215.87 秒 | **100.62 秒** |
+| rubocop/rubocop | 1,765 | 12.71 秒 | **4.59 秒** | 42.74 秒 | **13.75 秒** |
+| mastodon/mastodon | 3,290 | 29.95 秒 | **6.48 秒** | 37.60 秒 | **15.88 秒** |
+| Homebrew/brew | 2,179 | 18.20 秒 | **4.31 秒** | 38.72 秒 | **11.67 秒** |
+| rails/rails | 3,551 | 52.55 秒 | **16.88 秒** | 162.55 秒 | **63.97 秒** |
+| ruby/ruby | 7,466 | 132.17 秒 | **43.10 秒** | 199.78 秒 | **76.07 秒** |
 
-差は並列で 2.1〜4.5 倍、単一プロセスで 2.1〜2.8 倍と幅があり、1 コーパスでは代表できません。
+差は並列で 2.8〜4.6 倍、単一プロセスで 2.4〜3.3 倍と幅があり、1 コーパスでは代表できません。
 **単一プロセスの列を読み、並列は目安として扱ってください。** 同じ 2 つのバイナリを 1 日に
 3 回測ったところ、単一プロセスの値は毎回 16% 以内に収まったのに対し、RuboCop 自身のツリーでの
 並列の倍率は、マシンが他に何をしていたかだけで 3.3 倍から 9.2 倍まで動きました。単一プロセスは
@@ -198,7 +198,10 @@ sonicop --force-default-config --format quiet
 ```
 
 測定機は Apple M2（8 コア）、Ruby 4.0.6（YJIT 利用可）、RubyGems 導入の RuboCop 1.89.0。
-1 分平均のロードアベレージは、計測開始時が 3.6、終了時が 9.6 でした。**アイドル状態ではありません**。
+1 分平均のロードアベレージは、計測開始時が 4.0、終了時が 3.1 でした。**アイドル状態ではありません**。
+RuboCop 自身のツリーだけは後から単独で測り直しています（負荷 3.7 → 4.0）。1 回目はリリース
+ビルドの終わりがけに走ってしまい、値が 60% ほど高く出たためです。**負荷の違う 1 行を同じ表に
+並べることはできません**。
 両者を同じ条件で測っているため倍率は保たれますが、秒数そのものは下限ではなく、静かなマシンなら
 より速く出ます。コアを奪い合うものが動いていると両者とも膨らみ、その度合いは一致しません。それが
 並列の列があれだけ動く理由です。秒数そのものが重要なときは、他に負荷のない状態で測り、**実行の

data/README.md

@@ -171,13 +171,13 @@ warmed runs.
 
 | Corpus | Files | RuboCop parallel | Sonicop parallel | RuboCop single | Sonicop single |
 |---|---:|---:|---:|---:|---:|
-| rubocop/rubocop | 1,765 | 11.49 s | **3.45 s** | 42.49 s | **16.39 s** |
-| mastodon/mastodon | 3,290 | 27.26 s | **6.03 s** | 42.07 s | **19.53 s** |
-| Homebrew/brew | 2,179 | 20.37 s | **5.36 s** | 45.08 s | **16.03 s** |
-| rails/rails | 3,551 | 45.89 s | **18.96 s** | 99.56 s | **44.61 s** |
-| ruby/ruby | 7,466 | 117.79 s | **54.97 s** | 215.87 s | **100.62 s** |
+| rubocop/rubocop | 1,765 | 12.71 s | **4.59 s** | 42.74 s | **13.75 s** |
+| mastodon/mastodon | 3,290 | 29.95 s | **6.48 s** | 37.60 s | **15.88 s** |
+| Homebrew/brew | 2,179 | 18.20 s | **4.31 s** | 38.72 s | **11.67 s** |
+| rails/rails | 3,551 | 52.55 s | **16.88 s** | 162.55 s | **63.97 s** |
+| ruby/ruby | 7,466 | 132.17 s | **43.10 s** | 199.78 s | **76.07 s** |
 
-The gap is 2.1x to 4.5x in parallel and 2.1x to 2.8x single-process, so no single corpus summarizes
+The gap is 2.8x to 4.6x in parallel and 2.4x to 3.3x single-process, so no single corpus summarizes
 it. **Read the single-process column and treat the parallel one as indicative.** Measuring the same
 two binaries three times over a day put the single-process figures within 16% of each other every
 time, while the parallel ratio on RuboCop's own tree moved between 3.3x and 9.2x purely with what
@@ -204,8 +204,11 @@ sonicop --force-default-config --format quiet
 ```
 
 Machine: Apple M2 (8 cores), Ruby 4.0.6 with YJIT available, RubyGems-installed RuboCop 1.89.0.
-The one-minute load average was 3.6 when the run started and 9.6 when it finished — the machine was
-in use, not idle. Both tools ran under the same conditions, so the ratios hold, but the absolute
+The one-minute load average was 4.0 when the run started and 3.1 when it finished — the machine was
+in use, not idle. RuboCop's own tree was re-measured on its own afterwards, at load 3.7 rising to 4.0,
+because the first pass over it ran while a release build was still finishing and its numbers came out
+60% high; a row measured under a different load cannot sit in the same table as the others. Both tools
+ran under the same conditions, so the ratios hold, but the absolute
 seconds are not a floor: expect better on a quiet machine. Anything competing for cores inflates
 both sides, and not by the same factor on each, which is what makes the parallel column move as much
 as it does. If the absolute numbers matter to you, measure on an idle machine and record the load

data/lib/sonicop/version.rb

@@ -2,5 +2,5 @@
 
 # Generated from Cargo.toml by `rake version:sync`. Do not edit by hand.
 module Sonicop
-  VERSION = '26.8.110'
+  VERSION = '26.8.111'
 end

data/src/cli.rs

@@ -390,6 +390,64 @@ fn try_run(cli: Cli, outputs: &[Option<PathBuf>]) -> Result<i32> {
         return Ok(0);
     }
 
+    let correct_mode = cli.correct_mode();
+    let selection = build_selection(&cli, &config, correct_mode)?;
+    if !cli.list_target_files {
+        warn_unimplemented_enabled(&config, &selection);
+    }
+
+    let parallel = !cli.no_parallel && (cli.parallel || cli.stdin.is_none());
+    let mut reports = match inspect_inputs(&cli, &cwd, &configs, &selection, parallel)? {
+        Inspection::Reports(reports) => reports,
+        Inspection::ListedTargets => return Ok(0),
+    };
+
+    if cli.debug {
+        debug_report(&cwd, &config, reports.len(), parallel);
+    }
+    if cli.auto_gen_config || cli.regenerate_todo {
+        generate_todo(&reports, &cwd, &cli)?;
+        return Ok(0);
+    }
+    if cli.disable_uncorrectable {
+        eprintln!(
+            "Sonicop: --disable-uncorrectable is accepted; todo insertion is not implemented yet."
+        );
+    }
+
+    let CorrectionRun {
+        reports: corrected_reports,
+        corrected_count,
+        stdin_corrected,
+        had_errors,
+    } = apply_corrections(reports, &cli, &configs, correct_mode, &selection)?;
+    reports = corrected_reports;
+
+    // A file RuboCop could not finish counts as a failed run even when nothing else offended.
+    let failing = fail_level.failing(&reports) || had_errors;
+
+    if let Some(corrected) = stdin_corrected {
+        print!("{corrected}");
+    } else {
+        filter_displayed_offenses(&mut reports, &cli, fail_level);
+        render_outputs(
+            &RenderRequest {
+                cli: &cli,
+                config: &config,
+                cwd: &cwd,
+                fail_level,
+                outputs,
+                corrected_count,
+                elapsed: started.elapsed().as_secs_f64(),
+            },
+            &reports,
+        )?;
+    }
+
+    Ok(i32::from(failing))
+}
+
+fn build_selection(cli: &Cli, config: &Config, correct_mode: CorrectMode) -> Result<Selection> {
     let mut only = csv(cli.only.as_deref());
     if cli.lint {
         only.push("Lint".to_owned());
@@ -397,10 +455,12 @@ fn try_run(cli: Cli, outputs: &[Option<PathBuf>]) -> Result<i32> {
     if cli.fix_layout {
         only.push("Layout".to_owned());
     }
-    validate_selection(&only, "--only", &config)?;
+    validate_selection(&only, "--only", config)?;
+
     let except = csv(cli.except.as_deref());
-    validate_selection(&except, "--except", &config)?;
-    let selection = Selection {
+    validate_selection(&except, "--except", config)?;
+
+    Ok(Selection {
         only,
         except,
         disable_all: cli.disable_all_cops,
@@ -410,49 +470,40 @@ fn try_run(cli: Cli, outputs: &[Option<PathBuf>]) -> Result<i32> {
         safe_only: cli.safe,
         ignore_disable_comments: cli.ignore_disable_comments,
         display_suppressed: cli.display_suppressed,
-        correcting: cli.correct_mode() != CorrectMode::None,
+        correcting: correct_mode != CorrectMode::None,
         // **No flag turns this on from the command line.** The guard is switched off for tests
         // only, and even then per case; a run reaches the environment variable or nothing.
         skip_syntax_guard: false,
-    };
-    let correct_mode = cli.correct_mode();
-    if !cli.list_target_files {
-        warn_unimplemented_enabled(&config, &selection);
-    }
+    })
+}
 
-    let parallel = !cli.no_parallel && (cli.parallel || cli.stdin.is_none());
-    let mut reports = if let Some(stdin_path) = &cli.stdin {
-        if !cli.paths.is_empty() {
-            bail!(
-                "--stdin requires exactly one path supplied as its argument and no file arguments"
-            );
-        }
-        let mut text = String::new();
-        io::stdin()
-            .read_to_string(&mut text)
-            .context("failed to read UTF-8 source from stdin")?;
-        let target_config = configs.for_path(stdin_path)?;
-        vec![inspect_source(
-            stdin_path.clone(),
-            text,
-            &target_config,
-            &selection,
-        )?]
-    } else {
+enum Inspection {
+    Reports(Vec<FileReport>),
+    ListedTargets,
+}
+
+fn inspect_inputs(
+    cli: &Cli,
+    cwd: &Path,
+    configs: &ConfigStore,
+    selection: &Selection,
+    parallel: bool,
+) -> Result<Inspection> {
+    let Some(stdin_path) = &cli.stdin else {
         let mut targets = discover_targets_with_store(
             &cli.paths,
-            &cwd,
-            &configs,
+            cwd,
+            configs,
             cli.force_exclusion,
             cli.only_recognized_file_types,
         )?;
         if cli.list_target_files {
             for path in targets {
-                println!("{}", smart_path(&path, &cwd));
+                println!("{}", smart_path(&path, cwd));
             }
-            return Ok(0);
+            return Ok(Inspection::ListedTargets);
         }
-        if cli.fail_fast {
+        let reports = if cli.fail_fast {
             targets.sort_by_key(|path| {
                 std::cmp::Reverse(
                     fs::metadata(path)
@@ -460,45 +511,60 @@ fn try_run(cli: Cli, outputs: &[Option<PathBuf>]) -> Result<i32> {
                         .ok(),
                 )
             });
-            inspect_fail_fast(&targets, &configs, &selection)?
+            inspect_fail_fast(&targets, configs, selection)?
         } else {
-            inspect_files_with_store(&targets, &configs, &selection, parallel)?
-        }
+            inspect_files_with_store(&targets, configs, selection, parallel)?
+        };
+        return Ok(Inspection::Reports(reports));
     };
 
-    if cli.debug {
-        debug_report(&cwd, &config, reports.len(), parallel);
-    }
-    if cli.auto_gen_config || cli.regenerate_todo {
-        generate_todo(&reports, &cwd, &cli)?;
-        return Ok(0);
-    }
-    if cli.disable_uncorrectable {
-        eprintln!(
-            "Sonicop: --disable-uncorrectable is accepted; todo insertion is not implemented yet."
-        );
+    if !cli.paths.is_empty() {
+        bail!("--stdin requires exactly one path supplied as its argument and no file arguments");
     }
+    let mut text = String::new();
+    io::stdin()
+        .read_to_string(&mut text)
+        .context("failed to read UTF-8 source from stdin")?;
+    let target_config = configs.for_path(stdin_path)?;
+    let report = inspect_source(stdin_path.clone(), text, &target_config, selection)?;
+    Ok(Inspection::Reports(vec![report]))
+}
+
+struct CorrectionRun {
+    reports: Vec<FileReport>,
+    corrected_count: usize,
+    stdin_corrected: Option<String>,
+    had_errors: bool,
+}
 
+fn apply_corrections(
+    reports: Vec<FileReport>,
+    cli: &Cli,
+    configs: &ConfigStore,
+    correct_mode: CorrectMode,
+    selection: &Selection,
+) -> Result<CorrectionRun> {
     let mut corrected_count = 0;
     let mut stdin_corrected = None;
-    let mut run_errors = 0;
+    let mut had_errors = false;
     let mut corrected_reports = Vec::with_capacity(reports.len());
+
     for report in reports {
         let path = report.path.clone();
         let target_config = configs.for_path(&path)?;
-        let outcome = correct_file(report, correct_mode, &target_config, &selection)?;
+        let outcome = correct_file(report, correct_mode, &target_config, selection)?;
         corrected_count += outcome.corrected_count;
         if let Some(message) = outcome.infinite_loop {
             // RuboCop keeps the run going and still writes what it managed to correct.
             eprintln!("{message}");
-            run_errors += 1;
+            had_errors = true;
         }
         // Not an offense: the file on disk parses, so a reader told to look for a syntax error
         // would find none. It is an autocorrect failure, and it has to reach the exit code --
         // a `-A` run that silently declined to correct must not look like a clean one to CI.
         if let Some(message) = outcome.rollback {
             eprintln!("{message}");
-            run_errors += 1;
+            had_errors = true;
         }
         if outcome.rewritten {
             if cli.stdin.is_some() {
@@ -509,30 +575,13 @@ fn try_run(cli: Cli, outputs: &[Option<PathBuf>]) -> Result<i32> {
         }
         corrected_reports.push(outcome.report);
     }
-    reports = corrected_reports;
-
-    // A file RuboCop could not finish counts as a failed run even when nothing else offended.
-    let failing = fail_level.failing(&reports) || run_errors > 0;
-
-    if let Some(corrected) = stdin_corrected {
-        print!("{corrected}");
-    } else {
-        filter_displayed_offenses(&mut reports, &cli, fail_level);
-        render_outputs(
-            &RenderRequest {
-                cli: &cli,
-                config: &config,
-                cwd: &cwd,
-                fail_level,
-                outputs,
-                corrected_count,
-                elapsed: started.elapsed().as_secs_f64(),
-            },
-            &reports,
-        )?;
-    }
 
-    Ok(i32::from(failing))
+    Ok(CorrectionRun {
+        reports: corrected_reports,
+        corrected_count,
+        stdin_corrected,
+        had_errors,
+    })
 }
 
 /// RuboCop's `--fail-level` accepts a severity plus the pseudo level `autocorrect`, which changes