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

Some code cleanups to better integrate this into other packages #6

Open
wants to merge 61 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
61 commits
Select commit Hold shift + click to select a range
1e99ac1
add truncation
StrongChris Mar 27, 2023
3baa005
add mismatch counts
StrongChris Mar 27, 2023
77d3f45
Update deps
ChrisRega Oct 4, 2023
f634b5c
Reformat and make truncation length optional arg for the function
ChrisRega Oct 4, 2023
9a8c03d
Smaller code/internal cleanups
ChrisRega Oct 4, 2023
8bea37a
Add more convenient method of getting the absolute keys without exter…
ChrisRega Oct 4, 2023
f0cbf49
Add convenience API and use more modern clap package in arg parsing
ChrisRega Oct 4, 2023
0c8ac8f
Remove colored output
ChrisRega Oct 4, 2023
19a288f
Remove colored output
ChrisRega Oct 4, 2023
25675ec
Improve data structures for library access
ChrisRega Oct 5, 2023
59edca5
Improve data structures for library access
ChrisRega Oct 5, 2023
55fc1e4
Make the truncation available in CLI
ChrisRega Oct 5, 2023
2413fdf
Bump version to 0.2.0
ChrisRega Oct 5, 2023
d81d4bf
Fix issue with empty strings being propagated as diff
ChrisRega Oct 6, 2023
7d96baf
Cleanup main.rs
ChrisRega Oct 6, 2023
3b60e7c
bump version
ChrisRega Oct 6, 2023
ff53f6b
bump lockfile
ChrisRega Oct 6, 2023
055c05a
Fork to new package for publishing of new hvc version
ChrisRega Oct 9, 2023
8bd74d1
Update gitignore
ChrisRega Oct 9, 2023
b885504
Remove Cargo.lock
ChrisRega Oct 9, 2023
425d414
Add array support
ChrisRega Oct 10, 2023
238ad5b
Add myers diff for handling arrays
ChrisRega Oct 28, 2023
057c0ca
Fix some problematic case for myers diff
ChrisRega Nov 10, 2023
1d7ea79
Bump version to 0.3.1
ChrisRega Nov 10, 2023
6ab8672
Fixup README.md
ChrisRega Nov 10, 2023
826f258
Merge pull request #1 from ChrisRega/0.3.1-dev
ChrisRega Nov 10, 2023
6c4f589
Add deep-sorting as an option to the API.
ChrisRega Feb 14, 2024
a16874d
Fix inner diffs in deep sorting.
ChrisRega Feb 15, 2024
e6429b9
Remove unused Array variant.
ChrisRega Feb 17, 2024
24b8d5a
Merge pull request #2 from ChrisRega/0.4.0-sorting
ChrisRega Feb 17, 2024
475e4ce
sort nested arrays
tsetso-spread Mar 14, 2024
ad5b924
Merge pull request #3 from tsetso-spread/sort-nested-arrays
ChrisRega Mar 17, 2024
192e1a9
Remove obsolete comment. Bump version
ChrisRega Mar 17, 2024
ecbf314
Add first shot at ignoring the diff of keys.
ChrisRega May 3, 2024
cd42fd7
Adding first unit test for sorting with ignores
ChrisRega May 3, 2024
5766076
Bump crate version
ChrisRega May 3, 2024
b021c2e
Merge pull request #4 from ChrisRega/feature/add-ignore-list
ChrisRega May 3, 2024
7073fd2
- Clean up truncation
ChrisRega May 22, 2024
ec09467
Merge pull request #5 from ChrisRega/feature/0.6.0-new-diffs-api
ChrisRega May 22, 2024
f04ba93
Add error message to structural problems, Refactoring comparison code…
ChrisRega May 25, 2024
82837a3
Merge pull request #6 from ChrisRega/feature/0.6.0-better-error-handling
ChrisRega May 25, 2024
8f0becf
Starting with documentation
ChrisRega May 25, 2024
6e8e451
- Add more docs
ChrisRega May 26, 2024
a5f39dd
- Make the diff enums drop useless allocations
ChrisRega May 26, 2024
a205441
Fix unit tests
ChrisRega May 26, 2024
3e153bb
- Refactor old ds dir away
ChrisRega May 26, 2024
53db14c
Merge pull request #7 from ChrisRega/feature/0.6.0-better-error-handling
ChrisRega May 26, 2024
7fb67bf
- Minor cleanups
ChrisRega May 26, 2024
6f2a322
- More minor cleanups
ChrisRega May 26, 2024
e4f6ec9
- Fix documentation
ChrisRega May 26, 2024
2fa9d0f
- Add even better docs
ChrisRega May 30, 2024
661e966
- Add coverage
ChrisRega May 30, 2024
1450958
- Fix README.md
ChrisRega May 30, 2024
45b513b
- Fix target in coverage.yml
ChrisRega May 30, 2024
d62528d
- Add cached build for grcov
ChrisRega May 30, 2024
b8bb8dd
- Go to non-cached grcov build again
ChrisRega May 30, 2024
2b24ba6
- Add doctest coverage also
ChrisRega May 30, 2024
4fbf3c2
Merge pull request #8 from ChrisRega/feature/0.6.0-better-error-handling
ChrisRega May 30, 2024
aaf53b5
- Add feature for CLI
ChrisRega May 30, 2024
f8f32d1
Merge pull request #9 from ChrisRega/chore/0.6.0-release-cleanup
ChrisRega May 30, 2024
2d2b0a4
- Don't run tests on CLI
ChrisRega May 30, 2024
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
44 changes: 44 additions & 0 deletions .github/workflows/coverage.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
name: coverage instrument based

