Skip to content

Commit 586541b

Browse files
borsbors
committed
Auto merge of #3249 - joshtriplett:switch-to-main, r=Amanieu
Change branch references to HEAD where possible or main otherwise This updates CI, documentation, and similar to work with a `main` branch. It also renames references to *other* repositories to work, as well, which additionally makes it easier to search for remaining references. I verified that all modified links still work.
2 parents d1df702 + 07f7c83 commit 586541b

File tree

16 files changed

+38
-40
lines changed

16 files changed

+38
-40
lines changed

‎.github/workflows/bors.yml‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
x86_64-unknown-linux-gnu,
2424
]
2525
steps:
26-
- uses: rust-lang/simpleinfra/github-actions/cancel-outdated-builds@master
26+
- uses: rust-lang/simpleinfra/github-actions/cancel-outdated-builds@HEAD
2727
with:
2828
github_token: "${{ secrets.GITHUB_TOKEN }}"
2929
- uses: actions/checkout@v3
@@ -46,7 +46,7 @@ jobs:
4646
x86_64-apple-darwin,
4747
]
4848
steps:
49-
- uses: rust-lang/simpleinfra/github-actions/cancel-outdated-builds@master
49+
- uses: rust-lang/simpleinfra/github-actions/cancel-outdated-builds@HEAD
5050
with:
5151
github_token: "${{ secrets.GITHUB_TOKEN }}"
5252
- uses: actions/checkout@v3
@@ -81,7 +81,7 @@ jobs:
8181
# ARCH: i686
8282
- target: i686-pc-windows-msvc
8383
steps:
84-
- uses: rust-lang/simpleinfra/github-actions/cancel-outdated-builds@master
84+
- uses: rust-lang/simpleinfra/github-actions/cancel-outdated-builds@HEAD
8585
with:
8686
github_token: "${{ secrets.GITHUB_TOKEN }}"
8787
- uses: actions/checkout@v3
@@ -103,7 +103,7 @@ jobs:
103103
name: Style check
104104
runs-on: ubuntu-22.04
105105
steps:
106-
- uses: rust-lang/simpleinfra/github-actions/cancel-outdated-builds@master
106+
- uses: rust-lang/simpleinfra/github-actions/cancel-outdated-builds@HEAD
107107
with:
108108
github_token: "${{ secrets.GITHUB_TOKEN }}"
109109
- uses: actions/checkout@v3
@@ -163,7 +163,7 @@ jobs:
163163
# x86_64-unknown-redox,
164164
]
165165
steps:
166-
- uses: rust-lang/simpleinfra/github-actions/cancel-outdated-builds@master
166+
- uses: rust-lang/simpleinfra/github-actions/cancel-outdated-builds@HEAD
167167
with:
168168
github_token: "${{ secrets.GITHUB_TOKEN }}"
169169
- uses: actions/checkout@v3
@@ -191,7 +191,7 @@ jobs:
191191
armv7-unknown-linux-uclibceabihf
192192
]
193193
steps:
194-
- uses: rust-lang/simpleinfra/github-actions/cancel-outdated-builds@master
194+
- uses: rust-lang/simpleinfra/github-actions/cancel-outdated-builds@HEAD
195195
with:
196196
github_token: "${{ secrets.GITHUB_TOKEN }}"
197197
- uses: actions/checkout@v3
@@ -210,7 +210,7 @@ jobs:
210210
needs: [docker_linux_tier1, style_check]
211211
runs-on: ubuntu-22.04
212212
steps:
213-
- uses: rust-lang/simpleinfra/github-actions/cancel-outdated-builds@master
213+
- uses: rust-lang/simpleinfra/github-actions/cancel-outdated-builds@HEAD
214214
with:
215215
github_token: "${{ secrets.GITHUB_TOKEN }}"
216216
- uses: actions/checkout@v3
@@ -244,7 +244,7 @@ jobs:
244244
1.30.0,
245245
]
246246
steps:
247-
- uses: rust-lang/simpleinfra/github-actions/cancel-outdated-builds@master
247+
- uses: rust-lang/simpleinfra/github-actions/cancel-outdated-builds@HEAD
248248
with:
249249
github_token: "${{ secrets.GITHUB_TOKEN }}"
250250
- uses: actions/checkout@v3
@@ -277,7 +277,7 @@ jobs:
277277
- { toolchain: 1.30.0, os: macos-11 }
278278
runs-on: ${{ matrix.target.os }}
279279
steps:
280-
- uses: rust-lang/simpleinfra/github-actions/cancel-outdated-builds@master
280+
- uses: rust-lang/simpleinfra/github-actions/cancel-outdated-builds@HEAD
281281
with:
282282
github_token: "${{ secrets.GITHUB_TOKEN }}"
283283
- uses: actions/checkout@v3
@@ -321,7 +321,7 @@ jobs:
321321
name: "Check #[cfg]s"
322322
runs-on: ubuntu-22.04
323323
steps:
324-
- uses: rust-lang/simpleinfra/github-actions/cancel-outdated-builds@master
324+
- uses: rust-lang/simpleinfra/github-actions/cancel-outdated-builds@HEAD
325325
with:
326326
github_token: "${{ secrets.GITHUB_TOKEN }}"
327327
- uses: actions/checkout@v3
@@ -339,7 +339,7 @@ jobs:
339339
runs-on: ubuntu-22.04
340340
needs: docker_linux_tier2
341341
steps:
342-
- uses: rust-lang/simpleinfra/github-actions/cancel-outdated-builds@master
342+
- uses: rust-lang/simpleinfra/github-actions/cancel-outdated-builds@HEAD
343343
with:
344344
github_token: "${{ secrets.GITHUB_TOKEN }}"
345345
- uses: actions/checkout@v3

