Skip to content

Commit

Permalink
Please consider migrating to 'main' branch
Browse files Browse the repository at this point in the history
This PR makes it much easier to rename the primary branch to main.
Thanks!
  • Loading branch information
nyurik authored and nical committed Dec 26, 2023
1 parent a7423e3 commit 2407b7f
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 10 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ name: Rust

on:
push:
branches: [ master ]
branches: [ main ]
pull_request:
branches: [ master ]
branches: [ main ]

jobs:
ci:
Expand Down
4 changes: 2 additions & 2 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,9 @@ about the algorithms that may be useful to you

## Pull Request Checklist

- Branch from the master branch and, if needed, rebase to the current master
- Branch from the main branch and, if needed, rebase to the current main
branch before submitting your pull request. If it doesn't merge cleanly with
master you may be asked to rebase your changes.
main, you may be asked to rebase your changes.

- Commits should be as small as possible, while ensuring that each commit is
correct independently (i.e., each commit should compile and pass tests).
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ Don't hesitate to [file an issue](https://github.com/nical/lyon/issues/new), ask

### How can I help?

See [CONTRIBUTING.md](https://github.com/nical/lyon/blob/master/CONTRIBUTING.md).
See [CONTRIBUTING.md](https://github.com/nical/lyon/blob/main/CONTRIBUTING.md).

## License

Expand All @@ -110,4 +110,4 @@ Dual MIT/Apache2 is strictly more permissive

### Contribution

There is useful information for contributors in the [contribution guidelines](https://github.com/nical/lyon/blob/master/CONTRIBUTING.md).
There is useful information for contributors in the [contribution guidelines](https://github.com/nical/lyon/blob/main/CONTRIBUTING.md).
6 changes: 3 additions & 3 deletions crates/lyon/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,8 @@
//!
//! # Additional documentation and links
//!
//! * [wgpu example](https://github.com/nical/lyon/tree/master/examples/wgpu).
//! * [wgpu_svg example](https://github.com/nical/lyon/tree/master/examples/wgpu_svg) similar to the first example,
//! * [wgpu example](https://github.com/nical/lyon/tree/main/examples/wgpu).
//! * [wgpu_svg example](https://github.com/nical/lyon/tree/main/examples/wgpu_svg) similar to the first example,
//! can render a very small subset of SVG.
//! * There is some useful documentation on the project's [wiki](https://github.com/nical/lyon/wiki).
//! * The source code is available on the project's [git repository](https://github.com/nical/lyon).
Expand Down Expand Up @@ -171,7 +171,7 @@
//! Lyon does not provide with any GPU abstraction or rendering backend (for now).
//! It is up to the user of this crate to decide whether to use OpenGL, vulkan, gfx-rs,
//! wgpu, glium, or any low level graphics API and how to render it.
//! The [wgpu example](https://github.com/nical/lyon/tree/master/examples/wgpu)
//! The [wgpu example](https://github.com/nical/lyon/tree/main/examples/wgpu)
//! can be used to get an idea of how to render the geometry (in this case
//! using wgpu).
Expand Down
2 changes: 1 addition & 1 deletion crates/tessellation/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@
//! The tessellators produce geometry in the form of vertex and index buffers which are expected
//! to be rendered using the equivalent of OpenGL's `glDrawElements` with mode `GL_TRIANGLES` available
//! under various names in the different graphics APIs.
//! There is an [example](https://github.com/nical/lyon/tree/master/examples/wgpu) showing how
//! There is an [example](https://github.com/nical/lyon/tree/main/examples/wgpu) showing how
//! it can be done with wgpu.
//!
//! ### Flattening and tolerance
Expand Down

0 comments on commit 2407b7f

Please sign in to comment.