From 553258af51034bc84dc9f951201e7b8f2285b57e Mon Sep 17 00:00:00 2001 From: Josh Triplett Date: Thu, 25 Jul 2024 15:35:58 -0700 Subject: [PATCH 1/5] Have clippy warn about uninlined format arguments This makes clippy warn about `format!("{}", var)`, with a machine-applicable fix converting to `format!("{var}")`. --- Cargo.toml | 1 + 1 file changed, 1 insertion(+) diff --git a/Cargo.toml b/Cargo.toml index 90d89f6..97c7ed7 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -80,6 +80,7 @@ string_lit_as_bytes = "warn" string_to_string = "warn" todo = "warn" trait_duplication_in_bounds = "warn" +uninlined_format_args = "warn" verbose_file_reads = "warn" wildcard_imports = "warn" zero_sized_map_values = "warn" From 7a28f01acfe8eb95f4e54127e1b66aa31cf2aeed Mon Sep 17 00:00:00 2001 From: Ed Page Date: Fri, 23 Aug 2024 19:02:02 -0500 Subject: [PATCH 2/5] docs(contrib): Fix tpo --- CONTRIBUTING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 87d9134..b0318b8 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -45,7 +45,7 @@ We ask that commits are atomic, meaning they are complete and have a single resp PRs should tell a cohesive story, with test and refactor commits that keep the fix or feature commits simple and clear. -Specifically, we would encouage +Specifically, we would encourage - File renames be isolated into their own commit - Add tests in a commit before their feature or fix, showing the current behavior. The diff for the feature/fix commit will then show how the behavior changed, From 37cf1085bc6aa53e18a37f0aa97be51afa6e7f14 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sun, 1 Sep 2024 01:02:47 +0000 Subject: [PATCH 3/5] chore(deps): Update EmbarkStudios/cargo-deny-action action to v2 --- .github/workflows/audit.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/audit.yml b/.github/workflows/audit.yml index 07c70ee..a94be15 100644 --- a/.github/workflows/audit.yml +++ b/.github/workflows/audit.yml @@ -47,7 +47,7 @@ jobs: - bans licenses sources steps: - uses: actions/checkout@v4 - - uses: EmbarkStudios/cargo-deny-action@v1 + - uses: EmbarkStudios/cargo-deny-action@v2 with: command: check ${{ matrix.checks }} rust-version: stable From 6e193aa09aed80118df4e1317b8eed057bad6f0b Mon Sep 17 00:00:00 2001 From: Ed Page Date: Thu, 26 Sep 2024 20:59:12 -0500 Subject: [PATCH 4/5] chore: Ensure pre-commit gets non-system Python This is needed with the ubuntu-24.04 images so that `setup-python` will install a version of Python that the pre-commit action can install into. See pre-commit/action#210 for more of an analysis of this. --- .github/workflows/pre-commit.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/pre-commit.yml b/.github/workflows/pre-commit.yml index 1b000ab..7b55a3d 100644 --- a/.github/workflows/pre-commit.yml +++ b/.github/workflows/pre-commit.yml @@ -24,4 +24,6 @@ jobs: steps: - uses: actions/checkout@v4 - uses: actions/setup-python@v5 + with: + python-version: '3.x' - uses: pre-commit/action@v3.0.1 From 3bee433df38eebaf4eb988a68caecdd559e2592b Mon Sep 17 00:00:00 2001 From: Ed Page Date: Fri, 27 Sep 2024 13:11:51 -0500 Subject: [PATCH 5/5] style: Inline fmt args --- examples/case_tree.rs | 2 +- src/ord.rs | 4 ++-- src/path/ft.rs | 2 +- src/str/difference.rs | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/examples/case_tree.rs b/examples/case_tree.rs index f9c75dc..6599117 100644 --- a/examples/case_tree.rs +++ b/examples/case_tree.rs @@ -7,7 +7,7 @@ fn main() { let var = 5; let case = pred.find_case(true, &var); if let Some(case) = case { - println!("var is {}", var); + println!("var is {var}"); println!("{}", case.tree()); } } diff --git a/src/ord.rs b/src/ord.rs index 1a78c8d..4c2305c 100644 --- a/src/ord.rs +++ b/src/ord.rs @@ -26,7 +26,7 @@ impl fmt::Display for EqOps { EqOps::Equal => "==", EqOps::NotEqual => "!=", }; - write!(f, "{}", op) + write!(f, "{op}") } } @@ -148,7 +148,7 @@ impl fmt::Display for OrdOps { OrdOps::GreaterThanOrEqual => ">=", OrdOps::GreaterThan => ">", }; - write!(f, "{}", op) + write!(f, "{op}") } } diff --git a/src/path/ft.rs b/src/path/ft.rs index aceed55..eec09f7 100644 --- a/src/path/ft.rs +++ b/src/path/ft.rs @@ -54,7 +54,7 @@ impl fmt::Display for FileType { FileType::Dir => "dir", FileType::Symlink => "symlink", }; - write!(f, "{}", t) + write!(f, "{t}") } } diff --git a/src/str/difference.rs b/src/str/difference.rs index 81c62b8..0a362dc 100644 --- a/src/str/difference.rs +++ b/src/str/difference.rs @@ -31,8 +31,8 @@ impl Predicate for DifferencePredicate { None } else { let palette = crate::Palette::new(true); - let orig: Vec<_> = self.orig.lines().map(|l| format!("{}\n", l)).collect(); - let variable: Vec<_> = variable.lines().map(|l| format!("{}\n", l)).collect(); + let orig: Vec<_> = self.orig.lines().map(|l| format!("{l}\n")).collect(); + let variable: Vec<_> = variable.lines().map(|l| format!("{l}\n")).collect(); let diff = difflib::unified_diff( &orig, &variable,