Skip to content

Commit e36aa79

Browse files
committed
Replace hardcoded references to master
1 parent bb0d4f2 commit e36aa79

16 files changed

+33
-33
lines changed

src/archive/release-history.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -96,31 +96,31 @@ older key][pre-0.5-key]).
9696
- [Release notes][1.3.0-notes]
9797

9898
[1.3.0-announce]: http://blog.rust-lang.org/2015/09/17/Rust-1.3.html
99-
[1.3.0-notes]: https://github.com/rust-lang/rust/blob/master/RELEASES.md#version-130-september-2015
99+
[1.3.0-notes]: https://github.com/rust-lang/rust/blob/HEAD/RELEASES.md#version-130-september-2015
100100

101101
## 1.2.0
102102

103103
- [Announcement][1.2.0-announce]
104104
- [Release notes][1.2.0-notes]
105105

106106
[1.2.0-announce]: http://blog.rust-lang.org/2015/08/06/Rust-1.2.html
107-
[1.2.0-notes]: https://github.com/rust-lang/rust/blob/master/RELEASES.md#version-120-2015-08-07
107+
[1.2.0-notes]: https://github.com/rust-lang/rust/blob/HEAD/RELEASES.md#version-120-2015-08-07
108108

109109
## 1.1.0
110110

111111
- [Announcement][1.1.0-announce]
112112
- [Release notes][1.1.0-notes]
113113

114114
[1.1.0-announce]: http://blog.rust-lang.org/2015/06/25/Rust-1.1.html
115-
[1.1.0-notes]: https://github.com/rust-lang/rust/blob/master/RELEASES.md#version-110-2015-06-25
115+
[1.1.0-notes]: https://github.com/rust-lang/rust/blob/HEAD/RELEASES.md#version-110-2015-06-25
116116

117117
## 1.0.0
118118

119119
- [Announcement][1.0.0-announce]
120120
- [Release notes][1.0.0-notes]
121121

122122
[1.0.0-announce]: http://blog.rust-lang.org/2015/05/15/Rust-1.0.html
123-
[1.0.0-notes]: https://github.com/rust-lang/rust/blob/master/RELEASES.md#version-100-2015-05-15
123+
[1.0.0-notes]: https://github.com/rust-lang/rust/blob/HEAD/RELEASES.md#version-100-2015-05-15
124124

125125
## 1.0.0-beta
126126

src/compiler/backports.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ The [release team](../release/index.md) (`T-release`) will handle the backport a
7272
current development cycle (see [release backporting](../release/backporting.md)). If a beta backport
7373
nomination is approved too late, the release team may be unable to backport the change.
7474

