Skip to content

Commit af415fc

Browse files
committed
Prepare for renaming of rust-lang/rust default branch
1 parent 6818718 commit af415fc

File tree

6 files changed

+30
-26
lines changed

6 files changed

+30
-26
lines changed

.github/workflows/main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,6 @@ jobs:
9999
- name: Check for broken links
100100
run: |
101101
curl -sSLo linkcheck.sh \
102-
https://raw.githubusercontent.com/rust-lang/rust/master/src/tools/linkchecker/linkcheck.sh
102+
https://raw.githubusercontent.com/rust-lang/rust/HEAD/src/tools/linkchecker/linkcheck.sh
103103
# Cannot use --all here because of the generated redirect pages aren't available.
104104
sh linkcheck.sh book

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ Building the book requires [mdBook], ideally the same version that
2727
rust-lang/rust uses in [this file][rust-mdbook]. To get it:
2828

2929
[mdBook]: https://github.com/rust-lang/mdBook
30-
[rust-mdbook]: https://github.com/rust-lang/rust/blob/master/src/tools/rustbook/Cargo.toml
30+
[rust-mdbook]: https://github.com/rust-lang/rust/blob/HEAD/src/tools/rustbook/Cargo.toml
3131

3232
```bash
3333
$ cargo install mdbook --locked --version <version_num>

nostarch/appendix.md

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -777,6 +777,10 @@ the Translations label at *https://github.com/rust-lang/book/issues?q=is%3Aopen+
777777
* हिंदी at *https://github.com/venkatarun95/rust-book-hindi*
778778
* ไทย at *https://github.com/rust-lang-th/book-th*
779779
* Danske at *https://github.com/DanKHansen/book-dk*
780+
* O’zbek at *https://github.com/rust-lang-uz/book*
781+
* Tiếng Việt at *https://github.com/tuanemdev/rust-book-vn*
782+
* Italiano at *https://nixxo.github.io/rust-lang-book-it/*
783+
* বাংলা at *https://github.com/IsmailHosenIsmailJames/rust-book-bn*
780784

781785
## Appendix G - How Rust is Made and “Nightly Rust”
782786

@@ -799,7 +803,7 @@ bring you new features, fewer bugs, and faster compile times.
799803
### Choo, Choo! Release Channels and Riding the Trains
800804

801805
Rust development operates on a *train schedule*. That is, all development is
802-
done on the `master` branch of the Rust repository. Releases follow a software
806+
done in the main branch of the Rust repository. Releases follow a software
803807
release train model, which has been used by Cisco IOS and other software
804808
projects. There are three *release channels* for Rust:
805809

@@ -813,7 +817,7 @@ try out experimental new features may use nightly or beta.
813817
Here’s an example of how the development and release process works: let’s
814818
assume that the Rust team is working on the release of Rust 1.5. That release
815819
happened in December of 2015, but it will provide us with realistic version
816-
numbers. A new feature is added to Rust: a new commit lands on the `master`
820+
numbers. A new feature is added to Rust: a new commit lands on the main
817821
branch. Each night, a new nightly version of Rust is produced. Every day is a
818822
release day, and these releases are created by our release infrastructure
819823
automatically. So as time passes, our releases look like this, once a night:
@@ -823,7 +827,7 @@ nightly: * - - * - - *
823827
```
824828

825829
Every six weeks, it’s time to prepare a new release! The `beta` branch of the
826-
Rust repository branches off from the `master` branch used by nightly. Now,
830+
Rust repository branches off from the main branch used by nightly. Now,
827831
there are two releases:
828832

829833
```
@@ -844,8 +848,8 @@ beta: *
844848

845849
Let’s say a regression is found. Good thing we had some time to test the beta
846850
release before the regression snuck into a stable release! The fix is applied
847-
to `master`, so that nightly is fixed, and then the fix is backported to the
848-
`beta` branch, and a new release of beta is produced:
851+
to the main branch, so that nightly is fixed, and then the fix is backported to
852+
the `beta` branch, and a new release of beta is produced:
849853

850854
```
851855
nightly: * - - * - - * - - * - - * - - *
@@ -904,9 +908,9 @@ each version is supported for six weeks.
904908

905909
There’s one more catch with this release model: unstable features. Rust uses a
906910
technique called “feature flags” to determine what features are enabled in a
907-
given release. If a new feature is under active development, it lands on
908-
`master`, and therefore, in nightly, but behind a *feature flag*. If you, as a
909-
user, wish to try out the work-in-progress feature, you can, but you must be
911+
given release. If a new feature is under active development, it lands on the
912+
main branch, and therefore, in nightly, but behind a *feature flag*. If you, as
913+
a user, wish to try out the work-in-progress feature, you can, but you must be
910914
using a nightly release of Rust and annotate your source code with the
911915
appropriate flag to opt in.
912916

@@ -975,8 +979,8 @@ there’s consensus to accept or reject the feature.
975979
If the feature is accepted, an issue is opened on the Rust repository, and
976980
someone can implement it. The person who implements it very well may not be the
977981
person who proposed the feature in the first place! When the implementation is
978-
ready, it lands on the `master` branch behind a feature gate, as we discussed
979-
in the “Unstable Features” section.
982+
ready, it lands on the main branch behind a feature gate, as we discussed in
983+
the “Unstable Features” section.
980984

