Skip to content

Commit

Permalink
Exclude Charon from workspace (#3580)
Browse files Browse the repository at this point in the history
@celinval pointed out that `cargo update` will attempt to update the
`charon` submodule as well.

Exclude the `charon` submodule from the workspace so that it's not
considered when running `cargo update`, `cargo deny`, `cargo clippy`,
and `cargo fmt`. The PR also reverts some of the configuration changes
made in #3514.

By submitting this pull request, I confirm that my contribution is made
under the terms of the Apache 2.0 and MIT licenses.
  • Loading branch information
zhassan-aws authored Oct 12, 2024
1 parent 184c615 commit 373af49
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 13 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/format-check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ jobs:
- name: 'Run Clippy'
run: |
cargo clippy --workspace --exclude charon --exclude macros --no-deps -- -D warnings
cargo clippy --workspace -- -D warnings
- name: 'Print Clippy Statistics'
run: |
Expand Down
11 changes: 0 additions & 11 deletions deny.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,6 @@
db-path = "~/.cargo/advisory-db"
db-urls = ["https://github.com/rustsec/advisory-db"]
yanked = "deny"
# A list of advisory IDs to ignore. Note that ignored advisories will still
# output a note when they are encountered.
ignore = [
# This is for a crate that is used by Charon
"RUSTSEC-2021-0139",
# This is for a crate that is used by Charon
"RUSTSEC-2020-0095",
]

# This section is considered when running `cargo deny check licenses`
# More documentation for the licenses section can be found here:
Expand Down Expand Up @@ -50,6 +42,3 @@ wildcards = "allow"
unknown-registry = "deny"
unknown-git = "deny"
allow-registry = ["https://github.com/rust-lang/crates.io-index"]
allow-git = [
"https://github.com/hacspec/hax",
]
1 change: 0 additions & 1 deletion rustfmt.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,4 @@ ignore = [
# For some reason, this is not working without the directory wildcard.
"**/firecracker",
"**/tests/perf/s2n-quic/",
"**/charon/charon/",
]

0 comments on commit 373af49

Please sign in to comment.