Skip to content

Commit

Permalink
Merge branch 'main' into feat/openapi-lint
Browse files Browse the repository at this point in the history
  • Loading branch information
bkioshn authored Jan 30, 2024
2 parents fb746ad + 20745c9 commit a573a0c
Show file tree
Hide file tree
Showing 30 changed files with 366 additions and 322 deletions.
14 changes: 13 additions & 1 deletion .config/dictionaries/project.dic
Original file line number Diff line number Diff line change
Expand Up @@ -106,4 +106,16 @@ xcodeproj
xctest
xctestrun
xcworkspace
yoroi
yoroi
idents
rustflags
rustdoc
rustdocflags
codegen
lintfix
testunit
nextest
testcov
testdocs
fmtchk
fmtfix
69 changes: 16 additions & 53 deletions catalyst-gateway/.cargo/config.toml
Original file line number Diff line number Diff line change
@@ -1,11 +1,8 @@
# Use MOLD linker where possible, but ONLY in CI applicable targets.
# cspell: words rustflags armv gnueabihf msvc nextest idents rustdocflags
# cspell: words rustdoc lintfix lintrestrict testfast testdocs codegen testci testunit
# cspell: words fmtchk fmtfix

# Configure how Docker container targets build.

# If you want to customize these targets for a local build, then customize them in you:
# If you want to customize these targets for a local build, then customize them in your:
# $CARGO_HOME/config.toml
# NOT in the project itself.
# These targets are ONLY the targets used by CI and inside docker builds.
Expand All @@ -28,46 +25,12 @@ rustflags = [
"-C", "target-feature=-crt-static"
]


[build]

rustflags = [
"-D",
"warnings",
"-D",
"missing_docs",
"-D",
"let_underscore_drop",
"-D",
"non_ascii_idents",
"-D",
"single_use_lifetimes",
"-D",
"trivial_casts",
"-D",
"trivial_numeric_casts",
]

rustflags = []
rustdocflags = [
"--enable-index-page",
"-Z",
"unstable-options",
"-D",
"warnings",
"-D",
"missing_docs",
"-D",
"rustdoc::broken_intra_doc_links",
"-D",
"rustdoc::invalid_codeblock_attributes",
"-D",
"rustdoc::invalid_html_tags",
"-D",
"rustdoc::invalid_rust_codeblocks",
"-D",
"rustdoc::bare_urls",
"-D",
"rustdoc::unescaped_backticks",
]

[profile.dev]
Expand All @@ -76,7 +39,7 @@ debug = true
debug-assertions = true
overflow-checks = true
lto = false
panic = 'unwind'
panic = "unwind"
incremental = true
codegen-units = 256

Expand All @@ -86,7 +49,7 @@ debug = false
debug-assertions = false
overflow-checks = false
lto = "thin"
panic = 'unwind'
panic = "unwind"
incremental = false
codegen-units = 16

Expand All @@ -108,23 +71,23 @@ incremental = false
codegen-units = 16

[alias]
lint = "clippy --all-targets -- -D warnings -D clippy::pedantic -D clippy::unwrap_used -D clippy::expect_used -D clippy::exit -D clippy::get_unwrap -D clippy::index_refutable_slice -D clippy::indexing_slicing -D clippy::match_on_vec_items -D clippy::match_wild_err_arm -D clippy::missing_panics_doc -D clippy::panic -D clippy::string_slice -D clippy::unchecked_duration_subtraction -D clippy::unreachable -D clippy::missing_docs_in_private_items"
lintfix = "clippy --all-targets --fix --allow-dirty -- -D warnings -D clippy::pedantic -D clippy::unwrap_used -D clippy::expect_used -D clippy::exit -D clippy::get_unwrap -D clippy::index_refutable_slice -D clippy::indexing_slicing -D clippy::match_on_vec_items -D clippy::match_wild_err_arm -D clippy::missing_panics_doc -D clippy::panic -D clippy::string_slice -D clippy::unchecked_duration_subtraction -D clippy::unreachable -D clippy::missing_docs_in_private_items"
lintrestrict = "clippy -- -D warnings -D clippy::pedantic -D clippy::restriction -D clippy::missing_docs_in_private_items"
lint-vscode = "clippy --workspace --message-format=json-diagnostic-rendered-ansi --all-targets -- -D warnings -D clippy::pedantic -D clippy::unwrap_used -D clippy::expect_used -D clippy::exit -D clippy::get_unwrap -D clippy::index_refutable_slice -D clippy::indexing_slicing -D clippy::match_on_vec_items -D clippy::match_wild_err_arm -D clippy::missing_panics_doc -D clippy::panic -D clippy::string_slice -D clippy::unchecked_duration_subtraction -D clippy::unreachable -D clippy::missing_docs_in_private_items"
lint = "clippy --all-targets"
lintfix = "clippy --all-targets --fix --allow-dirty"
lint-vscode = "clippy --message-format=json-diagnostic-rendered-ansi --all-targets"

docs = "doc --workspace -r --all-features --no-deps --bins --document-private-items --examples --locked"
docs = "doc --release --no-deps --document-private-items --bins --lib --examples"
# nightly docs build broken... when they are'nt we can enable these docs... --unit-graph --timings=html,json -Z unstable-options"
testfast = "nextest --release --workspace --locked"
testdocs = "test --doc --release --workspace --locked"
testunit = "nextest run --release --bins --lib --tests --benches --no-fail-fast -P ci"
testcov = "llvm-cov nextest --release --bins --lib --tests --benches --no-fail-fast -P ci"
testdocs = "test --doc --release"

# Rust formatting, MUST be run with +nightly
fmtchk = "fmt -- --check -v --color=always"
fmtfix = "fmt -- -v"

[term]
quiet = false # whether cargo output is quiet
verbose = true # whether cargo provides verbose output
color = 'always' # whether cargo colorizes output use `CARGO_TERM_COLOR="off"` to disable.
progress.when = 'auto' # whether cargo shows progress bar
progress.width = 80 # width of progress bar
quiet = false # whether cargo output is quiet
verbose = false # whether cargo provides verbose output
color = "auto" # whether cargo colorizes output use `CARGO_TERM_COLOR="off"` to disable.
progress.when = "never" # whether cargo shows progress bar
progress.width = 80 # width of progress bar
6 changes: 3 additions & 3 deletions catalyst-gateway/.config/nextest.toml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# cspell: words nextest scrollability testcase
# cspell: words scrollability testcase
[store]
# The directory under the workspace root at which nextest-related files are
# written. Profile-specific storage is currently written to dir/<profile-name>.
Expand Down Expand Up @@ -35,7 +35,7 @@ path = "junit.xml"
# The name of the top-level "report" element in JUnit report. If aggregating
# reports across different test runs, it may be useful to provide separate names
# for each report.
report-name = "cat-gateway"
report-name = "nextest"

# Whether standard output and standard error for passing tests should be stored in the JUnit report.
# Output is stored in the <system-out> and <system-err> elements of the <testcase> element.
Expand All @@ -46,4 +46,4 @@ store-success-output = true
#
# Note that if a description can be extracted from the output, it is always stored in the
# <description> element.
store-failure-output = true
store-failure-output = true
Loading

0 comments on commit a573a0c

Please sign in to comment.