Skip to content

Commit

Permalink
Switch branch name to main
Browse files Browse the repository at this point in the history
Update all references.
  • Loading branch information
joshtriplett committed Jun 2, 2022
1 parent 97a2fbe commit ca83050
Show file tree
Hide file tree
Showing 7 changed files with 21 additions and 21 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ on:
pull_request:
push:
branches:
- master
- main
- staging
- trying

Expand Down
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -419,7 +419,7 @@ assert_eq!(right, [2, 4]);

## Changed

- Enabled CI on master branch.
- Enabled CI.
- `Future::join` and `Future::try_join` can now join futures with different
output types.

Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ fn main() {
More examples, including networking and file access, can be found in our
[`examples`] directory and in our [documentation].

[`examples`]: https://github.com/async-rs/async-std/tree/master/examples
[`examples`]: https://github.com/async-rs/async-std/tree/HEAD/examples
[documentation]: https://docs.rs/async-std#examples
[`task::block_on`]: https://docs.rs/async-std/*/async_std/task/fn.block_on.html
[`"attributes"` feature]: https://docs.rs/async-std/#features
Expand Down
2 changes: 1 addition & 1 deletion ci/install-mdbook.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
set -euxo pipefail

# Based on the Rust-Embedded WG's book CI
# https://github.com/rust-embedded/book/blob/master/ci/install.sh
# https://github.com/rust-embedded/book/blob/HEAD/ci/install.sh

main() {
# Note - this will only accept releases tagged with v0.3.x
Expand Down
2 changes: 1 addition & 1 deletion docs/src/tutorial/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,4 @@ How will it distribute the messages?

This tutorial explains how to write a chat server in `async-std`.

You can also find the tutorial in [our repository](https://github.com/async-rs/async-std/blob/master/examples/a-chat).
You can also find the tutorial in [our repository](https://github.com/async-rs/async-std/blob/HEAD/examples/a-chat).
30 changes: 15 additions & 15 deletions examples/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -154,18 +154,18 @@ Make requests by running the client example:
cargo run --example udp-client
```

[hello-world]: https://github.com/async-rs/async-std/blob/master/examples/hello-world.rs
[line-count]: https://github.com/async-rs/async-std/blob/master/examples/line-count.rs
[list-dir]: https://github.com/async-rs/async-std/blob/master/examples/list-dir.rs
[logging]: https://github.com/async-rs/async-std/blob/master/examples/logging.rs
[print-file]: https://github.com/async-rs/async-std/blob/master/examples/print-file.rs
[socket-timeouts]: https://github.com/async-rs/async-std/blob/master/examples/socket-timeouts.rs
[stdin-echo]: https://github.com/async-rs/async-std/blob/master/examples/stdin-echo.rs
[stdin-timeout]: https://github.com/async-rs/async-std/blob/master/examples/stdin-timeout.rs
[surf-web]: https://github.com/async-rs/async-std/blob/master/examples/surf-web.rs
[task-local]: https://github.com/async-rs/async-std/blob/master/examples/task-local.rs
[task-name]: https://github.com/async-rs/async-std/blob/master/examples/task-name.rs
[tcp-client]: https://github.com/async-rs/async-std/blob/master/examples/tcp-client.rs
[tcp-echo]: https://github.com/async-rs/async-std/blob/master/examples/tcp-echo.rs
[udp-client]: https://github.com/async-rs/async-std/blob/master/examples/udp-client.rs
[udp-echo]: https://github.com/async-rs/async-std/blob/master/examples/udp-echo.rs
[hello-world]: https://github.com/async-rs/async-std/blob/HEAD/examples/hello-world.rs
[line-count]: https://github.com/async-rs/async-std/blob/HEAD/examples/line-count.rs
[list-dir]: https://github.com/async-rs/async-std/blob/HEAD/examples/list-dir.rs
[logging]: https://github.com/async-rs/async-std/blob/HEAD/examples/logging.rs
[print-file]: https://github.com/async-rs/async-std/blob/HEAD/examples/print-file.rs
[socket-timeouts]: https://github.com/async-rs/async-std/blob/HEAD/examples/socket-timeouts.rs
[stdin-echo]: https://github.com/async-rs/async-std/blob/HEAD/examples/stdin-echo.rs
[stdin-timeout]: https://github.com/async-rs/async-std/blob/HEAD/examples/stdin-timeout.rs
[surf-web]: https://github.com/async-rs/async-std/blob/HEAD/examples/surf-web.rs
[task-local]: https://github.com/async-rs/async-std/blob/HEAD/examples/task-local.rs
[task-name]: https://github.com/async-rs/async-std/blob/HEAD/examples/task-name.rs
[tcp-client]: https://github.com/async-rs/async-std/blob/HEAD/examples/tcp-client.rs
[tcp-echo]: https://github.com/async-rs/async-std/blob/HEAD/examples/tcp-echo.rs
[udp-client]: https://github.com/async-rs/async-std/blob/HEAD/examples/udp-client.rs
[udp-echo]: https://github.com/async-rs/async-std/blob/HEAD/examples/udp-echo.rs
2 changes: 1 addition & 1 deletion src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
//! * [The async-std website](https://async.rs/)
//! * [The async-std book](https://book.async.rs)
//! * [GitHub repository](https://github.com/async-rs/async-std)
//! * [List of code examples](https://github.com/async-rs/async-std/tree/master/examples)
//! * [List of code examples](https://github.com/async-rs/async-std/tree/HEAD/examples)
//! * [Discord chat](https://discord.gg/JvZeVNe)
//!
//! # What is in the `async-std` documentation?
Expand Down

0 comments on commit ca83050

Please sign in to comment.