Skip to content

Commit 6dfb2d7

Browse files
committed
Rename default branch from master to main
1 parent 9a73ad8 commit 6dfb2d7

33 files changed

Lines changed: 82 additions & 81 deletions

.github/workflows/deploy.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: Deploy
33
on:
44
push:
55
branches:
6-
- master
6+
- main
77
- beta
88
tags:
99
- rust-1.**
@@ -54,10 +54,10 @@ jobs:
5454
# We need to check out all files that (transitively) depend on the
5555
# structure of the gh-pages branch, so that we're able to change that
5656
# structure without breaking the deployment.
57-
- name: Use deploy files from master branch
57+
- name: Use deploy files from main branch
5858
run: |
59-
git fetch --no-tags --prune --depth=1 origin master
60-
git checkout origin/master -- .github/deploy.sh util/versions.py util/gh-pages/versions.html
59+
git fetch --no-tags --prune --depth=1 origin main
60+
git checkout origin/main -- .github/deploy.sh util/versions.py util/gh-pages/versions.html
6161
6262
# Generate lockfile for caching to avoid build problems with cached deps
6363
- name: cargo generate-lockfile
@@ -66,7 +66,7 @@ jobs:
6666
- name: Cache
6767
uses: Swatinem/rust-cache@v2
6868
with:
69-
save-if: ${{ github.ref == 'refs/heads/master' }}
69+
save-if: ${{ github.ref == 'refs/heads/main' }}
7070

7171
- name: cargo collect-metadata
7272
run: cargo collect-metadata

.github/workflows/lintcheck.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ jobs:
3030
# Unsetting this would make so that any malicious package could get our Github Token
3131
persist-credentials: false
3232

33-
# HEAD is the generated merge commit `refs/pull/N/merge` between the PR and `master`, `HEAD^`
34-
# being the commit from `master` that is the base of the merge
33+
# HEAD is the generated merge commit `refs/pull/N/merge` between the PR and `main`, `HEAD^`
34+
# being the commit from `main` that is the base of the merge
3535
- name: Checkout base
3636
run: git checkout HEAD^
3737

.github/workflows/remark.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ jobs:
4141
run: |
4242
rustup toolchain install nightly --component rust-docs
4343
rustup override set nightly
44-
curl https://raw.githubusercontent.com/rust-lang/rust/master/src/tools/linkchecker/linkcheck.sh -o linkcheck.sh
44+
curl https://raw.githubusercontent.com/rust-lang/rust/main/src/tools/linkchecker/linkcheck.sh -o linkcheck.sh
4545
sh linkcheck.sh clippy --path ./book
4646
4747
- name: Build mdbook

CHANGELOG.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6730,9 +6730,9 @@ Released 2018-09-13
67306730
[`AsRef`]: https://doc.rust-lang.org/std/convert/trait.AsRef.html
67316731
[configuration file]: ./rust-clippy#configuration
67326732
[pull3665]: https://github.com/rust-lang/rust-clippy/pull/3665
6733-
[adding_lints]: https://github.com/rust-lang/rust-clippy/blob/master/book/src/development/adding_lints.md
6734-
[`README.md`]: https://github.com/rust-lang/rust-clippy/blob/master/README.md
6735-
[Clippy's lint list]: https://rust-lang.github.io/rust-clippy/master/index.html
6733+
[adding_lints]: https://github.com/rust-lang/rust-clippy/blob/main/book/src/development/adding_lints.md
6734+
[`README.md`]: https://github.com/rust-lang/rust-clippy/blob/main/README.md
6735+
[Clippy's lint list]: https://rust-lang.github.io/rust-clippy/main/index.html
67366736

67376737
<!-- lint disable no-unused-definitions -->
67386738
<!-- begin autogenerated links to lint list -->

CONTRIBUTING.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ a [developer guide] and is a good place to start your journey.
4949
All issues on Clippy are mentored, if you want help simply ask someone from the
5050
Clippy team directly by mentioning them in the issue or over on [Zulip]. All
5151
currently active team members can be found
52-
[here](https://github.com/rust-lang/rust-clippy/blob/master/triagebot.toml#L18)
52+
[here](https://github.com/rust-lang/rust-clippy/blob/main/triagebot.toml#L18)
5353

5454
Some issues are easier than others. The [`good first issue`] label can be used to find the easy
5555
issues. You can use `@rustbot claim` to assign the issue to yourself.
@@ -176,7 +176,7 @@ via the `LateContext` parameter.
176176
That's why the `else_if_without_else` example is listed in `early_lint_methods!`. Because the
177177
[actual lint logic][else_if_without_else] does not depend on any type information.
178178

179-
[lint_crate_entry]: https://github.com/rust-lang/rust-clippy/blob/master/clippy_lints/src/lib.rs
179+
[lint_crate_entry]: https://github.com/rust-lang/rust-clippy/blob/main/clippy_lints/src/lib.rs
180180
[else_if_without_else]: https://github.com/rust-lang/rust-clippy/blob/4253aa7137cb7378acc96133c787e49a345c2b3c/clippy_lints/src/else_if_without_else.rs
181181
[`LintStore`]: https://doc.rust-lang.org/nightly/nightly-rustc/rustc_lint/struct.LintStore.html
182182
[early_lint_pass]: https://doc.rust-lang.org/nightly/nightly-rustc/rustc_lint/trait.EarlyLintPass.html

README.md

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
A collection of lints to catch common mistakes and improve your [Rust](https://github.com/rust-lang/rust) code.
66

7-
[There are over 800 lints included in this crate!](https://rust-lang.github.io/rust-clippy/master/index.html)
7+
[There are over 800 lints included in this crate!](https://rust-lang.github.io/rust-clippy/main/index.html)
88

99
Lints are divided into categories, each with a default [lint level](https://doc.rust-lang.org/rustc/lints/levels.html).
1010
You can choose how much Clippy is supposed to ~~annoy~~ help you by changing the lint level by category.
@@ -35,9 +35,9 @@ on a case-by-case basis before enabling.
3535
- Preventing panicking in certain functions (e.g. [`clippy::unwrap_used`]).
3636
- Running a lint only on a subset of code (e.g. `#[forbid(clippy::float_arithmetic)]` on a module).
3737

38-
[`clippy::else_if_without_else`]: https://rust-lang.github.io/rust-clippy/master/index.html#else_if_without_else
39-
[`clippy::todo`]: https://rust-lang.github.io/rust-clippy/master/index.html#todo
40-
[`clippy::unwrap_used`]: https://rust-lang.github.io/rust-clippy/master/index.html#unwrap_used
38+
[`clippy::else_if_without_else`]: https://rust-lang.github.io/rust-clippy/main/index.html#else_if_without_else
39+
[`clippy::todo`]: https://rust-lang.github.io/rust-clippy/main/index.html#todo
40+
[`clippy::unwrap_used`]: https://rust-lang.github.io/rust-clippy/main/index.html#unwrap_used
4141

4242
---
4343

@@ -224,11 +224,11 @@ disallowed-names = ["toto", "tata", "titi"]
224224

225225
The [table of configurations](https://doc.rust-lang.org/nightly/clippy/lint_configuration.html)
226226
contains all config values, their default, and a list of lints they affect.
227-
Each [configurable lint](https://rust-lang.github.io/rust-clippy/master/index.html#Configuration)
227+
Each [configurable lint](https://rust-lang.github.io/rust-clippy/main/index.html#Configuration)
228228
, also contains information about these values.
229229

230230
For configurations that are a list type with default values such as
231-
[disallowed-names](https://rust-lang.github.io/rust-clippy/master/index.html#disallowed_names),
231+
[disallowed-names](https://rust-lang.github.io/rust-clippy/main/index.html#disallowed_names),
232232
you can use the unique value `".."` to extend the default values instead of replacing them.
233233

234234
```toml
@@ -276,11 +276,11 @@ is equivalent to `msrv = 1.30.0`.
276276

277277
Note: `custom_inner_attributes` is an unstable feature, so it has to be enabled explicitly.
278278

279-
Lints that recognize this configuration option can be found [here](https://rust-lang.github.io/rust-clippy/master/index.html#msrv)
279+
Lints that recognize this configuration option can be found [here](https://rust-lang.github.io/rust-clippy/main/index.html#msrv)
280280

281281
## Contributing
282282

283-
If you want to contribute to Clippy, you can find more information in [CONTRIBUTING.md](https://github.com/rust-lang/rust-clippy/blob/master/CONTRIBUTING.md).
283+
If you want to contribute to Clippy, you can find more information in [CONTRIBUTING.md](https://github.com/rust-lang/rust-clippy/blob/main/CONTRIBUTING.md).
284284

285285
## License
286286

book/book.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ title = "Clippy Documentation"
77
edition = "2024"
88

99
[output.html]
10-
edit-url-template = "https://github.com/rust-lang/rust-clippy/edit/master/book/{path}"
11-
git-repository-url = "https://github.com/rust-lang/rust-clippy/tree/master/book"
10+
edit-url-template = "https://github.com/rust-lang/rust-clippy/edit/main/book/{path}"
11+
git-repository-url = "https://github.com/rust-lang/rust-clippy/tree/main/book"
1212
mathjax-support = true
1313
site-url = "/rust-clippy/"
1414

book/src/README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
A collection of lints to catch common mistakes and improve your
66
[Rust](https://github.com/rust-lang/rust) code.
77

8-
[There are over 800 lints included in this crate!](https://rust-lang.github.io/rust-clippy/master/index.html)
8+
[There are over 800 lints included in this crate!](https://rust-lang.github.io/rust-clippy/HEAD/index.html)
99

1010
Lints are divided into categories, each with a default [lint
1111
level](https://doc.rust-lang.org/rustc/lints/levels.html). You can choose how
@@ -38,6 +38,6 @@ on a case-by-case basis before enabling.
3838
- Preventing panicking in certain functions (e.g. [`clippy::unwrap_used`]).
3939
- Running a lint only on a subset of code (e.g. `#[forbid(clippy::float_arithmetic)]` on a module).
4040

41-
[`clippy::else_if_without_else`]: https://rust-lang.github.io/rust-clippy/master/index.html#else_if_without_else
42-
[`clippy::todo`]: https://rust-lang.github.io/rust-clippy/master/index.html#todo
43-
[`clippy::unwrap_used`]: https://rust-lang.github.io/rust-clippy/master/index.html#unwrap_used
41+
[`clippy::else_if_without_else`]: https://rust-lang.github.io/rust-clippy/main/index.html#else_if_without_else
42+
[`clippy::todo`]: https://rust-lang.github.io/rust-clippy/main/index.html#todo
43+
[`clippy::unwrap_used`]: https://rust-lang.github.io/rust-clippy/main/index.html#unwrap_used

book/src/configuration.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,11 @@ disallowed-names = ["toto", "tata", "titi"]
2222

2323
The [table of configurations](./lint_configuration.md)
2424
contains all config values, their default, and a list of lints they affect.
25-
Each [configurable lint](https://rust-lang.github.io/rust-clippy/master/index.html#Configuration)
25+
Each [configurable lint](https://rust-lang.github.io/rust-clippy/main/index.html#Configuration)
2626
, also contains information about these values.
2727

2828
For configurations that are a list type with default values such as
29-
[disallowed-names](https://rust-lang.github.io/rust-clippy/master/index.html#disallowed_names),
29+
[disallowed-names](https://rust-lang.github.io/rust-clippy/main/index.html#disallowed_names),
3030
you can use the unique value `".."` to extend the default values instead of replacing them.
3131

3232
```toml
@@ -132,7 +132,7 @@ is equivalent to `msrv = 1.30.0`.
132132
> enabled explicitly.
133133
134134
Lints that recognize this configuration option can be
135-
found [here](https://rust-lang.github.io/rust-clippy/master/index.html#msrv)
135+
found [here](https://rust-lang.github.io/rust-clippy/main/index.html#msrv)
136136

137137
### Disabling evaluation of certain code
138138

book/src/development/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,4 +61,4 @@ book](../lints.md).
6161
[clippy_rfc]: https://github.com/rust-lang/rfcs/blob/master/text/2476-clippy-uno.md
6262
[rfc_stability]: https://github.com/rust-lang/rfcs/blob/master/text/2476-clippy-uno.md#stability-guarantees
6363
[rfc_lint_cats]: https://github.com/rust-lang/rfcs/blob/master/text/2476-clippy-uno.md#lint-audit-and-categories
64-
[`CONTRIBUTING.md`]: https://github.com/rust-lang/rust-clippy/blob/master/CONTRIBUTING.md
64+
[`CONTRIBUTING.md`]: https://github.com/rust-lang/rust-clippy/blob/main/CONTRIBUTING.md

0 commit comments

Comments
 (0)