75-
Most of the time, accepted backports target the `master` branch. In rare circumstances, a beta
75+
Most of the time, accepted backports target the default branch. In rare circumstances, a beta
7676
backport may need to *directly* target the `beta` branch. In this case, coordinate with the release
7777
team before merging, by opening a new thread on the Zulip [#t-release
7878
channel](https://rust-lang.zulipchat.com/#narrow/channel/241545-t-release)).

src/compiler/third-party-out-of-tree.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ should be labelled appropriately (eg. `relnotes`, `t-compiler`, `t-lang`) just a
102102
were implemented in `rust-lang/rust` directly, include a description of the changes when it is not
103103
obvious to those unfamiliar with the compiler or the out-of-tree crate.
104104

105-
[licenses]: https://github.com/rust-lang/rust/blob/master/src/tools/tidy/src/deps.rs#L10-L19
105+
[licenses]: https://github.com/rust-lang/rust/blob/HEAD/src/tools/tidy/src/deps.rs#L10-L19
106106
[guide_issue]: https://github.com/rust-lang/rustc-dev-guide/issues/285
107107

108108
---
@@ -135,10 +135,10 @@ In summary, the process for establishing an out-of-tree crate is as follows:
135135
1. Add the crate as a dependency to the appropriate in-tree crate and start using.
136136

137137
[gitignore]: https://gitignore.io/api/vim,rust,emacs,clion,visualstudio,visualstudiocode
138-
[triagebot]: https://github.com/rust-lang/rust/blob/master/triagebot.toml
139-
[apache]: https://github.com/rust-lang/rust/blob/master/LICENSE-APACHE
138+
[triagebot]: https://github.com/rust-lang/rust/blob/HEAD/triagebot.toml
139+
[apache]: https://github.com/rust-lang/rust/blob/HEAD/LICENSE-APACHE
140140
[coc]: https://www.rust-lang.org/policies/code-of-conduct
141-
[mit]: https://github.com/rust-lang/rust/blob/master/LICENSE-MIT
141+
[mit]: https://github.com/rust-lang/rust/blob/HEAD/LICENSE-MIT
142142

143143
## Third-party crates
144144
It is sometimes desirable to use the functionality of an existing third-party crate in the compiler.

src/compiler/working-areas.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,15 +30,15 @@ Traits | Improving the trait-system design + implement
3030

3131
[Weekly, in Zulip]: #meeting-calendar
3232
[Polonius]: https://github.com/rust-lang/polonius
33-
[rustc]: https://github.com/rust-lang/rust/tree/master/compiler
33+
[rustc]: https://github.com/rust-lang/rust/tree/HEAD/compiler
3434
[async-await_stream]: https://rust-lang.zulipchat.com/#narrow/channel/187312-wg-async
3535
[async-await_code]: https://github.com/rust-lang/wg-async-foundations
3636
[diagnostics_stream]: https://rust-lang.zulipchat.com/#narrow/channel/147480-t-compiler.2Fdiagnostics
3737
[llvm_stream]: https://rust-lang.zulipchat.com/#narrow/stream/187780-t-compiler.2Fwg-llvm
3838
[llvm_code]: https://github.com/rust-lang/llvm-project
3939
[meta_stream]: https://rust-lang.zulipchat.com/#narrow/channel/185694-z-archived-t-compiler.2Fwg-meta
4040
[mir-opts-stream]: https://rust-lang.zulipchat.com/#narrow/stream/189540-t-compiler.2Fwg-mir-opt
41-
[mir_transform_code]: https://github.com/rust-lang/rust/tree/master/compiler/rustc_mir_transform
41+
[mir_transform_code]: https://github.com/rust-lang/rust/tree/HEAD/compiler/rustc_mir_transform
4242
[nll_stream]: https://rust-lang.zulipchat.com/#narrow/channel/122657-z-archived-t-compiler.2Fwg-nll
4343
[parallel-rustc_stream]: https://rust-lang.zulipchat.com/#narrow/stream/187679-t-compiler.2Fwg-parallel-rustc
4444
[pgo_stream]: https://rust-lang.zulipchat.com/#narrow/channel/187830-z-archived-t-compiler.2Fwg-profile-guided-optimization
@@ -57,8 +57,8 @@ Traits | Improving the trait-system design + implement
5757
[borrowck]: https://github.com/rust-lang/rust/tree/ae9173d7dd4a31806c950c90dcc331f1508b4d17/compiler/rustc_borrowck
5858
[ra-repo]: https://github.com/rust-analyzer/rust-analyzer
5959
[rustc-dev-guide-repo]: https://github.com/rust-lang/rustc-dev-guide
60-
[rustc_errors]: https://github.com/rust-lang/rust/tree/master/compiler/rustc_errors
61-
[rustc_lint]: https://github.com/rust-lang/rust/tree/master/compiler/rustc_lint
60+
[rustc_errors]: https://github.com/rust-lang/rust/tree/HEAD/compiler/rustc_errors
61+
[rustc_lint]: https://github.com/rust-lang/rust/tree/HEAD/compiler/rustc_lint
6262
[annotate-snippets]: https://crates.io/crates/annotate-snippets
6363
[#wg-autodiff]: https://rust-lang.zulipchat.com/#narrow/channel/390790-wg-autodiff
6464
[enzyme-project-goal]: https://github.com/rust-lang/rust-project-goals/issues/109

src/infra/docs/bors/queue-resync.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ the tree.
2020

2121
Sometimes you have to do a bors queue sync for various reasons. This is not
2222
trivial and requires you to be very careful, as otherwise we may accidentally
23-
merge PRs to `master` (or even `beta`) that should not have been merged
23+
merge PRs to the default branch (or even `beta`) that should not have been merged
2424
otherwise.
2525

2626
## Steps

src/infra/docs/rustc-ci.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# How the Rust CI works
22

3-
Continuous integration (CI) workflows on the `rust-lang/rust` repository ensure that the `master` branch
3+
Continuous integration (CI) workflows on the `rust-lang/rust` repository ensure that the default branch
44
is always in a valid state.
55

66
The CI infrastructure is described in detail in the [rustc-dev-guide][rustc-dev-guide].

src/infra/toolstate.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ rules are for when which tools are (not) allowed to break.
3939

4040
* For all tools except for "nightly only" tools, the following extra rules are applied:
4141
* If a PR lands on the `beta` or `stable` branch, the tool has to be `test-pass`.
42-
* If a PR lands on `master` in the week before the beta is cut, and that PR
42+
* If a PR lands on the default branch in the week before the beta is cut, and that PR
4343
regresses the tool (if it makes the state "worse"), CI fails. This is to
4444
help make sure all these tools become `test-pass` so that a beta can be
4545
cut. (See the [Forge index][forge] for when the next beta cutoff is
@@ -55,7 +55,7 @@ runs on the `auto` branch (where bors moves a PR to test if it is good for
5555
integration), the "tool" runners for the individual platforms (at the time of
5656
writing, Linux and Windows) each submit a JSON file to the repository recording
5757
the state of each tool for the commit they are testing. Later, if that commit
58-
actually entirely passed CI and bors moves it to the `master` branch, the
58+
actually entirely passed CI and bors moves it to the default branch, the
5959
"current tool status" in the toolstate repository is updated appropriately.
6060

6161
These scripts also automatically ping some people and create issues when tools
@@ -100,8 +100,8 @@ To add a new tool to be tracked, the following steps must be taken:
100100
4. Submit a PR to the [toolstate repository] to manually add the tool to the
101101
[`latest.json`] file.
102102

103-
[`checktools.sh`]: https://github.com/rust-lang/rust/blob/master/src/ci/docker/x86_64-gnu-tools/checktools.sh
104-
[`publish_toolstate.py`]: https://github.com/rust-lang/rust/blob/master/src/tools/publish_toolstate.py
103+
[`checktools.sh`]: https://github.com/rust-lang/rust/blob/HEAD/src/ci/docker/x86_64-gnu-tools/checktools.sh
104+
[`publish_toolstate.py`]: https://github.com/rust-lang/rust/blob/HEAD/src/tools/publish_toolstate.py
105105
[`latest.json`]: https://github.com/rust-lang-nursery/rust-toolstate/blob/master/_data/latest.json
106106
[Book]: https://doc.rust-lang.org/book/
107107
[Reference]: https://doc.rust-lang.org/reference/

src/libs/maintaining-std.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -291,7 +291,7 @@ Changes to hot code might impact performance in consumers, for better or for wor
291291

292292
### Is the commit log tidy?
293293

294-
PRs shouldn’t have merge commits in them. If they become out of date with `master` then they need to be rebased.
294+
PRs shouldn’t have merge commits in them. If they become out of date with the default branch then they need to be rebased.
295295

296296
## Merging PRs
297297

src/release/issue-triaging.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ To do the initial triage and remove the `needs-triage` label, the following cond
6161

6262
### Applying and removing labels
6363

64-
Users without write access to [`rust-lang/rust`] can use **@rustbot** to add or remove [the labels allowed by the `triagebot.toml` configuration](https://github.com/rust-lang/rust/blob/master/triagebot.toml) as a workaround.
64+
Users without write access to [`rust-lang/rust`] can use **@rustbot** to add or remove [the labels allowed by the `triagebot.toml` configuration](https://github.com/rust-lang/rust/blob/HEAD/triagebot.toml) as a workaround.
6565

6666
Users with write access should change the labels directly to avoid sending a notification to everyone subscribed to the issue unnecessarily.
6767

@@ -73,7 +73,7 @@ For example:
7373

7474
To see a list of all labels, check out the "labels" page next to the search bar in the issue tracker.
7575

76-
Note that some labels may only be applied by users with write access to [`rust-lang/rust`]. Refer to the `allow-unauthenticated` list under `[relabel]` section in [`triagebot.toml`](https://github.com/rust-lang/rust/blob/master/triagebot.toml) to see what labels users without write access may use.
76+
Note that some labels may only be applied by users with write access to [`rust-lang/rust`]. Refer to the `allow-unauthenticated` list under `[relabel]` section in [`triagebot.toml`](https://github.com/rust-lang/rust/blob/HEAD/triagebot.toml) to see what labels users without write access may use.
7777

7878
### Relnotes triage
7979

src/release/process.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ following changes:
6060
- If the release notes PR was merged:
6161

6262
```console
63-
git checkout origin/master -- RELEASES.md
63+
git checkout origin/HEAD -- RELEASES.md
6464
```
6565

6666
- Otherwise, manually copy `RELEASES.md` from the pending release notes PR
@@ -113,18 +113,18 @@ After the `stable` PR is merged you'll need to start the pre-release. Run this c
113113

114114
You need to replace `YYYY-MM-DD` with the date of the release (Thursday).
115115

116-
## Master bootstrap update (Tuesday)
116+
## Default branch bootstrap update (Tuesday)
117117

118118
This step can only be done after the new beta has been released. The release
119119
process for the beta happens automatically at 00:00 UTC every day, so if the
120120
beta PR landed after that you will have to wait another day. You can check
121121
whether beta has been released by installing it with rustup.
122122

123-
Send a PR to the master branch to:
123+
Send a PR to the default branch to:
124124

125125
- Cherry pick the commit that ran `replace-version-placeholder`
126126
from the now merged beta branch PR. Do not re-run the tool as there might
127-
have been other stabilizations on master which were not included in the
127+
have been other stabilizations on the default branch which were not included in the
128128
branched beta, so may not be attributed to the current release.
129129

130130
- Run this to update the bootstrap compiler to the beta you created yesterday:
@@ -151,7 +151,7 @@ Send a PR to the master branch to:
151151
- Replace any `#[cfg_attr(not(bootstrap), $attr)]` with `#[$attr]`.
152152

153153
Note that if a PR adds `cfg(bootstrap)` and is merged between the beta PR and
154-
the master bootstrap update, the `rg` invocation will show them even though
154+
the default branch bootstrap update, the `rg` invocation will show them even though
155155
they won't have to be removed. The easiest way to handle this is to change
156156
them anyway and let CI show you the failure.
157157

0 commit comments

Comments
 (0)