on: [ push, pull_request ]

jobs:
build:

runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
- name: Install latest nightly
uses: actions-rs/toolchain@v1
with:
toolchain: nightly
override: true
components: rustfmt, clippy, llvm-tools-preview

- name: Install lcov
run: sudo apt-get install lcov

- name: install grcov
run: cargo install grcov

- uses: actions/checkout@v2
with:
fetch-depth: 0

- name: Run grcov
env:
PROJECT_NAME: "json-diff"
RUSTDOCFLAGS: "-Cinstrument-coverage -Ccodegen-units=1 -Copt-level=0 -Clink-dead-code -Coverflow-checks=off -Zpanic_abort_tests -Cpanic=abort"
RUSTFLAGS: "-Cinstrument-coverage -Ccodegen-units=1 -Copt-level=0 -Clink-dead-code -Coverflow-checks=off -Zpanic_abort_tests -Cpanic=abort"
CARGO_INCREMENTAL: 0
run: |
cargo +nightly build --verbose --no-default-features
cargo +nightly test --verbose --no-default-features
grcov . -s . --binary-path ./target/debug/ -t lcov --llvm --branch --ignore-not-existing --ignore="/*" --ignore="target/*" --ignore="tests/*" -o lcov.info

- name: Push grcov results to Coveralls via GitHub Action
uses: coverallsapp/[email protected]
with:
github-token: ${{ secrets.GITHUB_TOKEN }}
path-to-lcov: "lcov.info"
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,4 @@
/target
**/*.rs.bk
.idea
Cargo.lock
64 changes: 64 additions & 0 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
{
// Verwendet IntelliSense zum Ermitteln möglicher Attribute.
// Zeigen Sie auf vorhandene Attribute, um die zugehörigen Beschreibungen anzuzeigen.
// Weitere Informationen finden Sie unter https://go.microsoft.com/fwlink/?linkid=830387
"version": "0.2.0",
"configurations": [
{
"type": "lldb",
"request": "launch",
"name": "Debug unit tests in library 'json_diff'",
"cargo": {
"args": [
"test",
"--no-run",
"--lib",
"--package=json_diff_ng"
],
"filter": {
"name": "json_diff",
"kind": "lib"
}
},
"args": [],
"cwd": "${workspaceFolder}"
},
{
"type": "lldb",
"request": "launch",
"name": "Debug executable 'json_diff'",
"cargo": {
"args": [
"build",
"--bin=json_diff",
"--package=json_diff_ng"
],
"filter": {
"name": "json_diff",
"kind": "bin"
}
},
"args": [],
"cwd": "${workspaceFolder}"
},
{
"type": "lldb",
"request": "launch",
"name": "Debug unit tests in executable 'json_diff'",
"cargo": {
"args": [
"test",
"--no-run",
"--bin=json_diff",
"--package=json_diff_ng"
],
"filter": {
"name": "json_diff",
"kind": "bin"
}
},
"args": [],
"cwd": "${workspaceFolder}"
}
]
}
244 changes: 0 additions & 244 deletions Cargo.lock

This file was deleted.

Loading