Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: minor typo #348

Merged
merged 1 commit into from
Aug 29, 2021
Merged

fix: minor typo #348

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions CONTRIBUTING.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ codebase to enable this functionality. See
## Git Workflow

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

### Fork the Repository
Expand Down Expand Up @@ -85,16 +85,16 @@ git remote -v

### Create a Branch

Update your local `master` branch:
Update your local `main` branch:

```bash
cd $working_dir/mun
git fetch upstream
git checkout master
git rebase upstream/master
git checkout main
git rebase upstream/main
```

Branch from `master`:
Branch from `main`:

```bash
git checkout -b feature/my-precious
Expand All @@ -107,7 +107,7 @@ Now you are ready to edit code on the `feature/my-precious` branch.
```bash
# While on your feature/my-precious branch
git fetch upstream
git rebase upstream/master
git rebase upstream/main
```

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

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

### Push Changes

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

Please submit a [GitHub Pull Request to
mun-lang/mun](https://github.com/mun-lang/mun/pull/new/master) with a clear list
mun-lang/mun](https://github.com/mun-lang/mun/pull/new/main) with a clear list
of changes (read more about [pull
requests](http://help.github.com/pull-requests/)). When you submit a pull request,
make sure to include tests that validate the implemented feature or bugfix
Expand Down
2 changes: 1 addition & 1 deletion crates/mun_hir/src/source_id.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ impl AstIdMap {
assert!(node.parent().is_none());

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