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.

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

refactor: renamed public to pub and removed some un-used functions #26

Merged
merged 10 commits into from
Jan 3, 2020

Conversation

tdejager
Copy link
Collaborator

No description provided.

@tdejager tdejager requested a review from baszalmstra October 27, 2019 16:30
@baszalmstra baszalmstra requested a review from Wodann October 28, 2019 15:38
@baszalmstra baszalmstra self-assigned this Oct 28, 2019
@baszalmstra
Copy link
Collaborator

@baszalmstra
Copy link
Collaborator

baszalmstra commented Oct 29, 2019

@tdejager Can you squash both commits into one and rebase onto master? After that I can incorporate them.

@baszalmstra baszalmstra changed the title Renamed public to pub and removed some un-used functions refactor: renamed public to pub and removed some un-used functions Oct 31, 2019
@baszalmstra
Copy link
Collaborator

@tdejager could you take another look at this?

@Wodann Wodann self-requested a review November 21, 2019 22:35
@Wodann
Copy link
Collaborator

Wodann commented Nov 23, 2019

Hi @tdejager, I am planning on using pub in structs (PR #64) so would like to incorporate this PR. Do you have time to rebase this PR with the latest master and update the PR for review?

@tdejager
Copy link
Collaborator Author

Brought this brach up-to-date with master again

@codecov
Copy link

codecov bot commented Nov 26, 2019

Codecov Report

Merging #26 into master will increase coverage by 0.17%.
The diff coverage is 89.47%.

Impacted file tree graph

@@            Coverage Diff            @@
##           master     #26      +/-   ##
=========================================
+ Coverage   71.52%   71.7%   +0.17%     
=========================================
  Files         106     106              
  Lines        7204    7213       +9     
=========================================
+ Hits         5153    5172      +19     
+ Misses       2051    2041      -10
Impacted Files Coverage Δ
...tes/mun_syntax/src/parsing/grammar/declarations.rs 72% <ø> (ø) ⬆️
crates/mun_syntax/src/tests/lexer.rs 100% <ø> (ø) ⬆️
crates/mun_syntax/src/tests/parser.rs 98.24% <ø> (ø) ⬆️
crates/mun_codegen/src/code_gen/symbols.rs 88.27% <100%> (+0.22%) ⬆️
crates/mun_syntax/src/parsing/grammar.rs 71.79% <100%> (ø) ⬆️
crates/mun_syntax/src/syntax_kind/generated.rs 78.77% <100%> (-0.69%) ⬇️
crates/mun_hir/src/code_model.rs 70.65% <83.33%> (+0.88%) ⬆️
crates/mun_syntax/src/ast/generated.rs 57.69% <0%> (+1.23%) ⬆️
crates/mun_syntax/src/ast/traits.rs 62.06% <0%> (+10.34%) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update e53b37d...ec848a1. Read the comment docs.

@baszalmstra
Copy link
Collaborator

@tdejager Could you squash and rebase this PR so we can "rebase and merge" it into master? It's currently still showing conflicts. Running:

git rebase master

will show you what exactly.

@tdejager
Copy link
Collaborator Author

tdejager commented Nov 29, 2019

@tdejager Could you squash and rebase this PR so we can "rebase and merge" it into master? It's currently still showing conflicts. Running:

git rebase master

will show you what exactly.

Sorry, but I've used a regular merge. Even when squashing my commits, although I don't think it matters (you have to solve for commits on the remote branch I believe), I have to solve a merge conflict for an unknown number of commits. Because the generated files are almost always changed. I stopped rebasing after about fixing 4 commits...

@baszalmstra baszalmstra merged commit 6896708 into mun-lang:master Jan 3, 2020
@Wodann Wodann added this to the Mun v0.1.0 milestone May 14, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants