From 0a3d75e2c04e285078d4b6ee40fbc17eb47d13ac Mon Sep 17 00:00:00 2001 From: Ed Page Date: Fri, 18 Sep 2026 11:01:21 -0500 Subject: [PATCH] chore: Rename master to main --- .github/settings.yml | 4 ++-- .github/workflows/audit.yml | 2 +- .github/workflows/ci.yml | 2 +- .github/workflows/maturin.yml | 2 +- .github/workflows/pre-commit.yml | 10 +--------- CONTRIBUTING.md | 4 ++-- README.md | 26 +++++++++++++------------- crates/typos-cli/pyproject.toml | 2 +- release.toml | 2 +- 9 files changed, 23 insertions(+), 31 deletions(-) diff --git a/.github/settings.yml b/.github/settings.yml index a8f3b1c4..8664c075 100644 --- a/.github/settings.yml +++ b/.github/settings.yml @@ -7,7 +7,7 @@ repository: has_projects: false has_wiki: true has_downloads: true - default_branch: master + default_branch: main # Preference: people do clean commits allow_merge_commit: true @@ -46,7 +46,7 @@ labels: # See https://github.com/repository-settings/app/issues/825 # # branches: -# - name: master +# - name: main # protection: # required_pull_request_reviews: null # required_conversation_resolution: true diff --git a/.github/workflows/audit.yml b/.github/workflows/audit.yml index bd52a484..0e7a759c 100644 --- a/.github/workflows/audit.yml +++ b/.github/workflows/audit.yml @@ -7,7 +7,7 @@ on: pull_request: push: branches: - - master + - main env: RUST_BACKTRACE: 1 diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b7bbb40d..960a2782 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -7,7 +7,7 @@ on: pull_request: push: branches: - - master + - main env: RUST_BACKTRACE: 1 diff --git a/.github/workflows/maturin.yml b/.github/workflows/maturin.yml index 47ad18a2..ce8cf832 100644 --- a/.github/workflows/maturin.yml +++ b/.github/workflows/maturin.yml @@ -6,7 +6,7 @@ on: push: branches: - - master + - main tags: - "v*.*.*" - "!varcon*" diff --git a/.github/workflows/pre-commit.yml b/.github/workflows/pre-commit.yml index e145752a..0465cc9c 100644 --- a/.github/workflows/pre-commit.yml +++ b/.github/workflows/pre-commit.yml @@ -5,7 +5,7 @@ permissions: {} # none on: pull_request: push: - branches: [master] + branches: [main] env: RUST_BACKTRACE: 1 @@ -22,16 +22,8 @@ jobs: contents: read runs-on: ubuntu-latest steps: -<<<<<<< HEAD - - uses: actions/checkout@v6 - - uses: j178/prek-action@v2 -||||||| e4f2b351 - - uses: actions/checkout@v6 - - uses: j178/prek-action@v1 -======= - name: Checkout repository uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1 ->>>>>>> _rust/main with: persist-credentials: false - name: prek diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 15d7b332..4bc3adec 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -116,10 +116,10 @@ When we're ready to release, a project owner should do the following - Update the dependency version in `src/lib.rs` - Update the dependency version in `README.md` - Tag the commit via `git tag -am "v.." v..` -- `git push upstream master --tag v..` +- `git push upstream main --tag v..` - Run `cargo publish` (run `cargo login` first if needed) [issues]: https://github.com/crate-ci/typos/issues [new issue]: https://github.com/crate-ci/typos/issues/new [all issues]: https://github.com/crate-ci/typos/issues?utf8=%E2%9C%93&q=is%3Aissue -[CI]: https://github.com/crate-ci/typos/tree/master/.github/workflows +[CI]: https://github.com/crate-ci/typos/tree/main/.github/workflows diff --git a/README.md b/README.md index 93bf9755..d026c744 100644 --- a/README.md +++ b/README.md @@ -6,12 +6,12 @@ Finds and corrects spelling mistakes among source code: - Fast enough to run on monorepos - Low false positives so you can run on PRs -![Screenshot](https://github.com/crate-ci/typos/raw/master/docs/screenshot.png) +![Screenshot](https://github.com/crate-ci/typos/raw/main/docs/screenshot.png) [![Downloads](https://img.shields.io/github/downloads/crate-ci/typos/total.svg)](https://github.com/crate-ci/typos/releases) -[![codecov](https://codecov.io/gh/crate-ci/typos/branch/master/graph/badge.svg)](https://codecov.io/gh/crate-ci/typos) -[![Documentation](https://img.shields.io/badge/docs-master-blue.svg)][Documentation] +[![codecov](https://codecov.io/gh/crate-ci/typos/branch/main/graph/badge.svg)](https://codecov.io/gh/crate-ci/typos) +[![Documentation](https://img.shields.io/badge/docs-main-blue.svg)][Documentation] ![License](https://img.shields.io/crates/l/typos.svg) [![Crates Status](https://img.shields.io/crates/v/typos.svg)][Crates.io] @@ -23,16 +23,16 @@ Dual-licensed under [MIT](LICENSE-MIT) or [Apache 2.0](LICENSE-APACHE) - [Getting Started](#getting-started) - [False Positives](#false-positives) - [Integrations](#integrations) - - [GitHub Action](https://github.com/crate-ci/typos/blob/master/docs/github-action.md) - - [pre-commit](https://github.com/crate-ci/typos/blob/master/docs/pre-commit.md) + - [GitHub Action](https://github.com/crate-ci/typos/blob/main/docs/github-action.md) + - [pre-commit](https://github.com/crate-ci/typos/blob/main/docs/pre-commit.md) - [Custom](#custom) - [Debugging](#debugging) -- [Reference](https://github.com/crate-ci/typos/blob/master/docs/reference.md) +- [Reference](https://github.com/crate-ci/typos/blob/main/docs/reference.md) - [FAQ](#faq) -- [Comparison with other spell checkers](https://github.com/crate-ci/typos/blob/master/docs/comparison.md) +- [Comparison with other spell checkers](https://github.com/crate-ci/typos/blob/main/docs/comparison.md) - [Projects using typos](https://github.com/crate-ci/typos/wiki) - [Benchmarks](benchsuite/runs) -- [Design](https://github.com/crate-ci/typos/blob/master/docs/design.md) +- [Design](https://github.com/crate-ci/typos/blob/main/docs/design.md) - [Contribute](CONTRIBUTING.md) - [CHANGELOG](CHANGELOG.md) @@ -79,7 +79,7 @@ If there is any ambiguity (multiple possible corrections), `typos` will just rep Sometimes, what looks like a typo is intentional, like with people's names, acronyms, or localized content. -To mark a word or an identifier (grouping of words) as valid, add it to your [`_typos.toml`](https://github.com/crate-ci/typos/blob/master/docs/reference.md) by declaring itself as the valid spelling: +To mark a word or an identifier (grouping of words) as valid, add it to your [`_typos.toml`](https://github.com/crate-ci/typos/blob/main/docs/reference.md) by declaring itself as the valid spelling: ```toml [default] extend-ignore-identifiers-re = [ @@ -95,7 +95,7 @@ AttributeIDSupressMenu = "AttributeIDSupressMenu" # Don't correct the surname "Teh" teh = "teh" ``` -For more ways to ignore or extend the dictionary with examples, see the [config reference](https://github.com/crate-ci/typos/blob/master/docs/reference.md). +For more ways to ignore or extend the dictionary with examples, see the [config reference](https://github.com/crate-ci/typos/blob/main/docs/reference.md). For cases like localized content, you can disable spell checking of file contents while still checking the file name: ```toml @@ -113,8 +113,8 @@ extend-exclude = ["localized/*.po"] ### Integrations -- [GitHub Actions](https://github.com/crate-ci/typos/blob/master/docs/github-action.md) -- [pre-commit](https://github.com/crate-ci/typos/blob/master/docs/pre-commit.md) +- [GitHub Actions](https://github.com/crate-ci/typos/blob/main/docs/github-action.md) +- [pre-commit](https://github.com/crate-ci/typos/blob/main/docs/pre-commit.md) - [🐊Putout Processor](https://github.com/putoutjs/putout-processor-typos) - [Visual Studio Code](https://github.com/tekumara/typos-vscode) - [typos-lsp (Language Server Protocol server)](https://github.com/tekumara/typos-vscode) @@ -182,7 +182,7 @@ intent by finding the closest-looking word. It then has a gauge for when a word isn't close enough and assumes you know best. The user has the opportunity to verify these corrections and explicitly allow or reject them. -For more on the trade offs of these approaches, see [Design](https://github.com/crate-ci/typos/blob/master/docs/design.md). +For more on the trade offs of these approaches, see [Design](https://github.com/crate-ci/typos/blob/main/docs/design.md). - To correct it locally, see also our [False Positives documentation](#false-positives). - To contribute your correction, see [Contribute](CONTRIBUTING.md) diff --git a/crates/typos-cli/pyproject.toml b/crates/typos-cli/pyproject.toml index 51087d25..fc741ee4 100644 --- a/crates/typos-cli/pyproject.toml +++ b/crates/typos-cli/pyproject.toml @@ -26,7 +26,7 @@ classifiers = [ [project.urls] Repository = "https://github.com/crate-ci/typos" Documentation = "https://github.com/crate-ci/typos#typos" -Changelog = "https://github.com/crate-ci/typos/blob/master/CHANGELOG.md" +Changelog = "https://github.com/crate-ci/typos/blob/main/CHANGELOG.md" Releases = "https://github.com/crate-ci/typos/releases" [tool.maturin] diff --git a/release.toml b/release.toml index dac7b6ba..83b7e22d 100644 --- a/release.toml +++ b/release.toml @@ -1 +1 @@ -allow-branch = ["master"] +allow-branch = ["main"]