From cd160a5b247a13a26b2d22c27773db85af171b74 Mon Sep 17 00:00:00 2001 From: Brendan <2bndy5@gmail.com> Date: Sun, 7 Jun 2026 13:44:36 -0700 Subject: [PATCH 1/2] fix: rename `clang-installer` to `clang-tools-manager` resolves #334 --- .config/nextest.toml | 2 +- .github/workflows/benchmark.yml | 2 +- .github/workflows/binary-builds.yml | 16 ++++++++-------- .github/workflows/build-docs.yml | 4 ++-- .github/workflows/bump-n-release.nu | 8 ++++---- .github/workflows/bump-n-release.yml | 2 +- .github/workflows/node-js-packaging.yml | 4 ++-- .github/workflows/python-packaging.yml | 14 +++++++------- .github/workflows/run-dev-tests.yml | 8 ++++---- Cargo.lock | 4 ++-- Cargo.toml | 2 +- .../CHANGELOG.md | 12 ++++++------ .../Cargo.toml | 4 ++-- .../README.md | 2 +- .../build.rs | 2 +- .../src/downloader/caching.rs | 0 .../src/downloader/hashing.rs | 0 .../src/downloader/mod.rs | 0 .../src/downloader/native_packages/mod.rs | 0 .../src/downloader/native_packages/unix.rs | 0 .../src/downloader/native_packages/windows.rs | 0 .../src/downloader/pypi.rs | 0 .../src/downloader/static_dist.rs | 0 .../src/lib.rs | 0 .../src/main.rs | 4 ++-- .../src/progress_bar.rs | 2 +- .../src/tool.rs | 0 .../src/utils.rs | 0 .../src/version.rs | 0 .../tests/common.rs | 6 +++--- .../tests/pypi.rs | 2 +- .../tests/pypi_clang-format.json | 0 .../tests/static_dist.rs | 2 +- cpp-linter/Cargo.toml | 2 +- cpp-linter/src/clang_tools/clang_tidy.rs | 4 ++-- cpp-linter/src/clang_tools/mod.rs | 2 +- cpp-linter/src/cli/mod.rs | 2 +- cpp-linter/src/run.rs | 2 +- cspell.config.yml | 2 +- docs/docs/changelog/clang-installer.md | 4 ++-- docs/license_gen.py | 6 +++--- docs/mkdocs.yml | 2 +- nurfile | 4 ++-- 43 files changed, 66 insertions(+), 66 deletions(-) rename {clang-installer => clang-tools-manager}/CHANGELOG.md (67%) rename {clang-installer => clang-tools-manager}/Cargo.toml (92%) rename {clang-installer => clang-tools-manager}/README.md (92%) rename {clang-installer => clang-tools-manager}/build.rs (96%) rename {clang-installer => clang-tools-manager}/src/downloader/caching.rs (100%) rename {clang-installer => clang-tools-manager}/src/downloader/hashing.rs (100%) rename {clang-installer => clang-tools-manager}/src/downloader/mod.rs (100%) rename {clang-installer => clang-tools-manager}/src/downloader/native_packages/mod.rs (100%) rename {clang-installer => clang-tools-manager}/src/downloader/native_packages/unix.rs (100%) rename {clang-installer => clang-tools-manager}/src/downloader/native_packages/windows.rs (100%) rename {clang-installer => clang-tools-manager}/src/downloader/pypi.rs (100%) rename {clang-installer => clang-tools-manager}/src/downloader/static_dist.rs (100%) rename {clang-installer => clang-tools-manager}/src/lib.rs (100%) rename {clang-installer => clang-tools-manager}/src/main.rs (97%) rename {clang-installer => clang-tools-manager}/src/progress_bar.rs (99%) rename {clang-installer => clang-tools-manager}/src/tool.rs (100%) rename {clang-installer => clang-tools-manager}/src/utils.rs (100%) rename {clang-installer => clang-tools-manager}/src/version.rs (100%) rename {clang-installer => clang-tools-manager}/tests/common.rs (95%) rename {clang-installer => clang-tools-manager}/tests/pypi.rs (95%) rename {clang-installer => clang-tools-manager}/tests/pypi_clang-format.json (100%) rename {clang-installer => clang-tools-manager}/tests/static_dist.rs (95%) diff --git a/.config/nextest.toml b/.config/nextest.toml index 24db51b4..d750fa1c 100644 --- a/.config/nextest.toml +++ b/.config/nextest.toml @@ -27,7 +27,7 @@ status-level = "pass" # A profile to run only tests that use clang-tidy and/or clang-format # NOTE: This profile is intended to keep CI runtime low. Locally, use default or all profiles -default-filter = "(kind(test) + test(use_extra_args)) - package(clang-installer)" +default-filter = "(kind(test) + test(use_extra_args)) - package(clang-tools-manager)" # show log output from each failing test failure-output = "final" diff --git a/.github/workflows/benchmark.yml b/.github/workflows/benchmark.yml index 220520a5..dafa577b 100644 --- a/.github/workflows/benchmark.yml +++ b/.github/workflows/benchmark.yml @@ -84,7 +84,7 @@ jobs: uses: actions/download-artifact@v8 with: name: static-binary-versions - path: clang-installer + path: clang-tools-manager - run: cargo build --bin cpp-linter --features bin --release if: steps.cache.outputs.cache-hit != 'true' || steps.validate.outputs.cache-valid == 'false' - name: Upload build artifact diff --git a/.github/workflows/binary-builds.yml b/.github/workflows/binary-builds.yml index b4b11637..4b84d65d 100644 --- a/.github/workflows/binary-builds.yml +++ b/.github/workflows/binary-builds.yml @@ -6,20 +6,20 @@ on: paths: - cpp-linter/src/** - cpp-linter/Cargo.toml - - clang-installer/src/** - - clang-installer/Cargo.toml + - clang-tools-manager/src/** + - clang-tools-manager/Cargo.toml - Cargo.toml - Cargo.lock tags: - cpp-linter/v* - - clang-installer/v* + - clang-tools-manager/v* pull_request: branches: [main] paths: - cpp-linter/src/** - cpp-linter/Cargo.toml - - clang-installer/src/** - - clang-installer/Cargo.toml + - clang-tools-manager/src/** + - clang-tools-manager/Cargo.toml - Cargo.toml - Cargo.lock @@ -136,7 +136,7 @@ jobs: uses: actions/download-artifact@v8 with: name: static-binary-versions - path: clang-installer + path: clang-tools-manager - name: Build run: >- @@ -198,7 +198,7 @@ jobs: if-no-files-found: error publish: - if: startswith(github.ref, 'refs/tags/cpp-linter/v') || startswith(github.ref, 'refs/tags/clang-installer/v') + if: startswith(github.ref, 'refs/tags/cpp-linter/v') || startswith(github.ref, 'refs/tags/clang-tools-manager/v') runs-on: ubuntu-latest needs: [create-assets] permissions: @@ -229,6 +229,6 @@ jobs: uses: rust-lang/crates-io-auth-action@bbd81622f20ce9e2dd9622e3218b975523e45bbe # v1.0.4 - name: Publish package env: - PKG_NAME: ${{ startsWith(github.ref_name, 'cpp-linter') && 'cpp-linter' || 'clang-installer' }} + PKG_NAME: ${{ startsWith(github.ref_name, 'cpp-linter') && 'cpp-linter' || 'clang-tools-manager' }} CARGO_REGISTRY_TOKEN: ${{ steps.auth.outputs.token }} run: cargo publish -p ${PKG_NAME} diff --git a/.github/workflows/build-docs.yml b/.github/workflows/build-docs.yml index 30f743aa..e1c4c9a4 100644 --- a/.github/workflows/build-docs.yml +++ b/.github/workflows/build-docs.yml @@ -88,7 +88,7 @@ jobs: uses: actions/download-artifact@v8 with: name: static-binary-versions - path: clang-installer + path: clang-tools-manager - name: Build docs run: nur docs --build - name: Upload docs build as artifact @@ -124,7 +124,7 @@ jobs: uses: actions/download-artifact@v8 with: name: static-binary-versions - path: clang-installer + path: clang-tools-manager - run: nur docs rs - name: upload rustdoc build as artifact uses: actions/upload-artifact@v7 diff --git a/.github/workflows/bump-n-release.nu b/.github/workflows/bump-n-release.nu index d9729159..327d0b04 100644 --- a/.github/workflows/bump-n-release.nu +++ b/.github/workflows/bump-n-release.nu @@ -58,7 +58,7 @@ const PkgPaths = { 'cpp-linter': { include: ['cpp-linter/**/*'] exclude: [ - 'clang-installer/**/*' + 'clang-tools-manager/**/*' 'bindings/**/*' 'yarn.lock' '.yarnrc.yml' @@ -66,8 +66,8 @@ const PkgPaths = { ] path: 'cpp-linter' }, - 'clang-installer': { - include: ['clang-installer/**'] + 'clang-tools-manager': { + include: ['clang-tools-manager/**'] exclude: [ 'cpp-linter/**/*' 'bindings/**/*' @@ -75,7 +75,7 @@ const PkgPaths = { '.yarnrc.yml' ...$COMMON_EXCLUDES ] - path: 'clang-installer' + path: 'clang-tools-manager' }, 'cpp-linter-py': { include: [] diff --git a/.github/workflows/bump-n-release.yml b/.github/workflows/bump-n-release.yml index 34572bac..6e09dbb4 100644 --- a/.github/workflows/bump-n-release.yml +++ b/.github/workflows/bump-n-release.yml @@ -20,7 +20,7 @@ on: - cpp-linter - cpp-linter-js - cpp-linter-py - - clang-installer + - clang-tools-manager component: description: The version component to increase type: choice diff --git a/.github/workflows/node-js-packaging.yml b/.github/workflows/node-js-packaging.yml index 9d4a370d..a3190b2e 100644 --- a/.github/workflows/node-js-packaging.yml +++ b/.github/workflows/node-js-packaging.yml @@ -144,7 +144,7 @@ jobs: uses: actions/download-artifact@v8 with: name: static-binary-versions - path: clang-installer + path: clang-tools-manager - name: Build run: ${{ matrix.settings.build }} shell: bash @@ -179,7 +179,7 @@ jobs: uses: actions/download-artifact@v8 with: name: static-binary-versions - path: clang-installer + path: clang-tools-manager - name: Build shell: cpa.sh {0} run: |- diff --git a/.github/workflows/python-packaging.yml b/.github/workflows/python-packaging.yml index 1eeb2545..3d1dcf2d 100644 --- a/.github/workflows/python-packaging.yml +++ b/.github/workflows/python-packaging.yml @@ -13,8 +13,8 @@ on: branches: [main] paths: - cpp-linter/**.{rs,toml} - - clang-installer/src/** - - clang-installer/Cargo.toml + - clang-tools-manager/src/** + - clang-tools-manager/Cargo.toml - bindings/python/** - Cargo.{toml,lock} - .github/workflows/python-packaging.yml @@ -25,8 +25,8 @@ on: branches: [main] paths: - cpp-linter/**.{rs,toml} - - clang-installer/src/** - - clang-installer/Cargo.toml + - clang-tools-manager/src/** + - clang-tools-manager/Cargo.toml - bindings/python/** - Cargo.{toml,lock} - .github/workflows/python-packaging.yml @@ -94,7 +94,7 @@ jobs: uses: actions/download-artifact@v8 with: name: static-binary-versions - path: clang-installer + path: clang-tools-manager - name: Build wheels uses: PyO3/maturin-action@e83996d129638aa358a18fbd1dfb82f0b0fb5d3b # v1.51.0 with: @@ -146,7 +146,7 @@ jobs: uses: actions/download-artifact@v8 with: name: static-binary-versions - path: clang-installer + path: clang-tools-manager - name: Build wheels uses: PyO3/maturin-action@e83996d129638aa358a18fbd1dfb82f0b0fb5d3b # v1.51.0 with: @@ -181,7 +181,7 @@ jobs: uses: actions/download-artifact@v8 with: name: static-binary-versions - path: clang-installer + path: clang-tools-manager - name: Build wheels uses: PyO3/maturin-action@e83996d129638aa358a18fbd1dfb82f0b0fb5d3b # v1.51.0 with: diff --git a/.github/workflows/run-dev-tests.yml b/.github/workflows/run-dev-tests.yml index 657f704b..cb8f2a48 100644 --- a/.github/workflows/run-dev-tests.yml +++ b/.github/workflows/run-dev-tests.yml @@ -5,7 +5,7 @@ on: branches: [main] paths: - cpp-linter/** - - clang-installer/** + - clang-tools-manager/** - Cargo.toml - Cargo.lock - .github/workflows/run-dev-tests.yml @@ -13,7 +13,7 @@ on: branches: [main] paths: - cpp-linter/** - - clang-installer/** + - clang-tools-manager/** - Cargo.toml - Cargo.lock - .github/workflows/run-dev-tests.yml @@ -121,12 +121,12 @@ jobs: uses: actions/download-artifact@v8 with: name: static-binary-versions - path: clang-installer + path: clang-tools-manager - name: Run test suite shell: nu {0} run: |- - let version_info = open "clang-installer/versions.json" + let version_info = open "clang-tools-manager/versions.json" mut max_ver = 0 mut min_ver = 99 for ver in ($version_info.llvm_versions | columns) { diff --git a/Cargo.lock b/Cargo.lock index fbef1c3f..1b962826 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -223,7 +223,7 @@ dependencies = [ ] [[package]] -name = "clang-installer" +name = "clang-tools-manager" version = "0.1.2" dependencies = [ "anyhow", @@ -372,7 +372,7 @@ dependencies = [ "anyhow", "async-trait", "chrono", - "clang-installer", + "clang-tools-manager", "clap", "colored", "fast-glob", diff --git a/Cargo.toml b/Cargo.toml index 2e63d206..e458159b 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,7 +1,7 @@ # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [workspace] -members = ["cpp-linter", "bindings/python", "bindings/node", "docs", "clang-installer"] +members = ["cpp-linter", "bindings/python", "bindings/node", "docs", "clang-tools-manager"] resolver = "2" [workspace.package] diff --git a/clang-installer/CHANGELOG.md b/clang-tools-manager/CHANGELOG.md similarity index 67% rename from clang-installer/CHANGELOG.md rename to clang-tools-manager/CHANGELOG.md index 230ac5a2..434937ca 100644 --- a/clang-installer/CHANGELOG.md +++ b/clang-tools-manager/CHANGELOG.md @@ -6,17 +6,17 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). -## [clang-installer/v0.1.2] - 2026-06-05 +## [clang-tools-manager/v0.1.2] - 2026-06-05 ### 🛠️ Fixed - Restore cargo binstall support by @2bndy5 in [#328](https://github.com/cpp-linter/cpp-linter-rs/pull/328) -[clang-installer/v0.1.2]: https://github.com/cpp-linter/cpp-linter-rs/compare/clang-installer/v0.1.1...clang-installer/v0.1.2 +[clang-tools-manager/v0.1.2]: https://github.com/cpp-linter/cpp-linter-rs/compare/clang-tools-manager/v0.1.1...clang-tools-manager/v0.1.2 -Full commit diff: [`clang-installer/v0.1.1...clang-installer/v0.1.2`][clang-installer/v0.1.2] +Full commit diff: [`clang-tools-manager/v0.1.1...clang-tools-manager/v0.1.2`][clang-tools-manager/v0.1.2] -## [clang-installer/v0.1.1] - 2026-06-04 +## [clang-tools-manager/v0.1.1] - 2026-06-04 ### 🚀 Added @@ -32,8 +32,8 @@ Full commit diff: [`clang-installer/v0.1.1...clang-installer/v0.1.2`][clang-inst - Prepare to release individual packages by @2bndy5 in [#302](https://github.com/cpp-linter/cpp-linter-rs/pull/302) -[clang-installer/v0.1.1]: https://github.com/cpp-linter/cpp-linter-rs/compare/2e25fec0a447df24d0bcc1b80f6624040bab755e...clang-installer/v0.1.1 +[clang-tools-manager/v0.1.1]: https://github.com/cpp-linter/cpp-linter-rs/compare/2e25fec0a447df24d0bcc1b80f6624040bab755e...clang-tools-manager/v0.1.1 -Full commit diff: [`2e25fec...clang-installer/v0.1.1`][clang-installer/v0.1.1] +Full commit diff: [`2e25fec...clang-tools-manager/v0.1.1`][clang-tools-manager/v0.1.1] diff --git a/clang-installer/Cargo.toml b/clang-tools-manager/Cargo.toml similarity index 92% rename from clang-installer/Cargo.toml rename to clang-tools-manager/Cargo.toml index 075a1968..19efd4cb 100644 --- a/clang-installer/Cargo.toml +++ b/clang-tools-manager/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "clang-installer" +name = "clang-tools-manager" version = "0.1.2" description = "A utility for installing specific versions of clang-format and clang-tidy, used by cpp-linter." readme = "README.md" @@ -53,4 +53,4 @@ serde_json = { workspace = true } reqwest = { workspace = true, features = ["default-tls", "blocking"] } [package.metadata.binstall] -pkg-url = "{ repo }/releases/download/clang-installer/v{ version }/{ name }-{ target }{ archive-suffix }" +pkg-url = "{ repo }/releases/download/clang-tools-manager/v{ version }/{ name }-{ target }{ archive-suffix }" diff --git a/clang-installer/README.md b/clang-tools-manager/README.md similarity index 92% rename from clang-installer/README.md rename to clang-tools-manager/README.md index 1b8487b1..7d2d6213 100644 --- a/clang-installer/README.md +++ b/clang-tools-manager/README.md @@ -1,4 +1,4 @@ -# clang-installer +# clang-tools-manager A Rust crate to ensure clang-format and/or clang-tidy are installed. diff --git a/clang-installer/build.rs b/clang-tools-manager/build.rs similarity index 96% rename from clang-installer/build.rs rename to clang-tools-manager/build.rs index 276cce4e..deb8b26e 100644 --- a/clang-installer/build.rs +++ b/clang-tools-manager/build.rs @@ -16,7 +16,7 @@ fn main() { fs::read_to_string(&pre_seed).unwrap() } else { ClientBuilder::new() - .user_agent("cpp-linter-rs/clang-installer") + .user_agent("cpp-linter-rs/clang-tools-manager") .timeout(Duration::from_secs(30)) .build() .unwrap() diff --git a/clang-installer/src/downloader/caching.rs b/clang-tools-manager/src/downloader/caching.rs similarity index 100% rename from clang-installer/src/downloader/caching.rs rename to clang-tools-manager/src/downloader/caching.rs diff --git a/clang-installer/src/downloader/hashing.rs b/clang-tools-manager/src/downloader/hashing.rs similarity index 100% rename from clang-installer/src/downloader/hashing.rs rename to clang-tools-manager/src/downloader/hashing.rs diff --git a/clang-installer/src/downloader/mod.rs b/clang-tools-manager/src/downloader/mod.rs similarity index 100% rename from clang-installer/src/downloader/mod.rs rename to clang-tools-manager/src/downloader/mod.rs diff --git a/clang-installer/src/downloader/native_packages/mod.rs b/clang-tools-manager/src/downloader/native_packages/mod.rs similarity index 100% rename from clang-installer/src/downloader/native_packages/mod.rs rename to clang-tools-manager/src/downloader/native_packages/mod.rs diff --git a/clang-installer/src/downloader/native_packages/unix.rs b/clang-tools-manager/src/downloader/native_packages/unix.rs similarity index 100% rename from clang-installer/src/downloader/native_packages/unix.rs rename to clang-tools-manager/src/downloader/native_packages/unix.rs diff --git a/clang-installer/src/downloader/native_packages/windows.rs b/clang-tools-manager/src/downloader/native_packages/windows.rs similarity index 100% rename from clang-installer/src/downloader/native_packages/windows.rs rename to clang-tools-manager/src/downloader/native_packages/windows.rs diff --git a/clang-installer/src/downloader/pypi.rs b/clang-tools-manager/src/downloader/pypi.rs similarity index 100% rename from clang-installer/src/downloader/pypi.rs rename to clang-tools-manager/src/downloader/pypi.rs diff --git a/clang-installer/src/downloader/static_dist.rs b/clang-tools-manager/src/downloader/static_dist.rs similarity index 100% rename from clang-installer/src/downloader/static_dist.rs rename to clang-tools-manager/src/downloader/static_dist.rs diff --git a/clang-installer/src/lib.rs b/clang-tools-manager/src/lib.rs similarity index 100% rename from clang-installer/src/lib.rs rename to clang-tools-manager/src/lib.rs diff --git a/clang-installer/src/main.rs b/clang-tools-manager/src/main.rs similarity index 97% rename from clang-installer/src/main.rs rename to clang-tools-manager/src/main.rs index f8c3324b..32c47d15 100644 --- a/clang-installer/src/main.rs +++ b/clang-tools-manager/src/main.rs @@ -1,5 +1,5 @@ use anyhow::Result; -use clang_installer::{ClangTool, RequestedVersion}; +use clang_tools_manager::{ClangTool, RequestedVersion}; use clap::Parser; use std::{collections::HashMap, path::PathBuf, str::FromStr}; @@ -43,7 +43,7 @@ mod logging { } else if self.enabled(record.metadata()) { let module = record.module_path(); if module.is_none_or(|v| { - v.starts_with("clang_installer") || v.starts_with("clang_tools") + v.starts_with("clang_tools_manager") || v.starts_with("clang_tools") }) { writeln!( stdout, diff --git a/clang-installer/src/progress_bar.rs b/clang-tools-manager/src/progress_bar.rs similarity index 99% rename from clang-installer/src/progress_bar.rs rename to clang-tools-manager/src/progress_bar.rs index 852f6d6a..0eaa6915 100644 --- a/clang-installer/src/progress_bar.rs +++ b/clang-tools-manager/src/progress_bar.rs @@ -40,7 +40,7 @@ impl ProgressBar { /// /// ``` /// use std::num::NonZero; - /// use clang_installer::ProgressBar; + /// use clang_tools_manager::ProgressBar; /// /// let total = NonZero::new(100); /// let mut progress_bar = ProgressBar::new(total, "Downloading"); diff --git a/clang-installer/src/tool.rs b/clang-tools-manager/src/tool.rs similarity index 100% rename from clang-installer/src/tool.rs rename to clang-tools-manager/src/tool.rs diff --git a/clang-installer/src/utils.rs b/clang-tools-manager/src/utils.rs similarity index 100% rename from clang-installer/src/utils.rs rename to clang-tools-manager/src/utils.rs diff --git a/clang-installer/src/version.rs b/clang-tools-manager/src/version.rs similarity index 100% rename from clang-installer/src/version.rs rename to clang-tools-manager/src/version.rs diff --git a/clang-installer/tests/common.rs b/clang-tools-manager/tests/common.rs similarity index 95% rename from clang-installer/tests/common.rs rename to clang-tools-manager/tests/common.rs index 55c83fa8..6bc9dadc 100644 --- a/clang-installer/tests/common.rs +++ b/clang-tools-manager/tests/common.rs @@ -36,9 +36,9 @@ impl Log for SimpleLogger { .expect("Failed to flush log command in stdout"); } else if self.enabled(record.metadata()) { let module = record.module_path(); - if module - .is_none_or(|v| v.starts_with("clang_installer") || v.starts_with("clang_tools")) - { + if module.is_none_or(|v| { + v.starts_with("clang_tools_manager") || v.starts_with("clang_tools") + }) { writeln!( stdout, "[{}]: {}", diff --git a/clang-installer/tests/pypi.rs b/clang-tools-manager/tests/pypi.rs similarity index 95% rename from clang-installer/tests/pypi.rs rename to clang-tools-manager/tests/pypi.rs index 81b3a711..7c9b7a1c 100644 --- a/clang-installer/tests/pypi.rs +++ b/clang-tools-manager/tests/pypi.rs @@ -2,7 +2,7 @@ use std::{env, process::Command}; use semver::VersionReq; -use clang_installer::{ClangTool, PyPiDownloader}; +use clang_tools_manager::{ClangTool, PyPiDownloader}; use tempfile::TempDir; mod common; diff --git a/clang-installer/tests/pypi_clang-format.json b/clang-tools-manager/tests/pypi_clang-format.json similarity index 100% rename from clang-installer/tests/pypi_clang-format.json rename to clang-tools-manager/tests/pypi_clang-format.json diff --git a/clang-installer/tests/static_dist.rs b/clang-tools-manager/tests/static_dist.rs similarity index 95% rename from clang-installer/tests/static_dist.rs rename to clang-tools-manager/tests/static_dist.rs index 9bf8be50..85d9b579 100644 --- a/clang-installer/tests/static_dist.rs +++ b/clang-tools-manager/tests/static_dist.rs @@ -1,6 +1,6 @@ use std::env; -use clang_installer::{ClangTool, StaticDistDownloader}; +use clang_tools_manager::{ClangTool, StaticDistDownloader}; use semver::VersionReq; use tempfile::TempDir; mod common; diff --git a/cpp-linter/Cargo.toml b/cpp-linter/Cargo.toml index 82f187b1..b88748d8 100644 --- a/cpp-linter/Cargo.toml +++ b/cpp-linter/Cargo.toml @@ -17,7 +17,7 @@ license.workspace = true anyhow = { workspace = true } async-trait = "0.1.89" chrono = "0.4.44" -clang-installer = { path = "../clang-installer", version = "0.1.2" } +clang-tools-manager = { path = "../clang-tools-manager", version = "0.1.2" } clap = { workspace = true, optional = true } colored = { workspace = true, optional = true } fast-glob = "1.0.1" diff --git a/cpp-linter/src/clang_tools/clang_tidy.rs b/cpp-linter/src/clang_tools/clang_tidy.rs index 5724f068..b9da583d 100644 --- a/cpp-linter/src/clang_tools/clang_tidy.rs +++ b/cpp-linter/src/clang_tools/clang_tidy.rs @@ -11,7 +11,7 @@ use std::{ // non-std crates use anyhow::{Context, Result, anyhow}; -use clang_installer::utils::normalize_path; +use clang_tools_manager::utils::normalize_path; use regex::Regex; use serde::Deserialize; @@ -376,7 +376,7 @@ mod test { sync::{Arc, Mutex}, }; - use clang_installer::RequestedVersion; + use clang_tools_manager::RequestedVersion; use regex::Regex; use crate::{ diff --git a/cpp-linter/src/clang_tools/mod.rs b/cpp-linter/src/clang_tools/mod.rs index d7fc64da..180c31db 100644 --- a/cpp-linter/src/clang_tools/mod.rs +++ b/cpp-linter/src/clang_tools/mod.rs @@ -10,7 +10,7 @@ use std::{ // non-std crates use anyhow::{Context, Result, anyhow}; -use clang_installer::{ClangTool, RequestedVersion}; +use clang_tools_manager::{ClangTool, RequestedVersion}; use git_bot_feedback::ReviewComment; use git2::{DiffOptions, Patch}; use semver::Version; diff --git a/cpp-linter/src/cli/mod.rs b/cpp-linter/src/cli/mod.rs index 6a7d586c..e66cf796 100644 --- a/cpp-linter/src/cli/mod.rs +++ b/cpp-linter/src/cli/mod.rs @@ -7,7 +7,7 @@ use std::str::FromStr; // non-std crates #[cfg(feature = "bin")] -use clang_installer::RequestedVersion; +use clang_tools_manager::RequestedVersion; #[cfg(feature = "bin")] use clap::{ ArgAction, Args, Parser, Subcommand, ValueEnum, diff --git a/cpp-linter/src/run.rs b/cpp-linter/src/run.rs index 224e92f9..27a39ee3 100644 --- a/cpp-linter/src/run.rs +++ b/cpp-linter/src/run.rs @@ -12,7 +12,7 @@ use std::{ // non-std crates use anyhow::{Result, anyhow}; -use clang_installer::RequestedVersion; +use clang_tools_manager::RequestedVersion; use clap::Parser; use log::{LevelFilter, set_max_level}; diff --git a/cspell.config.yml b/cspell.config.yml index afd5bbf4..cbe2624c 100644 --- a/cspell.config.yml +++ b/cspell.config.yml @@ -134,7 +134,7 @@ ignorePaths: - target/** - "**/.gitignore" - cpp-linter/tests/**/*.json - - clang-installer/tests/**/*.json + - clang-tools-manager/tests/**/*.json - cpp-linter/tests/**/*.diff - cpp-linter/tests/**/.clang-tidy - .vscode/extensions.json diff --git a/docs/docs/changelog/clang-installer.md b/docs/docs/changelog/clang-installer.md index 2f746d9b..0a421162 100644 --- a/docs/docs/changelog/clang-installer.md +++ b/docs/docs/changelog/clang-installer.md @@ -1,8 +1,8 @@ --- -title: Changes in clang-installer +title: Changes in clang-tools-manager --- {% - include "../../../clang-installer/CHANGELOG.md" + include "../../../clang-tools-manager/CHANGELOG.md" %} diff --git a/docs/license_gen.py b/docs/license_gen.py index 30a34fa8..b7450fc2 100644 --- a/docs/license_gen.py +++ b/docs/license_gen.py @@ -19,7 +19,7 @@ {TABLE_HEADER}\ """ -CLANG_INSTALLER_DEPS = f"""## clang-installer's dependencies +CLANG_INSTALLER_DEPS = f"""## clang-tools-manager's dependencies {TABLE_HEADER}\ """ @@ -35,7 +35,7 @@ {TABLE_HEADER}""" SELF_DEP = re.compile( - r"(\| \[(?:cpp-linter|clang-installer) v[0-9.]+[^\s]*)[^\]]+(\]\(.*)$" + r"(\| \[(?:cpp-linter|clang-tools-manager) v[0-9.]+[^\s]*)[^\]]+(\]\(.*)$" ) @@ -95,7 +95,7 @@ def get_output(self) -> str: tg.package("cpp-linter-js") doc = tg.get_output() print(f"\n{JS_BINDING_HEADER}{doc}", file=io_doc) - tg.package("clang-installer") + tg.package("clang-tools-manager") doc = tg.get_output() print(f"\n{CLANG_INSTALLER_DEPS}{doc}", file=io_doc) diff --git a/docs/mkdocs.yml b/docs/mkdocs.yml index a2f0e36f..d1f37ed9 100644 --- a/docs/mkdocs.yml +++ b/docs/mkdocs.yml @@ -15,7 +15,7 @@ nav: - changelog/cpp-linter.md - changelog/cpp-linter-py.md - changelog/cpp-linter-js.md - - changelog/clang-installer.md + - changelog/clang-tools-manager.md - contributing.md - other-licenses.md diff --git a/nurfile b/nurfile index bffda157..d0be7902 100644 --- a/nurfile +++ b/nurfile @@ -12,7 +12,7 @@ def "nur docs rs" [ "--package", "cpp-linter", "--package", - "clang-installer", + "clang-tools-manager", ] if $open { $cmd = $cmd | append "--open" @@ -73,7 +73,7 @@ export def "nur test" [ --package, cpp-linter, --package, - clang-installer, + clang-tools-manager, --features, bin, --lib, From 8e04c9940a27504d0b7f52d55a48c15091aa8ed4 Mon Sep 17 00:00:00 2001 From: Brendan <2bndy5@gmail.com> Date: Sun, 7 Jun 2026 15:03:19 -0700 Subject: [PATCH 2/2] rename docs file --- .../docs/changelog/{clang-installer.md => clang-tools-manager.md} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename docs/docs/changelog/{clang-installer.md => clang-tools-manager.md} (100%) diff --git a/docs/docs/changelog/clang-installer.md b/docs/docs/changelog/clang-tools-manager.md similarity index 100% rename from docs/docs/changelog/clang-installer.md rename to docs/docs/changelog/clang-tools-manager.md