981985
After some time, once Rust developers who use nightly releases have been able
982986
to try out the new feature, team members will discuss the feature, how it’s

packages/tools/src/bin/link2print.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -364,7 +364,7 @@ note: required by `std::fmt::Display::fmt`
364364
365365
[I'm a reference-style link][Arbitrary case-insensitive reference text]
366366
367-
[I'm a relative reference to a repository file](../blob/master/LICENSE)
367+
[I'm a relative reference to a repository file](../blob/HEAD/LICENSE)
368368
369369
[You can use numbers for reference-style link definitions][1]
370370
@@ -387,7 +387,7 @@ I'm an inline-style link with title at *https://www.google.com*
387387
388388
I'm a reference-style link at *https://www.mozilla.org*
389389
390-
I'm a relative reference to a repository file at *../blob/master/LICENSE*
390+
I'm a relative reference to a repository file at *../blob/HEAD/LICENSE*
391391
392392
You can use numbers for reference-style link definitions at *http://slashdot.org*
393393

redirects/release-channels.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ You can check out other resources that describe release channels.
2222

2323
[1]: https://doc.rust-lang.org/1.30.0/book/first-edition/release-channels.html
2424
[2]: appendix-07-nightly-rust.html
25-
[3]: https://github.com/rust-lang/rfcs/blob/master/text/0507-release-channels.md
26-
[4]: https://github.com/rust-lang-nursery/rustup.rs/blob/master/README.md#keeping-rust-up-to-date
25+
[3]: https://github.com/rust-lang/rfcs/blob/HEAD/text/0507-release-channels.md
26+
[4]: https://github.com/rust-lang-nursery/rustup.rs/blob/HEAD/README.md#keeping-rust-up-to-date
2727
[5]: https://www.rust-lang.org/en-US/tools/install
2828

src/appendix-07-nightly-rust.md

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ bring you new features, fewer bugs, and faster compile times.
1919
### Choo, Choo! Release Channels and Riding the Trains
2020

2121
Rust development operates on a _train schedule_. That is, all development is
22-
done on the `master` branch of the Rust repository. Releases follow a software
22+
done in the main branch of the Rust repository. Releases follow a software
2323
release train model, which has been used by Cisco IOS and other software
2424
projects. There are three _release channels_ for Rust:
2525

@@ -33,7 +33,7 @@ try out experimental new features may use nightly or beta.
3333
Here’s an example of how the development and release process works: let’s
3434
assume that the Rust team is working on the release of Rust 1.5. That release
3535
happened in December of 2015, but it will provide us with realistic version
36-
numbers. A new feature is added to Rust: a new commit lands on the `master`
36+
numbers. A new feature is added to Rust: a new commit lands on the main
3737
branch. Each night, a new nightly version of Rust is produced. Every day is a
3838
release day, and these releases are created by our release infrastructure
3939
automatically. So as time passes, our releases look like this, once a night:
@@ -43,7 +43,7 @@ nightly: * - - * - - *
4343
```
4444

4545
Every six weeks, it’s time to prepare a new release! The `beta` branch of the
46-
Rust repository branches off from the `master` branch used by nightly. Now,
46+
Rust repository branches off from the main branch used by nightly. Now,
4747
there are two releases:
4848

4949
```text
@@ -64,8 +64,8 @@ beta: *
6464

6565
Let’s say a regression is found. Good thing we had some time to test the beta
6666
release before the regression snuck into a stable release! The fix is applied
67-
to `master`, so that nightly is fixed, and then the fix is backported to the
68-
`beta` branch, and a new release of beta is produced:
67+
to the main branch, so that nightly is fixed, and then the fix is backported to
68+
the `beta` branch, and a new release of beta is produced:
6969

7070
```text
7171
nightly: * - - * - - * - - * - - * - - *
@@ -124,9 +124,9 @@ each version is supported for six weeks.
124124

125125
There’s one more catch with this release model: unstable features. Rust uses a
126126
technique called “feature flags” to determine what features are enabled in a
127-
given release. If a new feature is under active development, it lands on
128-
`master`, and therefore, in nightly, but behind a _feature flag_. If you, as a
129-
user, wish to try out the work-in-progress feature, you can, but you must be
127+
given release. If a new feature is under active development, it lands on the
128+
main branch, and therefore, in nightly, but behind a _feature flag_. If you, as
129+
a user, wish to try out the work-in-progress feature, you can, but you must be
130130
using a nightly release of Rust and annotate your source code with the
131131
appropriate flag to opt in.
132132

@@ -195,8 +195,8 @@ there’s consensus to accept or reject the feature.
195195
If the feature is accepted, an issue is opened on the Rust repository, and
196196
someone can implement it. The person who implements it very well may not be the
197197
person who proposed the feature in the first place! When the implementation is
198-
ready, it lands on the `master` branch behind a feature gate, as we discussed
199-
in the [“Unstable Features”](#unstable-features)<!-- ignore --> section.
198+
ready, it lands on the main branch behind a feature gate, as we discussed in
199+
the [“Unstable Features”](#unstable-features)<!-- ignore --> section.
200200

201201
After some time, once Rust developers who use nightly releases have been able
202202
to try out the new feature, team members will discuss the feature, how it’s

0 commit comments

Comments
 (0)