Cyclic0007/ruff
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use rustfmt directly in prek (#22508)

Browse Source 
## Summary

Apparently this is about ~18x faster (2.25s → 0.12s) for a single-file
change, and ~2x faster (2.36s → 1.25s) for `prek run -a`.
This commit is contained in:
Charlie Marsh
2026-01-12 08:59:20 -05:00
committed by GitHub
parent f1db842821
commit 29064034ba
8 changed files with 17 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
.github/workflows/ci.yaml vendored
View File

@@ -778,9 +778,6 @@ jobs:
with: with:
persist-credentials: false persist-credentials: false
- uses: astral-sh/setup-uv@61cb8a9741eeb8a550a1b8544337180c0fc8476b # v7.2.0 - uses: astral-sh/setup-uv@61cb8a9741eeb8a550a1b8544337180c0fc8476b # v7.2.0
- uses: Swatinem/rust-cache@779680da715d629ac1d338a641029a2f4372abb5 # v2.8.2
with:
save-if: ${{ github.ref == 'refs/heads/main' }}
- uses: actions/setup-node@395ad3262231945c25e8478fd5baf05154b1d79f # v6.1.0 - uses: actions/setup-node@395ad3262231945c25e8478fd5baf05154b1d79f # v6.1.0
with: with:
node-version: 24 node-version: 24
@@ -794,7 +791,7 @@ jobs:
echo '```console' > "$GITHUB_STEP_SUMMARY" echo '```console' > "$GITHUB_STEP_SUMMARY"
# Enable color output for prek and remove it for the summary # Enable color output for prek and remove it for the summary
# Use --hook-stage=manual to enable slower hooks that are skipped by default # Use --hook-stage=manual to enable slower hooks that are skipped by default
SKIP=cargo-fmt uvx prek run --all-files --show-diff-on-failure --color always --hook-stage manual | \ SKIP=rustfmt uvx prek run --all-files --show-diff-on-failure --color always --hook-stage manual | \
tee >(sed -E 's/\x1B\[([0-9]{1,2}(;[0-9]{1,2})*)?[mGK]//g' >> "$GITHUB_STEP_SUMMARY") >&1 tee >(sed -E 's/\x1B\[([0-9]{1,2}(;[0-9]{1,2})*)?[mGK]//g' >> "$GITHUB_STEP_SUMMARY") >&1
exit_code="${PIPESTATUS[0]}" exit_code="${PIPESTATUS[0]}"
echo '```' >> "$GITHUB_STEP_SUMMARY" echo '```' >> "$GITHUB_STEP_SUMMARY"

7
.pre-commit-config.yaml
View File

@@ -42,12 +42,11 @@ repos:
- repo: local - repo: local
hooks: hooks:
- id: cargo-fmt - id: rustfmt
name: cargo fmt name: rustfmt
entry: cargo fmt -- entry: rustfmt
language: system language: system
types: [rust] types: [rust]
pass_filenames: false # This makes it a lot faster
priority: 0 priority: 0
# Prettier # Prettier

5
crates/ruff_formatter/shared_traits.rs
View File

@@ -13,7 +13,10 @@ impl<T, C> AsFormat<C> for &T
where where
T: AsFormat<C>, T: AsFormat<C>,
{ {
type Format<'a> = T::Format<'a> where Self: 'a; type Format<'a>
= T::Format<'a>
where
Self: 'a;
fn format(&self) -> Self::Format<'_> { fn format(&self) -> Self::Format<'_> {
AsFormat::format(&**self) AsFormat::format(&**self)

2
fuzz/fuzz_targets/ruff_fix_validity.rs
View File

@@ -3,7 +3,7 @@
#![no_main] #![no_main]
use libfuzzer_sys::{fuzz_target, Corpus}; use libfuzzer_sys::{Corpus, fuzz_target};
use ruff_linter::settings::LinterSettings; use ruff_linter::settings::LinterSettings;
use std::sync::OnceLock; use std::sync::OnceLock;

4
fuzz/fuzz_targets/ruff_formatter_idempotency.rs
View File

@@ -3,10 +3,10 @@
#![no_main] #![no_main]
use libfuzzer_sys::{fuzz_target, Corpus}; use libfuzzer_sys::{Corpus, fuzz_target};
use similar::TextDiff; use similar::TextDiff;
use ruff_python_formatter::{format_module_source, PyFormatOptions}; use ruff_python_formatter::{PyFormatOptions, format_module_source};
fn do_fuzz(case: &[u8]) -> Corpus { fn do_fuzz(case: &[u8]) -> Corpus {
// Throw away inputs which aren't utf-8 // Throw away inputs which aren't utf-8

6
fuzz/fuzz_targets/ruff_formatter_validity.rs
View File

@@ -6,13 +6,13 @@
use std::collections::HashMap; use std::collections::HashMap;
use std::sync::OnceLock; use std::sync::OnceLock;
use libfuzzer_sys::{fuzz_target, Corpus}; use libfuzzer_sys::{Corpus, fuzz_target};
use ruff_linter::linter::ParseSource; use ruff_linter::linter::ParseSource;
use ruff_linter::settings::flags::Noqa;
use ruff_linter::settings::LinterSettings; use ruff_linter::settings::LinterSettings;
use ruff_linter::settings::flags::Noqa;
use ruff_linter::source_kind::SourceKind; use ruff_linter::source_kind::SourceKind;
use ruff_python_ast::PySourceType; use ruff_python_ast::PySourceType;
use ruff_python_formatter::{format_module_source, PyFormatOptions}; use ruff_python_formatter::{PyFormatOptions, format_module_source};
use similar::TextDiff; use similar::TextDiff;
static SETTINGS: OnceLock<LinterSettings> = OnceLock::new(); static SETTINGS: OnceLock<LinterSettings> = OnceLock::new();

2
fuzz/fuzz_targets/ruff_parse_idempotency.rs
View File

@@ -3,7 +3,7 @@
#![no_main] #![no_main]
use libfuzzer_sys::{fuzz_target, Corpus}; use libfuzzer_sys::{Corpus, fuzz_target};
use ruff_python_codegen::round_trip; use ruff_python_codegen::round_trip;
use similar::TextDiff; use similar::TextDiff;

4
fuzz/fuzz_targets/ruff_parse_simple.rs
View File

@@ -3,9 +3,9 @@
#![no_main] #![no_main]
use libfuzzer_sys::{fuzz_target, Corpus}; use libfuzzer_sys::{Corpus, fuzz_target};
use ruff_python_codegen::{Generator, Stylist}; use ruff_python_codegen::{Generator, Stylist};
use ruff_python_parser::{parse_module, ParseError}; use ruff_python_parser::{ParseError, parse_module};
use ruff_text_size::Ranged; use ruff_text_size::Ranged;
fn do_fuzz(case: &[u8]) -> Corpus { fn do_fuzz(case: &[u8]) -> Corpus {