Skip to content

Commit e4187db

Browse files
authored
Merge pull request #2570 from rust-lang/tshepang/branch-rename
rename primary git branch
2 parents 9565ecd + 0aea968 commit e4187db

File tree

5 files changed

+5
-5
lines changed

5 files changed

+5
-5
lines changed

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: CI
33
on:
44
push:
55
branches:
6-
- master
6+
- main
77
pull_request:
88
schedule:
99
# Run multiple times a day as the successfull cached links are not checked every time.

.github/workflows/rustc-pull.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
github-app-id: ${{ vars.APP_CLIENT_ID }}
1515
zulip-stream-id: 196385
1616
zulip-bot-email: "[email protected]"
17-
pr-base-branch: master
17+
pr-base-branch: main
1818
branch-name: rustc-pull
1919
secrets:
2020
zulip-api-token: ${{ secrets.ZULIP_API_TOKEN }}

book.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ command = "mdbook-mermaid"
1111

1212
[output.html]
1313
git-repository-url = "https://github.com/rust-lang/rustc-dev-guide"
14-
edit-url-template = "https://github.com/rust-lang/rustc-dev-guide/edit/master/{path}"
14+
edit-url-template = "https://github.com/rust-lang/rustc-dev-guide/edit/main/{path}"
1515
additional-js = [
1616
"mermaid.min.js",
1717
"mermaid-init.js",

ci/linkcheck.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ elif [ "$GITHUB_EVENT_NAME" = "pull_request" ] ; then # running in PR CI build
3232

3333
echo "Checking files changed since $BASE_SHA: $CHANGED_FILES"
3434
else # running locally
35-
COMMIT_RANGE=master...
35+
COMMIT_RANGE=main...
3636
CHANGED_FILES=$(git diff --name-only $COMMIT_RANGE | sed 's#^src/##' | tr '\n' ' ')
3737
FLAGS="-f $CHANGED_FILES"
3838

src/rustc-driver/intro.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ specifically [`rustc_driver_impl::run_compiler`][rdi_rc]
3434
[`rustc_driver`]: https://doc.rust-lang.org/nightly/nightly-rustc/rustc_driver/
3535
[`rustc_interface`]: https://doc.rust-lang.org/nightly/nightly-rustc/rustc_interface/index.html
3636
[`Callbacks`]: https://doc.rust-lang.org/nightly/nightly-rustc/rustc_driver/trait.Callbacks.html
37-
[example]: https://github.com/rust-lang/rustc-dev-guide/blob/master/examples/rustc-interface-example.rs
37+
[example]: https://github.com/rust-lang/rustc-dev-guide/blob/main/examples/rustc-interface-example.rs
3838
[i_rc]: https://doc.rust-lang.org/nightly/nightly-rustc/rustc_interface/interface/fn.run_compiler.html
3939
[rd_rc]: https://doc.rust-lang.org/nightly/nightly-rustc/rustc_driver/fn.run_compiler.html
4040
[rdi_rc]: https://doc.rust-lang.org/nightly/nightly-rustc/rustc_driver_impl/fn.run_compiler.html

0 commit comments

Comments
 (0)