‎.github/workflows/docs.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: Upload documentation to GitHub Pages
33
on:
44
push:
55
branches:
6-
- master
6+
- main
77

88
# Sets permissions of `GITHUB_TOKEN` to allow deployment to GitHub Pages
99
permissions:

‎.github/workflows/main.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ on:
55
types: [opened, synchronize, reopened]
66
push:
77
branches:
8-
- master
8+
- main
99

1010
permissions:
1111
contents: read # to fetch code (actions/checkout)

‎README.md‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ of all the exported APIs match the platform that libc is compiled for.
1414
More detailed information about the design of this library can be found in its
1515
[associated RFC][rfc].
1616

17-
[rfc]: https://github.com/rust-lang/rfcs/blob/master/text/1291-promote-libc.md
17+
[rfc]: https://github.com/rust-lang/rfcs/blob/HEAD/text/1291-promote-libc.md
1818

1919
## Usage
2020

@@ -60,10 +60,10 @@ newer Rust features are only available on newer Rust toolchains:
6060

6161
## Platform support
6262

63-
[Platform-specific documentation (master branch)][docs.master].
63+
[Platform-specific documentation (HEAD)][docs.head].
6464

6565
See
66-
[`ci/build.sh`](https://github.com/rust-lang/libc/blob/master/ci/build.sh)
66+
[`ci/build.sh`](https://github.com/rust-lang/libc/blob/HEAD/ci/build.sh)
6767
for the platforms on which `libc` is guaranteed to build for each Rust
6868
toolchain. The test-matrix at [GitHub Actions] and [Cirrus CI] show the
6969
platforms in which `libc` tests are run.
@@ -75,10 +75,10 @@ platforms in which `libc` tests are run.
7575
This project is licensed under either of
7676

7777
* [Apache License, Version 2.0](https://www.apache.org/licenses/LICENSE-2.0)
78-
([LICENSE-APACHE](https://github.com/rust-lang/libc/blob/master/LICENSE-APACHE))
78+
([LICENSE-APACHE](https://github.com/rust-lang/libc/blob/HEAD/LICENSE-APACHE))
7979

8080
* [MIT License](https://opensource.org/licenses/MIT)
81-
([LICENSE-MIT](https://github.com/rust-lang/libc/blob/master/LICENSE-MIT))
81+
([LICENSE-MIT](https://github.com/rust-lang/libc/blob/HEAD/LICENSE-MIT))
8282

8383
at your option.
8484

@@ -87,7 +87,7 @@ at your option.
8787
We welcome all people who want to contribute. Please see the [contributing
8888
instructions] for more information.
8989

90-
[contributing instructions]: https://github.com/rust-lang/libc/blob/master/CONTRIBUTING.md
90+
[contributing instructions]: https://github.com/rust-lang/libc/blob/HEAD/CONTRIBUTING.md
9191

9292
Contributions in any form (issues, pull requests, etc.) to this project
9393
must adhere to Rust's [Code of Conduct].
@@ -107,4 +107,4 @@ dual licensed as above, without any additional terms or conditions.
107107
[Documentation]: https://docs.rs/libc/badge.svg
108108
[docs.rs]: https://docs.rs/libc
109109
[License]: https://img.shields.io/crates/l/libc.svg
110-
[docs.master]: https://rust-lang.github.io/libc/#platform-specific-documentation
110+
[docs.head]: https://rust-lang.github.io/libc/#platform-specific-documentation

‎ci/README.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,9 @@ The remaining architectures look like:
4242
* The BSD builds, currently OpenBSD and FreeBSD, use QEMU to boot up a system
4343
and compile/run tests. More information on that below.
4444

45-
[Actions config]: https://github.com/rust-lang/libc/tree/master/.github/workflows
46-
[Cirrus config]: https://github.com/rust-lang/libc/blob/master/.cirrus.yml
47-
[android-docker]: https://github.com/rust-lang/libc/blob/master/ci/docker/x86_64-linux-android/Dockerfile
45+
[Actions config]: https://github.com/rust-lang/libc/tree/HEAD/.github/workflows
46+
[Cirrus config]: https://github.com/rust-lang/libc/blob/HEAD/.cirrus.yml
47+
[android-docker]: https://github.com/rust-lang/libc/blob/HEAD/ci/docker/x86_64-linux-android/Dockerfile
4848

4949
## QEMU
5050

‎ci/linux-s390x.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ set -ex
55
mkdir -m 777 /qemu
66
cd /qemu
77

8-
curl --retry 5 -LO https://github.com/qemu/qemu/raw/master/pc-bios/s390-ccw.img
8+
curl --retry 5 -LO https://github.com/qemu/qemu/raw/HEAD/pc-bios/s390-ccw.img
99
curl --retry 5 -LO http://ftp.debian.org/debian/dists/testing/main/installer-s390x/20220914/images/generic/kernel.debian
1010
curl --retry 5 -LO http://ftp.debian.org/debian/dists/testing/main/installer-s390x/20220914/images/generic/initrd.debian
1111

‎ci/rust.css‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* This is taken from https://github.com/rust-lang/rust/blob/master/src/doc/rust.css */
1+
/* This is taken from https://github.com/rust-lang/rust/blob/HEAD/src/doc/rust.css */
22

33
@font-face {
44
font-family: 'Fira Sans';

‎src/unix/bsd/apple/mod.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3797,7 +3797,7 @@ pub const MSG_RCVMORE: ::c_int = 0x4000;
37973797
pub const SCM_TIMESTAMP: ::c_int = 0x02;
37983798
pub const SCM_CREDS: ::c_int = 0x03;
37993799

3800-
// https://github.com/aosm/xnu/blob/master/bsd/net/if.h#L140-L156
3800+
// https://github.com/aosm/xnu/blob/HEAD/bsd/net/if.h#L140-L156
38013801
pub const IFF_UP: ::c_int = 0x1; // interface is up
38023802
pub const IFF_BROADCAST: ::c_int = 0x2; // broadcast address valid
38033803
pub const IFF_DEBUG: ::c_int = 0x4; // turn on debugging
@@ -4594,7 +4594,7 @@ pub const DLT_ATM_RFC1483: ::c_uint = 11; // LLC/SNAP encapsulated atm
45944594
pub const DLT_RAW: ::c_uint = 12; // raw IP
45954595
pub const DLT_LOOP: ::c_uint = 108;
45964596

4597-
// https://github.com/apple/darwin-xnu/blob/master/bsd/net/bpf.h#L100
4597+
// https://github.com/apple/darwin-xnu/blob/HEAD/bsd/net/bpf.h#L100
45984598
// sizeof(i32)
45994599
pub const BPF_ALIGNMENT: ::c_int = 4;
46004600

‎src/unix/bsd/freebsdlike/dragonfly/mod.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1133,7 +1133,7 @@ pub const PROC_REAP_STATUS: ::c_int = 0x0003;
11331133
pub const PROC_PDEATHSIG_CTL: ::c_int = 0x0004;
11341134
pub const PROC_PDEATHSIG_STATUS: ::c_int = 0x0005;
11351135

1136-
// https://github.com/DragonFlyBSD/DragonFlyBSD/blob/master/sys/net/if.h#L101
1136+
// https://github.com/DragonFlyBSD/DragonFlyBSD/blob/HEAD/sys/net/if.h#L101
11371137
pub const IFF_UP: ::c_int = 0x1; // interface is up
11381138
pub const IFF_BROADCAST: ::c_int = 0x2; // broadcast address valid
11391139
pub const IFF_DEBUG: ::c_int = 0x4; // turn on debugging

‎src/unix/bsd/freebsdlike/mod.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1339,7 +1339,7 @@ pub const CMGROUP_MAX: usize = 16;
13391339

13401340
pub const EUI64_LEN: usize = 8;
13411341

1342-
// https://github.com/freebsd/freebsd/blob/master/sys/net/bpf.h
1342+
// https://github.com/freebsd/freebsd/blob/HEAD/sys/net/bpf.h
13431343
pub const BPF_ALIGNMENT: usize = SIZEOF_LONG;
13441344

13451345
// Values for rtprio struct (prio field) and syscall (function argument)

0 commit comments

Comments
 (0)