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

quick pr to fix merge conflicts #1048

Merged
merged 1 commit into from
Jun 18, 2021
Merged

quick pr to fix merge conflicts #1048

merged 1 commit into from
Jun 18, 2021

Conversation

gluax
Copy link
Contributor

@gluax gluax commented Jun 18, 2021

Merging too fast caused a merge conflict in a test file. Quick pr to fix it.

@gluax gluax requested a review from acoglio June 18, 2021 16:17
Copy link
Collaborator

@acoglio acoglio left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good -- thank you for doing it so quickly!

@codecov
Copy link

codecov bot commented Jun 18, 2021

Codecov Report

Merging #1048 (b27cffe) into master (001056f) will increase coverage by 0.04%.
The diff coverage is 72.88%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #1048      +/-   ##
==========================================
+ Coverage   75.62%   75.66%   +0.04%     
==========================================
  Files         434      439       +5     
  Lines       17462    17771     +309     
==========================================
+ Hits        13205    13447     +242     
- Misses       4257     4324      +67     
Impacted Files Coverage Δ
asg/src/expression/tuple_access.rs 60.00% <0.00%> (+0.98%) ⬆️
asg/src/lib.rs 94.44% <ø> (-5.56%) ⬇️
asg/src/prelude.rs 80.00% <ø> (-10.00%) ⬇️
asg/src/reducer/monoidal_reducer.rs 90.69% <ø> (-4.66%) ⬇️
asg/tests/fail/circuits/mod.rs 100.00% <ø> (ø)
asg/tests/pass/circuits/mod.rs 100.00% <ø> (ø)
asg/tests/pass/form_ast.rs 100.00% <ø> (ø)
asg/tests/pass/function/mod.rs 100.00% <ø> (ø)
ast/src/common/array_dimensions.rs 89.65% <ø> (+9.65%) ⬆️
ast/src/imports/import_symbol.rs 44.44% <ø> (ø)
... and 339 more

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 b414cde...b27cffe. Read the comment docs.

@acoglio acoglio merged commit 5cc0cca into master Jun 18, 2021
@acoglio acoglio deleted the resolve-master-conflicts branch June 18, 2021 16:38
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.

2 participants