summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorgithub-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>2023-01-18 17:23:35 +0000
committerGitHub <noreply@github.com>2023-01-18 17:23:35 +0000
commitffb69f0c6a50347dcbea8497c30876eeeee1d492 (patch)
treec9b0276fc1f873a33bccdea9bc5b0d777c33574d
parent6322b2d9eb3bbc59408606e72dae270511eccec1 (diff)
parent758ec87c952bb9e82c2b1a7bd8c63ee20f0b25fb (diff)
-rw-r--r--.github/workflows/bindgen.yml4
-rw-r--r--.github/workflows/deploy-book.yml2
-rw-r--r--CHANGELOG.md2
-rw-r--r--CONTRIBUTING.md8
-rw-r--r--appveyor.yml2
-rw-r--r--releases/release-announcement-template.md2
6 files changed, 10 insertions, 10 deletions
diff --git a/.github/workflows/bindgen.yml b/.github/workflows/bindgen.yml
index 9ee3ce64..8faa4988 100644
--- a/.github/workflows/bindgen.yml
+++ b/.github/workflows/bindgen.yml
@@ -3,10 +3,10 @@ name: bindgen
on:
push:
branches:
- - master
+ - main
pull_request:
branches:
- - master
+ - main
jobs:
rustfmt-clippy:
diff --git a/.github/workflows/deploy-book.yml b/.github/workflows/deploy-book.yml
index ce7083c8..a0d87a20 100644
--- a/.github/workflows/deploy-book.yml
+++ b/.github/workflows/deploy-book.yml
@@ -3,7 +3,7 @@ name: Deploy book
on:
push:
branches:
- - master
+ - main
jobs:
deploy-book:
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 740a4cb1..bfc611cd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1302,7 +1302,7 @@ Released 2017/10/27
have. [#1094][]
[faq]: https://rust-lang.github.io/rust-bindgen/faq.html
-[fuzzing]: https://github.com/rust-lang/rust-bindgen/blob/master/csmith-fuzzing/README.md
+[fuzzing]: https://github.com/rust-lang/rust-bindgen/blob/main/csmith-fuzzing/README.md
[#938]: https://github.com/rust-lang/rust-bindgen/issues/938
[#888]: https://github.com/rust-lang/rust-bindgen/issues/888
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index ea0fcd97..af7a6232 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -336,7 +336,7 @@ the `codegen::postprocessing` module by following these steps:
Ensure that each commit stands alone, and passes tests. This enables better `git
bisect`ing when needed. If your commits do not stand on their own, then rebase
-them on top of the latest master and squash them into a single commit.
+them on top of the latest main and squash them into a single commit.
All pull requests undergo code review before merging. To request review, comment
`r? @github_username_of_reviewer`. They we will respond with `r+` to approve the
@@ -419,7 +419,7 @@ $ brew install creduce
$ # Etc...
```
-Otherwise, follow [these instructions](https://github.com/csmith-project/creduce/blob/master/INSTALL.md) for building and/or installing `creduce`.
+Otherwise, follow [these instructions](https://github.com/csmith-project/creduce/blob/main/INSTALL.md) for building and/or installing `creduce`.
Running `creduce` requires two things:
@@ -548,9 +548,9 @@ $ ./node_modules/doctoc/doctoc.js CHANGELOG.md
Bump version numbers as needed. Run tests just to ensure everything is working
as expected.
-### Merge to `master`
+### Merge to `main`
-For regular releases, the changes above should end up in `master` before
+For regular releases, the changes above should end up in `main` before
publishing. For dot-releases of an old version (e.g., cherry-picking an
important fix) you can skip this.
diff --git a/appveyor.yml b/appveyor.yml
index 62efeea2..741c59fd 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -25,7 +25,7 @@ platform:
branches:
only:
- - master
+ - main
install:
- if %PLATFORM% == x86 (set RUST_PLATFORM=i686&set MINGW_BITS=32) else (set RUST_PLATFORM=x86_64&set MINGW_BITS=64)
diff --git a/releases/release-announcement-template.md b/releases/release-announcement-template.md
index 9f4e87cc..c33ef85f 100644
--- a/releases/release-announcement-template.md
+++ b/releases/release-announcement-template.md
@@ -41,7 +41,7 @@ Found a bug with `bindgen`? [File an issue here.][file-issue]
[crates.io]: https://crates.io/crates/bindgen
[guide]: https://rust-lang.github.io/rust-bindgen
[docs]: https://docs.rs/bindgen
-[contributing]: https://github.com/rust-lang/rust-bindgen/blob/master/CONTRIBUTING.md
+[contributing]: https://github.com/rust-lang/rust-bindgen/blob/main/CONTRIBUTING.md
[easy]: https://github.com/rust-lang/rust-bindgen/issues?q=is%3Aopen+is%3Aissue+label%3AE-easy
[less-easy]: https://github.com/rust-lang/rust-bindgen/issues?q=is%3Aopen+is%3Aissue+label%3AE-less-easy
[looking]: https://github.com/rust-lang/rust-bindgen/issues/747