Skip to content

Commit eafc510

Browse files
committed
fix: minor typo
fix: typos in CONTRIBUTING.md
1 parent 5953a7b commit eafc510

2 files changed

Lines changed: 9 additions & 9 deletions

File tree

CONTRIBUTING.md

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ codebase to enable this functionality. See
5454
## Git Workflow
5555

5656
We follow a Git workflow similar to
57-
[Kubernetes](https://github.com/kubernetes/community/blob/master/contributors/guide/git_workflow.png).
57+
[Kubernetes](https://github.com/kubernetes/community/blob/main/contributors/guide/git_workflow.png).
5858
If you are not familiar with it, please review the following instructions.
5959

6060
### Fork the Repository
@@ -85,16 +85,16 @@ git remote -v
8585

8686
### Create a Branch
8787

88-
Update your local `master` branch:
88+
Update your local `main` branch:
8989

9090
```bash
9191
cd $working_dir/mun
9292
git fetch upstream
93-
git checkout master
94-
git rebase upstream/master
93+
git checkout main
94+
git rebase upstream/main
9595
```
9696

97-
Branch from `master`:
97+
Branch from `main`:
9898

9999
```bash
100100
git checkout -b feature/my-precious
@@ -107,7 +107,7 @@ Now you are ready to edit code on the `feature/my-precious` branch.
107107
```bash
108108
# While on your feature/my-precious branch
109109
git fetch upstream
110-
git rebase upstream/master
110+
git rebase upstream/main
111111
```
112112

113113
Please don't use `git pull` instead of the above `fetch` / `rebase`. By default,
@@ -171,7 +171,7 @@ Refs #133
171171
```
172172

173173
For more examples, check [recent commit
174-
message](https://github.com/mun-lang/mun/commits/master).
174+
message](https://github.com/mun-lang/mun/commits/main).
175175

176176
### Push Changes
177177

@@ -188,7 +188,7 @@ push](https://blog.developer.atlassian.com/force-with-lease/) changes.
188188
### Create a Pull Request
189189

190190
Please submit a [GitHub Pull Request to
191-
mun-lang/mun](https://github.com/mun-lang/mun/pull/new/master) with a clear list
191+
mun-lang/mun](https://github.com/mun-lang/mun/pull/new/main) with a clear list
192192
of changes (read more about [pull
193193
requests](http://help.github.com/pull-requests/)). When you submit a pull request,
194194
make sure to include tests that validate the implemented feature or bugfix

crates/mun_hir/src/source_id.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ impl AstIdMap {
9393
assert!(node.parent().is_none());
9494

9595
let mut res = AstIdMap::default();
96-
// By walking the tree in bread-first order we make sure that parents
96+
// By walking the tree in breadth-first order we make sure that parents
9797
// get lower ids then children. That is, adding a new child does not
9898
// change parent's id. This means that, say, adding a new function to a
9999
// trait does not change ids of top-level items, which helps caching.

0 commit comments

Comments
 (0)